weboptimizer 4.0.36 → 4.0.37

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weboptimizer",
-  "version": "4.0.36",
+  "version": "4.0.37",
   "description": "A generic web optimizer, (module) bundler and development environment.",
   "keywords": [
     "webpack",
@@ -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.1467",
+    "clientnode": "4.0.1469",
     "core-js": "^3.49.0",
     "ejs": "^6.0.1",
     "exports-loader": "^5.0.0",

package/type.d.ts

@@ -403,7 +403,8 @@ export interface WebpackConfiguration extends BaseWebpackConfiguration {
     devServer: Mapping<unknown>;
     replaceWebOptimizer: WebpackConfiguration;
 }
-export type RuleSet = Array<WebpackRuleSetUseItem>;
+export type RuleSetItem = WebpackRuleSetUseItem;
+export type RuleSet = Array<RuleSetItem>;
 export type RuleSetRule = WebpackRuleSetRule & {
     use: RuleSet;
 };

package/webpackConfigurator.js

@@ -364,7 +364,7 @@ const scope = {
   isFilePathInDependencies,
   loader
 };
-const evaluateAndThrow = (object, givenOptions = {}) => {
+const evaluateOrThrowOnError = (object, givenOptions = {}) => {
   const options = {
     filePath: configuration.path.context,
     ...givenOptions
@@ -380,23 +380,23 @@ const evaluateAndThrow = (object, givenOptions = {}) => {
   }
   return object;
 };
-const createEvaluateMapper = type => value => evaluateAndThrow(value, {
+const createEvaluateMapper = type => value => evaluateOrThrowOnError(value, {
   type
 });
 const evaluateAdditionalLoaderConfiguration = loaderConfiguration => ({
-  exclude: filePath => evaluateAndThrow(loaderConfiguration.exclude, {
+  exclude: filePath => evaluateOrThrowOnError(loaderConfiguration.exclude, {
     filePath
   }),
-  include: loaderConfiguration.include && evaluateAndThrow(loaderConfiguration.include) || configuration.path.source.base,
-  test: new RegExp(evaluateAndThrow(loaderConfiguration.test)),
-  use: evaluateAndThrow(loaderConfiguration.use)
+  include: loaderConfiguration.include && evaluateOrThrowOnError(loaderConfiguration.include) || configuration.path.source.base,
+  test: new RegExp(evaluateOrThrowOnError(loaderConfiguration.test)),
+  use: evaluateOrThrowOnError(loaderConfiguration.use)
 });
 const getIncludingPaths = path => normalizePaths([path].concat(module.locations.directoryPaths));
 const postCSSResolver = (name, _context) => {
   for (const [source, target] of Object.entries(configuration.module.aliases)) if (source.startsWith(name)) return target;
   return name;
 };
-const cssUse = module.preprocessor.cascadingStyleSheet.additional.pre.map(createEvaluateMapper('css')).concat({
+const cssUse = (await Promise.all(module.preprocessor.cascadingStyleSheet.additional.pre.map(createEvaluateMapper('css')))).concat({
   loader: module.style.loader,
   options: module.style.options || {}
 }, {
@@ -414,7 +414,7 @@ const cssUse = module.preprocessor.cascadingStyleSheet.additional.pre.map(create
       plugins: [].concat(postcssImport ? postcssImport({
         root: configuration.path.context,
         resolve: postCSSResolver
-      }) : [], module.preprocessor.cascadingStyleSheet.additional.plugins.pre.map(createEvaluateMapper('css.postcss')),
+      }) : [], await Promise.all(module.preprocessor.cascadingStyleSheet.additional.plugins.pre.map(createEvaluateMapper('css.postcss'))),
       /*
           NOTE: Checking path doesn't work if fonts
           are referenced in libraries provided in
@@ -454,37 +454,37 @@ const cssUse = module.preprocessor.cascadingStyleSheet.additional.pre.map(create
         stylesheetPath: configuration.path.source.asset.cascadingStyleSheet,
         spritePath: configuration.path.source.asset.image,
         ...configuration.imageSprite
-      }) : [], module.preprocessor.cascadingStyleSheet.additional.plugins.post.map(createEvaluateMapper('css.postcss')), module.optimizer.cssnano && postcssCSSnano ? postcssCSSnano(module.optimizer.cssnano) : [])
+      }) : [], await Promise.all(module.preprocessor.cascadingStyleSheet.additional.plugins.post.map(createEvaluateMapper('css.postcss'))), module.optimizer.cssnano && postcssCSSnano ? postcssCSSnano(module.optimizer.cssnano) : [])
     }
   } : {}, module.preprocessor.cascadingStyleSheet.options || {})
-} : [], module.preprocessor.cascadingStyleSheet.additional.post.map(createEvaluateMapper('css')));
+} : [], await Promise.all(module.preprocessor.cascadingStyleSheet.additional.post.map(createEvaluateMapper('css'))));
 const genericLoader = {
   // Convert to compatible native web types.
   // region generic template
   ejs: {
-    exclude: filePath => normalizePaths(configuration.files.html.concat(configuration.files.defaultHTML).map(htmlConfiguration => htmlConfiguration.template.filePath)).includes(filePath) || module.preprocessor.ejs.exclude === null ? false : evaluateAndThrow(module.preprocessor.ejs.exclude, {
+    exclude: filePath => normalizePaths(configuration.files.html.concat(configuration.files.defaultHTML).map(htmlConfiguration => htmlConfiguration.template.filePath)).includes(filePath) || module.preprocessor.ejs.exclude === null ? false : evaluateOrThrowOnError(module.preprocessor.ejs.exclude, {
       filePath
     }),
     include: getIncludingPaths(configuration.path.source.asset.template),
     test: /^(?!.+\.html\.ejs$).+\.ejs$/i,
-    use: module.preprocessor.ejs.additional.pre.map(createEvaluateMapper('ejs')).concat({
+    use: (await Promise.all(module.preprocessor.ejs.additional.pre.map(createEvaluateMapper('ejs')))).concat({
       loader: module.preprocessor.ejs.loader,
       options: extend(true, module.preprocessor.ejs.options || {}, {
         compress: {
           html: false
         }
       })
-    }, module.preprocessor.ejs.additional.post.map(createEvaluateMapper('ejs')))
+    }, await Promise.all(module.preprocessor.ejs.additional.post.map(createEvaluateMapper('ejs'))))
   },
   // endregion
   // region script
   script: {
-    exclude: filePath => evaluateAndThrow(module.preprocessor.javaScript.exclude, {
+    exclude: filePath => evaluateOrThrowOnError(module.preprocessor.javaScript.exclude, {
       filePath,
       type: 'script'
     }),
     include: filePath => {
-      const result = evaluateAndThrow(module.preprocessor.javaScript.include, {
+      const result = evaluateOrThrowOnError(module.preprocessor.javaScript.include, {
         filePath,
         type: 'script'
       });
@@ -495,10 +495,10 @@ const genericLoader = {
       return Boolean(result);
     },
     test: new RegExp(module.preprocessor.javaScript.regularExpression, 'i'),
-    use: module.preprocessor.javaScript.additional.pre.map(createEvaluateMapper('script')).concat({
+    use: (await Promise.all(module.preprocessor.javaScript.additional.pre.map(createEvaluateMapper('script')))).concat({
       loader: module.preprocessor.javaScript.loader,
       options: module.preprocessor.javaScript.options || {}
-    }, module.preprocessor.javaScript.additional.post.map(createEvaluateMapper('script')))
+    }, await Promise.all(module.preprocessor.javaScript.additional.post.map(createEvaluateMapper('script'))))
   },
   // endregion
   // region HTML template
@@ -509,16 +509,16 @@ const genericLoader = {
       use: configuration.files.defaultHTML.template.use
     },
     ejs: {
-      exclude: filePath => normalizePaths(configuration.files.html.concat(configuration.files.defaultHTML).map(htmlConfiguration => htmlConfiguration.template.filePath)).includes(filePath) || (module.preprocessor.html.exclude === null ? false : evaluateAndThrow(module.preprocessor.html.exclude, {
+      exclude: filePath => normalizePaths(configuration.files.html.concat(configuration.files.defaultHTML).map(htmlConfiguration => htmlConfiguration.template.filePath)).includes(filePath) || (module.preprocessor.html.exclude === null ? false : evaluateOrThrowOnError(module.preprocessor.html.exclude, {
         filePath,
         type: 'html.ejs'
       })),
       include: configuration.path.source.asset.template,
       test: /\.html\.ejs(?:\?.*)?$/i,
-      use: module.preprocessor.html.additional.pre.map(createEvaluateMapper('html.ejs')).concat(
+      use: (await Promise.all(module.preprocessor.html.additional.pre.map(createEvaluateMapper('html.ejs')))).concat(
       /*
           We might need to evaluate ejs before we are able to
-          parse html beforhand. If not we parse it as html
+          parse html beforehand. If not we parse it as html
           directly.
       */
 
@@ -532,35 +532,35 @@ const genericLoader = {
       }], {
         loader: module.preprocessor.html.loader,
         options: module.preprocessor.html.options || {}
-      }, module.preprocessor.html.additional.post.map(createEvaluateMapper('html.ejs')))
+      }, await Promise.all(module.preprocessor.html.additional.post.map(createEvaluateMapper('html.ejs'))))
     },
     html: {
-      exclude: filePath => normalizePaths(configuration.files.html.concat(configuration.files.defaultHTML).map(htmlConfiguration => htmlConfiguration.template.filePath)).includes(filePath) || (module.html.exclude === null ? true : evaluateAndThrow(module.html.exclude, {
+      exclude: filePath => normalizePaths(configuration.files.html.concat(configuration.files.defaultHTML).map(htmlConfiguration => htmlConfiguration.template.filePath)).includes(filePath) || (module.html.exclude === null ? true : evaluateOrThrowOnError(module.html.exclude, {
         filePath,
         type: 'html'
       })),
       include: configuration.path.source.asset.template,
       test: /\.html(?:\?.*)?$/i,
-      use: module.html.additional.pre.map(createEvaluateMapper('html')).concat({
+      use: (await Promise.all(module.html.additional.pre.map(createEvaluateMapper('html')))).concat({
         loader: 'file?name=' + join(relative(configuration.path.target.base, configuration.path.target.asset.template), `[name][ext]?${configuration.hashAlgorithm}=` + '[contenthash]')
       }, {
         loader: 'extract'
       }, {
         loader: module.html.loader,
         options: module.html.options || {}
-      }, module.html.additional.post.map(createEvaluateMapper('html')))
+      }, await Promise.all(module.html.additional.post.map(createEvaluateMapper('html'))))
     }
   },
   // endregion
   // Load dependencies.
   // region style
   style: {
-    exclude: filePath => module.cascadingStyleSheet.exclude === null ? isFilePathInDependencies(filePath) : evaluateAndThrow(module.cascadingStyleSheet.exclude, {
+    exclude: filePath => module.cascadingStyleSheet.exclude === null ? isFilePathInDependencies(filePath) : evaluateOrThrowOnError(module.cascadingStyleSheet.exclude, {
       filePath,
       type: 'style'
     }),
     include: filePath => {
-      const result = evaluateAndThrow(module.cascadingStyleSheet.include, {
+      const result = evaluateOrThrowOnError(module.cascadingStyleSheet.include, {
         filePath,
         type: 'style'
       });
@@ -578,7 +578,7 @@ const genericLoader = {
   // region font
   font: {
     eot: {
-      exclude: filePath => module.optimizer.font.eot.exclude === null ? false : evaluateAndThrow(module.optimizer.font.eot.exclude, {
+      exclude: filePath => module.optimizer.font.eot.exclude === null ? false : evaluateOrThrowOnError(module.optimizer.font.eot.exclude, {
         filePath,
         type: 'font.eot'
       }),
@@ -592,10 +592,10 @@ const genericLoader = {
           maxSize: configuration.inPlace.otherMaximumFileSizeLimitInByte
         }
       },
-      use: module.optimizer.font.eot.loader.map(createEvaluateMapper('font.eot'))
+      use: await Promise.all(module.optimizer.font.eot.loader.map(createEvaluateMapper('font.eot')))
     },
     svg: {
-      exclude: filePath => module.optimizer.font.svg.exclude === null ? false : evaluateAndThrow(module.optimizer.font.svg.exclude, {
+      exclude: filePath => module.optimizer.font.svg.exclude === null ? false : evaluateOrThrowOnError(module.optimizer.font.svg.exclude, {
         filePath,
         type: 'svg'
       }),
@@ -611,10 +611,10 @@ const genericLoader = {
       },
       test: /\.svg(?: \?.*)?$/i,
       type: 'asset/resource',
-      use: module.optimizer.font.svg.loader.map(createEvaluateMapper('font.svg'))
+      use: await Promise.all(module.optimizer.font.svg.loader.map(createEvaluateMapper('font.svg')))
     },
     ttf: {
-      exclude: filePath => module.optimizer.font.ttf.exclude === null ? false : evaluateAndThrow(module.optimizer.font.ttf.exclude, {
+      exclude: filePath => module.optimizer.font.ttf.exclude === null ? false : evaluateOrThrowOnError(module.optimizer.font.ttf.exclude, {
         filePath,
         type: 'ttf'
       }),
@@ -629,10 +629,10 @@ const genericLoader = {
           maxSize: configuration.inPlace.otherMaximumFileSizeLimitInByte
         }
       },
-      use: module.optimizer.font.ttf.loader.map(createEvaluateMapper('font.ttf'))
+      use: await Promise.all(module.optimizer.font.ttf.loader.map(createEvaluateMapper('font.ttf')))
     },
     woff: {
-      exclude: filePath => module.optimizer.font.woff.exclude === null ? false : evaluateAndThrow(module.optimizer.font.woff.exclude, {
+      exclude: filePath => module.optimizer.font.woff.exclude === null ? false : evaluateOrThrowOnError(module.optimizer.font.woff.exclude, {
         filePath,
         type: 'woff'
       }),
@@ -646,13 +646,13 @@ const genericLoader = {
           maxSize: configuration.inPlace.otherMaximumFileSizeLimitInByte
         }
       },
-      use: module.optimizer.font.woff.loader.map(createEvaluateMapper('font.woff'))
+      use: await Promise.all(module.optimizer.font.woff.loader.map(createEvaluateMapper('font.woff')))
     }
   },
   // endregion
   // region image
   image: {
-    exclude: filePath => module.optimizer.image.exclude === null ? isFilePathInDependencies(filePath) : evaluateAndThrow(module.optimizer.image.exclude, {
+    exclude: filePath => module.optimizer.image.exclude === null ? isFilePathInDependencies(filePath) : evaluateOrThrowOnError(module.optimizer.image.exclude, {
       filePath,
       type: 'image'
     }),
@@ -667,14 +667,14 @@ const genericLoader = {
         maxSize: configuration.inPlace.otherMaximumFileSizeLimitInByte
       }
     },
-    use: module.optimizer.image.loader.map(createEvaluateMapper('image'))
+    use: await Promise.all(module.optimizer.image.loader.map(createEvaluateMapper('image')))
   },
   // endregion
   // region data
   data: {
     exclude: filePath => {
       if (typeof filePath !== 'string') return false;
-      return configuration.extensions.file.internal.includes(extname(stripLoader(filePath))) || (module.optimizer.data.exclude === null ? isFilePathInDependencies(filePath) : evaluateAndThrow(module.optimizer.data.exclude, {
+      return configuration.extensions.file.internal.includes(extname(stripLoader(filePath))) || (module.optimizer.data.exclude === null ? isFilePathInDependencies(filePath) : evaluateOrThrowOnError(module.optimizer.data.exclude, {
         filePath,
         type: 'data'
       }));
@@ -689,7 +689,7 @@ const genericLoader = {
         maxSize: configuration.inPlace.otherMaximumFileSizeLimitInByte
       }
     },
-    use: module.optimizer.data.loader.map(createEvaluateMapper('data'))
+    use: await Promise.all(module.optimizer.data.loader.map(createEvaluateMapper('data')))
   }
   // endregion
 };