weboptimizer 4.0.95-1 → 4.0.96-1

package/dist/configurator.js

@@ -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;
   }

package/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 '';

package/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

package/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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weboptimizer",
-  "version": "4.0.95-1",
+  "version": "4.0.96-1",
   "description": "A generic web optimizer, (module) bundler and development environment.",
   "keywords": [
     "webpack",
@@ -69,7 +69,7 @@
     "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 '/dist/test/.+\\\\.js$' dist/test/browser.js dist/test/configurator.js dist/test/ejsLoader.js dist/test/helper.js dist/test/stylelintConfigurator.js dist/test/index.js dist/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",
@@ -87,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.1526",
+    "clientnode": "4.0.1527",
     "core-js": "^3.51.0",
     "ejs": "^7.0.2",
     "exports-loader": "^5.0.0",