weboptimizer 2.0.1088 → 2.0.1092

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.1088",
+  "version": "2.0.1092",
   "description": "A generic web optimizer, (module) bundler and development environment.",
   "keywords": [
     "webpack",
@@ -112,6 +112,7 @@
     "@babel/eslint-parser": "*",
     "@types/cssnano": "*",
     "@types/ejs": "*",
+    "@types/favicons": "*",
     "@types/html-minifier": "*",
     "@types/html-minifier-terser": "*",
     "@types/jest": "*",
@@ -156,6 +157,7 @@
     "@babel/eslint-parser": "*",
     "@babel/preset-react": "*",
     "@types/ejs": "*",
+    "@types/favicons": "*",
     "@types/html-minifier": "*",
     "@types/jest": "*",
     "@types/jsdom": "*",
@@ -198,6 +200,9 @@
     "@types/ejs": {
       "optional": true
     },
+    "@types/favicons": {
+      "optional": true
+    },
     "@types/html-minifier": {
       "optional": true
     },

package/type.d.ts

@@ -1,5 +1,5 @@
 import { AnyFunction, Encoding, Mapping, PlainObject, SecondParameter } from 'clientnode/type';
-import { Configuration as FaviconConfiguration } from 'favicons';
+import { FaviconOptions } from 'favicons';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
 import { JSDOM } from 'jsdom';
 import { DefinePlugin as WebpackDefinePlugin, Configuration as BaseWebpackConfiguration, IgnorePlugin as WebpackIgnorePlugin, ModuleOptions as WebpackModuleOptions, RuleSetRule as WebpackRuleSetRule, WebpackOptionsNormalized } from 'webpack';
@@ -267,7 +267,7 @@ export interface ResolvedConfiguration {
         self: ExportFormat;
     };
     extensions: Extensions;
-    favicon: Mapping<FaviconConfiguration> & {
+    favicon: Mapping<FaviconOptions> & {
         logo: string;
     };
     files: {

package/webpackConfigurator.js

@@ -1270,11 +1270,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,