Merge pull request #872 from mollie/task/fix-build-action

Task/fix build action
mollie · Jan 8, 2024 · d8e9314 · d8e9314
2 parents c5f8cfd + 3b9fdf9
commit d8e9314
Show file tree

Hide file tree

Showing 5 changed files with 485 additions and 16 deletions.
diff --git a/.distignore b/.distignore
@@ -16,5 +16,14 @@ patchwork.json
 *.config.*
 *.md
 gulpfile.js
+webpack.config.js
+readme.md
 changelog.txt
 psalm.xml
+node_modules/
+.babelrc
+.composer_compiled_assets
+.editorconfig
+.env.example
+.idea/
+.psalm/
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -7,7 +7,7 @@ on:
         required: true
 jobs:
   create_archive:
-    uses: inpsyde/reusable-workflows/.github/workflows/build-plugin-archive.yml@main
+    uses: inpsyde/reusable-workflows/.github/workflows/build-plugin-archive.yml@task/build-plugin-archive-without-dep-dependencies
     with:
       PLUGIN_VERSION: ${{ inputs.PACKAGE_VERSION }}
       PHP_VERSION: 7.2

diff --git a/package.json b/package.json
@@ -48,11 +48,13 @@
     "pump": "^3.0.0",
     "sass": "^1.52.1",
     "sass-loader": "^7.0.1",
-    "wp-pot": "^1.10.2"
+    "webpack-cli": "^5.1.4",
+    "wp-pot": "^1.10.2",
+    "webpack": "^5.89.0"
   },
   "scripts": {
     "watch": "webpack --watch",
-    "build": "node_modules/.bin/encore dev --env.basePath=.",
+    "build": "BASE_PATH=. node_modules/.bin/encore dev",
     "setup": "gulp setup",
     "e2e-activation": "npx playwright test --project=activation",
     "e2e-simple": "npx playwright test --project=simple-classic",

diff --git a/webpack.config.js b/webpack.config.js
@@ -55,9 +55,10 @@ function configCss ({ basePath })
 
 function config (env)
 {
-  const config = [
-    configJavaScript(env),
-    configCss(env)
+    const basePath = process.env.BASE_PATH || '.';
+    const config = [
+    configJavaScript({basePath}),
+    configCss({basePath})
   ]
 
   return [...config]