weboptimizer 2.0.1089 → 2.0.1093

package/ejsLoader.js

@@ -42,8 +42,6 @@ var _fs = require("fs");
 
 var _htmlMinifier = require("html-minifier");
 
-var _loaderUtils = require("loader-utils");
-
 var _path = require("path");
 
 var _configurator = _interopRequireDefault(require("./configurator"));
@@ -85,7 +83,7 @@ function _default(source) {
       aliases: {},
       replacements: {}
     }
-  }, 'query' in this ? (0, _loaderUtils.getOptions)(this) || {} : {}), /#%%%#/g, '!');
+  }, 'getOptions' in this ? this.getOptions() || {} : {}), /#%%%#/g, '!');
 
   var compile = function compile(template) {
     var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : givenOptions.compiler;
@@ -265,7 +263,7 @@ function _default(source) {
     client: Boolean(givenOptions.compileSteps % 2),
     compileDebug: givenOptions.debug,
     debug: givenOptions.debug,
-    filename: 'remainingRequest' in this ? (0, _loaderUtils.getRemainingRequest)(this).replace(/^!/, '') : this.resourcePath || 'unknown',
+    filename: this.resourcePath || 'unknown',
     isString: true,
     localsName: 'scope'
   }), givenOptions.compileSteps)(givenOptions.locals || {});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weboptimizer",
-  "version": "2.0.1089",
+  "version": "2.0.1093",
   "description": "A generic web optimizer, (module) bundler and development environment.",
   "keywords": [
     "webpack",
@@ -99,7 +99,6 @@
     "html-webpack-plugin": "*",
     "imports-loader": "*",
     "jsdom": "^16.6.0",
-    "loader-utils": "*",
     "rimraf": "*",
     "script-loader": "*",
     "typescript": "*",

package/webpackConfigurator.js

@@ -54,10 +54,6 @@ var _configurator = _interopRequireDefault(require("./configurator"));
 
 var _helper = _interopRequireDefault(require("./helper"));
 
-var _htmlLoader = _interopRequireDefault(require("html-loader"));
-
-var _loaderUtils = _interopRequireDefault(require("loader-utils"));
-
 var _this = void 0,
     _configuration$path$c,
     _configuration$cache,
@@ -109,30 +105,9 @@ if (plugins.Offline) {
 }
 
 if (plugins.Imagemin) plugins.Imagemin = plugins.Imagemin["default"];
-if (require.cache && require.resolve('html-loader') in require.cache) require.cache[require.resolve('html-loader')].exports = function () {
-  _clientnode["default"].extend(true, this.options, module, this.options);
-
-  for (var _len = arguments.length, parameters = new Array(_len), _key = 0; _key < _len; _key++) {
-    parameters[_key] = arguments[_key];
-  }
-
-  return _htmlLoader["default"].call.apply(_htmlLoader["default"], [this].concat(parameters));
-}; // Monkey-Patch loader-utils to define which url is a local request.
-
-var loaderUtilsIsUrlRequestBackup = _loaderUtils["default"].isUrlRequest;
-if (require.cache && require.resolve('loader-utils') in require.cache) require.cache[require.resolve('loader-utils')].exports.isUrlRequest = function (url) {
-  if (/^[a-z]+:.+/.exec(url)) return false;
-
-  for (var _len2 = arguments.length, parameters = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
-    parameters[_key2 - 1] = arguments[_key2];
-  }
-
-  return loaderUtilsIsUrlRequestBackup.call.apply(loaderUtilsIsUrlRequestBackup, [_loaderUtils["default"], url].concat(parameters));
-}; // / endregion
 // endregion
 // region initialisation
 // / region determine library name
-
 var libraryName;
 if (_configurator["default"].libraryName) libraryName = _configurator["default"].libraryName;else if (Object.keys(_configurator["default"].injection.entry.normalized).length > 1) libraryName = '[name]';else {
   libraryName = _configurator["default"].name;
@@ -450,8 +425,8 @@ if (_configurator["default"].injection.external.modules === '__implicit__')
 
           try {
             for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-              var _key3 = _step6.value;
-              result[_key3] = _configurator["default"].injection.external.aliases[request](request, _key3);
+              var _key = _step6.value;
+              result[_key] = _configurator["default"].injection.external.aliases[request](request, _key);
             }
           } catch (err) {
             _iterator6.e(err);
@@ -466,8 +441,8 @@ if (_configurator["default"].injection.external.modules === '__implicit__')
 
           try {
             for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
-              var _key4 = _step7.value;
-              if (!Object.prototype.hasOwnProperty.call(result, _key4)) result[_key4] = result["default"];
+              var _key2 = _step7.value;
+              if (!Object.prototype.hasOwnProperty.call(result, _key2)) result[_key2] = result["default"];
             }
           } catch (err) {
             _iterator7.e(err);
@@ -1270,11 +1245,13 @@ var webpackConfiguration = _clientnode["default"].extend(true, {
     filename: (0, _path.relative)(_configurator["default"].path.target.base, _configurator["default"].files.compose.javaScript),
     globalObject: _configurator["default"].exportFormat.globalObject,
     hashFunction: _configurator["default"].hashAlgorithm,
-    library: libraryName === '*' ? undefined : libraryName,
-    libraryTarget: _configurator["default"].exportFormat.self,
+    library: {
+      name: libraryName === '*' ? undefined : libraryName,
+      type: _configurator["default"].exportFormat.self,
+      umdNamedDefine: true
+    },
     path: _configurator["default"].path.target.base,
-    publicPath: _configurator["default"].path.target["public"],
-    umdNamedDefine: true
+    publicPath: _configurator["default"].path.target["public"]
   },
   performance: _configurator["default"].performanceHints,