weboptimizer 4.0.95 → 4.0.96-1

package/{browser.js → dist/browser.js}

@@ -144,4 +144,4 @@ export const getInitializedBrowser = async (replaceWindow = true) => {
   if (browser.initialized) wrappedCallback();else onCreatedListener.push(wrappedCallback);
   return promise;
 };
-export default getInitializedBrowser;
+export default getInitializedBrowser;

package/{configurator.js → dist/configurator.js}

@@ -21,7 +21,7 @@ import fileSystemSynchronous from 'fs';
 import fileSystem, { lstat, readFile, unlink } from 'fs/promises';
 import path, { basename, dirname, join, resolve } from 'path';
 import { determineAssetType, determineModuleFilePath, determineModuleLocations, resolveAutoInjection, resolveBuildConfigurationFilePaths, resolveModulesInFolders, normalizeGivenInjection, normalizePaths } from "./helper.js";
-import packageConfiguration from './package.json' with { type: 'json' };
+import packageConfiguration from '../package.json' with { type: 'json' };
 import { SubConfigurationTypes } from "./type.js";
 // endregion
 const {
@@ -45,7 +45,7 @@ await importFilesystemAPI();
  * @param environment - Environment variables to take into account.
  * @returns Nothing.
  */
-export const load = async (context, currentWorkingDirectory = process.cwd(), commandLineArguments = process.argv, webOptimizerPath = import.meta.dirname,
+export const load = async (context, currentWorkingDirectory = process.cwd(), commandLineArguments = process.argv, webOptimizerPath = resolve(import.meta.dirname, '..'),
 /*
     NOTE: We have to avoid that some pre-processor removes this
     assignment.
@@ -89,11 +89,15 @@ environment = eval('process.env')) => {
   // region load application specific configuration
   let specificConfiguration = {};
   try {
-    specificConfiguration = (await optionalImport(join(metaConfiguration.default.path.context, 'package.json'), {
+    /*
+        NOTE: Imported modules are cached so we have to copy to avoid
+        leaking task specific merges into subsequent loads.
+    */
+    specificConfiguration = copy((await optionalImport(join(metaConfiguration.default.path.context, 'package.json'), {
       with: {
         type: 'json'
       }
-    })).default;
+    })).default);
   } catch {
     metaConfiguration.default.path.context = currentWorkingDirectory;
   }
@@ -289,4 +293,4 @@ export const get = async () => {
   if (!loadedConfiguration) loadedConfiguration = await load();
   return loadedConfiguration;
 };
-export default get;
+export default get;

package/{ejsLoader.js → dist/ejsLoader.js}

@@ -257,7 +257,7 @@ export const loader = async function (source) {
       return `${options.strict ? `'use strict';\n` : ''}${result}`;
     }
     if (typeof result === 'string') {
-      result = result.replace(new RegExp(`<script +processing-workaround *` + `(?: = *(?: " *"|' *') *)?>([\\s\\S]*?)</ *script *>`, 'ig'), '$1').replace(new RegExp(`<script +processing(-+)-workaround *` + `(?: = *(?: " *"|' *') *)?>([\\s\\S]*?)</ *script *>`, 'ig'), '<script processing$1workaround>$2</script>');
+      result = result.replace(new RegExp(`<script +processing-workaround *` + `(?:= *(?:" *"|' *') *)?>([\\s\\S]*?)</ *script *>`, 'ig'), '$1').replace(new RegExp(`<script +processing(-+)-workaround *` + `(?:= *(?:" *"|' *') *)?>([\\s\\S]*?)</ *script *>`, 'ig'), '<script processing$1workaround>$2</script>');
       return result;
     }
     return '';
@@ -275,4 +275,4 @@ export const loader = async function (source) {
     callback(error);
   }
 };
-export default loader;
+export default loader;

package/{eslint.config.js → dist/eslint.config.js}

