From cbfb1a0f430de6d4199c2b6926b63b16425d82aa Mon Sep 17 00:00:00 2001
From: Jelle van der Waa <jvanderwaa@redhat.com>
Date: Fri, 27 Oct 2023 12:22:11 +0200
Subject: [PATCH] test: apply eslint to .js files as well

We want to lint all our JavaScript code, this would trip over
tools/webpack-make.js as it's a shell script. Ignorning it still gives
an eslint warning so this has to be converted to a proper JavaScript
file.
---
 test/static-code      | 8 ++++----
 tools/webpack-make.js | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/static-code b/test/static-code
index 04216a9458b2..6be5d9450364 100755
--- a/test/static-code
+++ b/test/static-code
@@ -20,11 +20,11 @@ set -eu
 # note: `set -e` is not active during the tests.
 
 find_scripts() {
-    # Helper to find all Python files in the tree
+    # Helper to find all scripts in the tree
     (
-        # Any non-binary file which contains a python3 shebang
+        # Any non-binary file which contains a given shebang
         git grep --cached -lIz '^#!.*'"$1"
-        # Any file ending in '.py'
+        # Any file ending in the provided regex
         git ls-files -z "$2"
     ) | sort -z | uniq -z
 }
@@ -69,7 +69,7 @@ test_js_translatable_strings() {
 if [ "${WITH_PARTIAL_TREE:-0}" = 0 ]; then
     test_eslint() {
         test -x node_modules/.bin/eslint -a -x /usr/bin/node || skip 'no eslint'
-        find_scripts 'node' '*.js?' | xargs -0 node_modules/.bin/eslint
+        find_scripts 'node' '*.js' '*.js?' | xargs -0 node_modules/.bin/eslint
     }
 fi
 
diff --git a/tools/webpack-make.js b/tools/webpack-make.js
index d7cfc76c11bc..2c629f8cdbf4 100755
--- a/tools/webpack-make.js
+++ b/tools/webpack-make.js
@@ -1,3 +1,3 @@
-#!/bin/sh
-echo "This got renamed to ./build.js. Please see HACKING.md"
-exit 1
+#!/bin/env node
+console.error("This got renamed to ./build.js. Please see HACKING.md");
+process.exit(1);