weboptimizer 2.0.1491 → 2.0.1493

package/index.js

@@ -36,7 +36,7 @@ var _globAll = require("glob-all");
 var _path = _interopRequireWildcard(require("path"));
 var _rimraf = require("rimraf");
 var _configurator = require("./configurator");
-var _helper = _interopRequireDefault(require("./helper"));
+var _helper = require("./helper");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, 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 o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
@@ -96,13 +96,13 @@ var main = function main(context) {
             };
             if (configuration.givenCommandLineArguments.length > 3 && (0, _clientnode.parseEncodedObject)(configuration.givenCommandLineArguments[configuration.givenCommandLineArguments.length - 1], configuration, 'configuration')) configuration.givenCommandLineArguments.pop();
             count = 0;
-            filePath = (0, _path.resolve)(configuration.path.context, ".dynamicConfiguration-".concat(count, ".json"));
+            filePath = (0, _path.resolve)(configuration.path.context, ".dynamicConfiguration-".concat(String(count), ".json"));
           case 15:
-            if (!true) {
+            if (!(count < _clientnode.MAXIMAL_NUMBER_OF_ITERATIONS.value)) {
               _context3.next = 24;
               break;
             }
-            filePath = (0, _path.resolve)(configuration.path.context, ".dynamicConfiguration-".concat(count, ".json"));
+            filePath = (0, _path.resolve)(configuration.path.context, ".dynamicConfiguration-".concat(String(count), ".json"));
             _context3.next = 19;
             return (0, _clientnode.isFile)(filePath);
           case 19:
@@ -112,7 +112,7 @@ var main = function main(context) {
             }
             return _context3.abrupt("break", 24);
           case 21:
-            count += 1;
+            count++;
             _context3.next = 15;
             break;
           case 24:
@@ -151,7 +151,7 @@ var main = function main(context) {
                 return _regenerator["default"].wrap(function _callee$(_context) {
                   while (1) switch (_context.prev = _context.next) {
                     case 0:
-                      if (!_helper["default"].isFilePathInLocation(file.path, configuration.path.ignore.concat(configuration.module.directoryNames, configuration.loader.directoryNames).map(function (filePath) {
+                      if (!(0, _helper.isFilePathInLocation)(file.path, configuration.path.ignore.concat(configuration.module.directoryNames, configuration.loader.directoryNames).map(function (filePath) {
                         return (0, _path.resolve)(configuration.path.context, filePath);
                       }).filter(function (filePath) {
                         return !configuration.path.context.startsWith(filePath);
@@ -269,7 +269,7 @@ var main = function main(context) {
           case 67:
             // endregion
             // region handle build
-            buildConfigurations = _helper["default"].resolveBuildConfigurationFilePaths(configuration.buildContext.types, configuration.path.source.asset.base, configuration.path.ignore.concat(configuration.module.directoryNames, configuration.loader.directoryNames).map(function (filePath) {
+            buildConfigurations = (0, _helper.resolveBuildConfigurationFilePaths)(configuration.buildContext.types, configuration.path.source.asset.base, configuration.path.ignore.concat(configuration.module.directoryNames, configuration.loader.directoryNames).map(function (filePath) {
               return (0, _path.resolve)(configuration.path.context, filePath);
             }).filter(function (filePath) {
               return !configuration.path.context.startsWith(filePath);
@@ -295,13 +295,13 @@ var main = function main(context) {
                 try {
                   for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
                     var moduleID = _step3.value;
-                    var _filePath2 = _helper["default"].determineModuleFilePath(moduleID, configuration.module.aliases, configuration.module.replacements.normal, {
+                    var _filePath2 = (0, _helper.determineModuleFilePath)(moduleID, configuration.module.aliases, configuration.module.replacements.normal, {
                       file: configuration.extensions.file.internal
                     }, configuration.path.context, configuration.path.source.asset.base, configuration.path.ignore, configuration.module.directoryNames, configuration["package"].main.fileNames, configuration["package"].main.propertyNames, configuration["package"].aliasPropertyNames, configuration.encoding);
                     var type = null;
-                    if (_filePath2) type = _helper["default"].determineAssetType(_filePath2, configuration.buildContext.types, configuration.path);
-                    if (typeof type === 'string' && configuration.buildContext.types[type]) {
-                      var _filePath3 = _helper["default"].renderFilePathTemplate(_helper["default"].stripLoader(configuration.files.compose.javaScript), {
+                    if (_filePath2) type = (0, _helper.determineAssetType)(_filePath2, configuration.buildContext.types, configuration.path);
+                    if (typeof type === 'string' && Object.prototype.hasOwnProperty.call(configuration.buildContext.types, type)) {
+                      var _filePath3 = (0, _helper.renderFilePathTemplate)((0, _helper.stripLoader)(configuration.files.compose.javaScript), {
                         '[name]': chunkName
                       });
                       /*
@@ -347,6 +347,8 @@ var main = function main(context) {
                   NOTE: Take current weboptimizer's dependencies into
                   account.
               */
+              if (!childProcessOptions.env) childProcessOptions.env = {};
+              if (typeof childProcessOptions.env.PATH !== 'string') childProcessOptions.env.PATH = '';
               childProcessOptions.env.PATH += ":".concat(webOptimizerPath, "/node_modules/.bin");
               var childProcess = (0, _child_process.spawn)(configuration.commandLine.build.command, commandLineArguments, childProcessOptions);
               var copyAdditionalFilesAndTidyUp = function copyAdditionalFilesAndTidyUp() {
@@ -398,7 +400,7 @@ var main = function main(context) {
             }
             // Perform all file specific preprocessing stuff.
             testModuleFilePaths = [];
-            if ((0, _clientnode.isPlainObject)(configuration['test:browser'].injection) && configuration['test:browser'].injection.entry) testModuleFilePaths = _helper["default"].determineModuleLocations(configuration['test:browser'].injection.entry, configuration.module.aliases, configuration.module.replacements.normal, {
+            if ((0, _clientnode.isPlainObject)(configuration['test:browser'].injection) && configuration['test:browser'].injection.entry) testModuleFilePaths = (0, _helper.determineModuleLocations)(configuration['test:browser'].injection.entry, configuration.module.aliases, configuration.module.replacements.normal, {
               file: configuration.extensions.file.internal
             }, configuration.path.context, configuration.path.source.asset.base, configuration.path.ignore).filePaths;
             _iterator7 = _createForOfIteratorHelper(buildConfigurations);
@@ -442,7 +444,7 @@ var main = function main(context) {
                       return [(0, _clientnode.handleChildProcess)((0, _child_process.exec)(evaluated.result, _objectSpread({
                         encoding: configuration.encoding
                       }, processOptions), function (error) {
-                        return error ? reject(error) : resolve({
+                        if (error) reject(error);else resolve({
                           reason: 'Finished.',
                           parameters: []
                         });

package/jestEnvironmentBrowser.js

@@ -38,7 +38,9 @@ var BrowserEnvironment = exports.BrowserEnvironment = /*#__PURE__*/function () {
     }
   }, {
     key: "teardown",
-    value: function teardown() {}
+    value: function teardown() {
+      // Stub method.
+    }
   }, {
     key: "runScript",
     value: function runScript() {

package/jestSetup.js

@@ -22,6 +22,6 @@ _clientnode.globalContext.TextEncoder = _util.TextEncoder;
 _clientnode.globalContext.TextDecoder = _util.TextDecoder;
 try {
   if (eval('require')('jest-canvas-mock')) console.info('Canvas mocking module loaded.');
-} catch (error) {
+} catch (_error) {
   // Do nothing.
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weboptimizer",
-  "version": "2.0.1491",
+  "version": "2.0.1493",
   "description": "A generic web optimizer, (module) bundler and development environment.",
   "keywords": [
     "webpack",
@@ -76,7 +76,7 @@
     "clear": "rimraf --glob apiDocumentation browser.d.ts configurator.d.ts ejsLoader.d.ts eslint.config.d.ts helper.d.ts index.d.ts jestSetup.d.ts jestEnvironmentBrowser.d.ts 'plugins/*.d.ts' 'plugins/*.js' stylelintConfigurator.d.ts 'test/*.js' 'test/*.compiled.*' 'test/*.d.ts' 'test/**/yarn.lock' 'test/**/node_modules' type.d.ts webpackConfigurator.d.ts '*.compiled.*' '*.compiled' '*.html' '*.js' '*.log' '*.mjs' node_modules/weboptimizer .coverage .nyc_output",
     "document": "yarn build:plain && jsdoc --package ./package.json --readme ./readme.md --destination apiDocumentation *.js",
     "lint": "yarn build:lint && yarn lint:base",
-    "lint:base": "eslint *.ts */*.ts test/*/*.ts",
+    "lint:base": "eslint --no-warn-ignored *.ts */*.ts test/*/*.ts",
     "prepare": "yarn build",
     "prettify": "yarn lint:base --fix || true",
     "test": "yarn build:test && jest --config ./jest.json --noStackTrace --root-dir './' --test-regex '/test/.+\\\\.js$' test/browser.js test/configurator.js test/helper.js test/ejsLoader.js test/stylelintConfigurator.js test/index.js test/webpackConfigurator.js",
@@ -89,77 +89,77 @@
   },
   "runkitExample": "require('@babel/runtime/package.json')\n\nconst {default: main} = require('weboptimizer')\n\nawait main('./', './', ['clear'])",
   "dependencies": {
-    "@babel/core": "^7.24.9",
+    "@babel/core": "^7.25.2",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
     "@babel/plugin-proposal-decorators": "^7.24.7",
     "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
     "@babel/plugin-transform-runtime": "^7.24.7",
-    "@babel/preset-env": "^7.24.8",
+    "@babel/preset-env": "^7.25.3",
     "@babel/preset-typescript": "^7.24.7",
-    "@babel/runtime": "^7.24.8",
+    "@babel/runtime": "^7.25.0",
     "babel-loader": "^9.1.3",
     "babel-plugin-transform-modern-regexp": "^0.0.6",
     "babel-preset-minify": "^0.5.2",
-    "clientnode": "3.0.1166",
+    "clientnode": "3.0.1169",
     "ejs": "^3.1.10",
     "exports-loader": "^5.0.0",
     "extract-loader": "^5.1.0",
     "glob-all": "^3.3.1",
-    "html-loader": "^5.0.0",
+    "html-loader": "^5.1.0",
     "html-minifier": "^4.0.0",
     "html-webpack-plugin": "^5.6.0",
     "imports-loader": "^5.0.0",
     "jest-environment-jsdom": "^29.7.0",
     "rimraf": "^6.0.1",
     "script-loader": "^0.7.2",
-    "typescript": "^5.5.3",
+    "typescript": "^5.5.4",
     "webpack": "^5.93.0",
     "webpack-cli": "^5.1.4",
     "webpack-sources": "^3.2.3"
   },
   "devDependencies": {
     "@babel/cli": "^7.24.8",
-    "@babel/eslint-parser": "^7.24.8",
+    "@babel/eslint-parser": "^7.25.1",
+    "@stylistic/eslint-plugin": "^2.6.1",
     "@types/ejs": "^3.1.5",
-    "@types/eslint": "^8.56.10",
+    "@types/eslint": "^9.6.0",
     "@types/html-minifier": "^4.0.5",
     "@types/html-minifier-terser": "^7.0.2",
     "@types/imagemin": "^9.0.0",
-    "@types/node": "^20.14.11",
+    "@types/node": "^22.1.0",
     "@types/postcss-import": "^14.0.3",
     "@types/postcss-url": "^10.0.4",
     "@types/webpack-env": "^1.18.5",
     "@types/webpack-sources": "^3.2.3",
-    "@typescript-eslint/eslint-plugin": "^7.16.1",
-    "@typescript-eslint/parser": "^7.16.1",
+    "@typescript-eslint/parser": "^8.0.1",
     "css-loader": "^7.1.2",
     "cssnano": "^7.0.4",
-    "documentation-website": "^1.0.329",
-    "eslint": "^9.7.0",
+    "documentation-website": "^1.0.330",
+    "eslint": "^9.8.0",
     "eslint-config-google": "^0.14.0",
-    "eslint-plugin-jsdoc": "^48.7.0",
+    "eslint-plugin-jsdoc": "^50.0.0",
     "favicons": "^7.2.0",
     "favicons-webpack-plugin": "^6.0.1",
-    "globals": "^15.8.0",
-    "image-minimizer-webpack-plugin": "^4.0.2",
+    "globals": "^15.9.0",
+    "image-minimizer-webpack-plugin": "^4.1.0",
     "jest": "^29.7.0",
     "jsdoc": "^4.0.3",
     "mini-css-extract-plugin": "^2.9.0",
     "mkdirp": "^3.0.1",
     "node-fetch": "^3.3.2",
-    "postcss": "^8.4.39",
+    "postcss": "^8.4.41",
     "postcss-fontpath": "^1.0.0",
     "postcss-import": "^16.1.0",
     "postcss-loader": "^8.1.1",
-    "postcss-preset-env": "^9.6.0",
+    "postcss-preset-env": "^10.0.0",
     "postcss-sprites": "^4.2.1",
     "postcss-url": "^10.1.3",
     "shx": "^0.3.4",
     "style-loader": "^4.0.0",
-    "stylelint": "^16.7.0",
+    "stylelint": "^16.8.1",
     "stylelint-config-standard": "^36.0.1",
     "stylelint-config-standard-scss": "^13.1.0",
-    "typescript-eslint": "^7.16.1",
+    "typescript-eslint": "^8.0.1",
     "typescript-plugin-css-modules": "^5.1.0",
     "workbox-webpack-plugin": "^7.1.0"
   },
@@ -482,26 +482,7 @@
               {
                 "__evaluate__": "filesystem.isFileSync(path.resolve(currentPath, 'tsconfig.json')) ? '--parser-options=project:tsconfig.json' : ''"
               },
-              "--ignore-pattern",
-              "'**/.git/*'",
-              "--ignore-pattern",
-              "'**/.cache/*'",
-              "--ignore-pattern",
-              "'**/.config/*'",
-              "--ignore-pattern",
-              "'**/.npm/*'",
-              "--ignore-pattern",
-              "'**/log/*'",
-              "--ignore-pattern",
-              "'**/node_modules/*'",
-              "--ignore-pattern",
-              "'**/backup/*'",
-              "--ignore-pattern",
-              "'**/exclude/*'",
-              "--ignore-pattern",
-              "'**/plugins/*'",
-              "--ignore-pattern",
-              "'*.d.ts'",
+              "--no-warn-ignored",
               "'**/*.{jsx,ts,tsx}'"
             ],
             "command": "eslint",

package/plugins/HTMLTransformation.js

@@ -62,7 +62,7 @@ var HTMLTransformation = exports.HTMLTransformation = /*#__PURE__*/function () {
             unexpected escape sequences in resulting html.
         */
         dom = new _jsdom.JSDOM(data.html.replace(/<%/g, '##+#+#+##').replace(/%>/g, '##-#-#-##'));
-      } catch (error) {
+      } catch (_error) {
         return data;
       }
       var linkables = {
@@ -80,7 +80,8 @@ var HTMLTransformation = exports.HTMLTransformation = /*#__PURE__*/function () {
               necessary to match the generated request strings in offline
               plugin.
           */
-          domNode.setAttribute(attributeName, domNode.getAttribute(attributeName).replace(new RegExp("(\\?".concat(this.options.hashAlgorithm, "=[^&]+).*$")), '$1'));
+          var value = domNode.getAttribute(attributeName);
+          if (value) domNode.setAttribute(attributeName, value.replace(new RegExp("(\\?".concat(this.options.hashAlgorithm, "=[^&]+).*$")), '$1'));
         }
       }
       // NOTE: We have to restore template delimiter and style contents.
@@ -101,7 +102,7 @@ var HTMLTransformation = exports.HTMLTransformation = /*#__PURE__*/function () {
                 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: (0, _clientnode.extend)(true, (0, _clientnode.copy)(loaderConfiguration.options) || {}, htmlFileSpecification.template.postCompileOptions)
+                  query: (0, _clientnode.extend)(true, Object.prototype.hasOwnProperty.call(loaderConfiguration, 'options') ? (0, _clientnode.copy)(loaderConfiguration.options) : {}, htmlFileSpecification.template.postCompileOptions)
                 })(data.html);
               }
             } catch (err) {

package/plugins/InPlaceAssetsIntoHTML.js

@@ -56,7 +56,7 @@ var InPlaceAssetsIntoHTML = exports.InPlaceAssetsIntoHTML = /*#__PURE__*/functio
             }
             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) {
+            if (Object.prototype.hasOwnProperty.call(compilation.assets, name) && settings && settings[type] && [].concat(settings[type]).some(function (pattern) {
               return new RegExp(pattern).test(name);
             })) {
               var newAttributes = _objectSpread({}, tag.attributes);

package/tsconfig.json

@@ -23,11 +23,13 @@
         "target": "esnext"
     },
     "exclude": [
-        "**/exclude/*"
+        "**/exclude/*",
+        "test/**/*.d.ts"
     ],
     "include": [
         "*.ts", "*.tsx",
         "*/*.ts", "*/*.tsx",
+        "*/declarations.d.ts",
 
         "assets/src/**/*.ts", "/assets/src/**/*.tsx",
         "assets/source/**/*.ts", "/assets/source/**/*.tsx",

package/type.d.ts

@@ -1,14 +1,15 @@
 import { AnyFunction, Encoding, Mapping, PlainObject, SecondParameter } from 'clientnode';
-import FaviconWebpackPlugin from 'favicons-webpack-plugin';
+import type FaviconWebpackPlugin from 'favicons-webpack-plugin';
 import { FaviconWebpackPlugionOptions as FaviconWebpackPluginOptions } from 'favicons-webpack-plugin/src/options';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
-import ImageMinimizerWebpackPlugin, { PluginOptions as ImageMinimizerOptions } from 'image-minimizer-webpack-plugin';
+import type ImageMinimizerWebpackPlugin from 'image-minimizer-webpack-plugin';
+import { PluginOptions as ImageMinimizerOptions } from 'image-minimizer-webpack-plugin';
 import { JSDOM } from 'jsdom';
-import MiniCSSExtractPlugin from 'mini-css-extract-plugin';
-import TerserWebpackPlugin from 'terser-webpack-plugin';
+import type MiniCSSExtractPlugin from 'mini-css-extract-plugin';
+import type TerserWebpackPlugin from 'terser-webpack-plugin';
 import { DefinePlugin as WebpackDefinePlugin, Configuration as BaseWebpackConfiguration, IgnorePlugin as WebpackIgnorePlugin, library as webpackLibrary, ModuleOptions as WebpackModuleOptions, RuleSetRule as WebpackRuleSetRule, RuleSetUseItem as WebpackRuleSetUseItem, WebpackOptionsNormalized } from 'webpack';
 import { WebpackPartial as WorkboxBaseCommonOptions, BasePartial as WorkboxCommonOptions, WebpackGenerateSWOptions as WorkboxGenerateSWOptions, WebpackInjectManifestOptions as WorkboxInjectManifestOptions } from 'workbox-build';
-import OfflinePlugin from 'workbox-webpack-plugin';
+import type OfflinePlugin from 'workbox-webpack-plugin';
 export interface Browser {
     debug: boolean;
     domContentLoaded: boolean;
@@ -39,7 +40,7 @@ export interface RedundantRequest {
     path: string;
     version: string;
 }
-export type ExternalAliases = Mapping<Mapping | string | ((_request: string, _key: string) => string)>;
+export type ExternalAliases = Mapping<Mapping | null | string | ((_request: string, _key: string) => string)>;
 export type GivenInjection = AnyFunction | string | Array<string> | Mapping<string | Array<string>>;
 export type NormalizedGivenInjection = Mapping<Array<string>>;
 export interface GivenInjectionConfiguration {
@@ -170,7 +171,7 @@ export interface WebpackLoaderConfiguration {
 }
 export type WebpackLoaderIndicator = WebpackRuleSetRule['include'];
 export interface Command {
-    arguments: Array<string>;
+    arguments?: Array<string>;
     command: string;
     indicator?: string;
 }
@@ -328,7 +329,7 @@ export interface ResolvedConfiguration {
                 };
                 module?: PlainObject;
             };
-            cssnano: PlainObject;
+            cssnano?: PlainObject;
             data: ResourceLoaderConfiguration;
             font: {
                 eot: ResourceLoaderConfiguration;
@@ -339,7 +340,7 @@ export interface ResolvedConfiguration {
             htmlMinifier?: PlainObject;
             image: {
                 content: ImageMinimizerOptions<unknown, unknown>;
-                exclude: string;
+                exclude: null | string;
                 loader: Array<string>;
             };
         };
@@ -442,8 +443,8 @@ export interface WebpackBaseAssets {
     plugin: HtmlWebpackPlugin;
 }
 export interface WebpackAssets extends WebpackBaseAssets {
-    bodyTags: HtmlWebpackPlugin.HtmlTagObject[];
-    headTags: HtmlWebpackPlugin.HtmlTagObject[];
+    bodyTags: Array<HtmlWebpackPlugin.HtmlTagObject>;
+    headTags: Array<HtmlWebpackPlugin.HtmlTagObject>;
     outputName: string;
     publicPath: string;
     plugin: HtmlWebpackPlugin;
@@ -472,8 +473,8 @@ export type WebpackExtendedResolveData = WebpackResolveData & {
     };
 };
 export interface HTMLWebpackPluginAssetTagGroupsData {
-    bodyTags: HtmlWebpackPlugin.HtmlTagObject[];
-    headTags: HtmlWebpackPlugin.HtmlTagObject[];
+    bodyTags: Array<HtmlWebpackPlugin.HtmlTagObject>;
+    headTags: Array<HtmlWebpackPlugin.HtmlTagObject>;
     outputName: string;
     plugin: HtmlWebpackPlugin;
 }