@pixolith/webpack-sw6-config 8.1.4 → 8.1.6

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pixolith/webpack-sw6-config",
   "public": true,
-  "version": "8.1.4",
+  "version": "8.1.6",
   "description": "",
   "main": "src/index.js",
   "scripts": {},
@@ -21,7 +21,7 @@
     "url": "https://github.com/pixolith/webpack-plugins/issues"
   },
   "homepage": "https://github.com/pixolith/webpack-plugins/tree/master/packages/webpack-hook-plugin/#readme",
-  "gitHead": "a866050bf55edb2c031f4a83a1263b69b54dacf6",
+  "gitHead": "29093a6ab1223007b4e1e8a5752a5f40b69570c3",
   "dependencies": {
     "@babel/cli": "7.23.4",
     "@babel/core": "^7.23.7",
@@ -35,8 +35,8 @@
     "@pixolith/webpack-assets-copy-plugin": "^8.0.0",
     "@pixolith/webpack-filename-linter-plugin": "^8.0.0",
     "@pixolith/webpack-hook-plugin": "^8.0.0",
-    "@pixolith/webpack-sw6-plugin-map-emitter": "^8.1.4",
-    "@pixolith/webpack-watcher": "^8.0.4",
+    "@pixolith/webpack-sw6-plugin-map-emitter": "^8.1.6",
+    "@pixolith/webpack-watcher": "^8.1.6",
     "@swc/core": "^1.7.0",
     "autoprefixer": "^10.4.14",
     "babel-loader": "^9.1.2",

package/src/index.js

@@ -11,7 +11,6 @@ const Consola = require('consola');
 const setup = () => {
     Consola.info('Cleaning output folder');
     watcher.clean();
-    Consola.info('Building index files');
     watcher.run();
     console.table({
         isProd: isProd,
@@ -20,7 +19,6 @@ const setup = () => {
         publicPath: process.env.PUBLIC_PATH,
         sharedAssetPath: process.env.SHARED_SCSS_PATH,
         shopwareMode: process.env.SHOPWARE_MODE,
-        jsTranspile: process.env.JS_TRANSPILE,
         globalResourcesPaths: process.env.RESOURCES_PATHS,
         debug: process.env.DEBUG || false,
         version: pkg.version,

package/src/webpack.config.administration.js

@@ -204,7 +204,7 @@ module.exports = {
                                     Path.extname(fromPath),
                                     '',
                                 ).replace('pxsw-', ''),
-                                pluginName = ChangeCase.pascalCase(composerPluginName);
+                                pluginName = 'Pxsw' + ChangeCase.pascalCase(composerPluginName);
 
                             let isPlugin = await Fs.existsSync(`custom/plugins/${pluginName}/src`),
                                 isStaticPlugin = await Fs.existsSync(`custom/static-plugins/${pluginName}/src`);

package/src/webpack.config.dev.js

@@ -101,7 +101,7 @@ module.exports = {
             webSocketURL: {
                 hostname: 'node.px-staging.de',
                 protocol: 'wss',
-                port: 8080,
+                port: process.env.SHOPWARE_MODE === 'administration' ? 8080 : 8081,
             },
             overlay: {
                 warnings: false,
@@ -115,6 +115,7 @@ module.exports = {
             'Access-Control-Allow-Headers':
                 'X-Requested-With, content-type, Authorization',
         },
+        port: process.env.SHOPWARE_MODE === 'administration' ? 8080 : 8081,
         server: !isProd
             ? {
                 type: 'https',
@@ -143,13 +144,17 @@ module.exports = {
         devMiddleware: {
             writeToDisk: true,
         },
-        onAfterSetupMiddleware: function(devServer) {
-            if (!isProd) {
-                Consola.success(
-                    `Starting webpack in [${process.env.NODE_ENV}] with [${process.env.SHOPWARE_MODE}]`,
-                );
-                watcher.watch();
+        setupMiddlewares: (middlewares, devServer) => {
+            if (!devServer) {
+                throw new Error("webpack-dev-server is not defined")
             }
+
+            Consola.success(
+                `Starting webpack in [${process.env.NODE_ENV}] with [${process.env.SHOPWARE_MODE}]`,
+            );
+            watcher.watch();
+
+            return middlewares;
         },
     },
     plugins: [