[TASK] Move JavaScript from build/Source to Resources/Private

extcode · extcode · Jun 20, 2024 · Jun 20, 2024 · Jun 20, 2024 · Jun 20, 2024
commit 99c9c5e780c4ec5f549f8665d2bc82f5b4800a64
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -43,11 +43,11 @@ jobs:
 
       - name: Install modules based on package-lock.json
         run: npm install
-        working-directory: ./build/Sources
+        working-directory: ./
 
       - name: Run ESLint
         run: npm run lint
-        working-directory: ./build/Sources
+        working-directory: ./
 
   coding-guideline:
     runs-on: ubuntu-latest

diff --git a/.gitignore b/.gitignore
@@ -17,5 +17,5 @@ vendor/
 phpunit.coverage.xml
 phpunit.report.xml
 
-build/Sources/node_modules
+node_modules/
 package-lock.json
diff --git a/build/Sources/JavaScript/add_to_cart.js → Resources/Private/JavaScript/add_to_cart.js b/build/Sources/JavaScript/add_to_cart.js → Resources/Private/JavaScript/add_to_cart.js
diff --git a/...d/Sources/JavaScript/change_be_variant.js → ...s/Private/JavaScript/change_be_variant.js b/...d/Sources/JavaScript/change_be_variant.js → ...s/Private/JavaScript/change_be_variant.js
diff --git a/...avaScript/helper/dispatch_custom_event.js → ...avaScript/helper/dispatch_custom_event.js b/...avaScript/helper/dispatch_custom_event.js → ...avaScript/helper/dispatch_custom_event.js
diff --git a/.../Sources/JavaScript/helper/html_helper.js → .../Private/JavaScript/helper/html_helper.js b/.../Sources/JavaScript/helper/html_helper.js → .../Private/JavaScript/helper/html_helper.js
diff --git a/...ources/JavaScript/prevent_multi_submit.js → ...rivate/JavaScript/prevent_multi_submit.js b/...ources/JavaScript/prevent_multi_submit.js → ...rivate/JavaScript/prevent_multi_submit.js
diff --git a/build/Sources/JavaScript/update_country.js → ...rces/Private/JavaScript/update_country.js b/build/Sources/JavaScript/update_country.js → ...rces/Private/JavaScript/update_country.js
diff --git a/build/Sources/JavaScript/update_currency.js → ...ces/Private/JavaScript/update_currency.js b/build/Sources/JavaScript/update_currency.js → ...ces/Private/JavaScript/update_currency.js
diff --git a/...ces/JavaScript/update_payment_shipping.js → ...ate/JavaScript/update_payment_shipping.js b/...ces/JavaScript/update_payment_shipping.js → ...ate/JavaScript/update_payment_shipping.js
diff --git a/build/Sources/eslint.config.mjs → eslint.config.mjs b/build/Sources/eslint.config.mjs → eslint.config.mjs
diff --git a/build/Sources/package.json → package.json b/build/Sources/package.json → package.json
@@ -1,7 +1,7 @@
 {
   "scripts": {
-    "build": "esbuild JavaScript/add_to_cart.js JavaScript/change_be_variant.js JavaScript/prevent_multi_submit.js JavaScript/update_country.js JavaScript/update_currency.js JavaScript/update_payment_shipping.js --bundle --outdir=../../Resources/Public/JavaScript",
-    "lint": "./node_modules/.bin/eslint JavaScript/"
+    "build": "node_modules/.bin/esbuild Resources/Private/JavaScript/add_to_cart.js Resources/Private/JavaScript/change_be_variant.js Resources/Private/JavaScript/prevent_multi_submit.js Resources/Private/JavaScript/update_country.js Resources/Private/JavaScript/update_currency.js Resources/Private/JavaScript/update_payment_shipping.js --bundle --outdir=../Resources/Public/JavaScript",
+    "lint": "node_modules/.bin/eslint Resources/Private/JavaScript"
   },
   "devDependencies": {
     "@eslint/eslintrc": "^3.0.2",

diff --git a/shell.nix b/shell.nix
@@ -4,6 +4,8 @@
 }:
 
 let
+  nodejs = pkgs.nodejs_20;
+
   php = pkgs.${phpVersion}.buildEnv {
     extensions = { enabled, all }: enabled ++ (with all; [
       xdebug
@@ -92,6 +94,7 @@ in pkgs.mkShell {
   buildInputs = [
     php
     composer
+    nodejs
     projectInstall
     projectCgl
     projectCglFix