weboptimizer 2.0.1416 → 2.0.1418

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weboptimizer",
-  "version": "2.0.1416",
+  "version": "2.0.1418",
   "description": "A generic web optimizer, (module) bundler and development environment.",
   "keywords": [
     "webpack",
@@ -560,7 +560,7 @@
               "directory": {
                 "__evaluate__": "path.resolve(self.path.base, self.module.directoryNames[0])"
               },
-              "watch": true
+              "watch": false
             }
           ],
           "watchFiles": {
@@ -887,7 +887,7 @@
           "node_modules"
         ],
         "enforceDeduplication": {
-          "__evaluate__": "!self.module.resolveSymlinks"
+          "__evaluate__": "self.module.resolveSymlinks"
         },
         "html": {
           "additional": {

package/type.d.ts

@@ -255,12 +255,13 @@ export interface ResolvedConfiguration {
     contextType: string;
     debug: boolean;
     development: {
-        server: WebpackOptionsNormalized['devServer'] & {
+        server: (WebpackOptionsNormalized['devServer'] & {
+            hot: boolean;
             host: string;
             https: boolean;
             liveReload: boolean;
             port: number;
-        };
+        });
         tool: WebpackOptionsNormalized['devtool'];
     };
     document: PlainObject;

package/webpackConfigurator.js

@@ -25,6 +25,8 @@ var _construct2 = _interopRequireDefault(require("@babel/runtime/helpers/constru
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _clientnode = _interopRequireDefault(require("clientnode"));
 var _jsdom = require("jsdom");
@@ -35,12 +37,7 @@ var _webpackSources = require("webpack-sources");
 var _configurator = _interopRequireDefault(require("./configurator"));
 var _helper = _interopRequireDefault(require("./helper"));
 var _ejsLoader = _interopRequireDefault(require("./ejsLoader"));
-var _optionalRequire,
-  _this = void 0,
-  _configuration$path$c,
-  _configuration$cache,
-  _configuration$cache2,
-  _configuration$path$c2;
+var _optionalRequire, _configuration$path$c, _configuration$cache$, _configuration$cache, _configuration$cache2, _configuration$cache3, _configuration$path$c2;
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
@@ -232,57 +229,68 @@ pluginInstances.push({
     .replace(/##-#-#-##/g, '%>')
 */
 
-if (htmlAvailable && !['serve', 'test:browser'].includes(configuration.givenCommandLineArguments[2]) && configuration.inPlace.cascadingStyleSheet && Object.keys(configuration.inPlace.cascadingStyleSheet).length || configuration.inPlace.javaScript && Object.keys(configuration.inPlace.javaScript).length) pluginInstances.push({
-  apply: function apply(compiler) {
-    var publicPath = compiler.options.output.publicPath || '';
-    if (publicPath && !publicPath.endsWith('/')) publicPath += '/';
-    compiler.hooks.compilation.tap('inPlaceHTMLAssets', function (compilation) {
-      var hooks = plugins.HTML.getHooks(compilation);
-      var inPlacedAssetNames = [];
-      hooks.alterAssetTagGroups.tap('inPlaceHTMLAssets', function (assets) {
-        var inPlace = function inPlace(type, tag) {
-          var settings;
-          var url = false;
-          if (tag.tagName === 'script') {
-            settings = configuration.inPlace.javaScript;
-            url = tag.attributes.src;
-          } else if (tag.tagName === 'style') {
-            settings = configuration.inPlace.cascadingStyleSheet;
-            url = tag.attributes.href;
-          }
-          if (!(url && typeof url === 'string')) return tag;
-          var name = publicPath ? url.replace(publicPath, '') : url;
-          if (compilation.assets[name] && settings[type] && [].concat(settings[type]).some(function (pattern) {
-            return new RegExp(pattern).test(name);
-          })) {
-            var newAttributes = _objectSpread({}, tag.attributes);
-            delete newAttributes.href;
-            delete newAttributes.src;
-            inPlacedAssetNames.push(name);
-            return _objectSpread(_objectSpread({}, tag), {}, {
-              attributes: newAttributes,
-              innerHTML: compilation.assets[name].source(),
-              tagName: 'script'
-            });
-          }
-          return tag;
-        };
-        assets.headTags = assets.headTags.map(inPlace.bind(_this, 'head'));
-        assets.bodyTags = assets.bodyTags.map(inPlace.bind(_this, 'body'));
-        return assets;
-      });
+if (htmlAvailable && !['serve', 'test:browser'].includes(configuration.givenCommandLineArguments[2]) && configuration.inPlace.cascadingStyleSheet && Object.keys(configuration.inPlace.cascadingStyleSheet).length || configuration.inPlace.javaScript && Object.keys(configuration.inPlace.javaScript).length) {
+  var InPlaceAssetsIntoHTML = /*#__PURE__*/function () {
+    function InPlaceAssetsIntoHTML() {
+      (0, _classCallCheck2["default"])(this, InPlaceAssetsIntoHTML);
+    }
+    (0, _createClass2["default"])(InPlaceAssetsIntoHTML, [{
+      key: "apply",
+      value: function apply(compiler) {
+        var _this = this;
+        var publicPath = compiler.options.output.publicPath || '';
+        if (publicPath && !publicPath.endsWith('/')) publicPath += '/';
+        compiler.hooks.compilation.tap('inPlaceHTMLAssets', function (compilation) {
+          var hooks = plugins.HTML.getHooks(compilation);
+          var inPlacedAssetNames = [];
+          hooks.alterAssetTagGroups.tap('inPlaceHTMLAssets', function (assets) {
+            var inPlace = function inPlace(type, tag) {
+              var settings;
+              var url = false;
+              if (tag.tagName === 'script') {
+                settings = configuration.inPlace.javaScript;
+                url = tag.attributes.src;
+              } else if (tag.tagName === 'style') {
+                settings = configuration.inPlace.cascadingStyleSheet;
+                url = tag.attributes.href;
+              }
+              if (!(url && typeof url === 'string')) return tag;
+              var name = publicPath ? url.replace(publicPath, '') : url;
+              if (compilation.assets[name] && settings[type] && [].concat(settings[type]).some(function (pattern) {
+                return new RegExp(pattern).test(name);
+              })) {
+                var newAttributes = _objectSpread({}, tag.attributes);
+                delete newAttributes.href;
+                delete newAttributes.src;
+                inPlacedAssetNames.push(name);
+                return _objectSpread(_objectSpread({}, tag), {}, {
+                  attributes: newAttributes,
+                  innerHTML: compilation.assets[name].source(),
+                  tagName: 'script'
+                });
+              }
+              return tag;
+            };
+            assets.headTags = assets.headTags.map(inPlace.bind(_this, 'head'));
+            assets.bodyTags = assets.bodyTags.map(inPlace.bind(_this, 'body'));
+            return assets;
+          });
 
-      // NOTE: Avoid if you still want to emit the runtime chunks:
-      hooks.afterEmit.tap('inPlaceHTMLAssets', function (asset) {
-        for (var _i6 = 0, _inPlacedAssetNames = inPlacedAssetNames; _i6 < _inPlacedAssetNames.length; _i6++) {
-          var _name3 = _inPlacedAssetNames[_i6];
-          delete compilation.assets[_name3];
-        }
-        return asset;
-      });
-    });
-  }
-});
+          // NOTE: Avoid if you still want to emit the runtime chunks:
+          hooks.afterEmit.tap('inPlaceHTMLAssets', function (asset) {
+            for (var _i6 = 0, _inPlacedAssetNames = inPlacedAssetNames; _i6 < _inPlacedAssetNames.length; _i6++) {
+              var _name3 = _inPlacedAssetNames[_i6];
+              delete compilation.assets[_name3];
+            }
+            return asset;
+          });
+        });
+      }
+    }]);
+    return InPlaceAssetsIntoHTML;
+  }();
+  pluginInstances.push(new InPlaceAssetsIntoHTML());
+}
 ///// endregion
 ///// region mark empty javaScript modules as dummy
 if (!(configuration.needed.javaScript || configuration.needed.javaScriptExtension || configuration.needed.typeScript || configuration.needed.typeScriptExtension)) configuration.files.compose.javaScript = (0, _path.resolve)(configuration.path.target.asset.javaScript, '.__dummy__.compiled.js');
@@ -417,93 +425,103 @@ if (configuration.injection.external.modules === '__implicit__')
   };
 ///// endregion
 //// endregion
-//// region apply final cascadingStyleSheet/dom/javaScript modifications/fixes
-if (htmlAvailable) pluginInstances.push({
-  apply: function apply(compiler) {
-    return compiler.hooks.compilation.tap('WebOptimizer', function (compilation) {
-      plugins.HTML.getHooks(compilation).beforeEmit.tap('WebOptimizerPostProcessHTML', function (data) {
-        /*
-            NOTE: We have to prevent creating native "style" dom nodes
-            to prevent jsdom from parsing the entire cascading style
-            sheet. Which is error prune and very resource intensive.
-        */
-        var styleContents = [];
-        data.html = data.html.replace(/(<style[^>]*>)([\s\S]*?)(<\/style[^>]*>)/gi, function (match, startTag, content, endTag) {
-          styleContents.push(content);
-          return "".concat(startTag).concat(endTag);
-        });
-        var dom;
-        try {
-          /*
-              NOTE: We have to translate template delimiter to html
-              compatible sequences and translate it back later to
-              avoid unexpected escape sequences in resulting html.
-          */
-          dom = new _jsdom.JSDOM(data.html.replace(/<%/g, '##+#+#+##').replace(/%>/g, '##-#-#-##'));
-        } catch (error) {
-          return data;
-        }
-        var linkables = {
-          link: 'href',
-          script: 'src'
-        };
-        for (var _i8 = 0, _Object$entries6 = Object.entries(linkables); _i8 < _Object$entries6.length; _i8++) {
-          var _Object$entries6$_i = (0, _slicedToArray2["default"])(_Object$entries6[_i8], 2),
-            tagName = _Object$entries6$_i[0],
-            attributeName = _Object$entries6$_i[1];
-          for (var _i9 = 0, _Array$from = Array.from(dom.window.document.querySelectorAll("".concat(tagName, "[").concat(attributeName, "*=\"?") + "".concat(configuration.hashAlgorithm, "=\"]"))); _i9 < _Array$from.length; _i9++) {
-            var domNode = _Array$from[_i9];
+//// region apply final html and inline cascadingStyleSheet/javaScript modifications/fixes
+if (htmlAvailable) {
+  var HTMLTransformation = /*#__PURE__*/function () {
+    function HTMLTransformation() {
+      (0, _classCallCheck2["default"])(this, HTMLTransformation);
+    }
+    (0, _createClass2["default"])(HTMLTransformation, [{
+      key: "apply",
+      value: function apply(compiler) {
+        compiler.hooks.compilation.tap('WebOptimizer', function (compilation) {
+          plugins.HTML.getHooks(compilation).beforeEmit.tap('WebOptimizerPostProcessHTML', function (data) {
             /*
-                NOTE: Removing symbols after a "&" in hash
-                string is necessary to match the generated
-                request strings in offline plugin.
+                NOTE: We have to prevent creating native "style" dom nodes
+                to prevent jsdom from parsing the entire cascading style
+                sheet. Which is error prune and very resource intensive.
             */
-            domNode.setAttribute(attributeName, domNode.getAttribute(attributeName).replace(new RegExp('(\\?' + "".concat(configuration.hashAlgorithm, "=") + '[^&]+).*$'), '$1'));
-          }
-        }
-        /*
-            NOTE: We have to restore template delimiter and style
-            contents.
-        */
-        data.html = dom.serialize().replace(/##\+#\+#\+##/g, '<%').replace(/##-#-#-##/g, '%>').replace(/(<style[^>]*>)[\s\S]*?(<\/style[^>]*>)/gi, function (match, startTag, endTag) {
-          return "".concat(startTag).concat(styleContents.shift()) + endTag;
-        });
-        // region post compilation
-        var _iterator7 = _createForOfIteratorHelper(configuration.files.html),
-          _step7;
-        try {
-          for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
-            var htmlFileSpecification = _step7.value;
-            if (htmlFileSpecification.filename === data.plugin.options.filename) {
-              var _iterator8 = _createForOfIteratorHelper([].concat(htmlFileSpecification.template.use)),
-                _step8;
-              try {
-                for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
-                  var _loaderConfiguration$;
-                  var loaderConfiguration = _step8.value;
-                  if ((_loaderConfiguration$ = loaderConfiguration.options) !== null && _loaderConfiguration$ !== void 0 && _loaderConfiguration$.compileSteps && typeof loaderConfiguration.options.compileSteps === 'number') data.html = _ejsLoader["default"].bind({
-                    query: _clientnode["default"].extend(true, _clientnode["default"].copy(loaderConfiguration.options) || {}, htmlFileSpecification.template.postCompileOptions)
-                  })(data.html);
+            var styleContents = [];
+            data.html = data.html.replace(/(<style[^>]*>)([\s\S]*?)(<\/style[^>]*>)/gi, function (match, startTag, content, endTag) {
+              styleContents.push(content);
+              return "".concat(startTag).concat(endTag);
+            });
+            var dom;
+            try {
+              /*
+                  NOTE: We have to translate template delimiter to html
+                  compatible sequences and translate it back later to
+                  avoid unexpected escape sequences in resulting html.
+              */
+              dom = new _jsdom.JSDOM(data.html.replace(/<%/g, '##+#+#+##').replace(/%>/g, '##-#-#-##'));
+            } catch (error) {
+              return data;
+            }
+            var linkables = {
+              link: 'href',
+              script: 'src'
+            };
+            for (var _i8 = 0, _Object$entries6 = Object.entries(linkables); _i8 < _Object$entries6.length; _i8++) {
+              var _Object$entries6$_i = (0, _slicedToArray2["default"])(_Object$entries6[_i8], 2),
+                tagName = _Object$entries6$_i[0],
+                attributeName = _Object$entries6$_i[1];
+              for (var _i9 = 0, _Array$from = Array.from(dom.window.document.querySelectorAll("".concat(tagName, "[").concat(attributeName, "*=\"?") + "".concat(configuration.hashAlgorithm, "=\"]"))); _i9 < _Array$from.length; _i9++) {
+                var domNode = _Array$from[_i9];
+                /*
+                    NOTE: Removing symbols after a "&" in hash
+                    string is necessary to match the generated
+                    request strings in offline plugin.
+                */
+                domNode.setAttribute(attributeName, domNode.getAttribute(attributeName).replace(new RegExp('(\\?' + "".concat(configuration.hashAlgorithm, "=") + '[^&]+).*$'), '$1'));
+              }
+            }
+            /*
+                NOTE: We have to restore template delimiter and style
+                contents.
+            */
+            data.html = dom.serialize().replace(/##\+#\+#\+##/g, '<%').replace(/##-#-#-##/g, '%>').replace(/(<style[^>]*>)[\s\S]*?(<\/style[^>]*>)/gi, function (match, startTag, endTag) {
+              return "".concat(startTag).concat(styleContents.shift()) + endTag;
+            });
+            // region post compilation
+            var _iterator7 = _createForOfIteratorHelper(configuration.files.html),
+              _step7;
+            try {
+              for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+                var htmlFileSpecification = _step7.value;
+                if (htmlFileSpecification.filename === data.plugin.options.filename) {
+                  var _iterator8 = _createForOfIteratorHelper([].concat(htmlFileSpecification.template.use)),
+                    _step8;
+                  try {
+                    for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
+                      var _loaderConfiguration$;
+                      var loaderConfiguration = _step8.value;
+                      if ((_loaderConfiguration$ = loaderConfiguration.options) !== null && _loaderConfiguration$ !== void 0 && _loaderConfiguration$.compileSteps && typeof loaderConfiguration.options.compileSteps === 'number') data.html = _ejsLoader["default"].bind({
+                        query: _clientnode["default"].extend(true, _clientnode["default"].copy(loaderConfiguration.options) || {}, htmlFileSpecification.template.postCompileOptions)
+                      })(data.html);
+                    }
+                  } catch (err) {
+                    _iterator8.e(err);
+                  } finally {
+                    _iterator8.f();
+                  }
+                  break;
                 }
-              } catch (err) {
-                _iterator8.e(err);
-              } finally {
-                _iterator8.f();
               }
-              break;
+              // endregion
+            } catch (err) {
+              _iterator7.e(err);
+            } finally {
+              _iterator7.f();
             }
-          }
-          // endregion
-        } catch (err) {
-          _iterator7.e(err);
-        } finally {
-          _iterator7.f();
-        }
-        return data;
-      });
-    });
-  }
-});
+            return data;
+          });
+        });
+      }
+    }]);
+    return HTMLTransformation;
+  }();
+  pluginInstances.push(new HTMLTransformation());
+}
 //// endregion
 //// region context replacements
 var _iterator9 = _createForOfIteratorHelper(_module.replacements.context),
@@ -1076,7 +1094,7 @@ if (configuration.files.compose.cascadingStyleSheet && plugins.MiniCSSExtract) {
     So we inject live reload and hot module replacement manually.
 */
 if (htmlAvailable && configuration.debug && configuration.development.server.liveReload && !configuration.injection.entry.normalized.developmentHandler && ['serve', 'test:browser'].includes(configuration.givenCommandLineArguments[2])) {
-  configuration.injection.entry.normalized.developmentHandler = ['webpack-dev-server/client/index.js?live-reload=true&hot=' + "".concat(configuration.development.server.hot ? 'true' : 'false', "&http") + "".concat(configuration.development.server.https ? 's' : '', "://") + "".concat(configuration.development.server.host, ":") + "".concat(configuration.development.server.port)];
+  configuration.injection.entry.normalized.developmentHandler = ['webpack-dev-server/client/index.js?' + 'live-reload=' + (configuration.development.server.liveReload ? 'true' : 'false') + "&hot=".concat(configuration.development.server.hot ? 'true' : 'false') + "&http".concat(configuration.development.server.https ? 's' : '', "://") + "".concat(configuration.development.server.host, ":") + "".concat(configuration.development.server.port)];
   if (configuration.development.server.hot) {
     configuration.injection.entry.normalized.developmentHandler.push('webpack/hot/dev-server.js');
     configuration.development.server.hot = false;
@@ -1153,7 +1171,7 @@ var webpackConfiguration = exports.webpackConfiguration = _clientnode["default"]
     mainFiles: configuration["package"].main.fileNames,
     modules: _helper["default"].normalizePaths(_module.directoryNames),
     symlinks: _module.resolveSymlinks,
-    unsafeCache: Boolean((_configuration$cache = configuration.cache) === null || _configuration$cache === void 0 ? void 0 : _configuration$cache.unsafe)
+    unsafeCache: Boolean((_configuration$cache$ = (_configuration$cache = configuration.cache) === null || _configuration$cache === void 0 ? void 0 : _configuration$cache.unsafe) !== null && _configuration$cache$ !== void 0 ? _configuration$cache$ : (_configuration$cache2 = configuration.cache) === null || _configuration$cache2 === void 0 ? void 0 : _configuration$cache2.main)
   },
   resolveLoader: {
     alias: configuration.loader.aliases,
@@ -1229,7 +1247,7 @@ var webpackConfiguration = exports.webpackConfiguration = _clientnode["default"]
     }
   })),
   plugins: pluginInstances
-}, (_configuration$cache2 = configuration.cache) !== null && _configuration$cache2 !== void 0 && _configuration$cache2.main ? {
+}, (_configuration$cache3 = configuration.cache) !== null && _configuration$cache3 !== void 0 && _configuration$cache3.main ? {
   cache: configuration.cache.main
 } : {}, configuration.webpack, customConfiguration);
 if (configuration.nodeENV !== null) webpackConfiguration.optimization.nodeEnv = configuration.nodeENV;