@@ -42,7 +42,7 @@ for (const filePath of ['./tsconfig.eslint.json', './tsconfig.json', './tsconfig
 let PROJECT_SPECIFIC_CONFIGURATION = [];
 if (PACKAGE_CONFIGURATION.name !== 'weboptimizer') try {
   // @ts-expect-error Need to create polymorphic type.
-  const config = await import('../../eslint.config.js');
+  const config = await import('../../../eslint.config.js');
   const resolvedConfig = config.config ?? config.default ?? config.configuration ?? config;
   PROJECT_SPECIFIC_CONFIGURATION = PROJECT_SPECIFIC_CONFIGURATION.concat(resolvedConfig);
 } catch {

package/{helper.js → dist/helper.js}

@@ -38,7 +38,15 @@ export const log = new Logger({
  * "false" otherwise.
  */
 export const isFilePathInLocation = (filePath, locationsToCheck) => {
-  for (const pathToCheck of locationsToCheck) if (resolve(filePath).startsWith(resolve(pathToCheck))) return true;
+  filePath = resolve(filePath);
+  for (const pathToCheck of locationsToCheck) {
+    const location = resolve(pathToCheck);
+    /*
+        NOTE: Only match whole path segments to avoid treating sibling
+        locations sharing a prefix (e.g. ".github" vs. ".git") as nested.
+    */
+    if (filePath === location || filePath.startsWith(location.endsWith(sep) ? location : `${location}${sep}`)) return true;
+  }
   return false;
 };
 // endregion
@@ -622,4 +630,4 @@ export const getClosestPackageDescriptor = async (modulePath, fileName = 'packag
     filePath
   };
 };
-// endregion
+// endregion

package/{index.js → dist/index.js}

@@ -52,7 +52,7 @@ await importFilesystemAPI();
  * @param environment - Environment variables to take into account.
  * @returns Nothing.
  */
-const main = async (context, currentWorkingDirectory = process.cwd(), commandLineArguments = process.argv, webOptimizerPath = import.meta.dirname,
+const main = async (context, currentWorkingDirectory = process.cwd(), commandLineArguments = process.argv, webOptimizerPath = resolve(import.meta.dirname, '..'),
 /*
     NOTE: We have to avoid that some pre-processor removes this
     assignment.
@@ -325,4 +325,4 @@ environment = eval('process.env')) => {
   return clear;
 };
 if (import.meta.main) void main();
-export default main;
+export default main;

package/{jestSetup.js → dist/jestSetup.js}

@@ -19,4 +19,4 @@ import { globalContext, optionalImport } from 'clientnode';
 import { TextEncoder, TextDecoder } from 'util';
 globalContext.TextEncoder = TextEncoder;
 globalContext.TextDecoder = TextDecoder;
-if (await optionalImport('jest-canvas-mock')) console.info('Canvas mocking module loaded.');
+if (await optionalImport('jest-canvas-mock')) console.info('Canvas mocking module loaded.');

package/{plugins → dist/plugins}/HTMLTransformation.js

@@ -92,4 +92,4 @@ export class HTMLTransformation {
     });
   }
 }
-export default HTMLTransformation;
+export default HTMLTransformation;

package/{plugins → dist/plugins}/InPlaceAssetsIntoHTML.js

@@ -41,12 +41,19 @@ export class InPlaceAssetsIntoHTML {
         const inPlace = (type, tag) => {
           let settings = null;
           let url = false;
+          let tagName = 'script';
           if (tag.tagName === 'script') {
             settings = this.options.javaScript;
             url = tag.attributes.src;
-          } else if (tag.tagName === 'style') {
+          } else if (tag.tagName === 'link' && tag.attributes.rel === 'stylesheet') {
+            /*
+                NOTE: Style sheets are referenced via
+                "link" tags and have to be in placed as
+                "style" tags.
+            */
             settings = this.options.cascadingStyleSheet;
             url = tag.attributes.href;
+            tagName = 'style';
           }
           if (!(url && typeof url === 'string')) return tag;
           const name = publicPath ? url.replace(publicPath, '') : url;
@@ -55,13 +62,15 @@ export class InPlaceAssetsIntoHTML {
               ...tag.attributes
             };
             delete newAttributes.href;
+            delete newAttributes.rel;
             delete newAttributes.src;
             inPlacedAssetNames.push(name);
             return {
               ...tag,
               attributes: newAttributes,
               innerHTML: compilation.assets[name].source(),
-              tagName: 'script'
+              tagName,
+              voidTag: false
             };
           }
           return tag;
@@ -79,4 +88,4 @@ export class InPlaceAssetsIntoHTML {
     });
   }
 }
-export default InPlaceAssetsIntoHTML;
+export default InPlaceAssetsIntoHTML;

package/{stylelintConfigurator.js → dist/stylelintConfigurator.js}

@@ -17,4 +17,4 @@
 */
 import getConfiguration from "./configurator.js";
 const configuration = await getConfiguration();
-export default configuration.stylelint;
+export default configuration.stylelint;

package/{type.js → dist/type.js}

@@ -38,4 +38,4 @@ export const TaskTypes = ['build', 'serve', ...SubConfigurationTypes];
 /// endregion
 // NOTE: Not yet defined in webpack types.
 
-// endregion
+// endregion

package/{webpackConfigurator.js → dist/webpackConfigurator.js}

@@ -1038,4 +1038,4 @@ void log.debug('Using webpack configuration:', util.inspect(webpackConfiguration
 }));
 
 // endregion
