@pixolith/webpack-sw6-config 9.0.0 → 11.0.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pixolith/webpack-sw6-config",
   "public": true,
-  "version": "9.0.0",
+  "version": "11.0.0",
   "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": "07feda64fe1e987ef572a4ad06619712eccd4b6e",
+  "gitHead": "d0ba47858dc6ddfeaadceaecea5ea59e97c96717",
   "dependencies": {
     "@babel/cli": "7.25.9",
     "@babel/core": "^7.26.0",
@@ -29,14 +29,15 @@
     "@babel/plugin-proposal-decorators": "7.25.9",
     "@babel/preset-env": "7.26.0",
     "@babel/preset-typescript": "7.26.0",
-    "@pixolith/eslint-config-sw6": "^9.0.0",
-    "@pixolith/external-svg-sprite-loader": "^9.0.0",
-    "@pixolith/stylelint-config-standard": "^9.0.0",
-    "@pixolith/webpack-assets-copy-plugin": "^9.0.0",
-    "@pixolith/webpack-filename-linter-plugin": "^9.0.0",
-    "@pixolith/webpack-hook-plugin": "^9.0.0",
-    "@pixolith/webpack-sw6-plugin-map-emitter": "^9.0.0",
-    "@pixolith/webpack-watcher": "^9.0.0",
+    "@pixolith/eslint-config-sw6": "^11.0.0",
+    "@pixolith/external-svg-sprite-loader": "^11.0.0",
+    "@pixolith/stylelint-config-standard": "^11.0.0",
+    "@pixolith/webpack-assets-copy-plugin": "^11.0.0",
+    "@pixolith/webpack-filename-linter-plugin": "^11.0.0",
+    "@pixolith/webpack-hook-plugin": "^11.0.0",
+    "@pixolith/webpack-sw6-plugin-map-emitter": "^11.0.0",
+    "@pixolith/webpack-twig-assets-emitter-plugin": "^11.0.0",
+    "@pixolith/webpack-watcher": "^11.0.0",
     "@swc/core": "^1.9.3",
     "autoprefixer": "^10.4.20",
     "babel-loader": "^9.2.1",

package/src/babel.config.js

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
     presets: [
         ['@babel/preset-env', {
             useBuiltIns: 'entry',

package/src/config.js

@@ -4,8 +4,9 @@ const Path = require('path');
 
 const config = {
     isProd: process.env.NODE_ENV === 'production',
-    isDebug: !!process.env.DEBUG || true,
+    isDebug: !!process.env.DEBUG || false,
     shopwareMode: process.env.SHOPWARE_MODE,
+    shopwareVersion: process.env.SHOPWARE_VERSION || '6.6',
 
     assetUrl: process.env.ASSET_URL || '/',
     pluginPrefixes: process.env.PLUGIN_PREFIXES || 'Pxsw',
@@ -31,13 +32,11 @@ const config = {
     shopwareVendorPath: Path.join(process.cwd(), 'vendor/shopware/storefront/Resources/app/storefront/vendor'),
     shopwarePluginPath: Path.join(process.cwd(), 'vendor/shopware/storefront/Resources/app/storefront/src'),
 
-    spriteOutputPath: Path.join(process.cwd(), 'custom/plugins/PxswTheme/src/Resources/views'),
-
     allowedExtensions: ['.ts', '.js', '.scss', '.css', '.svg']
 }
 
-const pxEntryPath = process.env.PX_ENTRY_PATH || process.env.SHOPWARE_MODE === 'storefront' ? 'src/Resources/app/storefront/private' : 'src/Resources/app/administration/src';
-const pxRouteSplitPath = process.env.PX_ROUTE_SPLIT_PATH || process.env.SHOPWARE_MODE === 'storefront' ? 'src/Resources/app/storefront/private/scss-route-split/*' : '';
+const pxEntryPath = process.env.PX_ENTRY_PATH || (process.env.SHOPWARE_MODE === 'storefront' ? 'src/Resources/app/storefront/private' : 'src/Resources/app/administration/src');
+const pxRouteSplitPath = process.env.PX_ROUTE_SPLIT_PATH || (process.env.SHOPWARE_MODE === 'storefront' ? 'src/Resources/app/storefront/private/scss-route-split/*' : '');
 
 // Create a glob regex to match the plugin prefixes
 let prefixes = config.pluginPrefixes.split(',').map(p => `${p}*`).join('|');

package/src/postcss.config.js

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
     'plugins': {
         // to edit target browsers: use "browserslist" field in package.json
         'autoprefixer': {},

package/src/webpack.config.administration.js

@@ -8,30 +8,29 @@ const Path = require('path'),
     Consola = require('consola'),
     AssetsCopyPlugin = require('@pixolith/webpack-assets-copy-plugin'),
     SvgStorePlugin = require('@pixolith/external-svg-sprite-loader'),
+    TwigAssetEmitterPlugin = require('@pixolith/webpack-twig-assets-emitter-plugin'),
     outputConfig = {
         path: config.outputPath,
         publicPath: '/',
         filename: (chunkData) => {
-            let pluginName = chunkData.chunk.name
-                .toLowerCase()
-                .replace('vendor-', '')
-                .replace('pxsw-pxsw-', 'pxsw-');
-            return `${pluginName.replace(
-                /-/g,
-                '',
-            )}/administration/js/${pluginName}.js`;
+            let pluginName = chunkData.chunk.name.toLowerCase().replace('pxsw-pxsw-', 'pxsw-');
+            pluginName = config.shopwareVersion === '6.6' ? pluginName.replace('vendor-', '') : pluginName;
+            return config.shopwareVersion === '6.6' ?
+                `${pluginName.replace(/-/g, '',)}/administration/js/${pluginName}.js` :
+                `js/${pluginName}${
+                    config.isProd ? '.admin.[contenthash]' : ''
+                }.js`;
         }
     },
     miniCssChunksConfig = {
         filename: (chunkData) => {
-            let pluginName = chunkData.chunk.name
-                .toLowerCase()
-                .replace('vendor-', '')
-                .replace('pxsw-pxsw-', 'pxsw-');
-            return `${pluginName.replace(
-                /-/g,
-                '',
-            )}/administration/css/${pluginName}.css`;
+            let pluginName = chunkData.chunk.name.toLowerCase().replace('pxsw-pxsw-', 'pxsw-');
+            pluginName = config.shopwareVersion === '6.6' ? pluginName.replace('vendor-', '') : pluginName;
+            return config.shopwareVersion === '6.6' ?
+                `${pluginName.replace(/-/g, '',)}/administration/css/${pluginName}.css` :
+                `css/${pluginName}${
+                    config.isProd ? '.admin.[contenthash]' : ''
+                }.css`;
         }
     }
 
@@ -58,12 +57,9 @@ module.exports = {
             console.table({...entriesPlugins, ...entriesVendor });
         }
 
-        console.table({...entriesPlugins, ...entriesVendor });
-
         return {...entriesPlugins, ...entriesVendor };
     },
     module: {
-        // loader order is from right to left or from bottom to top depending on the notation but basicly always reverse
         rules: [
             {
                 test: /\.js$/,
@@ -133,7 +129,7 @@ module.exports = {
         new SvgStorePlugin(),
         new MiniCssExtractPlugin(miniCssChunksConfig),
     ].concat(
-        config.isProd ?
+        config.isProd && config.shopwareVersion === '6.6' ?
             new AssetsCopyPlugin({
                 includes: ['js', 'css'],
                 ignoreFiles: [/[-\w.]*.hot-update.js/],
@@ -166,6 +162,17 @@ module.exports = {
                     },
                 ],
             }) : [],
+    ).concat(
+        config.isProd && config.shopwareVersion !== '6.6' ?
+        new TwigAssetEmitterPlugin({
+            includes: ['js', 'css'],
+            ignoreFiles: [/.*icons.*\.js/],
+            template: {
+                admin: {
+                    filename: 'index.html.twig',
+                },
+            },
+        }) : [],
     ),
 
     optimization: {

package/src/webpack.config.dev.js

@@ -23,11 +23,11 @@ module.exports = {
         ],
         alias: {
             src: Path.resolve(config.shopwarePluginPath),
+            vendor: Path.resolve(config.shopwareVendorPath),
         },
     },
     devtool: 'inline-cheap-module-source-map',
     module: {
-        // loader order is from right to left or from bottom to top depending on the notation but basicly always reverse
         rules: [
             {
                 test: /(\.scss|\.css)$/,
@@ -186,6 +186,7 @@ module.exports = {
                 process.env.NODE_ENV || 'development',
             ),
             'process.env.ASSET_URL': JSON.stringify(config.assetUrl),
+            'process.env.RESOURCES_PATHS': JSON.stringify(process.env.RESOURCES_PATHS || '[]'),
         }),
     ].concat(
         config.isProd && config.mediaQueries

package/src/webpack.config.production.js

@@ -1,11 +1,7 @@
-const config = require('./config'),
-    webpack = require('webpack'),
+const webpack = require('webpack'),
     TerserPlugin = require('terser-webpack-plugin'),
     CssMinimizerPlugin = require('css-minimizer-webpack-plugin'),
-    StyleLintPlugin = require('stylelint-webpack-plugin'),
-    Glob = require('glob'),
     RemoveEmptyScriptsPlugin = require('webpack-remove-empty-scripts'),
-    Path = require('path'),
     productionConfig = {
         devtool: 'nosources-source-map',
         performance: {
@@ -51,17 +47,7 @@ const config = require('./config'),
                 },
             }),
             new RemoveEmptyScriptsPlugin(),
-        ].concat(
-            //Glob.sync(Path.join(config.pluginSrcPath, '/**/*.s?(a|c)ss')).length
-            //    ? new StyleLintPlugin({
-            //        files: '**/Pxsw*/**/*.s?(a|c)ss',
-            //        failOnError: false,
-            //        fix: false,
-            //        configFile: Path.join(__dirname, 'stylelint.config.js'),
-            //    })
-            //    : [],
-            []
-        ),
+        ],
         stats: 'normal',
     };
 

package/src/webpack.config.storefront.js

@@ -68,7 +68,6 @@ module.exports = {
         return { ...entriesPlugins, ...entriesVendor, ...routeSplitEntriesPlugins, ...routeSplitEntriesVendor };
     },
     module: {
-        // loader order is from right to left or from bottom to top depending on the notation but basicly always reverse
         rules: [
             {
                 test: /\.js$/,