@pixolith/webpack-sw6-config 6.0.7 → 6.1.2

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@pixolith/webpack-sw6-config",
     "public": true,
-    "version": "6.0.7",
+    "version": "6.1.2",
     "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": "1afb964e58fd5dd972b4c8b5af2f23c3c769ac83",
+    "gitHead": "d04a0e3b3b31fcdebae568a69dcb33a38cc113b2",
     "dependencies": {
         "@babel/core": "^7.16.12",
         "@babel/plugin-proposal-class-properties": "^7.16.7",
@@ -37,7 +37,7 @@
         "@pixolith/webpack-assets-copy-plugin": "^6.0.1",
         "@pixolith/webpack-filename-linter-plugin": "^6.0.1",
         "@pixolith/webpack-hook-plugin": "^6.0.1",
-        "@pixolith/webpack-twig-assets-emitter-plugin": "^6.0.1",
+        "@pixolith/webpack-twig-assets-emitter-plugin": "^6.1.0",
         "@pixolith/webpack-watcher": "^6.0.1",
         "autoprefixer": "^9.7.4",
         "babel-eslint": "^10.0.3",

package/src/webpack.config.administration.js

@@ -3,7 +3,8 @@ const Path = require('path'),
     privatePath = process.env.PLUGIN_PATH,
     changeCase = require('change-case'),
     entry = require('webpack-glob-entry'),
-    publicPath = process.env.PUBLIC_PATH,
+    publicPath = 'public',
+    spritePath = process.env.SPRITE_PATH ?? 'custom/plugins/PxswTheme/src/Resources/views/administration';
     ExtractCssChunks = require('extract-css-chunks-webpack-plugin'),
     AssetsCopyPlugin = require('@pixolith/webpack-assets-copy-plugin'),
     isProd = process.env.NODE_ENV === 'production',
@@ -108,9 +109,9 @@ module.exports = {
                     {
                         loader: SvgStorePlugin.loader,
                         options: {
-                            name: 'sprite/sprite.svg',
+                            name: 'sprite/sprite_uses.svg',
                             iconName: '[name]',
-                            onlySymbols: true,
+                            onlySymbols: false,
                         },
                     },
                     {
@@ -149,7 +150,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) {
@@ -170,13 +171,13 @@ module.exports = {
                 let spriteInputPath = Path.join(
                     process.cwd(),
                     publicPath,
-                    'sprite/sprite.svg',
+                    'sprite/sprite_uses.svg',
                 );
                 let spriteOutputPath = Path.join(
                         process.cwd(),
-                        'custom/plugins/PxswTheme/src/Resources/views/administration',
+                        spritePath,
                     ),
-                    spritOutputFilename = '_sprite.svg';
+                    spritOutputFilename = '_sprite_uses.svg';
 
                 let exists = Fs.existsSync(spriteOutputPath);
 
@@ -195,7 +196,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,6 +3,7 @@ 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';
     ChangeCase = require('change-case'),
     Consola = require('consola'),
     TwigAssetEmitterPlugin = require('@pixolith/webpack-twig-assets-emitter-plugin'),
@@ -10,7 +11,7 @@ const Path = require('path'),
     isProd = process.env.NODE_ENV === 'production',
     isModern = process.env.MODE === 'modern',
     SvgStorePlugin = require('@pixolith/external-svg-sprite-loader'),
-    publicPath = 'public',
+    publicPath = process.env.PUBLIC_PATH,
     ASSET_URL = process.env.ASSET_URL || '/',
     HookPlugin = require('@pixolith/webpack-hook-plugin'),
     outputConfig = {
@@ -207,7 +208,7 @@ module.exports = {
                 );
                 let spriteOutputPath = Path.join(
                         process.cwd(),
-                        'custom/plugins/PxswTheme/src/Resources/views/storefront',
+                        spritePath,
                     ),
                     spritOutputFilename = '_sprite.svg';