@pixolith/webpack-sw6-config 7.1.2 → 7.2.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pixolith/webpack-sw6-config",
   "public": true,
-  "version": "7.1.2",
+  "version": "7.2.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": "9f3112e0ad94a701e864570bfd372de8aee50a80",
+  "gitHead": "07b8912cd6b9e25da138e3236199de3bec79a58b",
   "dependencies": {
     "@babel/core": "^7.22.1",
     "@babel/eslint-parser": "^7.21.8",
@@ -33,9 +33,9 @@
     "@babel/plugin-transform-runtime": "^7.22.4",
     "@babel/preset-env": "^7.22.4",
     "@babel/preset-typescript": "^7.21.5",
-    "@pixolith/eslint-config-sw6": "^7.0.6",
+    "@pixolith/eslint-config-sw6": "^7.2.0",
     "@pixolith/external-svg-sprite-loader": "^7.1.2",
-    "@pixolith/stylelint-config-standard": "^7.0.7",
+    "@pixolith/stylelint-config-standard": "^7.2.0",
     "@pixolith/webpack-assets-copy-plugin": "^7.1.0",
     "@pixolith/webpack-filename-linter-plugin": "^7.0.0",
     "@pixolith/webpack-hook-plugin": "^7.0.0",
@@ -66,6 +66,7 @@
     "media-query-plugin": "^1.5.0",
     "postcss": "^8.4.24",
     "postcss-loader": "^7.3.2",
+    "postcss-pxtorem": "^6.0.0",
     "postcss-scss": "^4.0.6",
     "prettier": "^2.8.8",
     "rimraf": "^5.0.1",

package/src/postcss.config.js

@@ -0,0 +1,15 @@
+module.exports = ({ file, options, env }) => {
+    return {
+        plugins: {
+            // to edit target browsers: use "browserslist" field in package.json
+            autoprefixer: {
+                env: options.mode + (options.isModern ? ':modern' : ''),
+            },
+            'postcss-pxtorem': {
+                rootValue: 16,
+                unitPrecision: 5,
+                propList: ['*']
+            }
+        },
+    };
+};

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: 'wss',
+                port: 8080,
+            },
+            overlay: {
+                warnings: false,
+                errors: true,
+            },
         },
-        writeToDisk: true,
         headers: {
             'Access-Control-Allow-Origin': '*',
             'Access-Control-Allow-Methods':
@@ -121,30 +116,35 @@ module.exports = {
             'Access-Control-Allow-Headers':
                 'X-Requested-With, content-type, Authorization',
         },
-        stats: 'errors-warnings',
-        https: !isProd
+        server: !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() {
+                type: 'https',
+                options: {
+                    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',
+                        ),
+                    ),
+                }
+            }
+            : 'http',
+        devMiddleware: {
+            writeToDisk: true,
+        },
+        onAfterSetupMiddleware: function(devServer) {
             if (!isProd) {
                 Consola.success(
                     `Starting webpack in [${process.env.NODE_ENV}] with [${process.env.SHOPWARE_MODE}]`,
@@ -156,9 +156,8 @@ module.exports = {
     plugins: [
         new ESLintPlugin({
             exclude: [
-                'node_modules',
-                'vendor/pxsw/enterprise-cms/node_modules',
-                'vendor/shopware'
+                '**/node_modules/**',
+                'vendor'
             ]
         }),
         new HookPlugin({
@@ -186,7 +185,7 @@ module.exports = {
         }),
 
         new FilenameLinterPlugin({
-            ignoreFiles: [/node_modules/, /custom\/apps/, /vendor\/shopware/, /vendor\/store.shopware.com/],
+            ignoreFiles: [/node_modules/, /custom\/apps/, /vendor/],
             rules: {
                 // check cases here https://github.com/blakeembrey/change-case
                 scss: 'paramCase',
@@ -196,7 +195,6 @@ module.exports = {
                 svg: 'paramCase',
             },
         }),
-
         new TimeFixPlugin(),
 
         new webpack.DefinePlugin({
@@ -216,17 +214,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',
@@ -14,7 +15,21 @@ const webpack = require('webpack'),
             removeAvailableModules: true,
             removeEmptyChunks: true,
             sideEffects: false,
+            minimize: true,
             minimizer: [
+                new CssMinimizerPlugin({
+                    minimizerOptions: {
+                        preset: [
+                            "advanced",
+                            {
+                                zIndex: false,
+                            },
+                        ],
+                    },
+                    minify: [
+                        CssMinimizerPlugin.cssnanoMinify,
+                    ]
+                }),
                 new TerserPlugin({
                     terserOptions: {
                         compress: {

package/src/.postcssrc.js

@@ -1,22 +0,0 @@
-module.exports = ({ file, options, env }) => {
-    return {
-        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,
-            },
-        },
-    };
-};