weboptimizer 2.0.1311 → 2.0.1313

package/browser.js

@@ -31,6 +31,8 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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 _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+// endregion
+// region declaration
 //  endregion
 //  region variables
 var onCreatedListener = [];

package/ejsLoader.js

@@ -39,6 +39,8 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 // endregion
+// region types
+// endregion
 var configuration = (0, _configurator["default"])();
 /**
  * Main transformation function.

package/index.js

@@ -34,7 +34,7 @@ var _fs = require("fs");
 var _promises = require("fs/promises");
 var _globAll = require("glob-all");
 var _path = _interopRequireWildcard(require("path"));
-var _rimraf = _interopRequireWildcard(require("rimraf"));
+var _rimraf = require("rimraf");
 var _configurator = require("./configurator");
 var _helper = _interopRequireDefault(require("./helper"));
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -177,7 +177,7 @@ var main = function main(context) {
                         break;
                       }
                       _context.next = 9;
-                      return (0, _rimraf["default"])(file.path);
+                      return (0, _rimraf.rimraf)(file.path);
                     case 9:
                       return _context.abrupt("return", false);
                     case 10:
@@ -240,7 +240,7 @@ var main = function main(context) {
             break;
           case 56:
             _context3.next = 58;
-            return (0, _rimraf["default"])(configuration.path.target.base);
+            return (0, _rimraf.rimraf)(configuration.path.target.base);
           case 58:
             _context3.next = 60;
             return _clientnode["default"].isDirectory(configuration.path.apiDocumentation);
@@ -250,7 +250,7 @@ var main = function main(context) {
               break;
             }
             _context3.next = 63;
-            return (0, _rimraf["default"])(configuration.path.apiDocumentation);
+            return (0, _rimraf.rimraf)(configuration.path.apiDocumentation);
           case 63:
             _iterator2 = _createForOfIteratorHelper(configuration.path.tidyUpOnClear);
             try {
@@ -258,14 +258,14 @@ var main = function main(context) {
                 _filePath = _step2.value;
                 if (_filePath) if (_clientnode["default"].isFileSync(_filePath))
                   // NOTE: Close handler have to be synchronous.
-                  (0, _fs.unlinkSync)(_filePath);else if (_clientnode["default"].isDirectorySync(_filePath)) (0, _rimraf.sync)(_filePath);
+                  (0, _fs.unlinkSync)(_filePath);else if (_clientnode["default"].isDirectorySync(_filePath)) (0, _rimraf.rimrafSync)(_filePath);
               }
             } catch (err) {
               _iterator2.e(err);
             } finally {
               _iterator2.f();
             }
-            (0, _rimraf.sync)((0, _globAll.sync)(configuration.path.tidyUpOnClearGlobs));
+            (0, _rimraf.rimrafSync)((0, _globAll.sync)(configuration.path.tidyUpOnClearGlobs));
           case 66:
             // endregion
             // region handle build
@@ -324,14 +324,14 @@ var main = function main(context) {
                   var _filePath4 = _step4.value;
                   if (_filePath4) if (_clientnode["default"].isFileSync(_filePath4))
                     // NOTE: Close handler have to be synchronous.
-                    (0, _fs.unlinkSync)(_filePath4);else if (_clientnode["default"].isDirectorySync(_filePath4)) (0, _rimraf.sync)(_filePath4);
+                    (0, _fs.unlinkSync)(_filePath4);else if (_clientnode["default"].isDirectorySync(_filePath4)) (0, _rimraf.rimrafSync)(_filePath4);
                 }
               } catch (err) {
                 _iterator4.e(err);
               } finally {
                 _iterator4.f();
               }
-              (0, _rimraf.sync)((0, _globAll.sync)(configuration.path.tidyUpGlobs));
+              (0, _rimraf.rimrafSync)((0, _globAll.sync)(configuration.path.tidyUpGlobs));
             };
             closeEventHandlers.push(tidyUp);
 
@@ -360,7 +360,7 @@ var main = function main(context) {
 
                     // NOTE: Close handler have to be synchronous.
                     if (_clientnode["default"].isDirectorySync(sourcePath)) {
-                      if (_clientnode["default"].isDirectorySync(targetPath)) (0, _rimraf.sync)(targetPath);
+                      if (_clientnode["default"].isDirectorySync(targetPath)) (0, _rimraf.rimrafSync)(targetPath);
                       _clientnode["default"].copyDirectoryRecursiveSync(sourcePath, targetPath);
                     } else if (_clientnode["default"].isFileSync(sourcePath)) _clientnode["default"].copyFileSync(sourcePath, targetPath);
                   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weboptimizer",
-  "version": "2.0.1311",
+  "version": "2.0.1313",
   "description": "A generic web optimizer, (module) bundler and development environment.",
   "keywords": [
     "webpack",

package/type.js

@@ -36,6 +36,15 @@ var TaskTypes = ['build', 'serve'].concat(SubConfigurationTypes);
 //// endregion
 //// region loader
 
+//// endregion
+
+/* eslint-disable max-len */
+
+/* eslint-enable max-len */
+
+/// endregion
+// NOTE: Not yet defined in webpack types.
+
 // endregion
 // region vim modline
 // vim: set tabstop=4 shiftwidth=4 expandtab:

package/webpackConfigurator.js

@@ -189,18 +189,25 @@ if (_module.provide) pluginInstances.push(new _webpack.ProvidePlugin(_module.pro
 ///// region apply module pattern
 pluginInstances.push({
   apply: function apply(compiler) {
-    compiler.hooks.emit.tap('applyModulePattern', function (compilation) {
-      for (var _i5 = 0, _Object$entries4 = Object.entries(compilation.assets); _i5 < _Object$entries4.length; _i5++) {
-        var _Object$entries4$_i = (0, _slicedToArray2["default"])(_Object$entries4[_i5], 2),
-          request = _Object$entries4$_i[0],
-          asset = _Object$entries4$_i[1];
-        var filePath = request.replace(/\?[^?]+$/, '');
-        var _type2 = _helper["default"].determineAssetType(filePath, configuration.buildContext.types, configuration.path);
-        if (_type2 && configuration.assetPattern[_type2] && new RegExp(configuration.assetPattern[_type2].includeFilePathRegularExpression).test(filePath) && !new RegExp(configuration.assetPattern[_type2].excludeFilePathRegularExpression).test(filePath)) {
-          var source = asset.source();
-          if (typeof source === 'string') compilation.assets[request] = new _webpackSources.RawSource(configuration.assetPattern[_type2].pattern.replace(/\{1\}/g, source.replace(/\$/g, '$$$')));
+    var name = 'ApplyModulePattern';
+    compiler.hooks.compilation.tap(name, function (compilation) {
+      compilation.hooks.processAssets.tap({
+        name: name,
+        additionalAssets: true,
+        stage: _webpack.Compilation.PROCESS_ASSETS_STAGE_ADDITIONS
+      }, function (assets) {
+        for (var _i5 = 0, _Object$entries4 = Object.entries(assets); _i5 < _Object$entries4.length; _i5++) {
+          var _Object$entries4$_i = (0, _slicedToArray2["default"])(_Object$entries4[_i5], 2),
+            request = _Object$entries4$_i[0],
+            asset = _Object$entries4$_i[1];
+          var filePath = request.replace(/\?[^?]+$/, '');
+          var _type2 = _helper["default"].determineAssetType(filePath, configuration.buildContext.types, configuration.path);
+          if (_type2 && configuration.assetPattern[_type2] && new RegExp(configuration.assetPattern[_type2].includeFilePathRegularExpression).test(filePath) && !new RegExp(configuration.assetPattern[_type2].excludeFilePathRegularExpression).test(filePath)) {
+            var source = asset.source();
+            if (typeof source === 'string') compilation.assets[request] = new _webpackSources.RawSource(configuration.assetPattern[_type2].pattern.replace(/\{1\}/g, source.replace(/\$/g, '$$$')));
+          }
         }
-      }
+      });
     });
   }
 });