@lingui/cli 4.8.0-next.1 → 4.10.0

package/README.md

@@ -60,7 +60,7 @@ node_modules/.bin/lingui compile
 
 ## Usage
 
-See the [tutorial][tutorial] or [reference][reference] documentation.
+See the [reference][reference] documentation.
 
 ## License
 
@@ -69,7 +69,6 @@ This package is licensed under [MIT][license] license.
 [license]: https://github.com/lingui/js-lingui/blob/main/LICENSE
 [linguijs]: https://github.com/lingui/js-lingui
 [documentation]: https://lingui.dev
-[tutorial]: https://lingui.dev/tutorials/cli
 [reference]: https://lingui.dev/ref/cli
 [package]: https://www.npmjs.com/package/@lingui/cli
 [badge-downloads]: https://img.shields.io/npm/dw/@lingui/cli.svg

package/dist/api/catalog/getCatalogs.js

@@ -95,7 +95,9 @@ function getCatalogForFile(file, catalogs) {
         const catalogGlob = (0, utils_1.replacePlaceholders)(catalogFile, { locale: "*" });
         const matchPattern = (0, utils_1.normalizeRelativePath)(path_1.default.relative(catalog.config.rootDir, catalogGlob))
             .replace("(", "\\(")
-            .replace(")", "\\)");
+            .replace(")", "\\)")
+            .replace("[", "\\[")
+            .replace("]", "\\]");
         const match = micromatch_1.default.capture(matchPattern, (0, utils_1.normalizeRelativePath)(file));
         if (match) {
             return {

package/dist/api/catalog.js

@@ -134,14 +134,16 @@ class Catalog {
     }
     async writeCompiled(locale, compiledCatalog, namespace) {
         let ext;
-        if (namespace === "es") {
-            ext = "mjs";
-        }
-        else if (namespace === "ts") {
-            ext = "ts";
-        }
-        else {
-            ext = "js";
+        switch (namespace) {
+            case "es":
+                ext = "mjs";
+                break;
+            case "ts":
+            case "json":
+                ext = namespace;
+                break;
+            default:
+                ext = "js";
         }
         const filename = `${(0, utils_1.replacePlaceholders)(this.path, { locale })}.${ext}`;
         await (0, utils_1.writeFile)(filename, compiledCatalog);

package/dist/api/extractors/babel.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.extractFromFileWithBabel = void 0;
 const core_1 = require("@babel/core");
 const babel_plugin_extract_messages_1 = __importDefault(require("@lingui/babel-plugin-extract-messages"));
-const plugin_1 = __importDefault(require("@lingui/macro/plugin"));
 const babelRe = new RegExp("\\.(" +
     [...core_1.DEFAULT_EXTENSIONS, ".ts", ".mts", ".cts", ".tsx"]
         .map((ext) => ext.slice(1))
@@ -89,10 +88,17 @@ async function extractFromFileWithBabel(filename, code, onMessageExtracted, ctx,
         parserOpts,
         plugins: [
             [
-                plugin_1.default,
+                "macros",
                 {
-                    extract: true,
-                    linguiConfig: ctx.linguiConfig,
+                    // macro plugin uses package `resolve` to find a path of macro file
+                    // this will not follow jest pathMapping and will resolve path from ./build
+                    // instead of ./src which makes testing & developing hard.
+                    // here we override resolve and provide correct path for testing
+                    resolvePath: (source) => require.resolve(source),
+                    lingui: {
+                        extract: true,
+                        linguiConfig: ctx.linguiConfig,
+                    },
                 },
             ],
             [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingui/cli",
-  "version": "4.8.0-next.1",
+  "version": "4.10.0",
   "description": "CLI for working wit message catalogs",
   "keywords": [
     "cli",
@@ -53,19 +53,18 @@
     "@babel/parser": "^7.21.2",
     "@babel/runtime": "^7.21.0",
     "@babel/types": "^7.21.2",
-    "@lingui/babel-plugin-extract-messages": "^4.8.0-next.1",
-    "@lingui/conf": "^4.8.0-next.1",
-    "@lingui/core": "^4.8.0-next.1",
-    "@lingui/format-po": "^4.8.0-next.1",
-    "@lingui/macro": "^4.8.0-next.1",
-    "@lingui/message-utils": "^4.8.0-next.1",
+    "@lingui/babel-plugin-extract-messages": "4.10.0",
+    "@lingui/conf": "4.10.0",
+    "@lingui/core": "4.10.0",
+    "@lingui/format-po": "4.10.0",
+    "@lingui/message-utils": "4.10.0",
     "babel-plugin-macros": "^3.0.1",
     "chalk": "^4.1.0",
     "chokidar": "3.5.1",
     "cli-table": "0.3.6",
     "commander": "^10.0.0",
     "convert-source-map": "^2.0.0",
-    "date-fns": "^2.16.1",
+    "date-fns": "^3.6.0",
     "esbuild": "^0.17.10",
     "glob": "^7.1.4",
     "inquirer": "^7.3.3",
@@ -80,7 +79,8 @@
     "source-map": "^0.8.0-beta.0"
   },
   "devDependencies": {
-    "@lingui/jest-mocks": "^3.0.3",
+    "@lingui/jest-mocks": "*",
+    "@lingui/macro": "4.10.0",
     "@types/convert-source-map": "^2.0.0",
     "@types/glob": "^8.1.0",
     "@types/micromatch": "^4.0.1",
@@ -88,5 +88,5 @@
     "mock-fs": "^5.2.0",
     "mockdate": "^3.0.5"
   },
-  "gitHead": "62a736f74796c6c3e5bfd23d2e95154fc7f3ff42"
+  "gitHead": "5088feb92de2a669659e85067c2849331122e830"
 }