@pixolith/webpack-sw6-config 7.0.0 → 7.0.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pixolith/webpack-sw6-config",
   "public": true,
-  "version": "7.0.0",
+  "version": "7.0.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": "15bac739d58808391fc621377b75bde5479639b5",
+  "gitHead": "3ab953477c9f86b856b61fd10f0899b6189d1389",
   "dependencies": {
     "@babel/core": "^7.21.3",
     "@babel/eslint-parser": "^7.21.3",
@@ -67,6 +67,7 @@
     "postcss-loader": "^7.0.2",
     "postcss-scss": "^4.0.6",
     "prettier": "^2.8.4",
+    "process": "^0.11.10",
     "rimraf": "^4.4.0",
     "sass": "^1.59.3",
     "sass-loader": "^13.2.0",

package/src/.postcssrc.js

@@ -1,22 +1,20 @@
 module.exports = ({ file, options, env }) => {
     return {
+        minimizerOptions: {
+            preset: [
+                'default',
+                {
+                    discardComments: { removeAll: true },
+                },
+            ],
+            zindex: false,
+        },
         plugins: {
             // to edit target browsers: use "browserslist" field in package.json
             autoprefixer: {
                 grid: true,
                 env: options.mode + (options.isModern ? ':modern' : ''),
             },
-            cssnano: {
-                preset: [
-                    'default',
-                    {
-                        discardComments: {
-                            removeAll: true,
-                        },
-                    },
-                ],
-                zindex: false,
-            },
         },
     };
 };

package/src/babel.config.js

@@ -7,13 +7,6 @@ module.exports = {
                 corejs: 3,
                 debug: false,
                 useBuiltIns: 'usage',
-                targets: {
-                    browsers: require(process.cwd() + '/package.json')
-                        .browserslist[
-                        process.env.SHOPWARE_MODE +
-                            (process.env.MODE ? ':modern' : '')
-                    ],
-                },
             },
         ],
     ],

package/src/postcss.config.js

@@ -0,0 +1,20 @@
+module.exports = ({ file, options, env }) => {
+    return {
+        minimizerOptions: {
+            preset: [
+                'default',
+                {
+                    discardComments: { removeAll: true },
+                },
+            ],
+            zindex: false,
+        },
+        plugins: {
+            // to edit target browsers: use "browserslist" field in package.json
+            //autoprefixer: {
+            //    grid: true,
+            //    env: options.mode + (options.isModern ? ':modern' : ''),
+            //},
+        },
+    };
+};

package/src/webpack.config.dev.js

@@ -3,7 +3,6 @@ const webpack = require('webpack'),
     Consola = require('consola'),
     fs = require('fs'),
     ASSET_URL = process.env.ASSET_URL || '/',
-    CssMinimizerPlugin = require('css-minimizer-webpack-plugin'),
     StyleLintPlugin = require('stylelint-webpack-plugin'),
     isProd = process.env.NODE_ENV === 'production',
     privatePath = process.env.PLUGIN_PATH,
@@ -57,6 +56,9 @@ module.exports = {
                         loader: 'postcss-loader',
                         options: {
                             sourceMap: !isProd,
+                            postcssOptions: {
+                                config: Path.resolve(__dirname, 'postcss.config.js'),
+                            },
                         },
                     },
                     {
@@ -91,29 +93,22 @@ module.exports = {
                     },
                 ],
             },
-            {
-                test: /\.js$/,
-                loader: 'string-replace-loader',
-                options: {
-                    search:
-                        "import PluginManager from 'src/plugin-system/plugin.manager'",
-                    //match, p1, offset, string
-                    replace: () => 'const PluginManager = window.PluginManager',
-                    flags: 'g',
-                },
-            },
         ],
     },
