@intlify/unplugin-vue-i18n 11.0.0-beta.3 → 11.0.0-beta.4

package/lib/index.cjs

@@ -10,6 +10,7 @@ const pluginutils = require('@rollup/pluginutils');
 const fg = require('fast-glob');
 const node_fs = require('node:fs');
 const path = require('node:path');
+const pathe = require('pathe');
 const compilerSfc = require('vue/compiler-sfc');
 const pc = require('picocolors');
 const eslintUitls = require('@eslint-community/eslint-utils');
@@ -194,17 +195,64 @@ function resourcePlugin({
   escapeHtml,
   transformI18nBlock
 }, meta) {
-  function resolveInclude() {
+  let viteModule = null;
+  async function getViteModule() {
+    if (viteModule != null) {
+      return viteModule;
+    }
+    try {
+      viteModule = await import('vite');
+    } catch (e) {
+      error(`vite not found, please install vite.`, e.message);
+      throw e;
+    }
+    return viteModule;
+  }
+  function resolveIncludeExclude() {
     const customBlockInclude = meta.framework === "vite" ? RE_SFC_I18N_CUSTOM_BLOCK : RE_SFC_I18N_WEBPACK_CUSTOM_BLOCK;
     if (shared.isArray(include)) {
-      return [...include, customBlockInclude];
+      return [[...include, customBlockInclude], exclude];
     } else if (shared.isString(include)) {
-      return [include, customBlockInclude];
+      return [[include, customBlockInclude], exclude];
     } else {
-      return [RE_RESOURCE_FORMAT, customBlockInclude];
+      return [[RE_RESOURCE_FORMAT, customBlockInclude], exclude];
     }
   }
-  const filter = pluginutils.createFilter(resolveInclude(), exclude);
+  function resolveIncludeExcludeForLegacy() {
+    const customBlockInclude = meta.framework === "vite" ? RE_SFC_I18N_CUSTOM_BLOCK : RE_SFC_I18N_WEBPACK_CUSTOM_BLOCK;
+    let _include = void 0;
+    let _exclude = void 0;
+    if (include) {
+      if (shared.isArray(include)) {
+        _include = [...include.map((item) => pathe.normalize(item)), customBlockInclude];
+      } else if (shared.isString(include)) {
+        _include = [pathe.normalize(include), customBlockInclude];
+      }
+    } else {
+      _exclude = "**/**";
+    }
+    return [_include, _exclude];
+  }
+  let _filter = null;
+  async function getFilter() {
+    if (_filter != null) {
+      return _filter;
+    }
+    if (meta.framework == "webpack") {
+      debug$2("Using filter for webpack");
+      _filter = pluginutils.createFilter(...resolveIncludeExclude());
+    } else {
+      const viteModule2 = await getViteModule();
+      if (viteModule2.rolldownVersion) {
+        debug$2("Using filter for rolldown-vite");
+        _filter = pluginutils.createFilter(...resolveIncludeExclude());
+      } else {
+        debug$2("Using filter for rollup-vite");
+        _filter = pluginutils.createFilter(...resolveIncludeExcludeForLegacy());
+      }
+    }
+    return _filter;
+  }
   const getVueI18nAliasPath = ({ ssr = false, runtimeOnly: runtimeOnly2 = false }) => {
     return `${module}/dist/${module}${runtimeOnly2 ? ".runtime" : ""}.${!ssr ? "esm-bundler.js" : "node.mjs"}`;
   };
@@ -224,7 +272,7 @@ function resourcePlugin({
      * For vite, If we have json (including SFC's custom block),
      * transform it first because it will be transformed into javascript code by `vite:json` plugin.
      *
-     * For webpack, This plugin will handle with ‘post’, because vue-loader generate the request query.
+     * For webpack, This plugin will handle with 'post', because vue-loader generate the request query.
      */
     enforce: meta.framework === "vite" ? "pre" : "post",
     vite: {
@@ -251,7 +299,7 @@ function resourcePlugin({
         debug$2("alias Config:", aliasConfig);
         return shared.assign(defineConfig, aliasConfig);
       },
-      configResolved(config) {
+      async configResolved(config) {
         vuePlugin = getVitePlugin(config, "vite:vue");
         if (!checkVuePlugin(vuePlugin)) {
           return;
@@ -259,6 +307,30 @@ function resourcePlugin({
         isProduction = config.isProduction;
         sourceMap = config.command === "build" ? !!config.build.sourcemap : false;
         debug$2(`configResolved: isProduction = ${isProduction}, sourceMap = ${sourceMap}`);
+        const isRolldownVite = !!(await getViteModule()).rolldownVersion;
+        debug$2(`Using ${isRolldownVite ? "rolldown-vite" : "vite"} for the build`);
+        if (!isRolldownVite) {
+          const jsonPlugin = getVitePlugin(config, "vite:json");
+          if (jsonPlugin) {
+            const orgTransform = "handler" in jsonPlugin.transform ? jsonPlugin.transform.handler : jsonPlugin.transform;
+            async function overrideJson(code, id) {
+              const filter = await getFilter();
+              if (!/\.json$/.test(id) || filter(id)) {
+                return;
+              }
+              const { query } = parseVueRequest(id);
+              if (query.vue) {
+                return;
+              }
+              debug$2("org json plugin");
+              return orgTransform.apply(this, [code, id]);
+            }
+            jsonPlugin.transform = overrideJson;
+            if ("handler" in jsonPlugin.transform) {
+              jsonPlugin.transform.handler = overrideJson;
+            }
+          }
+        }
       },
       async handleHotUpdate({ file, server }) {
         if (RE_RESOURCE_FORMAT.test(file)) {
@@ -290,26 +362,22 @@ function resourcePlugin({
           runtimeOnly
         })}`
       );
-      loadWebpack().then((webpack) => {
-        if (webpack) {
-          compiler.options.plugins.push(
-            new webpack.DefinePlugin({
-              __VUE_I18N_LEGACY_API__: JSON.stringify(compositionOnly),
-              __VUE_I18N_FULL_INSTALL__: JSON.stringify(fullInstall),
-              __INTLIFY_PROD_DEVTOOLS__: "false"
-            })
-          );
-          debug$2(`set __VUE_I18N_LEGACY_API__ is '${compositionOnly}'`);
-          debug$2(`set __VUE_I18N_FULL_INSTALL__ is '${fullInstall}'`);
-        } else {
-          debug$2("ignore vue-i18n feature flags with webpack.DefinePlugin");
-        }
-      });
+      compiler.options.plugins.push(
+        new compiler.webpack.DefinePlugin({
+          __VUE_I18N_LEGACY_API__: JSON.stringify(compositionOnly),
+          __VUE_I18N_FULL_INSTALL__: JSON.stringify(fullInstall),
+          __INTLIFY_PROD_DEVTOOLS__: "false"
+        })
+      );
+      debug$2(`set __VUE_I18N_LEGACY_API__ is '${compositionOnly}'`);
+      debug$2(`set __VUE_I18N_FULL_INSTALL__ is '${fullInstall}'`);
+      const filter = pluginutils.createFilter(...resolveIncludeExclude());
       if (compiler.options.module) {
         compiler.options.module.rules.push({
           test: RE_RESOURCE_FORMAT,
           type: "javascript/auto",
           include(resource) {
+            debug$2("webpack resource include", resource);
             return filter(resource);
           }
         });
@@ -350,13 +418,11 @@ function resourcePlugin({
       }
     },
     transform: {
-      filter: {
-        id: {
-          include: resolveInclude(),
-          exclude
-        }
-      },
       async handler(code, id) {
+        const filter = await getFilter();
+        if (!filter(id)) {
+          return;
+        }
         const { filename, query } = parseVueRequest(id);
         debug$2("transform", id, JSON.stringify(query), filename);
         let langInfo = defaultSFCLang;
@@ -483,15 +549,6 @@ function normalizeConfigResolveAlias(resolve, framework) {
     }
   }
 }
-async function loadWebpack() {
-  let webpack = null;
-  try {
-    webpack = await import('webpack').then((m) => m.default || m);
-  } catch (_e) {
-    warn(`webpack not found, please install webpack.`);
-  }
-  return webpack;
-}
 async function generateBundleResources(resources, isProduction, {
   forceStringify = false,
   isGlobal = false,

package/lib/index.mjs

@@ -6,6 +6,7 @@ import { createFilter } from '@rollup/pluginutils';
 import fg from 'fast-glob';
 import { promises } from 'node:fs';
 import path, { parse } from 'node:path';
+import { normalize } from 'pathe';
 import { parse as parse$1 } from 'vue/compiler-sfc';
 import pc from 'picocolors';
 import eslintUitls from '@eslint-community/eslint-utils';
@@ -182,17 +183,64 @@ function resourcePlugin({
   escapeHtml,
   transformI18nBlock
 }, meta) {
-  function resolveInclude() {
+  let viteModule = null;
+  async function getViteModule() {
+    if (viteModule != null) {
+      return viteModule;
+    }
+    try {
+      viteModule = await import('vite');
+    } catch (e) {
+      error(`vite not found, please install vite.`, e.message);
+      throw e;
+    }
+    return viteModule;
+  }
+  function resolveIncludeExclude() {
     const customBlockInclude = meta.framework === "vite" ? RE_SFC_I18N_CUSTOM_BLOCK : RE_SFC_I18N_WEBPACK_CUSTOM_BLOCK;
     if (isArray(include)) {
-      return [...include, customBlockInclude];
+      return [[...include, customBlockInclude], exclude];
     } else if (isString(include)) {
-      return [include, customBlockInclude];
+      return [[include, customBlockInclude], exclude];
     } else {
-      return [RE_RESOURCE_FORMAT, customBlockInclude];
+      return [[RE_RESOURCE_FORMAT, customBlockInclude], exclude];
     }
   }
-  const filter = createFilter(resolveInclude(), exclude);
+  function resolveIncludeExcludeForLegacy() {
+    const customBlockInclude = meta.framework === "vite" ? RE_SFC_I18N_CUSTOM_BLOCK : RE_SFC_I18N_WEBPACK_CUSTOM_BLOCK;
+    let _include = void 0;
+    let _exclude = void 0;
+    if (include) {
+      if (isArray(include)) {
+        _include = [...include.map((item) => normalize(item)), customBlockInclude];
+      } else if (isString(include)) {
+        _include = [normalize(include), customBlockInclude];
+      }
+    } else {
+      _exclude = "**/**";
+    }
+    return [_include, _exclude];
+  }
+  let _filter = null;
+  async function getFilter() {
+    if (_filter != null) {
+      return _filter;
+    }
+    if (meta.framework == "webpack") {
+      debug$2("Using filter for webpack");
+      _filter = createFilter(...resolveIncludeExclude());
+    } else {
+      const viteModule2 = await getViteModule();
+      if (viteModule2.rolldownVersion) {
+        debug$2("Using filter for rolldown-vite");
+        _filter = createFilter(...resolveIncludeExclude());
+      } else {
+        debug$2("Using filter for rollup-vite");
+        _filter = createFilter(...resolveIncludeExcludeForLegacy());
+      }
+    }
+    return _filter;
+  }
   const getVueI18nAliasPath = ({ ssr = false, runtimeOnly: runtimeOnly2 = false }) => {
     return `${module}/dist/${module}${runtimeOnly2 ? ".runtime" : ""}.${!ssr ? "esm-bundler.js" : "node.mjs"}`;
   };
@@ -212,7 +260,7 @@ function resourcePlugin({
      * For vite, If we have json (including SFC's custom block),
      * transform it first because it will be transformed into javascript code by `vite:json` plugin.
      *
-     * For webpack, This plugin will handle with ‘post’, because vue-loader generate the request query.
+     * For webpack, This plugin will handle with 'post', because vue-loader generate the request query.
      */
     enforce: meta.framework === "vite" ? "pre" : "post",
     vite: {
@@ -239,7 +287,7 @@ function resourcePlugin({
         debug$2("alias Config:", aliasConfig);
         return assign(defineConfig, aliasConfig);
       },
-      configResolved(config) {
+      async configResolved(config) {
         vuePlugin = getVitePlugin(config, "vite:vue");
         if (!checkVuePlugin(vuePlugin)) {
           return;
@@ -247,6 +295,30 @@ function resourcePlugin({
         isProduction = config.isProduction;
         sourceMap = config.command === "build" ? !!config.build.sourcemap : false;
         debug$2(`configResolved: isProduction = ${isProduction}, sourceMap = ${sourceMap}`);
+        const isRolldownVite = !!(await getViteModule()).rolldownVersion;
+        debug$2(`Using ${isRolldownVite ? "rolldown-vite" : "vite"} for the build`);
+        if (!isRolldownVite) {
+          const jsonPlugin = getVitePlugin(config, "vite:json");
+          if (jsonPlugin) {
+            const orgTransform = "handler" in jsonPlugin.transform ? jsonPlugin.transform.handler : jsonPlugin.transform;
+            async function overrideJson(code, id) {
+              const filter = await getFilter();
+              if (!/\.json$/.test(id) || filter(id)) {
+                return;
+              }
+              const { query } = parseVueRequest(id);
+              if (query.vue) {
+                return;
+              }
+              debug$2("org json plugin");
+              return orgTransform.apply(this, [code, id]);
+            }
+            jsonPlugin.transform = overrideJson;
+            if ("handler" in jsonPlugin.transform) {
+              jsonPlugin.transform.handler = overrideJson;
+            }
+          }
+        }
       },
       async handleHotUpdate({ file, server }) {
         if (RE_RESOURCE_FORMAT.test(file)) {
@@ -278,26 +350,22 @@ function resourcePlugin({
           runtimeOnly
         })}`
       );
-      loadWebpack().then((webpack) => {
-        if (webpack) {
-          compiler.options.plugins.push(
-            new webpack.DefinePlugin({
-              __VUE_I18N_LEGACY_API__: JSON.stringify(compositionOnly),
-              __VUE_I18N_FULL_INSTALL__: JSON.stringify(fullInstall),
-              __INTLIFY_PROD_DEVTOOLS__: "false"
-            })
-          );
-          debug$2(`set __VUE_I18N_LEGACY_API__ is '${compositionOnly}'`);
-          debug$2(`set __VUE_I18N_FULL_INSTALL__ is '${fullInstall}'`);
-        } else {
-          debug$2("ignore vue-i18n feature flags with webpack.DefinePlugin");
-        }
-      });
+      compiler.options.plugins.push(
+        new compiler.webpack.DefinePlugin({
+          __VUE_I18N_LEGACY_API__: JSON.stringify(compositionOnly),
+          __VUE_I18N_FULL_INSTALL__: JSON.stringify(fullInstall),
+          __INTLIFY_PROD_DEVTOOLS__: "false"
+        })
+      );
+      debug$2(`set __VUE_I18N_LEGACY_API__ is '${compositionOnly}'`);
+      debug$2(`set __VUE_I18N_FULL_INSTALL__ is '${fullInstall}'`);
+      const filter = createFilter(...resolveIncludeExclude());
       if (compiler.options.module) {
         compiler.options.module.rules.push({
           test: RE_RESOURCE_FORMAT,
           type: "javascript/auto",
           include(resource) {
+            debug$2("webpack resource include", resource);
             return filter(resource);
           }
         });
@@ -338,13 +406,11 @@ function resourcePlugin({
       }
     },
     transform: {
-      filter: {
-        id: {
-          include: resolveInclude(),
-          exclude
-        }
-      },
       async handler(code, id) {
+        const filter = await getFilter();
+        if (!filter(id)) {
+          return;
+        }
         const { filename, query } = parseVueRequest(id);
         debug$2("transform", id, JSON.stringify(query), filename);
         let langInfo = defaultSFCLang;
@@ -471,15 +537,6 @@ function normalizeConfigResolveAlias(resolve, framework) {
     }
   }
 }
-async function loadWebpack() {
-  let webpack = null;
-  try {
-    webpack = await import('webpack').then((m) => m.default || m);
-  } catch (_e) {
-    warn(`webpack not found, please install webpack.`);
-  }
-  return webpack;
-}
 async function generateBundleResources(resources, isProduction, {
   forceStringify = false,
   isGlobal = false,

package/lib/vite.cjs

@@ -9,6 +9,7 @@ require('@rollup/pluginutils');
 require('fast-glob');
 require('node:fs');
 require('node:path');
+require('pathe');
 require('vue/compiler-sfc');
 require('picocolors');
 require('@eslint-community/eslint-utils');

package/lib/vite.mjs

@@ -7,6 +7,7 @@ import '@rollup/pluginutils';
 import 'fast-glob';
 import 'node:fs';
 import 'node:path';
+import 'pathe';
 import 'vue/compiler-sfc';
 import 'picocolors';
 import '@eslint-community/eslint-utils';

package/lib/webpack.cjs

@@ -9,6 +9,7 @@ require('@rollup/pluginutils');
 require('fast-glob');
 require('node:fs');
 require('node:path');
+require('pathe');
 require('vue/compiler-sfc');
 require('picocolors');
 require('@eslint-community/eslint-utils');

package/lib/webpack.mjs

@@ -7,6 +7,7 @@ import '@rollup/pluginutils';
 import 'fast-glob';
 import 'node:fs';
 import 'node:path';
+import 'pathe';
 import 'vue/compiler-sfc';
 import 'picocolors';
 import '@eslint-community/eslint-utils';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intlify/unplugin-vue-i18n",
-  "version": "11.0.0-beta.3",
+  "version": "11.0.0-beta.4",
   "description": "unplugin for Vue I18n",
   "author": {
     "name": "kazuya kawaguchi",
@@ -30,11 +30,12 @@
     "@typescript-eslint/scope-manager": "^8.13.0",
     "@typescript-eslint/typescript-estree": "^8.13.0",
     "debug": "^4.3.3",
+    "pathe": "^2.0.3",
     "fast-glob": "^3.2.12",
     "picocolors": "^1.0.0",
     "unplugin": "^2.3.4",
     "vue": "^3.5.14",
-    "@intlify/bundle-utils": "11.0.0-beta.3"
+    "@intlify/bundle-utils": "11.0.0-beta.4"
   },
   "devDependencies": {
     "@intlify/core-base": "next",
@@ -49,6 +50,7 @@
     "ts-loader": "^9.5.2",
     "unbuild": "^3.5.0",
     "vite": "^6.3.5",
+    "rollup-vite": "npm:vite@^6.3.5",
     "vue-loader": "^17.4.2",
     "webpack": "^5.99.8",
     "webpack-merge": "^5.9.0"