@pixolith/webpack-sw6-config 6.1.1 → 6.1.4

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@pixolith/webpack-sw6-config",
     "public": true,
-    "version": "6.1.1",
+    "version": "6.1.4",
     "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": "02eecbeccef698937d5930a1ed9ef2e0a5abddf5",
+    "gitHead": "191cbc7ae88b565da1449eb915c8ab1572d7b9cf",
     "dependencies": {
         "@babel/core": "^7.16.12",
         "@babel/plugin-proposal-class-properties": "^7.16.7",

package/src/webpack.config.administration.js

@@ -4,7 +4,9 @@ const Path = require('path'),
     changeCase = require('change-case'),
     entry = require('webpack-glob-entry'),
     publicPath = process.env.PUBLIC_PATH,
-    spritePath = process.env.SPRITE_PATH ?? 'custom/plugins/PxswTheme/src/Resources/views/administration';
+    spritePath = process.env.SPRITE_PATH ?? 'custom/plugins/PxswTheme/src/Resources/views/administration',
+    swNodePath = process.env.SW_NODE_PATH ?? 'vendor/shopware/administration/Resources/app/administration/src',
+    swAliasPath = process.env.SW_ALIAS_PATH ?? 'vendor/shopware/administration/Resources/app/administration/src',
     ExtractCssChunks = require('extract-css-chunks-webpack-plugin'),
     AssetsCopyPlugin = require('@pixolith/webpack-assets-copy-plugin'),
     isProd = process.env.NODE_ENV === 'production',
@@ -58,13 +60,13 @@ module.exports = {
             Path.resolve(privatePath, 'js'),
             Path.resolve(
                 process.cwd(),
-                'vendor/shopware/administration/Resources/app/administration/src',
+                swNodePath,
             ),
         ],
         alias: {
             src: Path.join(
                 process.cwd(),
-                'vendor/shopware/administration/Resources/app/administration/src',
+                swAliasPath,
             ),
         },
     },
@@ -109,9 +111,9 @@ module.exports = {
                     {
                         loader: SvgStorePlugin.loader,
                         options: {
-                            name: 'sprite/sprite.svg',
+                            name: 'sprite/sprite_uses.svg',
                             iconName: '[name]',
-                            onlySymbols: true,
+                            onlySymbols: false,
                         },
                     },
                     {
@@ -150,7 +152,7 @@ module.exports = {
         new HookPlugin({
             beforeCompile(compiler, callback) {
                 let path = Path.join(process.cwd(), publicPath, 'sprite'),
-                    filename = 'sprite.svg',
+                    filename = 'sprite_uses.svg',
                     exists = Fs.existsSync(Path.join(path, filename));
 
                 if (!exists) {
@@ -171,13 +173,13 @@ module.exports = {
                 let spriteInputPath = Path.join(
                     process.cwd(),
                     publicPath,
-                    'sprite/sprite.svg',
+                    'sprite/sprite_uses.svg',
                 );
                 let spriteOutputPath = Path.join(
                         process.cwd(),
                         spritePath,
                     ),
-                    spritOutputFilename = '_sprite.svg';
+                    spritOutputFilename = '_sprite_uses.svg';
 
                 let exists = Fs.existsSync(spriteOutputPath);
 
@@ -196,7 +198,7 @@ module.exports = {
         }),
         new AssetsCopyPlugin({
             includes: ['js', 'css'],
-            ignoreFiles: [/[-\w.]*.hot-update.js/, /sprite\/sprite.svg/],
+            ignoreFiles: [/[-\w.]*.hot-update.js/, /sprite\/sprite_uses.svg/],
             files: [
                 {
                     from: publicPath,

package/src/webpack.config.storefront.js

@@ -3,7 +3,9 @@ const Path = require('path'),
     ExtractCssChunks = require('extract-css-chunks-webpack-plugin'),
     privatePath = process.env.PLUGIN_PATH,
     vendorPath = process.env.VENDOR_PATH,
-    spritePath = process.env.SPRITE_PATH ?? 'custom/plugins/PxswTheme/src/Resources/views/storefront';
+    spritePath = process.env.SPRITE_PATH ?? 'custom/plugins/PxswTheme/src/Resources/views/storefront',
+    swNodePath = process.env.SW_NODE_PATH ?? './vendor/shopware/storefront/Resources/app/storefront/vendor',
+    swAliasPath = process.env.SW_ALIAS_PATH ?? '/vendor/shopware/storefront/Resources/app/storefront/src',
     ChangeCase = require('change-case'),
     Consola = require('consola'),
     TwigAssetEmitterPlugin = require('@pixolith/webpack-twig-assets-emitter-plugin'),
@@ -65,14 +67,12 @@ module.exports = {
         modules: [
             'node_modules',
             Path.resolve(privatePath, 'js'),
-            Path.resolve(
-                './vendor/shopware/storefront/Resources/app/storefront/vendor',
-            ),
+            Path.resolve(swNodePath),
         ],
         alias: {
             src: Path.join(
                 process.cwd(),
-                '/vendor/shopware/storefront/Resources/app/storefront/src',
+                swAliasPath,
             ),
         },
     },