weboptimizer 4.0.15 → 4.0.17

package/browser.js

@@ -17,6 +17,7 @@
 */
 // region imports
 import { CONSOLE_METHODS, Logger, timeout } from 'clientnode';
+import webOptimizerDefaultTemplate from 'webOptimizerDefaultTemplateFilePath';
 // endregion
 // region declaration
 
@@ -92,6 +93,7 @@ if (typeof TARGET_TECHNOLOGY === 'undefined' || TARGET_TECHNOLOGY === 'node')
         virtualConsole
       });
     };
+    let evaluatedContent = '';
     if (typeof NAME === 'undefined' || NAME === 'webOptimizer') {
       const filePath = path.join(import.meta.dirname, 'index.html.ejs');
       /*
@@ -102,15 +104,14 @@ if (typeof TARGET_TECHNOLOGY === 'undefined' || TARGET_TECHNOLOGY === 'node')
       const content = await (await import('fs')).promises.readFile(filePath, {
         encoding: 'utf-8'
       });
-      let evaluatedContent = '';
       await ejsLoader.bind({
         resourcePath: filePath,
         async: (error, result) => {
           if (error) throw error;else evaluatedContent = result;
         }
       })(content);
-      render(evaluatedContent);
-    } else render(await import('webOptimizerDefaultTemplateFilePath'));
+    } else evaluatedContent = webOptimizerDefaultTemplate;
+    render(evaluatedContent);
     // endregion
   })().catch(error => {
     log.error(error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weboptimizer",
-  "version": "4.0.15",
+  "version": "4.0.17",
   "description": "A generic web optimizer, (module) bundler and development environment.",
   "keywords": [
     "webpack",
@@ -95,7 +95,7 @@
     "babel-plugin-polyfill-corejs3": "^1.0.0",
     "babel-plugin-transform-rewrite-imports": "^1.5.4",
     "babel-preset-minify": "^0.5.2",
-    "clientnode": "4.0.1437",
+    "clientnode": "4.0.1439",
     "core-js": "^3.49.0",
     "ejs": "^6.0.1",
     "exports-loader": "^5.0.0",
@@ -114,7 +114,7 @@
     "webpack-sources": "^3.5.1"
   },
   "devDependencies": {
-    "@babel/cli": "^8.0.1",
+    "@babel/cli": "^8.0.4",
     "@babel/eslint-parser": "^8.0.1",
     "@eslint/js": "^10.0.1",
     "@stylistic/eslint-plugin": "^5.10.0",
@@ -330,6 +330,12 @@
   },
   "sideEffects": true,
   "type": "module",
+  "exports": {
+    ".": "/.index.js",
+    "./browser": "./browser.js",
+    "./ejsLoader": "./ejsLoader.js",
+    "./type": "./type.js"
+  },
   "webDocumentation": {
     "trackingCode": "UA-40192634-11"
   },
@@ -356,7 +362,7 @@
             "__evaluate__": "self.debug"
           },
           "EXTERNAL_EXPORT_FORMAT": {
-            "__evaluate__": "`'${self.exportFormat.external ?? self.exportFormat.self}'`"
+            "__evaluate__": "`'${self.exportFormat.external}'`"
           },
           "NAME": {
             "__evaluate__": "`'${self.name}'`"
@@ -583,6 +589,9 @@
       },
       "encoding": "utf-8",
       "exportFormat": {
+        "external": {
+          "__evaluate__": "2 < self.givenCommandLineArguments.length && ['document', 'serve'].includes(self.givenCommandLineArguments[2]) ? 'window' : 'module-import'"
+        },
         "globalObject": {
           "__evaluate__": "2 < self.givenCommandLineArguments.length && self.givenCommandLineArguments[2] === 'serve' ? 'window' : 'this'"
         },
@@ -733,10 +742,9 @@
         "cascadingStyleSheetFileExtension": "css",
         "isWeb": true,
         "supportedBrowsers": [
-          "last 2 major versions",
-          "> 5%"
+          "last 2 major versions"
         ],
-        "testCommandLine": "jest --config node_modules/weboptimizer/jest.json --noStackTrace --test-regex",
+        "testCommandLine": "node --experimental-vm-modules node_modules/.bin/jest --config node_modules/weboptimizer/jest.json --noStackTrace --test-regex",
         "testCommandLineCoverageArguments": "--ci --coverage --coverage-reporters=text --coverage-reporters=text-summary --silent --test-location-in-results"
       },
       "givenCommandLineArguments": [],
@@ -1521,6 +1529,12 @@
         "offline": null
       },
       "webpack": {
+        "output": {
+          "environment": {
+            "dynamicImport": true,
+            "module": true
+          }
+        },
         "watchOptions": {
           "ignored": [
             "./*.js",

package/type.d.ts

@@ -207,7 +207,9 @@ export interface DefaultConfiguration {
     test: PlainObject;
     'test:browser': PlainObject;
 }
-export type ExportFormat = 'amd' | 'amd-require' | 'assign' | 'global' | 'jsonp' | 'var' | 'this' | 'commonjs' | 'commonjs2' | 'umd';
+export type BaseExportFormat = 'amd' | 'amd-require' | 'assign' | 'commonjs' | 'commonjs-module' | 'global' | 'jsonp' | 'module' | 'self' | 'system' | 'this' | 'umd' | 'umd2' | 'var' | 'window';
+export type ExternalExportFormat = BaseExportFormat | 'import' | 'module-import' | 'node-commonjs' | 'promise' | 'script';
+export type ExportFormat = BaseExportFormat | 'assign-properties' | 'modern-module' | 'commonjs2' | 'commonjs-static';
 export interface HTMLConfiguration {
     filename: string;
     template: {
@@ -280,7 +282,7 @@ export interface ResolvedConfiguration {
     document: PlainObject;
     encoding: Encoding;
     exportFormat: {
-        external: ExportFormat;
+        external: ExternalExportFormat;
         globalObject: string;
         self: ExportFormat;
     };

package/type.js

@@ -35,10 +35,6 @@ export const TaskTypes = ['build', 'serve', ...SubConfigurationTypes];
 
 //// endregion
 
-/* eslint-disable max-len */
-
-/* eslint-enable max-len */
-
 /// endregion
 // NOTE: Not yet defined in webpack types.
 

package/webpackConfigurator.js

@@ -243,8 +243,13 @@ if (configuration.injection.external.modules === '__implicit__')
         // endregion
       }
       if (typeof result !== 'string' && Object.prototype.hasOwnProperty.call(result, 'root') && Array.isArray(result.root)) result.root = [].concat(result.root).map(name => convertToValidVariableName(name));
-      const exportFormat = Object.prototype.hasOwnProperty.call(configuration.exportFormat, 'external') ? configuration.exportFormat.external : configuration.exportFormat.self;
+      const {
+        external: exportFormat
+      } = configuration.exportFormat;
       let reference = exportFormat === 'umd' || typeof result === 'string' ? result : result[exportFormat];
+      console.log();
+      console.log('EX', reference, exportFormat);
+      console.log();
       if (typeof reference === 'string' && ['window', 'var'].includes(exportFormat)) reference = convertToValidVariableName(reference);
       callback(undefined, reference, exportFormat);
       return;