weboptimizer 4.0.21 → 4.0.22

package/configurator.js

@@ -18,7 +18,6 @@
 // region imports
 import { convertCircularObjectToJSON, copy, evaluateAsyncDynamicData, evaluateDynamicData, extend, getUTCTimestamp, importsPromise, isFileSync, isObject, isPlainObject, Logger, MAXIMAL_NUMBER_OF_ITERATIONS, modifyObject, optionalImport, parseEncodedObject, removeKeyPrefixes, UTILITY_SCOPE } from 'clientnode';
 import fileSystem, { lstatSync, readFileSync, unlinkSync } from 'fs';
-import { createRequire } from 'node:module';
 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' };

package/ejsLoader.d.ts

@@ -14,7 +14,7 @@ export type LoaderConfiguration = Mapping<unknown> & {
     compileSteps: number;
     compress: {
         html: Mapping<unknown>;
-        javaScript: Mapping<unknown>;
+        javaScript: boolean;
     };
     context: string;
     debug: boolean;

package/ejsLoader.js

@@ -17,7 +17,6 @@
 */
 // region
 import { transform as babelTransform } from '@babel/core';
-import babelMinifyPreset from 'babel-preset-minify';
 import { convertSubstringInPlainObject, copy, evaluate, extend, Logger, UTILITY_SCOPE } from 'clientnode';
 import ejs from 'ejs';
 import { readFile } from 'fs/promises';
@@ -48,12 +47,15 @@ export const loader = async function (source) {
     compileSteps: 2,
     compress: {
       html: {},
-      javaScript: {}
+      javaScript: true
     },
     context: './',
     debug: false,
     extensions: {
       file: {
+        alias: {
+          '.js': ['.js', '.ts', '.tsx', '.jsx']
+        },
         external: [],
         internal: ['.js', '.json', '.css', '.svg', '.png', '.jpg', '.gif', '.ico', '.html', '.eot', '.ttf', '.woff', '.woff2']
       }
@@ -243,10 +245,9 @@ export const loader = async function (source) {
           ast: false,
           babelrc: false,
           comments: !givenOptions.compress?.javaScript,
-          compact: Boolean(givenOptions.compress?.javaScript),
           filename: options.filename || 'unknown',
-          minified: Boolean(givenOptions.compress?.javaScript),
-          presets: givenOptions.compress?.javaScript ? [[babelMinifyPreset, givenOptions.compress.javaScript]] : [],
+          minified: givenOptions.compress?.javaScript,
+          presets: [],
           sourceMaps: false,
           sourceType: 'script'
         }, (error, file) => {

package/helper.js

@@ -154,6 +154,9 @@ export const applyContext = (request, context = './', referencePath = './', alia
  */
 export const determineExternalRequest = (request, context = './', requestContext = './', normalizedGivenInjection = {}, relativeExternalModuleLocations = ['node_modules'], aliases = {}, moduleReplacements = {}, extensions = {
   file: {
+    alias: {
+      '.js': ['.js', '.ts', '.tsx', '.jsx']
+    },
     external: ['.compiled.js', '.js', '.json'],
     internal: KNOWN_FILE_EXTENSIONS.map(suffix => `.${suffix}`)
   }
@@ -374,6 +377,9 @@ export const normalizeGivenInjection = givenInjection => {
  */
 export const resolveAutoInjection = (givenInjection, buildConfigurations, aliases = {}, moduleReplacements = {}, extensions = {
   file: {
+    alias: {
+      '.js': ['.js', '.ts', '.tsx', '.jsx']
+    },
     external: ['compiled.js', '.js', '.json'],
     internal: KNOWN_FILE_EXTENSIONS.map(suffix => `.${suffix}`)
   }
@@ -591,7 +597,14 @@ export const findPackageDescriptorFilePath = (start, fileName = 'package.json')
 export const getClosestPackageDescriptor = async (modulePath, fileName = 'package.json') => {
   const filePath = findPackageDescriptorFilePath(modulePath, fileName);
   if (!filePath) return null;
-  const configuration = await import(filePath);
+
+  /*
+      NOTE: In native ecmascript module contexts json imports are wrapped
+      into a module namespace object providing its content as "default"
+      export whereas commonjs interoperability provides it directly.
+  */
+  const importedModule = await import(filePath);
+  const configuration = importedModule.default ?? importedModule;
   /*
       If the package.json does not have a name property, try again from
       one level higher.

package/index.js

@@ -288,7 +288,12 @@ environment = eval('process.env')) => {
     }
     // endregion
   } catch (error) {
-    if (configuration.debug) throw error;else log.error(error);
+    if (configuration.debug) throw error;else {
+      log.error(error);
+
+      // NOTE: Forward nested return codes.
+      process.exitCode = error.returnCode ?? 1;
+    }
   }
   return clear;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weboptimizer",
-  "version": "4.0.21",
+  "version": "4.0.22",
   "description": "A generic web optimizer, (module) bundler and development environment.",
   "keywords": [
     "webpack",
@@ -94,7 +94,6 @@
     "babel-loader": "^10.1.1",
     "babel-plugin-polyfill-corejs3": "^1.0.0",
     "babel-plugin-transform-rewrite-imports": "^1.5.4",
-    "babel-preset-minify": "^0.5.2",
     "clientnode": "4.0.1451",
     "core-js": "^3.49.0",
     "ejs": "^6.0.1",
@@ -583,7 +582,19 @@
         },
         "module": {
           "optimizer": {
-            "cssnano": null
+            "cssnano": null,
+            "terser": {
+              "terserOptions": {
+                "compress": {
+                  "drop_console": {
+                    "__evaluate__": "!self.debug"
+                  },
+                  "drop_debugger": {
+                    "__evaluate__": "!self.debug"
+                  }
+                }
+              }
+            }
           }
         }
       },
@@ -601,6 +612,15 @@
       },
       "extensions": {
         "file": {
+          "#": "NOTE: Maps import specifier extensions to resolvable source extensions (webpack's \"resolve.extensionAlias\") since imports rewritten to \".js\" have to be resolved back to their typescript sources.",
+          "alias": {
+            ".js": [
+              ".js",
+              ".ts",
+              ".tsx",
+              ".jsx"
+            ]
+          },
           "external": {
             "__evaluate__": "self.generic.isWeb ? self.extensions.file.internal : ['.compiled.js', '.js', '.json', '.mjs']"
           },
@@ -928,24 +948,6 @@
           }
         },
         "optimizer": {
-          "babelMinify": {
-            "bundle": {
-              "transform": {
-                "removeConsole": true,
-                "removeDebugger": true,
-                "mangle": {
-                  "topLevel": {
-                    "#": "Indicates to not mangle scope names from the entry (main) scope in libraries.",
-                    "__evaluate__": "!self.library"
-                  }
-                }
-              }
-            },
-            "module": {
-              "removeConsole": true,
-              "removeDebugger": true
-            }
-          },
           "cssnano": {
             "#": "The autoprefixer has to be disabled in this context since it would remove all needed vendor prefixes from the preceding processing (every prefix should be needed here).",
             "preset": [
@@ -1065,7 +1067,19 @@
             },
             "loader": []
           },
-          "minimize": true
+          "terser": {
+            "terserOptions": {
+              "compress": {
+                "#": "To provide a logging output we need to exclude this feature.",
+                "drop_console": {
+                  "__evaluate__": "!self.debug"
+                },
+                "drop_debugger": {
+                  "__evaluate__": "!self.debug"
+                }
+              }
+            }
+          }
         },
         "preprocessor": {
           "cascadingStyleSheet": {
@@ -1113,7 +1127,7 @@
                   "__evaluate__": "self.module.optimizer.htmlMinifier"
                 },
                 "javaScript": {
-                  "__evaluate__": "self.module.optimizer.babelMinify.module"
+                  "__evaluate__": "!self.debug"
                 }
               },
               "context": {
@@ -1218,8 +1232,8 @@
                 ]
               ],
               "presets": {
-                "#": "NOTE: We have to disable module export/import transformation to allow tree shaking by the final (minimizer).",
-                "__evaluate__": "[['@babel/preset-env', {targets: self.generic.isWeb ? {browsers: self.generic.supportedBrowsers, node: packageConfiguration.engines.node.replace(/>?=?([0-9]+)/, '$1')} : {node: packageConfiguration.engines.node.replace(/>?=?([0-9]+)/, '$1')}}], '@babel/preset-typescript'].concat((self.debug || !self.module.optimizer.babelMinify.module || 2 < self.givenCommandLineArguments.length && self.givenCommandLineArguments[2] === 'document') ? [] : [['minify', self.module.optimizer.babelMinify.module]])"
+                "#": "NOTE: We disable module export/import transformation to allow tree shaking by the final (minimizer).",
+                "__evaluate__": "[['@babel/preset-env', {targets: self.generic.isWeb ? {browsers: self.generic.supportedBrowsers, node: packageConfiguration.engines.node.replace(/>?=?([0-9]+)/, '$1')} : {node: packageConfiguration.engines.node.replace(/>?=?([0-9]+)/, '$1')}}], '@babel/preset-typescript']"
               }
             },
             "regularExpression": "\\.[jt]sx?(?:\\?.*)?$"
@@ -1492,14 +1506,16 @@
         },
         "module": {
           "optimizer": {
-            "babelMinify": {
-              "bundle": {
-                "transform": {
-                  "removeConsole": false
+            "terser": {
+              "terserOptions": {
+                "compress": {
+                  "drop_console": {
+                    "__evaluate__": "false"
+                  },
+                  "drop_debugger": {
+                    "__evaluate__": "false"
+                  }
                 }
-              },
-              "module": {
-                "removeConsole": false
               }
             }
           }

package/type.d.ts

@@ -231,6 +231,7 @@ export interface ResolvedBuildConfigurationItem extends BuildConfigurationItem {
 }
 export interface Extensions {
     file: {
+        alias: Mapping<Array<string>>;
         external: Array<string>;
         internal: Array<string>;
     };
@@ -325,13 +326,6 @@ export interface ResolvedConfiguration {
             filePaths: Array<string>;
         };
         optimizer: BaseWebpackConfiguration['optimization'] & {
-            babelMinify?: {
-                bundle?: {
-                    plugin?: PlainObject;
-                    transform?: PlainObject;
-                };
-                module?: PlainObject;
-            };
             cssnano?: PlainObject;
             data: ResourceLoaderConfiguration;
             font: {
@@ -346,6 +340,7 @@ export interface ResolvedConfiguration {
                 exclude: null | string;
                 loader: Array<string>;
             };
+            terser: Mapping<unknown>;
         };
         preprocessor: {
             cascadingStyleSheet: WebpackLoader & {

package/webpackConfigurator.js

@@ -737,7 +737,8 @@ if (!module.optimizer.minimizer) {
   module.optimizer.minimizer = [];
   if (plugins.Terser) module.optimizer.minimizer.push(new plugins.Terser({
     extractComments: false,
-    parallel: true
+    parallel: true,
+    ...module.optimizer.terser
   }));
   if (plugins.ImageMinimizer) module.optimizer.minimizer.push(new plugins.ImageMinimizer(extend(true, {
     minimizer: {
@@ -765,7 +766,26 @@ export let webpackConfiguration = extend(true, {
   devServer: configuration.development.server,
   experiments: {
     futureDefaults: true,
-    outputModule: true
+    outputModule: true,
+    /*
+        "futureDefaults" would enable webpack's native css support
+        which disables the configured "mini-css-extract-plugin"
+        pipeline (naming outputs "<name>.css.css" instead of
+        "<name>.compiled.css").
+    */
+    css: false,
+    /*
+        "futureDefaults" would enable webpack's native html support
+        which conflicts with the configured ejs / html plugin
+        pipeline.
+    */
+    html: false,
+    /*
+        "futureDefaults" would enable webpack's native type stripping
+        which cannot handle ".tsx" files; typescript sources are
+        transpiled via babel instead.
+    */
+    typescript: false
   },
   // region input
   entry: configuration.injection.entry.normalized,
@@ -773,6 +793,12 @@ export let webpackConfiguration = extend(true, {
   resolve: {
     alias: module.aliases,
     aliasFields: configuration.package.aliasPropertyNames,
+    /*
+        Resolves imports which were rewritten to ".js" (e.g. via
+        "babel-plugin-transform-rewrite-imports") back to their
+        (typescript) sources.
+    */
+    extensionAlias: configuration.extensions.file.alias,
     extensions: configuration.extensions.file.internal,
     mainFields: configuration.package.main.propertyNames,
     mainFiles: configuration.package.main.fileNames,
@@ -843,7 +869,6 @@ export let webpackConfiguration = extend(true, {
     // endregion
     ...mask(module.optimizer, {
       exclude: {
-        babelMinify: true,
         cssnano: true,
         data: true,
         font: true,