weboptimizer 2.0.1283 → 2.0.1284
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -2
- package/webpackConfigurator.js +16 -16
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "weboptimizer",
|
|
3
|
-
"version": "2.0.
|
|
3
|
+
"version": "2.0.1284",
|
|
4
4
|
"description": "A generic web optimizer, (module) bundler and development environment.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"webpack",
|
|
@@ -120,7 +120,6 @@
|
|
|
120
120
|
"@types/node": "*",
|
|
121
121
|
"@types/postcss-import": "*",
|
|
122
122
|
"@types/postcss-url": "*",
|
|
123
|
-
"@types/rimraf": "*",
|
|
124
123
|
"@types/webpack-env": "*",
|
|
125
124
|
"@types/webpack-sources": "*",
|
|
126
125
|
"@typescript-eslint/eslint-plugin": "*",
|
package/webpackConfigurator.js
CHANGED
|
@@ -167,13 +167,13 @@ if (htmlAvailable && configuration.offline && plugins.Offline) {
|
|
|
167
167
|
var _Object$entries3$_i = (0, _slicedToArray2["default"])(_Object$entries3[_i3], 2),
|
|
168
168
|
_name = _Object$entries3$_i[0],
|
|
169
169
|
extension = _Object$entries3$_i[1];
|
|
170
|
-
var
|
|
171
|
-
if (configuration.inPlace[
|
|
172
|
-
var matches = Object.keys(configuration.inPlace[
|
|
170
|
+
var _type = _name;
|
|
171
|
+
if (configuration.inPlace[_type]) {
|
|
172
|
+
var matches = Object.keys(configuration.inPlace[_type]);
|
|
173
173
|
if (!Array.isArray(configuration.offline.common.excludeChunks)) configuration.offline.common.excludeChunks = [];
|
|
174
174
|
for (var _i4 = 0, _matches = matches; _i4 < _matches.length; _i4++) {
|
|
175
175
|
var _name2 = _matches[_i4];
|
|
176
|
-
configuration.offline.common.excludeChunks.push((0, _path.relative)(configuration.path.target.base, configuration.path.target.asset[
|
|
176
|
+
configuration.offline.common.excludeChunks.push((0, _path.relative)(configuration.path.target.base, configuration.path.target.asset[_type]) + "".concat(_name2, ".").concat(extension, "?").concat(configuration.hashAlgorithm, "=*"));
|
|
177
177
|
}
|
|
178
178
|
}
|
|
179
179
|
}
|
|
@@ -352,10 +352,10 @@ if (configuration.injection.external.modules === '__implicit__')
|
|
|
352
352
|
var resolvedRequest = _helper["default"].determineExternalRequest(request, configuration.path.context, context, configuration.injection.entry.normalized, _module.directoryNames, _module.aliases, _module.replacements.normal, configuration.extensions, configuration.path.source.asset.base, configuration.path.ignore, _module.directoryNames, configuration["package"].main.fileNames, configuration["package"].main.propertyNames, configuration["package"].aliasPropertyNames, configuration.injection.external.implicit.pattern.include, configuration.injection.external.implicit.pattern.exclude, configuration.inPlace.externalLibrary.normal, configuration.inPlace.externalLibrary.dynamic, configuration.encoding);
|
|
353
353
|
if (resolvedRequest) {
|
|
354
354
|
var keys = ['amd', 'commonjs', 'commonjs2', 'root'];
|
|
355
|
-
var
|
|
355
|
+
var _result2 = resolvedRequest;
|
|
356
356
|
if (Object.prototype.hasOwnProperty.call(configuration.injection.external.aliases, request)) {
|
|
357
357
|
// region normal alias replacement
|
|
358
|
-
|
|
358
|
+
_result2 = {
|
|
359
359
|
"default": request
|
|
360
360
|
};
|
|
361
361
|
if (typeof configuration.injection.external.aliases[request] === 'string') {
|
|
@@ -364,7 +364,7 @@ if (configuration.injection.external.modules === '__implicit__')
|
|
|
364
364
|
try {
|
|
365
365
|
for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
|
|
366
366
|
var key = _step4.value;
|
|
367
|
-
|
|
367
|
+
_result2[key] = configuration.injection.external.aliases[request];
|
|
368
368
|
}
|
|
369
369
|
} catch (err) {
|
|
370
370
|
_iterator4.e(err);
|
|
@@ -377,21 +377,21 @@ if (configuration.injection.external.modules === '__implicit__')
|
|
|
377
377
|
try {
|
|
378
378
|
for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
|
|
379
379
|
var _key2 = _step5.value;
|
|
380
|
-
|
|
380
|
+
_result2[_key2] = configuration.injection.external.aliases[request](request, _key2);
|
|
381
381
|
}
|
|
382
382
|
} catch (err) {
|
|
383
383
|
_iterator5.e(err);
|
|
384
384
|
} finally {
|
|
385
385
|
_iterator5.f();
|
|
386
386
|
}
|
|
387
|
-
} else if (configuration.injection.external.aliases[request] !== null && (0, _typeof2["default"])(configuration.injection.external.aliases[request]) === 'object') _clientnode["default"].extend(
|
|
388
|
-
if (Object.prototype.hasOwnProperty.call(
|
|
387
|
+
} else if (configuration.injection.external.aliases[request] !== null && (0, _typeof2["default"])(configuration.injection.external.aliases[request]) === 'object') _clientnode["default"].extend(_result2, configuration.injection.external.aliases[request]);
|
|
388
|
+
if (Object.prototype.hasOwnProperty.call(_result2, 'default')) {
|
|
389
389
|
var _iterator6 = _createForOfIteratorHelper(keys),
|
|
390
390
|
_step6;
|
|
391
391
|
try {
|
|
392
392
|
for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
|
|
393
393
|
var _key3 = _step6.value;
|
|
394
|
-
if (!Object.prototype.hasOwnProperty.call(
|
|
394
|
+
if (!Object.prototype.hasOwnProperty.call(_result2, _key3)) _result2[_key3] = _result2["default"];
|
|
395
395
|
}
|
|
396
396
|
} catch (err) {
|
|
397
397
|
_iterator6.e(err);
|
|
@@ -402,11 +402,11 @@ if (configuration.injection.external.modules === '__implicit__')
|
|
|
402
402
|
// endregion
|
|
403
403
|
}
|
|
404
404
|
|
|
405
|
-
if (typeof
|
|
405
|
+
if (typeof _result2 !== 'string' && Object.prototype.hasOwnProperty.call(_result2, 'root')) _result2.root = [].concat(_result2.root).map(function (name) {
|
|
406
406
|
return _clientnode["default"].stringConvertToValidVariableName(name);
|
|
407
407
|
});
|
|
408
408
|
var exportFormat = configuration.exportFormat.external || configuration.exportFormat.self;
|
|
409
|
-
return callback(undefined, exportFormat === 'umd' || typeof
|
|
409
|
+
return callback(undefined, exportFormat === 'umd' || typeof _result2 === 'string' ? _result2 : _result2[exportFormat], exportFormat);
|
|
410
410
|
}
|
|
411
411
|
return callback();
|
|
412
412
|
};
|
|
@@ -1231,9 +1231,9 @@ if (configuration.nodeENV !== null) webpackConfiguration.optimization.nodeEnv =
|
|
|
1231
1231
|
if (!Array.isArray(_module.skipParseRegularExpressions) || _module.skipParseRegularExpressions.length) webpackConfiguration.module.noParse = _module.skipParseRegularExpressions;
|
|
1232
1232
|
if ((_configuration$path$c2 = configuration.path.configuration) !== null && _configuration$path$c2 !== void 0 && _configuration$path$c2.javaScript) try {
|
|
1233
1233
|
require.resolve(configuration.path.configuration.javaScript);
|
|
1234
|
-
var
|
|
1235
|
-
if (_clientnode["default"].isPlainObject(
|
|
1236
|
-
if (Object.prototype.hasOwnProperty.call(
|
|
1234
|
+
var _result3 = optionalRequire(configuration.path.configuration.javaScript);
|
|
1235
|
+
if (_clientnode["default"].isPlainObject(_result3)) {
|
|
1236
|
+
if (Object.prototype.hasOwnProperty.call(_result3, 'replaceWebOptimizer')) exports.webpackConfiguration = webpackConfiguration = _result3.replaceWebOptimizer;else _clientnode["default"].extend(true, webpackConfiguration, _result3);
|
|
1237
1237
|
} else console.debug('Failed to load given JavaScript configuration file path "' + "".concat(configuration.path.configuration.javaScript, "\"."));
|
|
1238
1238
|
} catch (error) {
|
|
1239
1239
|
console.debug('Optional configuration file script "' + "".concat(configuration.path.configuration.javaScript, "\" not available."));
|