@lingui/vite-plugin 6.0.0-next.2 → 6.0.0-next.3

package/dist/index.d.mts

@@ -1,4 +1,54 @@
 import { Plugin } from 'vite';
+import * as pluginBabel from '@rolldown/plugin-babel';
+import * as babelPluginLinguiMacro from '@lingui/babel-plugin-lingui-macro';
+
+/* eslint-disable @typescript-eslint/ban-ts-comment */
+
+
+
+// @ts-ignore --- `@rolldown/plugin-babel` is an optional peer dependency, so this may cause an error
+type RolldownBabelPreset = pluginBabel.RolldownBabelPreset
+// @ts-ignore --- `babel-plugin-react-compiler` is an optional peer dependency, so this may cause an error
+type LinguiMacroBabelPluginOptions =
+  babelPluginLinguiMacro.LinguiPluginOpts
+
+/**
+ * Convenient helper to define a rolldown preset with Lingui Transformer for `@rolldown/plugin-babel`
+ *
+ * @example
+ * ```js
+ * // vite.config.js
+ * import { defineConfig } from 'vite'
+ * import react from '@vitejs/plugin-react'
+ * import babel from '@rolldown/plugin-babel'
+ * import { lingui, linguiTransformerBabelPreset } from '@lingui/vite-plugin'
+ *
+ * export default defineConfig({
+ *   plugins: [react(), lingui(), babel({ presets: [linguiTransformerBabelPreset()] })],
+ * })
+ * ```
+ * @param options Options Passed to the babel-plugin-lingui-macro
+ * @param linguiConfigConfigOpts options passed to the lingui config discovery function
+ *
+ *
+ * > [!TIP]
+ * >
+ * > `linguiTransformerBabelPreset` is only a convenient helper with a preconfigured filter. You can configure override the filters to fit your project structure or code. For example, if you know a large portion of your files are never Lingui-related, you can aggressively exclude them via `rolldown.filter`:
+ * >
+ * > ```js
+ * > const myPreset = linguiTransformerBabelPreset()
+ * > myPreset.rolldown.filter.id.exclude = ['src/legacy/**', 'src/utils/**']
+ * >
+ * > babel({
+ * >   presets: [myPreset],
+ * > })
+ * > ```
+ */
+declare const linguiTransformerBabelPreset: (options?: LinguiMacroBabelPluginOptions, linguiConfigConfigOpts?: {
+    cwd?: string;
+    configPath?: string;
+    skipValidation?: boolean;
+}) => RolldownBabelPreset;
 
 type LinguiPluginOpts = {
     cwd?: string;
@@ -15,5 +65,5 @@ type LinguiPluginOpts = {
 };
 declare function lingui({ failOnMissing, failOnCompileError, ...linguiConfig }?: LinguiPluginOpts): Plugin[];
 
-export { lingui as default, lingui };
+export { lingui as default, lingui, linguiTransformerBabelPreset };
 export type { LinguiPluginOpts };

package/dist/index.mjs

@@ -2,35 +2,50 @@ import { getConfig } from '@lingui/conf';
 import { getCatalogForFile, getCatalogs, getCatalogDependentFiles, createMissingErrorMessage, createCompiledCatalog, createCompilationErrorMessage } from '@lingui/cli/api';
 import path from 'path';
 
+const linguiTransformerBabelPreset = (options, linguiConfigConfigOpts = {}) => {
+  const config = getConfig(linguiConfigConfigOpts);
+  const macroIds = /* @__PURE__ */ new Set([
+    ...config.macro.corePackage,
+    ...config.macro.jsxPackage
+  ]);
+  const macroPattern = Array.from(macroIds).map((id) => id.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")).join("|");
+  return {
+    preset: {
+      plugins: [["@lingui/babel-plugin-lingui-macro", options]]
+    },
+    rolldown: {
+      filter: {
+        code: new RegExp(`from ['"](?:${macroPattern})['"]`)
+      }
+    }
+  };
+};
+
 const fileRegex = /(\.po|\?lingui)$/;
 function lingui({
   failOnMissing,
   failOnCompileError,
   ...linguiConfig
 } = {}) {
-  const config = getConfig(linguiConfig);
-  const macroIds = /* @__PURE__ */ new Set([
-    ...config.macro.corePackage,
-    ...config.macro.jsxPackage
-  ]);
+  let config;
   return [
     {
-      name: "vite-plugin-lingui-report-macro-error",
+      name: "vite-plugin-lingui-get-config",
       enforce: "pre",
-      resolveDynamicImport(id, importer) {
-        if (macroIds.has(id)) {
-          throw new Error(
-            `The macro you imported from "${id}" cannot be dynamically imported. 
-Please check the import statement in file "${importer}". 
-Please see the documentation for how to configure Vite with Lingui correctly: https://lingui.dev/tutorials/setup-vite`
-          );
-        }
+      configResolved: () => {
+        config = getConfig(linguiConfig);
       }
     },
     {
-      name: "vite-plugin-lingui",
-      async transform(src, id) {
-        if (fileRegex.test(id)) {
+      name: "vite-plugin-lingui-load-catalog",
+      transform: {
+        filter: {
+          id: fileRegex
+        },
+        async handler(src, id) {
+          if (!fileRegex.test(id)) {
+            return;
+          }
           id = id.split("?")[0];
           const catalogRelativePath = path.relative(config.rootDir, id);
           const fileCatalog = getCatalogForFile(
@@ -102,4 +117,4 @@ You see this error because \`failOnMissing=true\` in Vite Plugin configuration.`
   ];
 }
 
-export { lingui as default, lingui };
+export { lingui as default, lingui, linguiTransformerBabelPreset };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingui/vite-plugin",
-  "version": "6.0.0-next.2",
+  "version": "6.0.0-next.3",
   "description": "Vite plugin for Lingui message catalogs",
   "type": "module",
   "exports": {
@@ -42,23 +42,35 @@
     "dist/"
   ],
   "dependencies": {
-    "@lingui/cli": "6.0.0-next.2",
-    "@lingui/conf": "6.0.0-next.2"
+    "@lingui/cli": "6.0.0-next.3",
+    "@lingui/conf": "6.0.0-next.3"
   },
   "peerDependencies": {
-    "vite": "^3 || ^4 || ^5.0.9 || ^6 || ^7 || ^8"
+    "@lingui/babel-plugin-lingui-macro": "^5 || ^6",
+    "@rolldown/plugin-babel": "^0.1.7 || ^0.2.0",
+    "vite": "^6.3.0 || ^7 || ^8"
+  },
+  "peerDependenciesMeta": {
+    "@lingui/babel-plugin-lingui-macro": {
+      "optional": true
+    },
+    "@rolldown/plugin-babel": {
+      "optional": true
+    }
   },
   "devDependencies": {
-    "@lingui/core": "^6.0.0-next.2",
-    "@lingui/format-json": "^6.0.0-next.2",
-    "@lingui/react": "^6.0.0-next.2",
+    "@lingui/babel-plugin-lingui-macro": "^6.0.0-next.3",
+    "@lingui/core": "^6.0.0-next.3",
+    "@lingui/format-json": "^6.0.0-next.3",
+    "@lingui/react": "^6.0.0-next.3",
+    "@rolldown/plugin-babel": "^0.2.2",
     "unbuild": "3.6.1",
-    "vite": "6.0.2",
+    "vite": "^8.0.3",
     "vite-plugin-babel-macros": "^1.0.6",
     "vitest": "4.0.18"
   },
   "unbuild": {
     "declaration": "node16"
   },
-  "gitHead": "f4bcdd555ceef0bed58b2f3075096efd4daaeec2"
+  "gitHead": "ebcb6dc8e8d327ae5775cadee931942ef309480f"
 }