weboptimizer 2.0.1419 → 2.0.1421

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weboptimizer",
-  "version": "2.0.1419",
+  "version": "2.0.1421",
   "description": "A generic web optimizer, (module) bundler and development environment.",
   "keywords": [
     "webpack",
@@ -42,8 +42,10 @@
     "jestEnvironmentBrowser.js",
     "jestSetup.d.ts",
     "jestSetup.js",
-    "plufgins/HTMLTransformation.d.ts",
-    "plufgins/InPlaceAssetsIntoHTML.d.ts",
+    "plugins/HTMLTransformation.d.ts",
+    "plugins/HTMLTransformation.js",
+    "plugins/InPlaceAssetsIntoHTML.d.ts",
+    "plugins/InPlaceAssetsIntoHTML.js",
     "stylelintConfigurator.d.ts",
     "stylelintConfigurator.js",
     "tsconfig.json",

package/plugins/HTMLTransformation.d.ts

@@ -0,0 +1,9 @@
+import { Compiler } from 'webpack';
+import { HTMLTransformationOptions } from '../type';
+export declare class HTMLTransformation {
+    private defaultOptions;
+    private options;
+    constructor(options?: Partial<HTMLTransformationOptions>);
+    apply(compiler: Compiler): void;
+}
+export default HTMLTransformation;

package/plugins/HTMLTransformation.js

@@ -0,0 +1,135 @@
+// #!/usr/bin/env babel-node
+// -*- coding: utf-8 -*-
+/** @module InPlaceAssetsIntoHTML */
+'use strict';
+
+/* !
+    region header
+    Copyright Torben Sickert (info["~at~"]torben.website) 16.12.2012
+
+    License
+    -------
+
+    This library written by Torben Sickert stand under a creative commons
+    naming 3.0 unported license.
+    See https://creativecommons.org/licenses/by/3.0/deed.de
+    endregion
+*/
+// region imports
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = exports.HTMLTransformation = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _clientnode = _interopRequireDefault(require("clientnode"));
+var _jsdom = require("jsdom");
+var _ejsLoader = _interopRequireDefault(require("../ejsLoader"));
+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; } } }; }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+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; }
+// endregion
+var HTMLTransformation = exports.HTMLTransformation = /*#__PURE__*/function () {
+  function HTMLTransformation() {
+    var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    (0, _classCallCheck2["default"])(this, HTMLTransformation);
+    (0, _defineProperty2["default"])(this, "defaultOptions", {});
+    (0, _defineProperty2["default"])(this, "options", void 0);
+    this.options = _objectSpread(_objectSpread({}, this.defaultOptions), options);
+  }
+  (0, _createClass2["default"])(HTMLTransformation, [{
+    key: "apply",
+    value: function apply(compiler) {
+      var _this = this;
+      compiler.hooks.compilation.tap('WebOptimizer', function (compilation) {
+        _this.options.htmlPlugin.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 _i = 0, _Object$entries = Object.entries(linkables); _i < _Object$entries.length; _i++) {
+            var _Object$entries$_i = (0, _slicedToArray2["default"])(_Object$entries[_i], 2),
+              tagName = _Object$entries$_i[0],
+              attributeName = _Object$entries$_i[1];
+            for (var _i2 = 0, _Array$from = Array.from(dom.window.document.querySelectorAll("".concat(tagName, "[").concat(attributeName, "*=\"?") + "".concat(_this.options.hashAlgorithm, "=\"]"))); _i2 < _Array$from.length; _i2++) {
+              var domNode = _Array$from[_i2];
+              /*
+                  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(_this.options.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 _iterator = _createForOfIteratorHelper(_this.options.files),
+            _step;
+          try {
+            for (_iterator.s(); !(_step = _iterator.n()).done;) {
+              var htmlFileSpecification = _step.value;
+              if (htmlFileSpecification.filename === data.plugin.options.filename) {
+                var _iterator2 = _createForOfIteratorHelper([].concat(htmlFileSpecification.template.use)),
+                  _step2;
+                try {
+                  for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+                    var _loaderConfiguration$;
+                    var loaderConfiguration = _step2.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) {
+                  _iterator2.e(err);
+                } finally {
+                  _iterator2.f();
+                }
+                break;
+              }
+            }
+            // endregion
+          } catch (err) {
+            _iterator.e(err);
+          } finally {
+            _iterator.f();
+          }
+          return data;
+        });
+      });
+    }
+  }]);
+  return HTMLTransformation;
+}();
+var _default = exports["default"] = HTMLTransformation;

package/plugins/InPlaceAssetsIntoHTML.d.ts

@@ -0,0 +1,9 @@
+import { Compiler } from 'webpack';
+import { InPlaceAssetsIntoHTMLOptions } from '../type';
+export declare class InPlaceAssetsIntoHTML {
+    private defaultOptions;
+    private options;
+    constructor(options?: Partial<InPlaceAssetsIntoHTMLOptions>);
+    apply(compiler: Compiler): void;
+}
+export default InPlaceAssetsIntoHTML;

package/plugins/InPlaceAssetsIntoHTML.js

@@ -0,0 +1,93 @@
+// #!/usr/bin/env babel-node
+// -*- coding: utf-8 -*-
+/** @module InPlaceAssetsIntoHTML */
+'use strict';
+
+/* !
+    region header
+    Copyright Torben Sickert (info["~at~"]torben.website) 16.12.2012
+
+    License
+    -------
+
+    This library written by Torben Sickert stand under a creative commons
+    naming 3.0 unported license.
+    See https://creativecommons.org/licenses/by/3.0/deed.de
+    endregion
+*/
+// region imports
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = exports.InPlaceAssetsIntoHTML = void 0;
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+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; }
+// endregion
+var InPlaceAssetsIntoHTML = exports.InPlaceAssetsIntoHTML = /*#__PURE__*/function () {
+  function InPlaceAssetsIntoHTML() {
+    var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    (0, _classCallCheck2["default"])(this, InPlaceAssetsIntoHTML);
+    (0, _defineProperty2["default"])(this, "defaultOptions", {});
+    (0, _defineProperty2["default"])(this, "options", void 0);
+    this.options = _objectSpread(_objectSpread({}, this.defaultOptions), options);
+  }
+  (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 = _this.options.htmlPlugin.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 = _this.options.javaScript;
+              url = tag.attributes.src;
+            } else if (tag.tagName === 'style') {
+              settings = _this.options.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 _i = 0, _inPlacedAssetNames = inPlacedAssetNames; _i < _inPlacedAssetNames.length; _i++) {
+            var name = _inPlacedAssetNames[_i];
+            delete compilation.assets[name];
+          }
+          return asset;
+        });
+      });
+    }
+  }]);
+  return InPlaceAssetsIntoHTML;
+}();
+var _default = exports["default"] = InPlaceAssetsIntoHTML;