@lingui/vite-plugin 4.0.0-next.0 → 4.0.0-next.2

package/README.md

@@ -4,7 +4,7 @@
 
 # @lingui/vite-plugin
 
-> Vite plugin which compiles on the fly the .po files for auto-refreshing. In summary, `lingui compile` command isn't required when using this plugin
+> Vite plugin that compiles Lingui catalogs on the fly. In summary, the `lingui compile` command isn't needed when using this plugin.
 
 `@lingui/vite-plugin` is part of [LinguiJS][linguijs]. See the [documentation][documentation] for all information, tutorials and examples.
 
@@ -31,7 +31,11 @@ const config: UserConfig = {
 ### Then in Vite-processed code: 
 
 ```ts
+// *.po files assigned to this loader by default
 const { messages } = await import(`./locales/${language}.po`);
+
+// for other extension you have to use `?lingui` suffix
+const { messages } = await import(`./locales/${language}.json?lingui`);
 ```
 > See Vite's official documentation for more info about Vite dynamic imports 
 > https://vitejs.dev/guide/features.html#dynamic-import

package/build/index.js

@@ -7,7 +7,7 @@ exports.lingui = void 0;
 const conf_1 = require("@lingui/conf");
 const api_1 = require("@lingui/cli/api");
 const path_1 = __importDefault(require("path"));
-const fileRegex = /\.(po)$/;
+const fileRegex = /(\.po|\?lingui)$/;
 function lingui(linguiConfig = {}) {
     const config = (0, conf_1.getConfig)(linguiConfig);
     return {
@@ -17,12 +17,22 @@ function lingui(linguiConfig = {}) {
             config.optimizeDeps.exclude = config.optimizeDeps.exclude || [];
             config.optimizeDeps.exclude.push("@lingui/macro");
         },
-        transform(src, id) {
+        async transform(src, id) {
             if (fileRegex.test(id)) {
+                id = id.split("?")[0];
                 const catalogRelativePath = path_1.default.relative(config.rootDir, id);
                 const fileCatalog = (0, api_1.getCatalogForFile)(catalogRelativePath, (0, api_1.getCatalogs)(config));
+                if (!fileCatalog) {
+                    throw new Error(`Requested resource ${catalogRelativePath} is not matched to any of your catalogs paths specified in "lingui.config".
+
+Resource: ${id}
+
+Your catalogs:
+${config.catalogs.map((c) => c.path).join("\n")}
+Please check that catalogs.path is filled properly.\n`);
+                }
                 const { locale, catalog } = fileCatalog;
-                const messages = catalog.getTranslations(locale, {
+                const messages = await catalog.getTranslations(locale, {
                     fallbackLocales: config.fallbackLocales,
                     sourceLocale: config.sourceLocale,
                 });

package/build/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,uCAAwC;AACxC,yCAIwB;AACxB,gDAAuB;AAGvB,MAAM,SAAS,GAAG,SAAS,CAAA;AAQ3B,SAAgB,MAAM,CAAC,eAAiC,EAAE;IACxD,MAAM,MAAM,GAAG,IAAA,gBAAS,EAAC,YAAY,CAAC,CAAA;IAEtC,OAAO;QACL,IAAI,EAAE,oBAAoB;QAE1B,MAAM,EAAE,CAAC,MAAM,EAAE,EAAE;YACjB,kDAAkD;YAClD,MAAM,CAAC,YAAY,CAAC,OAAO,GAAG,MAAM,CAAC,YAAY,CAAC,OAAO,IAAI,EAAE,CAAA;YAC/D,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;QACnD,CAAC;QAED,SAAS,CAAC,GAAG,EAAE,EAAE;YACf,IAAI,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE;gBACtB,MAAM,mBAAmB,GAAG,cAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,CAAC,CAAA;gBAE7D,MAAM,WAAW,GAAG,IAAA,uBAAiB,EACnC,mBAAmB,EACnB,IAAA,iBAAW,EAAC,MAAM,CAAC,CACpB,CAAA;gBAED,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,WAAW,CAAA;gBAEvC,MAAM,QAAQ,GAAG,OAAO,CAAC,eAAe,CAAC,MAAM,EAAE;oBAC/C,eAAe,EAAE,MAAM,CAAC,eAAe;oBACvC,YAAY,EAAE,MAAM,CAAC,YAAY;iBAClC,CAAC,CAAA;gBAEF,MAAM,QAAQ,GAAG,IAAA,2BAAqB,EAAC,MAAM,EAAE,QAAQ,EAAE;oBACvD,MAAM,EAAE,KAAK;oBACb,SAAS,EAAE,IAAI;oBACf,YAAY,EAAE,MAAM,CAAC,YAAY;iBAClC,CAAC,CAAA;gBAEF,OAAO;oBACL,IAAI,EAAE,QAAQ;oBACd,GAAG,EAAE,IAAI,EAAE,kCAAkC;iBAC9C,CAAA;aACF;QACH,CAAC;KACF,CAAA;AACH,CAAC;AAzCD,wBAyCC;AAED,kBAAe,MAAM,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,uCAAwC;AACxC,yCAIwB;AACxB,gDAAuB;AAGvB,MAAM,SAAS,GAAG,kBAAkB,CAAA;AAQpC,SAAgB,MAAM,CAAC,eAAiC,EAAE;IACxD,MAAM,MAAM,GAAG,IAAA,gBAAS,EAAC,YAAY,CAAC,CAAA;IAEtC,OAAO;QACL,IAAI,EAAE,oBAAoB;QAE1B,MAAM,EAAE,CAAC,MAAM,EAAE,EAAE;YACjB,kDAAkD;YAClD,MAAM,CAAC,YAAY,CAAC,OAAO,GAAG,MAAM,CAAC,YAAY,CAAC,OAAO,IAAI,EAAE,CAAA;YAC/D,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;QACnD,CAAC;QAED,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE;YACrB,IAAI,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE;gBACtB,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;gBAErB,MAAM,mBAAmB,GAAG,cAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,CAAC,CAAA;gBAE7D,MAAM,WAAW,GAAG,IAAA,uBAAiB,EACnC,mBAAmB,EACnB,IAAA,iBAAW,EAAC,MAAM,CAAC,CACpB,CAAA;gBAED,IAAI,CAAC,WAAW,EAAE;oBAChB,MAAM,IAAI,KAAK,CACb,sBAAsB,mBAAmB;;YAEzC,EAAE;;;EAGZ,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;sDACO,CAC3C,CAAA;iBACF;gBAED,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,WAAW,CAAA;gBAEvC,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,eAAe,CAAC,MAAM,EAAE;oBACrD,eAAe,EAAE,MAAM,CAAC,eAAe;oBACvC,YAAY,EAAE,MAAM,CAAC,YAAY;iBAClC,CAAC,CAAA;gBAEF,MAAM,QAAQ,GAAG,IAAA,2BAAqB,EAAC,MAAM,EAAE,QAAQ,EAAE;oBACvD,MAAM,EAAE,KAAK;oBACb,SAAS,EAAE,IAAI;oBACf,YAAY,EAAE,MAAM,CAAC,YAAY;iBAClC,CAAC,CAAA;gBAEF,OAAO;oBACL,IAAI,EAAE,QAAQ;oBACd,GAAG,EAAE,IAAI,EAAE,kCAAkC;iBAC9C,CAAA;aACF;QACH,CAAC;KACF,CAAA;AACH,CAAC;AAvDD,wBAuDC;AAED,kBAAe,MAAM,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingui/vite-plugin",
-  "version": "4.0.0-next.0",
+  "version": "4.0.0-next.2",
   "description": "Vite plugin for Lingui message catalogs",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
@@ -35,11 +35,11 @@
     "build/"
   ],
   "dependencies": {
-    "@lingui/cli": "^4.0.0-next.0",
-    "@lingui/conf": "^4.0.0-next.0"
+    "@lingui/cli": "^4.0.0-next.2",
+    "@lingui/conf": "^4.0.0-next.2"
   },
   "devDependencies": {
-    "vite": "3.2.4"
+    "vite": "4.1.4"
   },
-  "gitHead": "637f5cf6beda9d4ebce4e15cd9fdaa23e404b660"
+  "gitHead": "556ab57e20c2ac9d384a22424c6a90c2ba0dd133"
 }