@vocab/webpack 0.0.0-compiled-translation-import-order-20230328231631 → 0.0.0-expose-entry-regex-20230413013100

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

@@ -3,6 +3,7 @@ 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,8 +1,5 @@
-interface LoaderContext {
-    addDependency: (filePath: string) => void;
-    target: string;
-    resourcePath: string;
-    async: () => (err: unknown, result?: string) => void;
-}
+import { UserConfig } from '@vocab/types';
+import type { LoaderContext as WebpackLoaderContext } from 'webpack';
+type LoaderContext = WebpackLoaderContext<UserConfig>;
 export default function vocabLoader(this: LoaderContext): Promise<void>;
 export {};

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

@@ -4,7 +4,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var path = require('path');
 var core = require('@vocab/core');
-var loaderUtils = require('loader-utils');
 var chunkName_dist_vocabWebpackChunkName = require('../../chunk-name/dist/vocab-webpack-chunk-name.cjs.dev.js');
 var logger = require('../../dist/logger-65149486.cjs.dev.js');
 require('chalk');
@@ -15,9 +14,9 @@ function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e };
 var path__default = /*#__PURE__*/_interopDefault(path);
 
 const trace = logger.trace.extend('loader');
+
 // Resolve virtual-resource-loader dependency from current package
 const virtualResourceLoader = require.resolve('virtual-resource-loader');