+    stats: 'errors-warnings',
     devServer: {
-        disableHostCheck: true,
-        sockHost: 'node.px-staging.de',
-        watchContentBase: false,
-        sockPort: 8080,
-        overlay: {
-            warnings: false,
-            errors: true,
+        allowedHosts: 'all',
+        client: {
+            webSocketURL: {
+                hostname: 'node.px-staging.de',
+                protocol: 'ws',
+                port: 8080,
+            },
+            overlay: {
+                warnings: false,
+                errors: true,
+            },
         },
-        writeToDisk: true,
         headers: {
             'Access-Control-Allow-Origin': '*',
             'Access-Control-Allow-Methods':
@@ -121,30 +116,8 @@ module.exports = {
             'Access-Control-Allow-Headers':
                 'X-Requested-With, content-type, Authorization',
         },
-        stats: 'errors-warnings',
-        https: !isProd
-            ? {
-                  ca: fs.readFileSync(
-                      Path.join(
-                          process.cwd() +
-                              '/.ddev/ssl/_wildcard.px-staging.de+1-client.pem',
-                      ),
-                  ),
-                  key: fs.readFileSync(
-                      Path.join(
-                          process.cwd() +
-                              '/.ddev/ssl/_wildcard.px-staging.de+1-key.pem',
-                      ),
-                  ),
-                  cert: fs.readFileSync(
-                      Path.join(
-                          process.cwd() +
-                              '/.ddev/ssl/_wildcard.px-staging.de+1.pem',
-                      ),
-                  ),
-              }
-            : false,
-        after() {
+        server: 'http',
+        onAfterSetupMiddleware: function(devServer) {
             if (!isProd) {
                 Consola.success(
                     `Starting webpack in [${process.env.NODE_ENV}] with [${process.env.SHOPWARE_MODE}]`,
@@ -156,9 +129,8 @@ module.exports = {
     plugins: [
         new ESLintPlugin({
             exclude: [
-                'node_modules',
-                'vendor/pxsw/enterprise-cms/node_modules',
-                'vendor/shopware'
+                '**/node_modules/**',
+                'vendor'
             ]
         }),
         new HookPlugin({
@@ -186,7 +158,7 @@ module.exports = {
         }),
 
         new FilenameLinterPlugin({
-            ignoreFiles: [/node_modules/, /custom\/apps/, /vendor\/shopware/],
+            ignoreFiles: [/node_modules/, /custom\/apps/, /vendor/],
             rules: {
                 // check cases here https://github.com/blakeembrey/change-case
                 scss: 'paramCase',
@@ -197,6 +169,10 @@ module.exports = {
             },
         }),
 
+        new webpack.ProvidePlugin({
+            process: '../../../../process/browser.js',
+        }),
+
         new TimeFixPlugin(),
 
         new webpack.DefinePlugin({
@@ -216,17 +192,15 @@ module.exports = {
         //        '@media(min-width:1280px)': 'desktop',
         //    }
         //}),
-        new CssMinimizerPlugin(),
     ].concat(
         Glob.sync(Path.join(privatePath, '/**/*.s?(a|c)ss')).length
             ? new StyleLintPlugin({
-                  files: '**/Pxsw*/**/*.s?(a|c)ss',
-                  failOnError: false,
-                  fix: false,
-                  configFile: Path.join(__dirname, 'stylelint.config.js'),
-              })
+                files: '**/Pxsw*/**/*.s?(a|c)ss',
+                failOnError: false,
+                fix: false,
+                configFile: Path.join(__dirname, 'stylelint.config.js'),
+            })
             : [],
     ),
     watch: false,
-    stats: 'errors-warnings',
 };

package/src/webpack.config.production.js

@@ -1,5 +1,6 @@
 const webpack = require('webpack'),
     TerserPlugin = require('terser-webpack-plugin'),
+    CssMinimizerPlugin = require('css-minimizer-webpack-plugin'),
     isModern = process.env.MODE === 'modern',
     config = {
         devtool: 'nosources-source-map',
@@ -15,6 +16,19 @@ const webpack = require('webpack'),
             removeEmptyChunks: true,
             sideEffects: false,
             minimizer: [
+                new CssMinimizerPlugin({
+                    minimizerOptions: {
+                        preset: [
+                            "default",
+                            {
+                                discardComments: { removeAll: true },
+                            },
+                        ],
+                    },
+                    minify: [
+                        CssMinimizerPlugin.cssnanoMinify,
+                    ]
+                }),
                 new TerserPlugin({
                     terserOptions: {
                         compress: {