weboptimizer 4.0.48 → 4.0.50

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weboptimizer",
-  "version": "4.0.48",
+  "version": "4.0.50",
   "description": "A generic web optimizer, (module) bundler and development environment.",
   "keywords": [
     "webpack",
@@ -33,7 +33,7 @@
     "ejsLoader.d.ts",
     "ejsLoader.js",
     "eslint.config.d.ts",
-    "eslint.config.mjs",
+    "eslint.config.js",
     "helper.d.ts",
     "helper.js",
     "index.d.ts",
@@ -63,15 +63,15 @@
   },
   "scripts": {
     "build": "yarn build:types; yarn build:lint; yarn build:plain",
-    "build:lint": "           babel --extensions '.ts' --out-file eslint.config.mjs eslint.config.ts",
+    "build:lint": "           babel --extensions '.ts' --out-file eslint.config.js eslint.config.ts",
     "build:plain": "command=\"babel --extensions '.ts' --out-file\" && $command browser.js browser.ts && $command configurator.js configurator.ts && $command ejsLoader.js ejsLoader.ts && $command helper.js helper.ts && $command index.js index.ts && $command jestSetup.js jestSetup.ts && $command plugins/HTMLTransformation.js plugins/HTMLTransformation.ts && $command plugins/InPlaceAssetsIntoHTML.js plugins/InPlaceAssetsIntoHTML.ts && $command stylelintConfigurator.js stylelintConfigurator.ts && $command type.js type.ts && $command webpackConfigurator.js webpackConfigurator.ts && shx chmod +x index.js && shx sed -i 's/(#!\\\\/usr\\\\/bin\\\\/env )babel-(node)/$1$2/' index.js 1>/dev/null",
-    "build:copy-test-artefacts": "cd test/simple && shx touch yarn.lock && rimraf node_modules && YARN_ENABLE_IMMUTABLE_INSTALLS=false yarn install; cd ../../ && cd test/scss && shx touch yarn.lock && rimraf node_modules && YARN_ENABLE_IMMUTABLE_INSTALLS=false yarn install; cd ../../ && rimraf node_modules/weboptimizer test/simple/node_modules/weboptimizer test/scss/node_modules/weboptimizer && shx mkdir -p node_modules/weboptimizer test/simple/node_modules/weboptimizer test/scss/node_modules/weboptimizer && copyCommand='shx cp -r plugins *.ts *.js *.mjs *.json *.ejs' && $copyCommand node_modules/weboptimizer/ && $copyCommand test/simple/node_modules/weboptimizer/ && $copyCommand test/scss/node_modules/weboptimizer/",
+    "build:copy-test-artefacts": "cd test/simple && shx touch yarn.lock && rimraf node_modules && YARN_ENABLE_IMMUTABLE_INSTALLS=false yarn install; cd ../../ && cd test/scss && shx touch yarn.lock && rimraf node_modules && YARN_ENABLE_IMMUTABLE_INSTALLS=false yarn install; cd ../../ && rimraf node_modules/weboptimizer test/simple/node_modules/weboptimizer test/scss/node_modules/weboptimizer && shx mkdir -p node_modules/weboptimizer test/simple/node_modules/weboptimizer test/scss/node_modules/weboptimizer && copyCommand='shx cp -r plugins *.ts *.js *.json *.ejs' && $copyCommand node_modules/weboptimizer/ && $copyCommand test/simple/node_modules/weboptimizer/ && $copyCommand test/scss/node_modules/weboptimizer/",
     "build:test": "           yarn clear && yarn build && command='babel --extensions '.ts' --source-root ../ --out-file' && yarn build:copy-test-artefacts && $command test/browser.js test/browser.ts && $command test/configurator.js test/configurator.ts && $command test/helper.js test/helper.ts && $command test/ejsLoader.js test/ejsLoader.ts && $command test/stylelintConfigurator.js test/stylelintConfigurator.ts && $command test/index.js test/index.ts && $command test/webpackConfigurator.js test/webpackConfigurator.ts",
     "build:test:source-map": "yarn clear && yarn build && command='babel --extensions '.ts' --source-maps inline --source-root ../ --out-file' && yarn build:copy-test-artefacts && $command test/browser.js test/browser.ts && $command test/configurator.js test/configurator.ts && $command test/helper.js test/helper.ts && $command test/ejsLoader.js test/ejsLoader.ts && $command test/stylelintConfigurator.js test/stylelintConfigurator.ts && $command test/index.js test/index.ts && $command test/webpackConfigurator.js test/webpackConfigurator.ts",
     "build:types": "tsc --declaration --emitDeclarationOnly",
     "check": "yarn check:types; yarn lint",
     "check:types": "tsc --noEmit",
-    "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 '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",
+    "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 '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' 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 --no-warn-ignored *.ts */*.ts test/*/*.ts",
@@ -94,7 +94,7 @@
     "babel-loader": "^10.1.1",
     "babel-plugin-polyfill-corejs3": "^1.0.0",
     "babel-plugin-transform-rewrite-imports": "^1.5.4",
-    "clientnode": "4.0.1481",
+    "clientnode": "4.0.1482",
     "core-js": "^3.49.0",
     "ejs": "^6.0.1",
     "exports-loader": "^5.0.0",
@@ -127,15 +127,15 @@
     "@types/postcss-url": "^10.0.4",
     "@types/webpack-env": "^1.18.8",
     "@types/webpack-sources": "^3.2.3",
-    "@typescript-eslint/parser": "^8.65.0",
+    "@typescript-eslint/parser": "^8.66.0",
     "css-loader": "^7.1.4",
     "cssnano": "^8.0.2",
     "eslint": "^10.8.0",
     "eslint-config-google": "^0.14.0",
-    "eslint-plugin-jsdoc": "^63.3.2",
+    "eslint-plugin-jsdoc": "^63.3.3",
     "favicons": "^7.3.1",
     "favicons-webpack-plugin": "^6.0.1",
-    "globals": "^17.8.0",
+    "globals": "^17.9.0",
     "image-minimizer-webpack-plugin": "^5.0.0",
     "jest": "^30.4.2",
     "jsdoc": "^4.0.5",
@@ -155,9 +155,9 @@
     "stylelint-config-standard": "^40.0.0",
     "stylelint-config-standard-scss": "^17.0.0",
     "terser-webpack-plugin": "^5.6.1",
-    "typescript-eslint": "^8.65.0",
+    "typescript-eslint": "^8.66.0",
     "typescript-plugin-css-modules": "^5.2.0",
-    "web-documentation": "^1.0.44",
+    "web-documentation": "^1.0.45",
     "workbox-webpack-plugin": "^7.4.1"
   },
   "peerDependencies": {
@@ -383,7 +383,7 @@
         "types": {
           "default": {
             "filePathPattern": {
-              "__evaluate__": "`^${string.maskForRegularExpression(self.path.target.asset.javaScript)}.+(?:\\\\.[^.]+(?:\\\\.map)?)?\\\\.js$`"
+              "__evaluate__": "`^${string.maskForRegularExpression(self.path.target.asset.javaScript)}.+(?:\\\\.[^.]+(?:\\\\.map)?)?\\\\.c?js$`"
             },
             "outputExtension": "js",
             "preinstall": {
@@ -486,7 +486,7 @@
             "arguments": [
               "--config",
               {
-                "__evaluate__": "`'${webOptimizerPath}/eslint.config.mjs'`"
+                "__evaluate__": "`'${webOptimizerPath}/eslint.config.js'`"
               },
               "--ignore-pattern",
               {
@@ -622,10 +622,11 @@
             ]
           },
           "external": {
-            "__evaluate__": "self.generic.isWeb ? self.extensions.file.internal : ['.compiled.js', '.js', '.json', '.mjs']"
+            "__evaluate__": "self.generic.isWeb ? self.extensions.file.internal : ['.compiled.js', '.cjs', '.js', '.json', '.mjs']"
           },
           "internal": [
             ".compiled.js",
+            ".cjs",
             ".mjs",
             ".js",
             ".jsx",
@@ -859,6 +860,7 @@
         "extensions": {
           "file": [
             ".compiled.js",
+            ".cjs",
             ".mjs",
             ".js"
           ]
@@ -1117,6 +1119,7 @@
             "loader": "ejs-loader",
             "options": {
               "compiler": {
+                "async": true,
                 "cache": true,
                 "compileDebug": false,
                 "debug": false,
@@ -1567,6 +1570,7 @@
         "watchOptions": {
           "ignored": [
             "./.yarn",
+            "./*.cjs",
             "./*.js",
             "./end-to-end-tests",
             "**/.*",

package/webpackConfigurator.js

@@ -290,13 +290,13 @@ if (module.enforceDeduplication) {
   const absoluteContextPath = resolve(configuration.path.context);
   const consolidator = async result => {
     const targetPath = result.createData.resource;
-    if (targetPath && /((?: ^|\/)node_modules\/.+)/.test(targetPath) && (!targetPath.startsWith(absoluteContextPath) || /((?: ^|\/)node_modules\/.+){2}/.test(targetPath)) && isFileSync(targetPath)) {
+    if (targetPath && /((?:^|\/)node_modules\/.+)/.test(targetPath) && (!targetPath.startsWith(absoluteContextPath) || /((?:^|\/)node_modules\/.+){2}/.test(targetPath)) && isFileSync(targetPath)) {
       const packageDescriptor = await getClosestPackageDescriptor(targetPath);
       if (packageDescriptor) {
         let pathPrefixes;
         let pathSuffix;
         if (targetPath.startsWith(absoluteContextPath)) {
-          const matches = targetPath.match(/((?: ^|.*?\/)node_modules\/)/g);
+          const matches = targetPath.match(/((?:^|.*?\/)node_modules\/)/g);
           if (matches === null) return;
           pathPrefixes = Array.from(matches);
           /*
@@ -309,7 +309,7 @@ if (module.enforceDeduplication) {
             if (index > 0) pathPrefixes[index] = resolve(pathPrefixes[index - 1], pathPrefix);
             index += 1;
           }
-          pathSuffix = targetPath.replace(/(?: ^|.*\/)node_modules\/(.+$)/, '$1');
+          pathSuffix = targetPath.replace(/(?:^|.*\/)node_modules\/(.+$)/, '$1');
         } else {
           pathPrefixes = [resolve(absoluteContextPath, 'node_modules')];
           // Find longest common prefix.
@@ -574,7 +574,7 @@ const genericLoader = {
       }
       return Boolean(result);
     },
-    test: /\.s?css(?: \?.*)?$/i,
+    test: /\.s?css(?:\?.*)?$/i,
     use: cssUse
   },
   // endregion
@@ -589,7 +589,7 @@ const genericLoader = {
       generator: {
         filename: join(relative(configuration.path.target.base, configuration.path.target.asset.font), '[name][ext]') + `?${configuration.hashAlgorithm}=[contenthash]`
       },
-      test: /\.eot(?: \?.*)?$/i,
+      test: /\.eot(?:\?.*)?$/i,
       type: 'asset/resource',
       parser: {
         dataUrlCondition: {
@@ -613,7 +613,7 @@ const genericLoader = {
           maxSize: configuration.inPlace.otherMaximumFileSizeLimitInByte
         }
       },
-      test: /\.svg(?: \?.*)?$/i,
+      test: /\.svg(?:\?.*)?$/i,
       type: 'asset/resource',
       use: await Promise.all(module.optimizer.font.svg.loader.map(createEvaluateMapper('font.svg')))
     },
@@ -625,7 +625,7 @@ const genericLoader = {
       generator: {
         filename: join(relative(configuration.path.target.base, configuration.path.target.asset.font), '[name][ext]') + `?${configuration.hashAlgorithm}=[contenthash]`
       },
-      test: /\.ttf(?: \?.*)?$/i,
+      test: /\.ttf(?:\?.*)?$/i,
       type: 'asset/resource',
       mimetype: 'application/octet-stream',
       parser: {
@@ -643,7 +643,7 @@ const genericLoader = {
       generator: {
         filename: join(relative(configuration.path.target.base, configuration.path.target.asset.font), '[name][ext]') + `?${configuration.hashAlgorithm}=[contenthash]`
       },
-      test: /\.woff2?(?: \?.*)?$/i,
+      test: /\.woff2?(?:\?.*)?$/i,
       type: 'asset/resource',
       parser: {
         dataUrlCondition: {
@@ -664,7 +664,7 @@ const genericLoader = {
       filename: typeof configuration.path.target.asset.image === 'string' ? join(relative(configuration.path.target.base, configuration.path.target.asset.image), '[name][ext]') + `?${configuration.hashAlgorithm}=[contenthash]` : configuration.path.target.asset.image
     },
     include: configuration.path.source.asset.image,
-    test: /\.(?: gif|ico|jpg|png|svg)(?: \?.*)?$/i,
+    test: /\.(?:gif|ico|jpg|png|svg)(?:\?.*)?$/i,
     type: 'asset/resource',
     parser: {
       dataUrlCondition: {