weboptimizer 4.0.15 → 4.0.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weboptimizer",
-  "version": "4.0.15",
+  "version": "4.0.16",
   "description": "A generic web optimizer, (module) bundler and development environment.",
   "keywords": [
     "webpack",
@@ -330,6 +330,11 @@
   },
   "sideEffects": true,
   "type": "module",
+  "exports": {
+    ".": "/.index.js",
+    "./browser": "./browser.js",
+    "./ejsLoader": "./ejsLoader.js"
+  },
   "webDocumentation": {
     "trackingCode": "UA-40192634-11"
   },
@@ -356,7 +361,7 @@
             "__evaluate__": "self.debug"
           },
           "EXTERNAL_EXPORT_FORMAT": {
-            "__evaluate__": "`'${self.exportFormat.external ?? self.exportFormat.self}'`"
+            "__evaluate__": "`'${self.exportFormat.external}'`"
           },
           "NAME": {
             "__evaluate__": "`'${self.name}'`"
@@ -583,6 +588,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'"
         },
@@ -736,7 +744,7 @@
           "last 2 major versions",
           "> 5%"
         ],
-        "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": [],

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