-export default webpackConfiguration;
+export default webpackConfiguration;

package/jest.json

@@ -4,6 +4,6 @@
         "\\.((css)|(less)|(sass)|(scss))$": "identity-obj-proxy"
     },
     "rootDir": "../../",
-    "setupFilesAfterEnv": ["./node_modules/weboptimizer/jestSetup.js"],
+    "setupFilesAfterEnv": ["./node_modules/weboptimizer/dist/jestSetup.js"],
     "testPathIgnorePatterns": ["^(.*[/])?testHelper([./].*)?$"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weboptimizer",
-  "version": "4.0.95",
+  "version": "4.0.96-1",
   "description": "A generic web optimizer, (module) bundler and development environment.",
   "keywords": [
     "webpack",
@@ -30,67 +30,46 @@
   },
   "type": "module",
   "exports": {
-    ".": "/.index.js",
-    "./browser": "./browser.js",
-    "./browser.js": "./browser.js",
-    "./ejsLoader": "./ejsLoader.js",
-    "./ejsLoader.js": "./ejsLoader.js",
-    "./type": "./type.js",
-    "./type.js": "./type.js"
+    ".": "./dist/index.js",
+    "./browser": "./dist/browser.js",
+    "./browser.js": "./dist/browser.js",
+    "./ejsLoader": "./dist/ejsLoader.js",
+    "./ejsLoader.js": "./dist/ejsLoader.js",
+    "./type": "./dist/type.js",
+    "./type.js": "./dist/type.js"
   },
   "bin": {
-    "weboptimizer": "index.js"
+    "weboptimizer": "dist/index.js"
   },
   "files": [
-    "browser.d.ts",
-    "browser.js",
-    "configurator.d.ts",
-    "configurator.js",
-    "declarations.d.ts",
-    "ejsLoader.d.ts",
-    "ejsLoader.js",
-    "eslint.config.d.ts",
-    "eslint.config.js",
-    "helper.d.ts",
-    "helper.js",
-    "index.d.ts",
-    "index.html.ejs",
-    "index.js",
+    "dist/*.d.ts",
+    "dist/*.js",
+    "dist/index.html.ejs",
+    "dist/plugins/*.d.ts",
+    "dist/plugins/*.js",
     "jest.json",
-    "jestSetup.d.ts",
-    "jestSetup.js",
-    "plugins/HTMLTransformation.d.ts",
-    "plugins/HTMLTransformation.js",
-    "plugins/InPlaceAssetsIntoHTML.d.ts",
-    "plugins/InPlaceAssetsIntoHTML.js",
-    "stylelintConfigurator.d.ts",
-    "stylelintConfigurator.js",
     "tsconfig.json",
     "tsconfig.application.json",
-    "tsconfig.library.json",
-    "type.d.ts",
-    "type.js",
-    "webpackConfigurator.d.ts",
-    "webpackConfigurator.js"
+    "tsconfig.library.json"
   ],
   "sideEffects": true,
   "scripts": {
     "build": "yarn build:types && yarn build:lint && yarn build:plain",
-    "build:copy-test-artefacts": "cd test/simple && shx touch yarn.lock && shx rm -rf node_modules && YARN_ENABLE_IMMUTABLE_INSTALLS=false yarn install; cd ../../ && cd test/scss && shx touch yarn.lock && shx rm -rf node_modules && YARN_ENABLE_IMMUTABLE_INSTALLS=false yarn install; cd ../../ && shx rm -rf 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: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: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",
+    "build:copy-test-artefacts": "cd src/test/simple && shx touch yarn.lock && shx rm -rf node_modules && YARN_ENABLE_IMMUTABLE_INSTALLS=false yarn install; cd ../../../ && cd src/test/scss && shx touch yarn.lock && shx rm -rf node_modules && YARN_ENABLE_IMMUTABLE_INSTALLS=false yarn install; cd ../../../ && shx rm -rf node_modules/weboptimizer src/test/simple/node_modules/weboptimizer src/test/scss/node_modules/weboptimizer && shx mkdir -p node_modules/weboptimizer src/test/simple/node_modules/weboptimizer src/test/scss/node_modules/weboptimizer && copyCommand='shx cp -r dist *.json' && $copyCommand node_modules/weboptimizer/ && $copyCommand src/test/simple/node_modules/weboptimizer/ && $copyCommand src/test/scss/node_modules/weboptimizer/",
+    "build:lint": "           babel --extensions '.ts' --out-file dist/eslint.config.js src/eslint.config.ts",
+    "build:plain": "babel --extensions '.ts' --ignore 'src/**/*.d.ts,src/eslint.config.ts,src/test/**' --copy-files --no-copy-ignored --out-dir dist src && shx cp src/declarations.d.ts dist/ && shx chmod +x dist/index.js && shx sed -i 's/(#!\\\\/usr\\\\/bin\\\\/env )babel-(node)/$1$2/' dist/index.js 1>/dev/null",
+    "build:test": "           yarn clear && yarn build && yarn build:copy-test-artefacts && babel --extensions '.ts' --ignore 'src/test/**/*.d.ts,src/test/scss/**,src/test/simple/**' --out-dir dist/test src/test",
+    "build:test:source-map": "yarn clear && yarn build && yarn build:copy-test-artefacts && babel --extensions '.ts' --ignore 'src/test/**/*.d.ts,src/test/scss/**,src/test/simple/**' --source-maps inline --out-dir dist/test src/test",
+    "build:types": "tsc --declaration --emitDeclarationOnly --rootDir src --declarationDir dist",
     "check": "yarn check:types && yarn lint",
     "check:types": "tsc --noEmit",
-    "clear": "shx rm -rf 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",
+    "clear": "shx rm -rf apiDocumentation dist 'src/test/*/*.d.ts' 'src/test/**/yarn.lock' 'src/test/**/node_modules' '*.log' node_modules/weboptimizer .coverage .nyc_output",
+    "document": "yarn build:plain && jsdoc --package ./package.json --readme ./readme.md --destination apiDocumentation dist/*.js",
     "lint": "yarn build:lint && yarn lint:base",
-    "lint:base": "eslint --no-warn-ignored *.ts */*.ts test/*/*.ts",
+    "lint:base": "eslint --config dist/eslint.config.js --no-warn-ignored src/*.ts src/*/*.ts src/test/*/*.ts",
     "prepare": "yarn build",
     "prettify": "yarn lint:base --fix || true",
-    "test": "yarn build:test && node --experimental-vm-modules node_modules/.bin/jest --config ./weboptimizerJest.json --noStackTrace --root-dir './' --test-regex '/test/.+\\\\.js$' test/browser.js test/configurator.js test/ejsLoader.js test/helper.js test/stylelintConfigurator.js test/index.js test/webpackConfigurator.js",
+    "test": "yarn build:test && node --experimental-vm-modules node_modules/.bin/jest --config ./weboptimizerJest.json --noStackTrace --root-dir './' --test-regex '/dist/test/.+\\\\.js$' dist/test/browser.js dist/test/configurator.js dist/test/ejsLoader.js dist/test/helper.js dist/test/HTMLTransformation.js dist/test/InPlaceAssetsIntoHTML.js dist/test/stylelintConfigurator.js dist/test/index.js dist/test/webpackConfigurator.js",
     "test:coverage": "yarn test --ci --coverage --coverageReporters=text --coverageReporters=text-summary --silent --testLocationInResults",
     "test:coverage:report": "yarn test:coverage --coverageDirectory=.coverage --coverageReporters=lcov --outputFile=lcov.info",
     "test:watch": "yarn test --watch",
@@ -108,7 +87,7 @@
     "babel-loader": "^10.1.1",
     "babel-plugin-polyfill-corejs3": "^1.0.0",
     "babel-plugin-transform-rewrite-imports": "^1.5.4",
-    "clientnode": "4.0.1524",
+    "clientnode": "4.0.1527",
     "core-js": "^3.51.0",
     "ejs": "^7.0.2",
     "exports-loader": "^5.0.0",
@@ -135,7 +114,7 @@
     "@types/html-minifier": "^4.0.6",
     "@types/html-minifier-terser": "^7.0.2",
     "@types/imagemin": "^9.0.1",
-    "@types/node": "^26.6.5",
+    "@types/node": "^26.6.6",
     "@types/postcss-import": "^14.0.3",
     "@types/postcss-url": "^10.0.4",
     "@types/webpack-env": "^1.18.8",
@@ -466,7 +445,7 @@
           "arguments": [
             "--config",
             {
-              "__evaluate__": "`${webOptimizerPath}/webpackConfigurator.js`"
+              "__evaluate__": "`${webOptimizerPath}/dist/webpackConfigurator.js`"
             },
             "--progress"
           ],
@@ -518,7 +497,7 @@
               },
               "--config",
               {
-                "__evaluate__": "path.relative(self.path.context, path.resolve(webOptimizerPath, 'stylelintConfigurator.js'))"
+                "__evaluate__": "path.relative(self.path.context, path.resolve(webOptimizerPath, 'dist', 'stylelintConfigurator.js'))"
               }
             ],
             "command": "stylelint",
