@pixolith/webpack-sw6-config 8.0.4 → 8.1.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pixolith/webpack-sw6-config",
   "public": true,
-  "version": "8.0.4",
+  "version": "8.1.1",
   "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": "7725da79bfab658053a4e7251a67cfbdeb720f98",
+  "gitHead": "4bf80a9bd47a15e500ebd029f805d9abfdaa3fc6",
   "dependencies": {
     "@babel/cli": "7.23.4",
     "@babel/core": "^7.23.7",
@@ -35,7 +35,7 @@
     "@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-twig-assets-emitter-plugin": "^8.0.3",
+    "@pixolith/webpack-sw6-plugin-map-emitter": "^8.1.1",
     "@pixolith/webpack-watcher": "^8.0.4",
     "@swc/core": "^1.7.0",
     "autoprefixer": "^10.4.14",

package/src/webpack.config.administration.js

@@ -200,12 +200,11 @@ module.exports = {
                         from: publicPath,
                         to: '$pluginPath/$plugin/src/Resources/public',
                         replace: async (fromPath, toPath) => {
-                            let pluginName = ChangeCase.pascalCase(
-                                Path.basename(fromPath).replace(
+                            let composerPluginName = Path.basename(fromPath).replace(
                                     Path.extname(fromPath),
                                     '',
-                                ),
-                            );
+                                ).replace('pxsw-', ''),
+                                pluginName = ChangeCase.pascalCase(composerPluginName);
 
                             let isPlugin = await Fs.existsSync(`custom/plugins/${pluginName}/src`),
                                 isStaticPlugin = await Fs.existsSync(`custom/static-plugins/${pluginName}/src`);
@@ -213,7 +212,13 @@ module.exports = {
                             let pluginFolder = isPlugin ? 'custom/plugins' : (isStaticPlugin ? 'custom/static-plugins' : 'vendor/pxsw');
 
                             toPath = toPath.replace('$pluginPath', pluginFolder);
-                            toPath = toPath.replace('$plugin', pluginName);
+                            if (!isPlugin && !isStaticPlugin) {
+                                let isDoublePxswPlugin = await Fs.existsSync(`vendor/pxsw/pxsw-${composerPluginName}/src`);
+                                toPath = toPath.replace('$plugin', isDoublePxswPlugin ? `pxsw-${composerPluginName}` : composerPluginName);
+                            } else {
+                                toPath = toPath.replace('$plugin', pluginName);
+                            }
+
                             return toPath;
                         },
                     },

package/src/webpack.config.dev.js

@@ -194,6 +194,7 @@ module.exports = {
                 svg: 'paramCase',
             },
         }),
+
         new TimeFixPlugin(),
 
         new webpack.DefinePlugin({

package/src/webpack.config.storefront.js

@@ -9,7 +9,7 @@ const Path = require('path'),
     isProd = process.env.NODE_ENV === 'production',
     ChangeCase = require('change-case'),
     Consola = require('consola'),
-    TwigAssetEmitterPlugin = require('@pixolith/webpack-twig-assets-emitter-plugin'),
+    Sw6PluginMapEmitterPlugin = require('@pixolith/webpack-sw6-plugin-map-emitter'),
     Entry = require('webpack-glob-entry'),
     SvgStorePlugin = require('@pixolith/external-svg-sprite-loader'),
     publicPath = process.env.PUBLIC_PATH,
@@ -212,26 +212,10 @@ module.exports = {
                 callback();
             },
         }),
-        new TwigAssetEmitterPlugin({
+
+        new Sw6PluginMapEmitterPlugin({
             includes: ['js', 'css'],
             ignoreFiles: [/.*icons.*\.js/, /.*chunk.*\.js/],
-            template: {
-                'scripts': {
-                    namespace: '@Storefront/storefront',
-                    path: '',
-                    filename: '_px_base.html.twig',
-                },
-                'styles': {
-                    namespace: '@Storefront/storefront',
-                    path: 'layout',
-                    filename: '_px_meta.html.twig',
-                },
-                'hints': {
-                    namespace: '@Storefront/storefront',
-                    path: 'layout',
-                    filename: '_px_meta.html.twig',
-                },
-            },
         }),
 
         new SvgStorePlugin({