@vocab/webpack 1.1.6 → 1.2.1

package/dist/declarations/src/index.d.ts

@@ -1,8 +1,9 @@
-import { UserConfig } from '@vocab/types';
+import type { UserConfig } from '@vocab/core';
 import type { Compiler } from 'webpack';
 interface UserOptions extends Partial<UserConfig> {
     configFile?: string;
 }
+export declare const compiledVocabFileFilter: RegExp;
 export declare class VocabWebpackPlugin {
     options: UserConfig;
     constructor({ configFile, ...rest }?: UserOptions);

package/dist/declarations/src/loader.d.ts

@@ -1,5 +1,5 @@
-import { UserConfig } from '@vocab/types';
+import type { UserConfig } from '@vocab/core';
 import type { LoaderContext as WebpackLoaderContext } from 'webpack';
 type LoaderContext = WebpackLoaderContext<UserConfig>;
-export default function vocabLoader(this: LoaderContext): Promise<void>;
+export default function vocabLoader(this: LoaderContext, source: string): Promise<void>;
 export {};

package/dist/declarations/src/web.d.ts

@@ -1,3 +1,3 @@
-import type { TranslationModule } from '@vocab/types';
+import type { TranslationModule } from '@vocab/core';
 export { createTranslationFile } from '@vocab/core/translation-file';
 export declare const createLanguage: (moduleId: string, loadImport: () => Promise<any>) => TranslationModule<any>;

package/dist/vocab-webpack.cjs.dev.js

@@ -7,6 +7,7 @@ var logger = require('./logger-65149486.cjs.dev.js');
 require('chalk');
 require('debug');
 
+const compiledVocabFileFilter = /\.vocab[\\/]index\.(?:ts|js|cjs|mjs)$/;
 class VocabWebpackPlugin {
   constructor({
     configFile,
@@ -31,7 +32,7 @@ class VocabWebpackPlugin {
       compiler.options.module.rules = [];
     }
     compiler.options.module.rules.splice(0, 0, {
-      test: /\.vocab[\\\/]index\.ts$/,
+      test: compiledVocabFileFilter,
       loader: require.resolve('@vocab/webpack/loader'),
       options: this.options
     });
@@ -39,3 +40,4 @@ class VocabWebpackPlugin {
 }
 
 exports.VocabWebpackPlugin = VocabWebpackPlugin;
+exports.compiledVocabFileFilter = compiledVocabFileFilter;

package/dist/vocab-webpack.cjs.prod.js

@@ -7,6 +7,7 @@ var logger = require('./logger-f79e34a8.cjs.prod.js');
 require('chalk');
 require('debug');
 
+const compiledVocabFileFilter = /\.vocab[\\/]index\.(?:ts|js|cjs|mjs)$/;
 class VocabWebpackPlugin {
   constructor({
     configFile,
@@ -31,7 +32,7 @@ class VocabWebpackPlugin {
       compiler.options.module.rules = [];
     }
     compiler.options.module.rules.splice(0, 0, {
-      test: /\.vocab[\\\/]index\.ts$/,
+      test: compiledVocabFileFilter,
       loader: require.resolve('@vocab/webpack/loader'),
       options: this.options
     });
@@ -39,3 +40,4 @@ class VocabWebpackPlugin {
 }
 
 exports.VocabWebpackPlugin = VocabWebpackPlugin;
+exports.compiledVocabFileFilter = compiledVocabFileFilter;

package/dist/vocab-webpack.esm.js

@@ -3,6 +3,7 @@ import { t as trace } from './logger-e1862ea1.esm.js';
 import 'chalk';
 import 'debug';
 
+const compiledVocabFileFilter = /\.vocab[\\/]index\.(?:ts|js|cjs|mjs)$/;
 class VocabWebpackPlugin {
   constructor({
     configFile,
@@ -27,11 +28,11 @@ class VocabWebpackPlugin {
       compiler.options.module.rules = [];
     }
     compiler.options.module.rules.splice(0, 0, {
-      test: /\.vocab[\\\/]index\.ts$/,
+      test: compiledVocabFileFilter,
       loader: require.resolve('@vocab/webpack/loader'),
       options: this.options
     });
   }
 }
 
-export { VocabWebpackPlugin };
+export { VocabWebpackPlugin, compiledVocabFileFilter };

package/loader/dist/vocab-webpack-loader.cjs.dev.js

@@ -3,6 +3,8 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var path = require('path');
+var cjsModuleLexer = require('cjs-module-lexer');
+var esModuleLexer = require('es-module-lexer');
 var core = require('@vocab/core');
 var chunkName_dist_vocabWebpackChunkName = require('../../chunk-name/dist/vocab-webpack-chunk-name.cjs.dev.js');
 var logger = require('../../dist/logger-65149486.cjs.dev.js');
@@ -11,7 +13,27 @@ require('debug');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
 
+function _interopNamespace(e) {
+  if (e && e.__esModule) return e;
+  var n = Object.create(null);
+  if (e) {
+    Object.keys(e).forEach(function (k) {
+      if (k !== 'default') {
+        var d = Object.getOwnPropertyDescriptor(e, k);
+        Object.defineProperty(n, k, d.get ? d : {
+          enumerable: true,
+          get: function () { return e[k]; }
+        });
+      }
+    });
+  }
+  n["default"] = e;
+  return Object.freeze(n);
+}
+
 var path__default = /*#__PURE__*/_interopDefault(path);
+var cjsModuleLexer__namespace = /*#__PURE__*/_interopNamespace(cjsModuleLexer);
+var esModuleLexer__namespace = /*#__PURE__*/_interopNamespace(esModuleLexer);
 
 const trace = logger.trace.extend('loader');
 
@@ -51,7 +73,17 @@ function renderLanguageLoaderAsync(resourcePath, loadedTranslation) {
     );
   };
 }
-async function vocabLoader() {
+function findExportNames(source, mode) {
+  if (mode === 'esm') {
+    const [, exports] = esModuleLexer__namespace.parse(source);
+    return exports;
+  }
+  const {
+    exports
+  } = cjsModuleLexer__namespace.parse(source);
+  return exports;
+}
+async function vocabLoader(source) {
   trace(`Using vocab loader for ${this.resourcePath}`);
   const callback = this.async();
   if (!callback) {
@@ -70,14 +102,35 @@ async function vocabLoader() {
     return;
   }
   const renderLanguageLoader = renderLanguageLoaderAsync.call(this, devJsonFilePath, loadedTranslation);
-  const loadedLanguages = Object.keys(loadedTranslation.languages);
-  const result = /* ts */`
-    import { createLanguage, createTranslationFile } from '@vocab/webpack/${target}';
-
-    export default createTranslationFile({
-      ${loadedLanguages.map(lang => `${JSON.stringify(lang)}: ${renderLanguageLoader(lang)}`).join(',\n')}
-    });
+  const translations = /* ts */`
+    const translations = createTranslationFile({
+      ${Object.keys(loadedTranslation.languages).map(lang => `${JSON.stringify(lang)}: ${renderLanguageLoader(lang)}`).join(',\n')}
+      });
   `;
+  let result;
+
+  // this is necessary for the Web Assembly boot
+  await esModuleLexer__namespace.init;
+  const esmExports = findExportNames(source, 'esm');
+  if (esmExports.length > 0) {
+    const exportName = esmExports[0];
+    trace(`Found ESM export '${exportName}' in ${this.resourcePath}`);
+    result = /* ts */`
+      import { createLanguage, createTranslationFile } from '@vocab/webpack/${target}';
+      ${translations}
+      export { translations as ${exportName} };
+    `;
+  } else {
+    // init needs to be called and waited upon
+    await cjsModuleLexer__namespace.init();
+    const exportName = findExportNames(source, 'cjs')[0];
+    trace(`Found CJS export '${exportName}' in ${this.resourcePath}`);
+    result = /* ts */`
+      const { createLanguage, createTranslationFile } = require('@vocab/webpack/${target}');
+      ${translations}
+      exports.${exportName} = translations;
+    `;
+  }
   trace('Created translation file', result);
   callback(null, result);
 }

package/loader/dist/vocab-webpack-loader.cjs.prod.js

@@ -3,6 +3,8 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var path = require('path');
+var cjsModuleLexer = require('cjs-module-lexer');
+var esModuleLexer = require('es-module-lexer');
 var core = require('@vocab/core');
 var chunkName_dist_vocabWebpackChunkName = require('../../chunk-name/dist/vocab-webpack-chunk-name.cjs.prod.js');
 var logger = require('../../dist/logger-f79e34a8.cjs.prod.js');
@@ -11,7 +13,27 @@ require('debug');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
 
+function _interopNamespace(e) {
+  if (e && e.__esModule) return e;
+  var n = Object.create(null);
+  if (e) {
+    Object.keys(e).forEach(function (k) {
+      if (k !== 'default') {
+        var d = Object.getOwnPropertyDescriptor(e, k);
+        Object.defineProperty(n, k, d.get ? d : {
+          enumerable: true,
+          get: function () { return e[k]; }
+        });
+      }
+    });
+  }
+  n["default"] = e;
+  return Object.freeze(n);
+}
+
 var path__default = /*#__PURE__*/_interopDefault(path);
+var cjsModuleLexer__namespace = /*#__PURE__*/_interopNamespace(cjsModuleLexer);
+var esModuleLexer__namespace = /*#__PURE__*/_interopNamespace(esModuleLexer);
 
 const trace = logger.trace.extend('loader');
 
@@ -51,7 +73,17 @@ function renderLanguageLoaderAsync(resourcePath, loadedTranslation) {
     );
   };
 }
-async function vocabLoader() {
+function findExportNames(source, mode) {
+  if (mode === 'esm') {
+    const [, exports] = esModuleLexer__namespace.parse(source);
+    return exports;
+  }
+  const {
+    exports
+  } = cjsModuleLexer__namespace.parse(source);
+  return exports;
+}
+async function vocabLoader(source) {
   trace(`Using vocab loader for ${this.resourcePath}`);
   const callback = this.async();
   if (!callback) {
@@ -70,14 +102,35 @@ async function vocabLoader() {
     return;
   }
   const renderLanguageLoader = renderLanguageLoaderAsync.call(this, devJsonFilePath, loadedTranslation);
-  const loadedLanguages = Object.keys(loadedTranslation.languages);
-  const result = /* ts */`
-    import { createLanguage, createTranslationFile } from '@vocab/webpack/${target}';
-
-    export default createTranslationFile({
-      ${loadedLanguages.map(lang => `${JSON.stringify(lang)}: ${renderLanguageLoader(lang)}`).join(',\n')}
-    });
+  const translations = /* ts */`
+    const translations = createTranslationFile({
+      ${Object.keys(loadedTranslation.languages).map(lang => `${JSON.stringify(lang)}: ${renderLanguageLoader(lang)}`).join(',\n')}
+      });
   `;
+  let result;
+
+  // this is necessary for the Web Assembly boot
+  await esModuleLexer__namespace.init;
+  const esmExports = findExportNames(source, 'esm');
+  if (esmExports.length > 0) {
+    const exportName = esmExports[0];
+    trace(`Found ESM export '${exportName}' in ${this.resourcePath}`);
+    result = /* ts */`
+      import { createLanguage, createTranslationFile } from '@vocab/webpack/${target}';
+      ${translations}
+      export { translations as ${exportName} };
+    `;
+  } else {
+    // init needs to be called and waited upon
+    await cjsModuleLexer__namespace.init();
+    const exportName = findExportNames(source, 'cjs')[0];
+    trace(`Found CJS export '${exportName}' in ${this.resourcePath}`);
+    result = /* ts */`
+      const { createLanguage, createTranslationFile } = require('@vocab/webpack/${target}');
+      ${translations}
+      exports.${exportName} = translations;
+    `;
+  }
   trace('Created translation file', result);
   callback(null, result);
 }

package/loader/dist/vocab-webpack-loader.esm.js

@@ -1,4 +1,6 @@
 import path from 'path';
+import * as cjsModuleLexer from 'cjs-module-lexer';
+import * as esModuleLexer from 'es-module-lexer';
 import { getDevLanguageFileFromTsFile, loadTranslation } from '@vocab/core';
 import { getChunkName } from '../../chunk-name/dist/vocab-webpack-chunk-name.esm.js';
 import { t as trace$1 } from '../../dist/logger-e1862ea1.esm.js';
@@ -43,7 +45,17 @@ function renderLanguageLoaderAsync(resourcePath, loadedTranslation) {
     );
   };
 }
-async function vocabLoader() {
+function findExportNames(source, mode) {
+  if (mode === 'esm') {
+    const [, exports] = esModuleLexer.parse(source);
+    return exports;
+  }
+  const {
+    exports
+  } = cjsModuleLexer.parse(source);
+  return exports;
+}
+async function vocabLoader(source) {
   trace(`Using vocab loader for ${this.resourcePath}`);
   const callback = this.async();
   if (!callback) {
@@ -62,14 +74,35 @@ async function vocabLoader() {
     return;
   }
   const renderLanguageLoader = renderLanguageLoaderAsync.call(this, devJsonFilePath, loadedTranslation);
-  const loadedLanguages = Object.keys(loadedTranslation.languages);
-  const result = /* ts */`
-    import { createLanguage, createTranslationFile } from '@vocab/webpack/${target}';
-
-    export default createTranslationFile({
-      ${loadedLanguages.map(lang => `${JSON.stringify(lang)}: ${renderLanguageLoader(lang)}`).join(',\n')}
-    });
+  const translations = /* ts */`
+    const translations = createTranslationFile({
+      ${Object.keys(loadedTranslation.languages).map(lang => `${JSON.stringify(lang)}: ${renderLanguageLoader(lang)}`).join(',\n')}
+      });
   `;
+  let result;
+
+  // this is necessary for the Web Assembly boot
+  await esModuleLexer.init;
+  const esmExports = findExportNames(source, 'esm');
+  if (esmExports.length > 0) {
+    const exportName = esmExports[0];
+    trace(`Found ESM export '${exportName}' in ${this.resourcePath}`);
+    result = /* ts */`
+      import { createLanguage, createTranslationFile } from '@vocab/webpack/${target}';
+      ${translations}
+      export { translations as ${exportName} };
+    `;
+  } else {
+    // init needs to be called and waited upon
+    await cjsModuleLexer.init();
+    const exportName = findExportNames(source, 'cjs')[0];
+    trace(`Found CJS export '${exportName}' in ${this.resourcePath}`);
+    result = /* ts */`
+      const { createLanguage, createTranslationFile } = require('@vocab/webpack/${target}');
+      ${translations}
+      exports.${exportName} = translations;
+    `;
+  }
   trace('Created translation file', result);
   callback(null, result);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vocab/webpack",
-  "version": "1.1.6",
+  "version": "1.2.1",
   "main": "dist/vocab-webpack.cjs.js",
   "module": "dist/vocab-webpack.esm.js",
   "exports": {
@@ -39,10 +39,11 @@
     "web"
   ],
   "dependencies": {
-    "@vocab/core": "^1.2.5",
-    "@vocab/types": "^1.1.2",
+    "@vocab/core": "^1.3.0",
     "chalk": "^4.1.0",
+    "cjs-module-lexer": "^1.2.2",
     "debug": "^4.3.1",
+    "es-module-lexer": "^0.9.3",
     "virtual-resource-loader": "^1.0.1"
   },
   "devDependencies": {