weboptimizer 2.0.1167 → 2.0.1170

package/declarations.d.ts

@@ -25,7 +25,12 @@ declare module 'postcss-fontpath' {
 declare module 'postcss-sprites' {
     export default function(options:Partial<{
         filterBy:() => Promise<void>
-        hooks:{onSaveSpritesheet:(_image:Mapping) => string}
+        hooks:{
+            onSaveSpritesheet:(_image:Mapping<unknown>) => string
+            onUpdateRule:(
+                _rule:PostcssNode, _token:PostcssNode, _image:Mapping<unknown>
+            ) => void
+        }
         spritePath:string
         stylesheetPath:null|string
         verbose:boolean

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weboptimizer",
-  "version": "2.0.1167",
+  "version": "2.0.1170",
   "description": "A generic web optimizer, (module) bundler and development environment.",
   "keywords": [
     "webpack",
@@ -111,7 +111,6 @@
   "devDependencies": {
     "@babel/cli": "*",
     "@babel/eslint-parser": "*",
-    "@types/cssnano": "*",
     "@types/ejs": "*",
     "@types/favicons": "*",
     "@types/html-minifier": "*",
@@ -923,10 +922,17 @@
           },
           "cssnano": {
             "#": "The autoprefixer has to be disabled in this context since it would remove all needed vendor prefixes from the preceding processing (every prefix should be needed here).",
-            "autoprefixer": false,
-            "discardUnused": {
-              "__evaluate__": "!self.library"
-            }
+            "preset": [
+              {
+                "__evaluate__": "optionalRequire('cssnano-preset-default')"
+              },
+              {
+                "autoprefixer": false,
+                "discardUnused": {
+                  "__evaluate__": "!self.library"
+                }
+              }
+            ]
           },
           "data": {
             "exclude": null,

package/webpackConfigurator.js

@@ -54,7 +54,8 @@ var _helper = _interopRequireDefault(require("./helper"));
 
 var _ejsLoader = _interopRequireDefault(require("./ejsLoader"));
 
-var _this = void 0,
+var _optionalRequire,
+    _this = void 0,
     _configuration$path$c,
     _configuration$cache,
     _configuration$cache2,
@@ -78,6 +79,7 @@ var postcssCSSnano = (0, _clientnode.optionalRequire)('cssnano');
 var postcssFontpath = (0, _clientnode.optionalRequire)('postcss-fontpath');
 var postcssImport = (0, _clientnode.optionalRequire)('postcss-import');
 var postcssSprites = (0, _clientnode.optionalRequire)('postcss-sprites');
+var updateRule = (_optionalRequire = (0, _clientnode.optionalRequire)('postcss-sprites/lib/core')) === null || _optionalRequire === void 0 ? void 0 : _optionalRequire.updateRule;
 var postcssURL = (0, _clientnode.optionalRequire)('postcss-url');
 var pluginNameResourceMapping = {
   HTML: 'html-webpack-plugin',
@@ -896,6 +898,21 @@ var cssUse = _module.preprocessor.cascadingStyleSheet.additional.pre.map(evaluat
         hooks: {
           onSaveSpritesheet: function onSaveSpritesheet(image) {
             return (0, _path.join)(image.spritePath, (0, _path.relative)(configuration.path.target.asset.image, configuration.files.compose.image));
+          },
+
+          /*
+              Reset this token due to a
+              sprite bug with
+              "background-image" declaration
+              which do not refer to an image
+              (e.g. linear gradient instead).
+          */
+          onUpdateRule: function onUpdateRule(rule, token, image) {
+            if (token.value.includes(token.text)) updateRule(rule, token, image);else token.cloneAfter({
+              type: 'decl',
+              prop: 'background-image',
+              value: token.value
+            });
           }
         },
         stylesheetPath: configuration.path.source.asset.cascadingStyleSheet,
@@ -919,7 +936,7 @@ var genericLoader = {
     use: _module.preprocessor.ejs.additional.pre.map(evaluateMapper).concat({
       loader: 'file?name=[path][name]' + ((_clientnode["default"].isPlainObject(_module.preprocessor.ejs.options) ? _module.preprocessor.ejs.options : {
         compileSteps: 2
-      }).compileSteps % 2 ? '.js' : '') + "?".concat(configuration.hashAlgorithm, "=[chunkhash]")
+      }).compileSteps % 2 ? '.js' : '') + "?".concat(configuration.hashAlgorithm, "=[contenthash]")
     }, {
       loader: 'extract'
     }, {
@@ -981,7 +998,7 @@ var genericLoader = {
       use: _module.preprocessor.html.additional.pre.map(evaluateMapper).concat({
         loader: 'file?name=' + (0, _path.join)((0, _path.relative)(configuration.path.target.asset.base, configuration.path.target.asset.template), '[name]' + ((_clientnode["default"].isPlainObject(_module.preprocessor.html.options) ? _module.preprocessor.html.options : {
           compileSteps: 2
-        }).compileSteps % 2 ? '.js' : '') + "?".concat(configuration.hashAlgorithm, "=[chunkhash]"))
+        }).compileSteps % 2 ? '.js' : '') + "?".concat(configuration.hashAlgorithm, "=[contenthash]"))
       }, (_clientnode["default"].isPlainObject(_module.preprocessor.html.options) ? _module.preprocessor.html.options : {
         compileSteps: 2
       }).compileSteps % 2 ? [] : [{
@@ -1003,7 +1020,7 @@ var genericLoader = {
       include: configuration.path.source.asset.template,
       test: /\.html(?:\?.*)?$/i,
       use: _module.html.additional.pre.map(evaluateMapper).concat({
-        loader: 'file?name=' + (0, _path.join)((0, _path.relative)(configuration.path.target.base, configuration.path.target.asset.template), "[name][ext]?".concat(configuration.hashAlgorithm, "=") + '[chunkhash]')
+        loader: 'file?name=' + (0, _path.join)((0, _path.relative)(configuration.path.target.base, configuration.path.target.asset.template), "[name][ext]?".concat(configuration.hashAlgorithm, "=") + '[contenthash]')
       }, {
         loader: 'extract'
       }, {
@@ -1054,7 +1071,7 @@ var genericLoader = {
         return _module.optimizer.font.eot.exclude === null ? false : Boolean(evaluate(_module.optimizer.font.eot.exclude, filePath));
       },
       generator: {
-        filename: (0, _path.join)((0, _path.relative)(configuration.path.target.base, configuration.path.target.asset.font), '[name][ext]') + "?".concat(configuration.hashAlgorithm, "=[chunkhash]")
+        filename: (0, _path.join)((0, _path.relative)(configuration.path.target.base, configuration.path.target.asset.font), '[name][ext]') + "?".concat(configuration.hashAlgorithm, "=[contenthash]")
       },
       test: /\.eot(?:\?.*)?$/i,
       type: 'asset/resource',
@@ -1071,7 +1088,7 @@ var genericLoader = {
       },
       include: configuration.path.source.asset.font,
       generator: {
-        filename: (0, _path.join)((0, _path.relative)(configuration.path.target.base, configuration.path.target.asset.font), '[name][ext]') + "?".concat(configuration.hashAlgorithm, "=[chunkhash]")
+        filename: (0, _path.join)((0, _path.relative)(configuration.path.target.base, configuration.path.target.asset.font), '[name][ext]') + "?".concat(configuration.hashAlgorithm, "=[contenthash]")
       },
       mimetype: 'image/svg+xml',
       parser: {
@@ -1088,7 +1105,7 @@ var genericLoader = {
         return _module.optimizer.font.ttf.exclude === null ? false : Boolean(evaluate(_module.optimizer.font.ttf.exclude, filePath));
       },
       generator: {
-        filename: (0, _path.join)((0, _path.relative)(configuration.path.target.base, configuration.path.target.asset.font), '[name][ext]') + "?".concat(configuration.hashAlgorithm, "=[chunkhash]")
+        filename: (0, _path.join)((0, _path.relative)(configuration.path.target.base, configuration.path.target.asset.font), '[name][ext]') + "?".concat(configuration.hashAlgorithm, "=[contenthash]")
       },
       test: /\.ttf(?:\?.*)?$/i,
       type: 'asset/resource',
@@ -1105,7 +1122,7 @@ var genericLoader = {
         return _module.optimizer.font.woff.exclude === null ? false : Boolean(evaluate(_module.optimizer.font.woff.exclude, filePath));
       },
       generator: {
-        filename: (0, _path.join)((0, _path.relative)(configuration.path.target.base, configuration.path.target.asset.font), '[name][ext]') + "?".concat(configuration.hashAlgorithm, "=[chunkhash]")
+        filename: (0, _path.join)((0, _path.relative)(configuration.path.target.base, configuration.path.target.asset.font), '[name][ext]') + "?".concat(configuration.hashAlgorithm, "=[contenthash]")
       },
       test: /\.woff2?(?:\?.*)?$/i,
       type: 'asset/resource',
@@ -1124,7 +1141,7 @@ var genericLoader = {
       return _module.optimizer.image.exclude === null ? isFilePathInDependencies(filePath) : Boolean(evaluate(_module.optimizer.image.exclude, filePath));
     },
     generator: {
-      filename: (0, _path.join)((0, _path.relative)(configuration.path.target.base, configuration.path.target.asset.image), '[name][ext]') + "?".concat(configuration.hashAlgorithm, "=[chunkhash]")
+      filename: (0, _path.join)((0, _path.relative)(configuration.path.target.base, configuration.path.target.asset.image), '[name][ext]') + "?".concat(configuration.hashAlgorithm, "=[contenthash]")
     },
     include: configuration.path.source.asset.image,
     test: /\.(?:gif|ico|jpg|png|svg)(?:\?.*)?$/i,
@@ -1144,7 +1161,7 @@ var genericLoader = {
       return configuration.extensions.file.internal.includes((0, _path.extname)(_helper["default"].stripLoader(filePath))) || (_module.optimizer.data.exclude === null ? isFilePathInDependencies(filePath) : Boolean(evaluate(_module.optimizer.data.exclude, filePath)));
     },
     generator: {
-      filename: (0, _path.join)((0, _path.relative)(configuration.path.target.base, configuration.path.target.asset.data), '[name][ext]') + "?".concat(configuration.hashAlgorithm, "=[chunkhash]")
+      filename: (0, _path.join)((0, _path.relative)(configuration.path.target.base, configuration.path.target.asset.data), '[name][ext]') + "?".concat(configuration.hashAlgorithm, "=[contenthash]")
     },
     test: /.+/,
     type: 'asset/resource',