@lingui/loader 4.0.0-next.0 → 4.0.0-next.2

package/build/webpackLoader.js

@@ -3,59 +3,23 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = _default;
+exports.default = void 0;
 var _path = _interopRequireDefault(require("path"));
 var _conf = require("@lingui/conf");
 var _api = require("@lingui/cli/api");
-var _loaderUtils = _interopRequireDefault(require("loader-utils"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-// Check if webpack 5
-const isWebpack5 = parseInt(require("webpack").version) === 5;
-
-// Check if JavascriptParser and JavascriptGenerator exists -> Webpack 4
-let JavascriptParser;
-let JavascriptGenerator;
-try {
-  JavascriptParser = require("webpack/lib/Parser");
-  JavascriptGenerator = require("webpack/lib/JavascriptGenerator");
-} catch (error) {
-  if (error.code !== "MODULE_NOT_FOUND") {
-    throw error;
-  }
-}
-const requiredType = "javascript/auto";
-function _default(source) {
-  const options = _loaderUtils.default.getOptions(this) || {};
-  if (!isWebpack5 && JavascriptParser && JavascriptGenerator) {
-    // Webpack 4 uses json-loader automatically, which breaks this loader because it
-    // doesn't return JSON, but JS module. This is a temporary workaround before
-    // official API is added (https://github.com/webpack/webpack/issues/7057#issuecomment-381883220)
-    // See https://github.com/webpack/webpack/issues/7057
-    this._module.type = requiredType;
-    this._module.parser = new JavascriptParser();
-    this._module.generator = new JavascriptGenerator();
-  }
+const loader = async function (source) {
+  const options = this.getOptions() || {};
   const config = (0, _conf.getConfig)({
     configPath: options.config,
     cwd: _path.default.dirname(this.resourcePath)
   });
-  const EMPTY_EXT = /\.[0-9a-z]+$/.test(this.resourcePath);
-  const JS_EXT = /\.js+$/.test(this.resourcePath);
   const catalogRelativePath = _path.default.relative(config.rootDir, this.resourcePath);
-  if (!EMPTY_EXT || JS_EXT) {
-    const formats = {
-      minimal: ".json",
-      po: ".po",
-      lingui: ".json"
-    };
-    // we replace the .js, because webpack appends automatically the .js on imports without extension
-    throw new Error(`File extension is mandatory, for ex: import("@lingui/loader!./${catalogRelativePath.replace(".js", formats[config.format])}")`);
-  }
   const {
     locale,
     catalog
   } = (0, _api.getCatalogForFile)(catalogRelativePath, (0, _api.getCatalogs)(config));
-  const messages = catalog.getTranslations(locale, {
+  const messages = await catalog.getTranslations(locale, {
     fallbackLocales: config.fallbackLocales,
     sourceLocale: config.sourceLocale
   });
@@ -68,7 +32,9 @@ function _default(source) {
   const strict = process.env.NODE_ENV !== "production";
   return (0, _api.createCompiledCatalog)(locale, messages, {
     strict,
-    namespace: config.compileNamespace,
+    namespace: this._module.type === "json" ? "json" : "es",
     pseudoLocale: config.pseudoLocale
   });
-}
+};
+var _default = loader;
+exports.default = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingui/loader",
-  "version": "4.0.0-next.0",
+  "version": "4.0.0-next.2",
   "description": "webpack loader for lingui message catalogs",
   "types": "./build/index.d.ts",
   "main": "./build/index.js",
@@ -36,16 +36,14 @@
   ],
   "dependencies": {
     "@babel/runtime": "^7.20.13",
-    "@lingui/cli": "^4.0.0-next.0",
-    "@lingui/conf": "^4.0.0-next.0",
-    "loader-utils": "^2.0.0"
+    "@lingui/cli": "^4.0.0-next.2",
+    "@lingui/conf": "^4.0.0-next.2"
   },
   "devDependencies": {
-    "memory-fs": "^0.5.0",
-    "webpack": "^4.44.2"
+    "webpack": "^5.76.1"
   },
   "peerDependencies": {
-    "webpack": "^4.0.0 || ^5.0.0"
+    "webpack": "^5.0.0"
   },
-  "gitHead": "637f5cf6beda9d4ebce4e15cd9fdaa23e404b660"
+  "gitHead": "556ab57e20c2ac9d384a22424c6a90c2ba0dd133"
 }