-const encodeWithinSingleQuotes = v => v.replace(/'/g, "\\'");
 function createIdentifier(lang, resourcePath, loadedTranslation) {
   var _loadedTranslation$la;
   trace('Creating identifier for language', lang);
@@ -31,24 +30,34 @@ function createIdentifier(lang, resourcePath, loadedTranslation) {
   const fileIdent = path__default["default"].basename(resourcePath, 'translations.json');
   return `./${fileIdent}-${lang}-virtual.json!=!${unloader}!`;
 }
-const renderLanguageLoaderAsync = (resourcePath, loadedTranslation) => lang => {
-  const identifier = createIdentifier(lang, resourcePath, loadedTranslation);
-  return `'${encodeWithinSingleQuotes(lang)}': createLanguage(require.resolveWeak('${identifier}'), () => import(
-      /* webpackChunkName: "${chunkName_dist_vocabWebpackChunkName.getChunkName(lang)}" */
-      '${identifier}'
-    ))`;
-};
+
+// reimplement `stringifyRequest` from loader-utils 2.x
+// https://github.com/webpack/loader-utils/blob/master/CHANGELOG.md#300-2021-10-20
+function stringifyRequest(request) {
+  return JSON.stringify(this.utils.contextify(this.context, request));
+}
+function renderLanguageLoaderAsync(resourcePath, loadedTranslation) {
+  return lang => {
+    const identifier = stringifyRequest.call(this, createIdentifier(lang, resourcePath, loadedTranslation));
+    return (/* ts */`
+      createLanguage(
+        require.resolveWeak(${identifier}),
+        () => import(
+          /* webpackChunkName: ${JSON.stringify(chunkName_dist_vocabWebpackChunkName.getChunkName(lang))} */
+          ${identifier}
+        )
+      )
+    `.trim()
+    );
+  };
+}
 async function vocabLoader() {
   trace(`Using vocab loader for ${this.resourcePath}`);
   const callback = this.async();
   if (!callback) {
     throw new Error(`Webpack didn't provide an async callback`);
   }
-
-  // @ts-expect-error We define our own loader context type, getOptions expects
-  // webpack's LoaderContext type, but it's missing the target field
-  // https://github.com/webpack/webpack/issues/16753
-  const config = loaderUtils.getOptions(this);
+  const config = this.getOptions();
   const devJsonFilePath = core.getDevLanguageFileFromTsFile(this.resourcePath);
   const loadedTranslation = core.loadTranslation({
     filePath: devJsonFilePath,
@@ -60,15 +69,15 @@ async function vocabLoader() {
     callback(new Error('Called Vocab Loader with non-web target'));
     return;
   }
-  const renderLanguageLoader = renderLanguageLoaderAsync(devJsonFilePath, loadedTranslation);
+  const renderLanguageLoader = renderLanguageLoaderAsync.call(this, devJsonFilePath, loadedTranslation);
   const loadedLanguages = Object.keys(loadedTranslation.languages);
-  const result = `
-      import { createLanguage, createTranslationFile } from '@vocab/webpack/${target}';
+  const result = /* ts */`
+    import { createLanguage, createTranslationFile } from '@vocab/webpack/${target}';
 
-      export default createTranslationFile({
-          ${loadedLanguages.map(lang => renderLanguageLoader(lang)).join(',')}
-      });
-    `;
+    export default createTranslationFile({
+      ${loadedLanguages.map(lang => `${JSON.stringify(lang)}: ${renderLanguageLoader(lang)}`).join(',\n')}
+    });
+  `;
   trace('Created translation file', result);
   callback(null, result);
 }

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

@@ -4,7 +4,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var path = require('path');
 var core = require('@vocab/core');
-var loaderUtils = require('loader-utils');
 var chunkName_dist_vocabWebpackChunkName = require('../../chunk-name/dist/vocab-webpack-chunk-name.cjs.prod.js');
 var logger = require('../../dist/logger-f79e34a8.cjs.prod.js');
 require('chalk');
@@ -15,9 +14,9 @@ function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e };
 var path__default = /*#__PURE__*/_interopDefault(path);
 
 const trace = logger.trace.extend('loader');
+
 // Resolve virtual-resource-loader dependency from current package
 const virtualResourceLoader = require.resolve('virtual-resource-loader');
-const encodeWithinSingleQuotes = v => v.replace(/'/g, "\\'");
 function createIdentifier(lang, resourcePath, loadedTranslation) {
   var _loadedTranslation$la;
   trace('Creating identifier for language', lang);
@@ -31,24 +30,34 @@ function createIdentifier(lang, resourcePath, loadedTranslation) {
   const fileIdent = path__default["default"].basename(resourcePath, 'translations.json');
   return `./${fileIdent}-${lang}-virtual.json!=!${unloader}!`;
 }
-const renderLanguageLoaderAsync = (resourcePath, loadedTranslation) => lang => {
-  const identifier = createIdentifier(lang, resourcePath, loadedTranslation);
-  return `'${encodeWithinSingleQuotes(lang)}': createLanguage(require.resolveWeak('${identifier}'), () => import(
-      /* webpackChunkName: "${chunkName_dist_vocabWebpackChunkName.getChunkName(lang)}" */
-      '${identifier}'
-    ))`;
-};
+
+// reimplement `stringifyRequest` from loader-utils 2.x
+// https://github.com/webpack/loader-utils/blob/master/CHANGELOG.md#300-2021-10-20
+function stringifyRequest(request) {
+  return JSON.stringify(this.utils.contextify(this.context, request));
+}
+function renderLanguageLoaderAsync(resourcePath, loadedTranslation) {
+  return lang => {
+    const identifier = stringifyRequest.call(this, createIdentifier(lang, resourcePath, loadedTranslation));
+    return (/* ts */`
+      createLanguage(
+        require.resolveWeak(${identifier}),
+        () => import(
+          /* webpackChunkName: ${JSON.stringify(chunkName_dist_vocabWebpackChunkName.getChunkName(lang))} */
+          ${identifier}
+        )
+      )
+    `.trim()
+    );
+  };
+}
 async function vocabLoader() {
   trace(`Using vocab loader for ${this.resourcePath}`);
   const callback = this.async();
   if (!callback) {
     throw new Error(`Webpack didn't provide an async callback`);
   }
-
-  // @ts-expect-error We define our own loader context type, getOptions expects
-  // webpack's LoaderContext type, but it's missing the target field
-  // https://github.com/webpack/webpack/issues/16753
-  const config = loaderUtils.getOptions(this);
+  const config = this.getOptions();
   const devJsonFilePath = core.getDevLanguageFileFromTsFile(this.resourcePath);
   const loadedTranslation = core.loadTranslation({
     filePath: devJsonFilePath,
@@ -60,15 +69,15 @@ async function vocabLoader() {
     callback(new Error('Called Vocab Loader with non-web target'));
     return;
   }
-  const renderLanguageLoader = renderLanguageLoaderAsync(devJsonFilePath, loadedTranslation);
+  const renderLanguageLoader = renderLanguageLoaderAsync.call(this, devJsonFilePath, loadedTranslation);
   const loadedLanguages = Object.keys(loadedTranslation.languages);
-  const result = `
-      import { createLanguage, createTranslationFile } from '@vocab/webpack/${target}';
+  const result = /* ts */`
+    import { createLanguage, createTranslationFile } from '@vocab/webpack/${target}';
 
-      export default createTranslationFile({
-          ${loadedLanguages.map(lang => renderLanguageLoader(lang)).join(',')}
-      });
-    `;
+    export default createTranslationFile({
+      ${loadedLanguages.map(lang => `${JSON.stringify(lang)}: ${renderLanguageLoader(lang)}`).join(',\n')}
+    });
+  `;
   trace('Created translation file', result);
   callback(null, result);
 }

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

@@ -1,15 +1,14 @@
 import path from 'path';
 import { getDevLanguageFileFromTsFile, loadTranslation } from '@vocab/core';
-import { getOptions } from 'loader-utils';
 import { getChunkName } from '../../chunk-name/dist/vocab-webpack-chunk-name.esm.js';
 import { t as trace$1 } from '../../dist/logger-e1862ea1.esm.js';
 import 'chalk';
 import 'debug';
 
 const trace = trace$1.extend('loader');
+
 // Resolve virtual-resource-loader dependency from current package
 const virtualResourceLoader = require.resolve('virtual-resource-loader');
-const encodeWithinSingleQuotes = v => v.replace(/'/g, "\\'");
 function createIdentifier(lang, resourcePath, loadedTranslation) {
   var _loadedTranslation$la;
   trace('Creating identifier for language', lang);
@@ -23,24 +22,34 @@ function createIdentifier(lang, resourcePath, loadedTranslation) {
   const fileIdent = path.basename(resourcePath, 'translations.json');
   return `./${fileIdent}-${lang}-virtual.json!=!${unloader}!`;
 }
-const renderLanguageLoaderAsync = (resourcePath, loadedTranslation) => lang => {
-  const identifier = createIdentifier(lang, resourcePath, loadedTranslation);
-  return `'${encodeWithinSingleQuotes(lang)}': createLanguage(require.resolveWeak('${identifier}'), () => import(
-      /* webpackChunkName: "${getChunkName(lang)}" */
-      '${identifier}'
-    ))`;
-};
+
+// reimplement `stringifyRequest` from loader-utils 2.x
+// https://github.com/webpack/loader-utils/blob/master/CHANGELOG.md#300-2021-10-20
+function stringifyRequest(request) {
+  return JSON.stringify(this.utils.contextify(this.context, request));
+}
+function renderLanguageLoaderAsync(resourcePath, loadedTranslation) {
+  return lang => {
+    const identifier = stringifyRequest.call(this, createIdentifier(lang, resourcePath, loadedTranslation));
+    return (/* ts */`
+      createLanguage(
+        require.resolveWeak(${identifier}),
+        () => import(
+          /* webpackChunkName: ${JSON.stringify(getChunkName(lang))} */
+          ${identifier}
+        )
+      )
+    `.trim()
+    );
+  };
+}
 async function vocabLoader() {
   trace(`Using vocab loader for ${this.resourcePath}`);
   const callback = this.async();
   if (!callback) {
     throw new Error(`Webpack didn't provide an async callback`);
   }
-
-  // @ts-expect-error We define our own loader context type, getOptions expects
-  // webpack's LoaderContext type, but it's missing the target field
-  // https://github.com/webpack/webpack/issues/16753
-  const config = getOptions(this);
+  const config = this.getOptions();
   const devJsonFilePath = getDevLanguageFileFromTsFile(this.resourcePath);
   const loadedTranslation = loadTranslation({
     filePath: devJsonFilePath,
@@ -52,15 +61,15 @@ async function vocabLoader() {
     callback(new Error('Called Vocab Loader with non-web target'));
     return;
   }
-  const renderLanguageLoader = renderLanguageLoaderAsync(devJsonFilePath, loadedTranslation);
+  const renderLanguageLoader = renderLanguageLoaderAsync.call(this, devJsonFilePath, loadedTranslation);
   const loadedLanguages = Object.keys(loadedTranslation.languages);
-  const result = `
-      import { createLanguage, createTranslationFile } from '@vocab/webpack/${target}';
+  const result = /* ts */`
+    import { createLanguage, createTranslationFile } from '@vocab/webpack/${target}';
 
-      export default createTranslationFile({
-          ${loadedLanguages.map(lang => renderLanguageLoader(lang)).join(',')}
-      });
-    `;
+    export default createTranslationFile({
+      ${loadedLanguages.map(lang => `${JSON.stringify(lang)}: ${renderLanguageLoader(lang)}`).join(',\n')}
+    });
+  `;
   trace('Created translation file', result);
   callback(null, result);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vocab/webpack",
-  "version": "0.0.0-compiled-translation-import-order-20230328231631",
+  "version": "0.0.0-expose-entry-regex-20230413013100",
   "main": "dist/vocab-webpack.cjs.js",
   "module": "dist/vocab-webpack.esm.js",
   "exports": {
@@ -39,15 +39,17 @@
     "web"
   ],
   "dependencies": {
-    "@vocab/core": "0.0.0-compiled-translation-import-order-20230328231631",
+    "@vocab/core": "^1.2.5",
     "@vocab/types": "^1.1.2",
     "chalk": "^4.1.0",
     "debug": "^4.3.1",
-    "loader-utils": "^2.0.0",
     "virtual-resource-loader": "^1.0.1"
   },
   "devDependencies": {
     "@types/debug": "^4.1.5",
-    "@types/loader-utils": "^2.0.1"
+    "webpack": "^5.37.0"
+  },
+  "peerDependencies": {
+    "webpack": "^5.37.0"
   }
 }