@@ -528,7 +507,7 @@
             "arguments": [
               "--config",
               {
-                "__evaluate__": "`'${webOptimizerPath}/eslint.config.js'`"
+                "__evaluate__": "`'${webOptimizerPath}/dist/eslint.config.js'`"
               },
               "--ignore-pattern",
               {
@@ -552,7 +531,7 @@
             "serve",
             "--config",
             {
-              "__evaluate__": "`'${webOptimizerPath}/webpackConfigurator.js'`"
+              "__evaluate__": "`'${webOptimizerPath}/dist/webpackConfigurator.js'`"
             },
             "--progress"
           ],
@@ -751,7 +730,7 @@
           "scriptLoading": "module",
           "template": {
             "filePath": {
-              "__evaluate__": "`${filesystem.isFileSync(path.resolve(self.path.source.base, `${self.files.defaultHTML.filename}.ejs`)) ? path.resolve(self.path.source.base, `${self.files.defaultHTML.filename}.ejs`) : path.resolve(webOptimizerPath, 'index.html.ejs')}`"
+              "__evaluate__": "`${filesystem.isFileSync(path.resolve(self.path.source.base, `${self.files.defaultHTML.filename}.ejs`)) ? path.resolve(self.path.source.base, `${self.files.defaultHTML.filename}.ejs`) : path.resolve(webOptimizerPath, 'dist', 'index.html.ejs')}`"
             },
             "postCompileOptions": {
               "_with": false,

package/readme.md

@@ -322,4 +322,4 @@ package.json (see the API-Documentation, link above, for more details):
 2. Set Working directory:
     /PATH/TO/PROJECT
 3. Set configuration file path:
-    /PATH/TO/PROJECT/node_modules/weboptimizer/eslint.config.js
+    /PATH/TO/PROJECT/node_modules/weboptimizer/dist/eslint.config.js

package/tsconfig.json

@@ -24,6 +24,8 @@
     },
     "exclude": [
         "**/exclude/*",
+        "dist",
+        "src/test/**/*.d.ts",
         "test/**/*.d.ts"
     ],
     "include": [