@intlify/unplugin-vue-i18n 12.0.0-alpha.2 → 12.0.0-alpha.3

package/lib/index.cjs

@@ -5,15 +5,16 @@ Object.defineProperty(exports, '__esModule', { value: true });
 const createDebug = require('debug');
 const unplugin$1 = require('unplugin');
 const defu = require('defu');
-const node_path = require('node:path');
+const pathe = require('pathe');
 const bundleUtils = require('@intlify/bundle-utils');
 const shared = require('@intlify/shared');
 const pluginutils = require('@rollup/pluginutils');
-const fg = require('fast-glob');
 const knitwork = require('knitwork');
 const mlly = require('mlly');
 const node_crypto = require('node:crypto');
 const fs = require('node:fs');
+const node_path = require('node:path');
+const tinyglobby = require('tinyglobby');
 const compilerSfc = require('vue/compiler-sfc');
 const pc = require('picocolors');
 
@@ -21,7 +22,6 @@ function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'defau
 
 const createDebug__default = /*#__PURE__*/_interopDefaultCompat(createDebug);
 const defu__default = /*#__PURE__*/_interopDefaultCompat(defu);
-const fg__default = /*#__PURE__*/_interopDefaultCompat(fg);
 const fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
 const pc__default = /*#__PURE__*/_interopDefaultCompat(pc);
 
@@ -54,8 +54,8 @@ function resolveOptions(options) {
     dropMessageCompiler: false,
     transformI18nBlock: void 0
   });
-  const include = res.include ? toArray(res.include).map((item) => node_path.normalize(item)) : void 0;
-  const _exclude = res.exclude ? toArray(res.exclude).map((item) => node_path.normalize(item)) : void 0;
+  const include = res.include ? toArray(res.include).map((item) => pathe.normalize(item)) : void 0;
+  const _exclude = res.exclude ? toArray(res.exclude).map((item) => pathe.normalize(item)) : void 0;
   const exclude = res.include ? _exclude : ["**/**"];
   const onlyLocales = toArray(res.onlyLocales);
   const fullInstall = res.module !== "vue-i18n" ? false : res.fullInstall;
@@ -88,23 +88,6 @@ function resolveNamespace(name) {
 function getVitePlugin(config, name) {
   return config.plugins.find((p) => p.name === name);
 }
-function getVitePluginTransform(plugin) {
-  if (plugin.transform) {
-    return "handler" in plugin.transform ? [plugin.transform.handler, "handler"] : [plugin.transform, "transform"];
-  } else {
-    return [void 0, void 0];
-  }
-}
-function overrideVitePluginTransform(plugin, override, to) {
-  if (plugin.transform == void 0) {
-    throw new Error("plugin.transform is undefined");
-  }
-  if (to === "handler" && "handler" in plugin.transform) {
-    plugin.transform.handler = override;
-  } else {
-    plugin.transform = override;
-  }
-}
 function checkVuePlugin(vuePlugin) {
   if (vuePlugin == null || !vuePlugin.api) {
     error(
@@ -157,11 +140,53 @@ function getVueCompiler(vuePlugin) {
 
 const INTLIFY_BUNDLE_IMPORT_ID = "@intlify/unplugin-vue-i18n/messages";
 const VIRTUAL_PREFIX = "\0";
+const supportedFileExtensionsRE = /\.(json5?|ya?ml|[c|m]?[j|t]s)$/;
+const RE_SFC_I18N_CUSTOM_BLOCK = /\?vue&type=i18n/;
+const RE_SFC_I18N_WEBPACK_CUSTOM_BLOCK = /blockType=i18n/;
 const debug$1 = createDebug__default(resolveNamespace("resource"));
 function resourcePlugin(opts, meta) {
-  const _filter = pluginutils.createFilter(opts.include, opts.exclude);
   const importedResources = /* @__PURE__ */ new Set();
-  const filter = (val) => _filter(val) || importedResources.has(val);
+  function resolveIncludeExclude() {
+    const customBlockInclude = meta.framework === "vite" ? RE_SFC_I18N_CUSTOM_BLOCK : RE_SFC_I18N_WEBPACK_CUSTOM_BLOCK;
+    return opts.include ? [[...opts.include, customBlockInclude], opts.exclude] : [[supportedFileExtensionsRE, customBlockInclude], void 0];
+  }
+  function resolveIncludeExcludeForLegacy() {
+    const customBlockInclude = meta.framework === "vite" ? RE_SFC_I18N_CUSTOM_BLOCK : RE_SFC_I18N_WEBPACK_CUSTOM_BLOCK;
+    return opts.include ? [[...opts.include, customBlockInclude], opts.exclude] : [void 0, opts.exclude];
+  }
+  let _filter = null;
+  let hasViteJsonPlugin = false;
+  async function getFilter() {
+    if (_filter == null) {
+      if (meta.framework === "webpack" || meta.framework === "rspack") {
+        debug$1("Using filter for webpack/rspack");
+        _filter = pluginutils.createFilter(...resolveIncludeExclude());
+      } else if (hasViteJsonPlugin) {
+        debug$1("Using filter for rollup-vite");
+        _filter = pluginutils.createFilter(...resolveIncludeExcludeForLegacy());
+      } else {
+        debug$1("Using filter for rolldown-vite");
+        _filter = pluginutils.createFilter(...resolveIncludeExclude());
+      }
+    }
+    return (val) => _filter(val) || importedResources.has(val);
+  }
+  const VITE_VIRTUAL_PREFIX = "\0intlify-i18n-";
+  const virtualIdToRealPath = /* @__PURE__ */ new Map();
+  const realPathToVirtualId = /* @__PURE__ */ new Map();
+  let virtualCounter = 0;
+  function intlifyVirtualize(realPath) {
+    let virtualId = realPathToVirtualId.get(realPath);
+    if (!virtualId) {
+      virtualId = `${VITE_VIRTUAL_PREFIX}${virtualCounter++}`;
+      virtualIdToRealPath.set(virtualId, realPath);
+      realPathToVirtualId.set(realPath, virtualId);
+    }
+    return virtualId;
+  }
+  function isIntlifyVirtualId(id) {
+    return virtualIdToRealPath.has(id);
+  }
   debug$1(`vue-i18n alias name: ${opts.module}`);
   const ctx = {
     prod: false,
@@ -171,7 +196,11 @@ function resourcePlugin(opts, meta) {
   const getSfcParser = () => vuePlugin ? getVueCompiler(vuePlugin).parse : compilerSfc.parse;
   const resourcePaths = /* @__PURE__ */ new Set();
   for (const inc of opts.include || []) {
-    for (const resourcePath of fg__default.sync(inc, { ignore: opts.exclude })) {
+    for (const resourcePath of tinyglobby.globSync(inc, {
+      ignore: opts.exclude,
+      expandDirectories: false,
+      absolute: true
+    })) {
       resourcePaths.add(resourcePath);
     }
   }
@@ -185,6 +214,8 @@ function resourcePlugin(opts, meta) {
     ctx.prod = compiler.options.mode !== "development";
     ctx.sourceMap = !!compiler.options.devtool;
     debug$1(`${meta.framework}: isProduction = ${ctx.prod}, sourceMap = ${ctx.sourceMap}`);
+    const syncFilter = pluginutils.createFilter(...resolveIncludeExclude());
+    _filter = syncFilter;
     compiler.options.resolve.alias = {
       ...compiler.options.resolve.alias,
       [opts.module]: opts.vueI18nAliasPath
@@ -210,10 +241,9 @@ function resourcePlugin(opts, meta) {
     compiler.options.module.rules.push({
       test: /\.(json5?|ya?ml)$/,
       type: "javascript/auto",
-      include: (resource) => filter(resource)
+      include: (resource) => syncFilter(resource) || importedResources.has(resource)
     });
   }
-  const supportedFileExtensionsRE = /\.(json5?|ya?ml|[c|m]?[j|t]s)$/;
   return {
     name: resolveNamespace("resource"),
     /**
@@ -246,7 +276,7 @@ function resourcePlugin(opts, meta) {
         debug$1("alias Config:", aliasConfig);
         return shared.assign(defineConfig, aliasConfig);
       },
-      configResolved(config) {
+      async configResolved(config) {
         vuePlugin = getVitePlugin(config, "vite:vue");
         if (!checkVuePlugin(vuePlugin)) {
           return;
@@ -255,12 +285,13 @@ function resourcePlugin(opts, meta) {
         ctx.sourceMap = config.command === "build" ? !!config.build.sourcemap : false;
         debug$1(`configResolved: isProduction = ${ctx.prod}, sourceMap = ${ctx.sourceMap}`);
         const jsonPlugin = getVitePlugin(config, "vite:json");
-        if (jsonPlugin) {
-          const [orgTransform, transformWay] = getVitePluginTransform(jsonPlugin);
-          if (!orgTransform) {
-            throw new Error("vite:json plugin not found!");
-          }
-          async function overrideViteJsonPlugin(code, id) {
+        hasViteJsonPlugin = !!jsonPlugin;
+        if (jsonPlugin && jsonPlugin.transform) {
+          const transform = jsonPlugin.transform;
+          const isObjectHook = typeof transform !== "function" && "handler" in transform;
+          const orgTransform = isObjectHook ? transform.handler : transform;
+          async function overrideJson(code, id) {
+            const filter = await getFilter();
             if (!/\.json$/.test(id) || filter(id)) {
               return;
             }
@@ -271,20 +302,45 @@ function resourcePlugin(opts, meta) {
             debug$1("org json plugin");
             return orgTransform.apply(this, [code, id]);
           }
-          overrideVitePluginTransform(jsonPlugin, overrideViteJsonPlugin, transformWay);
+          if (isObjectHook) {
+            transform.handler = overrideJson;
+          } else {
+            jsonPlugin.transform = overrideJson;
+          }
         }
       }
     },
-    resolveId(id, importer) {
-      debug$1("resolveId", id, importer);
+    async resolveId(id, importer) {
+      debug$1("resolveId", id, "from", importer);
       if (id === INTLIFY_BUNDLE_IMPORT_ID) {
         return asVirtualId(id, meta.framework);
       }
+      if (meta.framework === "vite" && !hasViteJsonPlugin) {
+        if (id.includes("?vue&type=i18n") && /[?&]lang\.(?:json|json5)(?:$|&)/.test(id)) {
+          return intlifyVirtualize(id);
+        }
+        const idPath = id.split("?")[0];
+        if (!supportedFileExtensionsRE.test(idPath)) return;
+        let resolvedPath;
+        if (idPath.startsWith(".")) {
+          const realImporter = importer && isIntlifyVirtualId(importer) ? virtualIdToRealPath.get(importer) : importer;
+          if (!realImporter) return;
+          resolvedPath = node_path.resolve(node_path.dirname(realImporter), idPath);
+        } else if (idPath.startsWith("/") || /^[a-z]:[/\\]/i.test(idPath)) {
+          resolvedPath = idPath;
+        } else {
+          return;
+        }
+        const filter = await getFilter();
+        if (!filter(resolvedPath)) return;
+        return intlifyVirtualize(resolvedPath);
+      }
     },
     loadInclude(id) {
-      return INTLIFY_BUNDLE_IMPORT_ID === getVirtualId(id, meta.framework);
+      if (INTLIFY_BUNDLE_IMPORT_ID === getVirtualId(id, meta.framework)) return true;
+      return isIntlifyVirtualId(id);
     },
-    load(id) {
+    async load(id) {
       debug$1("load", id);
       if (INTLIFY_BUNDLE_IMPORT_ID === getVirtualId(id, meta.framework) && resourcePaths.size > 0) {
         const code = generateBundleResources(resourcePaths);
@@ -293,12 +349,78 @@ function resourcePlugin(opts, meta) {
         }
         return result(code);
       }
+      if (isIntlifyVirtualId(id)) {
+        const realId = virtualIdToRealPath.get(id);
+        if (realId.includes("?vue&type=i18n")) {
+          const { filename, query } = parseVueRequest(realId);
+          this.addWatchFile(filename);
+          const sfcSource = readFile(filename);
+          const { descriptor } = getSfcParser()(sfcSource, {
+            sourceMap: ctx.sourceMap,
+            filename
+          });
+          const block = descriptor.customBlocks[query.index];
+          if (!block) return;
+          let source = block.src ? readFile(block.src) : block.content;
+          if (typeof opts.transformI18nBlock === "function") {
+            const modifiedSource = opts.transformI18nBlock(source);
+            if (modifiedSource && typeof modifiedSource === "string") {
+              source = modifiedSource;
+            } else {
+              warn("transformI18nBlock should return a string");
+            }
+          }
+          const langInfo2 = query.lang || opts.defaultSFCLang;
+          const generate2 = getGenerator(langInfo2, bundleUtils.generateYAML);
+          const parseOptions2 = getOptions(filename, ctx, query, {
+            ...opts,
+            allowDynamic: false,
+            transformI18nBlock: void 0
+          });
+          const { code: generatedCode } = generate2(source, parseOptions2);
+          return result(generatedCode);
+        }
+        const realPath = realId;
+        this.addWatchFile(realPath);
+        const code = readFile(realPath);
+        const imports = mlly.findStaticImports(code);
+        for (const p of imports) {
+          const res = node_path.resolve(node_path.dirname(realPath), p.specifier);
+          importedResources.add(res);
+        }
+        const langInfo = node_path.parse(realPath).ext;
+        const generate = getGenerator(langInfo);
+        const parseOptions = getOptions(realPath, ctx, {}, {
+          ...opts,
+          transformI18nBlock: void 0
+        });
+        try {
+          const { code: generatedCode } = generate(code, parseOptions);
+          return result(generatedCode);
+        } catch (err) {
+          if (err instanceof bundleUtils.DynamicResourceError) {
+            error(
+              `Unable to precompile or optimize \`${realPath}\` - excluding from virtual bundle \`${INTLIFY_BUNDLE_IMPORT_ID}\`.
+`,
+              err
+            );
+            return `export default {}`;
+          } else {
+            throw err;
+          }
+        }
+      }
     },
     transformInclude(id) {
       debug$1("transformInclude", id);
       if (meta.framework === "vite") {
         return true;
       }
+      const f = _filter ?? pluginutils.createFilter(...resolveIncludeExclude());
+      if (_filter == null) {
+        _filter = f;
+      }
+      const filterWithImported = (v) => f(v) || importedResources.has(v);
       const { filename, query } = parseVueRequest(id);
       if (filename.endsWith("vue") || filename.endsWith(INTLIFY_BUNDLE_IMPORT_ID)) {
         return true;
@@ -307,12 +429,14 @@ function resourcePlugin(opts, meta) {
       if (!isResourcePath && "issuerPath" in query) {
         isResourcePath = resourcePaths.has(query.issuerPath);
       }
-      return supportedFileExtensionsRE.test(filename) && filter(filename) && isResourcePath;
+      return supportedFileExtensionsRE.test(filename) && filterWithImported(filename) && isResourcePath;
     },
     async transform(code, id) {
+      if (isIntlifyVirtualId(id)) return;
       const { filename, query } = parseVueRequest(id);
       debug$1("transform", id, JSON.stringify(query), filename);
       let langInfo = opts.defaultSFCLang;
+      const filter = await getFilter();
       if (filter(id)) {
         const imports = mlly.findStaticImports(code);
         for (const p of imports) {
@@ -329,7 +453,7 @@ function resourcePlugin(opts, meta) {
         });
         debug$1("parseOptions", parseOptions);
         try {
-          const { code: generatedCode, map } = await generate(code, parseOptions);
+          const { code: generatedCode, map } = generate(code, parseOptions);
           debug$1("generated code", generatedCode);
           debug$1("sourcemap", map, ctx.sourceMap);
           if (code === generatedCode) return;
@@ -369,7 +493,7 @@ function resourcePlugin(opts, meta) {
           }
         }
         const generate = getGenerator(langInfo, bundleUtils.generateYAML);
-        const { code: generatedCode, map } = await generate(source, parseOptions);
+        const { code: generatedCode, map } = generate(source, parseOptions);
         debug$1("generated code", generatedCode);
         debug$1("sourcemap", map, ctx.sourceMap);
         if (code !== generatedCode) {

package/lib/index.mjs

@@ -1,15 +1,16 @@
 import createDebug from 'debug';
 import { createUnplugin } from 'unplugin';
 import defu from 'defu';
-import { normalize, resolve, dirname, parse } from 'node:path';
-import { generateJSON, DynamicResourceError, generateYAML, generateJavaScript, generateTypescript } from '@intlify/bundle-utils';
+import { normalize } from 'pathe';
+import { DynamicResourceError, generateJSON, generateYAML, generateJavaScript, generateTypescript } from '@intlify/bundle-utils';
 import { assign, isEmptyObject, generateCodeFrame } from '@intlify/shared';
 import { createFilter } from '@rollup/pluginutils';
-import fg from 'fast-glob';
 import { genSafeVariableName, genImport } from 'knitwork';
 import { findStaticImports } from 'mlly';
 import { createHash } from 'node:crypto';
 import fs from 'node:fs';
+import { resolve, dirname, parse } from 'node:path';
+import { globSync } from 'tinyglobby';
 import { parse as parse$1 } from 'vue/compiler-sfc';
 import pc from 'picocolors';
 
@@ -76,23 +77,6 @@ function resolveNamespace(name) {
 function getVitePlugin(config, name) {
   return config.plugins.find((p) => p.name === name);
 }
-function getVitePluginTransform(plugin) {
-  if (plugin.transform) {
-    return "handler" in plugin.transform ? [plugin.transform.handler, "handler"] : [plugin.transform, "transform"];
-  } else {
-    return [void 0, void 0];
-  }
-}
-function overrideVitePluginTransform(plugin, override, to) {
-  if (plugin.transform == void 0) {
-    throw new Error("plugin.transform is undefined");
-  }
-  if (to === "handler" && "handler" in plugin.transform) {
-    plugin.transform.handler = override;
-  } else {
-    plugin.transform = override;
-  }
-}
 function checkVuePlugin(vuePlugin) {
   if (vuePlugin == null || !vuePlugin.api) {
     error(
@@ -145,11 +129,53 @@ function getVueCompiler(vuePlugin) {
 
 const INTLIFY_BUNDLE_IMPORT_ID = "@intlify/unplugin-vue-i18n/messages";
 const VIRTUAL_PREFIX = "\0";
+const supportedFileExtensionsRE = /\.(json5?|ya?ml|[c|m]?[j|t]s)$/;
+const RE_SFC_I18N_CUSTOM_BLOCK = /\?vue&type=i18n/;
+const RE_SFC_I18N_WEBPACK_CUSTOM_BLOCK = /blockType=i18n/;
 const debug$1 = createDebug(resolveNamespace("resource"));
 function resourcePlugin(opts, meta) {
-  const _filter = createFilter(opts.include, opts.exclude);
   const importedResources = /* @__PURE__ */ new Set();
-  const filter = (val) => _filter(val) || importedResources.has(val);
+  function resolveIncludeExclude() {
+    const customBlockInclude = meta.framework === "vite" ? RE_SFC_I18N_CUSTOM_BLOCK : RE_SFC_I18N_WEBPACK_CUSTOM_BLOCK;
+    return opts.include ? [[...opts.include, customBlockInclude], opts.exclude] : [[supportedFileExtensionsRE, customBlockInclude], void 0];
+  }
+  function resolveIncludeExcludeForLegacy() {
+    const customBlockInclude = meta.framework === "vite" ? RE_SFC_I18N_CUSTOM_BLOCK : RE_SFC_I18N_WEBPACK_CUSTOM_BLOCK;
+    return opts.include ? [[...opts.include, customBlockInclude], opts.exclude] : [void 0, opts.exclude];
+  }
+  let _filter = null;
+  let hasViteJsonPlugin = false;
+  async function getFilter() {
+    if (_filter == null) {
+      if (meta.framework === "webpack" || meta.framework === "rspack") {
+        debug$1("Using filter for webpack/rspack");
+        _filter = createFilter(...resolveIncludeExclude());
+      } else if (hasViteJsonPlugin) {
+        debug$1("Using filter for rollup-vite");
+        _filter = createFilter(...resolveIncludeExcludeForLegacy());
+      } else {
+        debug$1("Using filter for rolldown-vite");
+        _filter = createFilter(...resolveIncludeExclude());
+      }
+    }
+    return (val) => _filter(val) || importedResources.has(val);
+  }
+  const VITE_VIRTUAL_PREFIX = "\0intlify-i18n-";
+  const virtualIdToRealPath = /* @__PURE__ */ new Map();
+  const realPathToVirtualId = /* @__PURE__ */ new Map();
+  let virtualCounter = 0;
+  function intlifyVirtualize(realPath) {
+    let virtualId = realPathToVirtualId.get(realPath);
+    if (!virtualId) {
+      virtualId = `${VITE_VIRTUAL_PREFIX}${virtualCounter++}`;
+      virtualIdToRealPath.set(virtualId, realPath);
+      realPathToVirtualId.set(realPath, virtualId);
+    }
+    return virtualId;
+  }
+  function isIntlifyVirtualId(id) {
+    return virtualIdToRealPath.has(id);
+  }
   debug$1(`vue-i18n alias name: ${opts.module}`);
   const ctx = {
     prod: false,
@@ -159,7 +185,11 @@ function resourcePlugin(opts, meta) {
   const getSfcParser = () => vuePlugin ? getVueCompiler(vuePlugin).parse : parse$1;
   const resourcePaths = /* @__PURE__ */ new Set();
   for (const inc of opts.include || []) {
-    for (const resourcePath of fg.sync(inc, { ignore: opts.exclude })) {
+    for (const resourcePath of globSync(inc, {
+      ignore: opts.exclude,
+      expandDirectories: false,
+      absolute: true
+    })) {
       resourcePaths.add(resourcePath);
     }
   }
@@ -173,6 +203,8 @@ function resourcePlugin(opts, meta) {
     ctx.prod = compiler.options.mode !== "development";
     ctx.sourceMap = !!compiler.options.devtool;
     debug$1(`${meta.framework}: isProduction = ${ctx.prod}, sourceMap = ${ctx.sourceMap}`);
+    const syncFilter = createFilter(...resolveIncludeExclude());
+    _filter = syncFilter;
     compiler.options.resolve.alias = {
       ...compiler.options.resolve.alias,
       [opts.module]: opts.vueI18nAliasPath
@@ -198,10 +230,9 @@ function resourcePlugin(opts, meta) {
     compiler.options.module.rules.push({
       test: /\.(json5?|ya?ml)$/,
       type: "javascript/auto",
-      include: (resource) => filter(resource)
+      include: (resource) => syncFilter(resource) || importedResources.has(resource)
     });
   }
-  const supportedFileExtensionsRE = /\.(json5?|ya?ml|[c|m]?[j|t]s)$/;
   return {
     name: resolveNamespace("resource"),
     /**
@@ -234,7 +265,7 @@ function resourcePlugin(opts, meta) {
         debug$1("alias Config:", aliasConfig);
         return assign(defineConfig, aliasConfig);
       },
-      configResolved(config) {
+      async configResolved(config) {
         vuePlugin = getVitePlugin(config, "vite:vue");
         if (!checkVuePlugin(vuePlugin)) {
           return;
@@ -243,12 +274,13 @@ function resourcePlugin(opts, meta) {
         ctx.sourceMap = config.command === "build" ? !!config.build.sourcemap : false;
         debug$1(`configResolved: isProduction = ${ctx.prod}, sourceMap = ${ctx.sourceMap}`);
         const jsonPlugin = getVitePlugin(config, "vite:json");
-        if (jsonPlugin) {
-          const [orgTransform, transformWay] = getVitePluginTransform(jsonPlugin);
-          if (!orgTransform) {
-            throw new Error("vite:json plugin not found!");
-          }
-          async function overrideViteJsonPlugin(code, id) {
+        hasViteJsonPlugin = !!jsonPlugin;
+        if (jsonPlugin && jsonPlugin.transform) {
+          const transform = jsonPlugin.transform;
+          const isObjectHook = typeof transform !== "function" && "handler" in transform;
+          const orgTransform = isObjectHook ? transform.handler : transform;
+          async function overrideJson(code, id) {
+            const filter = await getFilter();
             if (!/\.json$/.test(id) || filter(id)) {
               return;
             }
@@ -259,20 +291,45 @@ function resourcePlugin(opts, meta) {
             debug$1("org json plugin");
             return orgTransform.apply(this, [code, id]);
           }
-          overrideVitePluginTransform(jsonPlugin, overrideViteJsonPlugin, transformWay);
+          if (isObjectHook) {
+            transform.handler = overrideJson;
+          } else {
+            jsonPlugin.transform = overrideJson;
+          }
         }
       }
     },
-    resolveId(id, importer) {
-      debug$1("resolveId", id, importer);
+    async resolveId(id, importer) {
+      debug$1("resolveId", id, "from", importer);
       if (id === INTLIFY_BUNDLE_IMPORT_ID) {
         return asVirtualId(id, meta.framework);
       }
+      if (meta.framework === "vite" && !hasViteJsonPlugin) {
+        if (id.includes("?vue&type=i18n") && /[?&]lang\.(?:json|json5)(?:$|&)/.test(id)) {
+          return intlifyVirtualize(id);
+        }
+        const idPath = id.split("?")[0];
+        if (!supportedFileExtensionsRE.test(idPath)) return;
+        let resolvedPath;
+        if (idPath.startsWith(".")) {
+          const realImporter = importer && isIntlifyVirtualId(importer) ? virtualIdToRealPath.get(importer) : importer;
+          if (!realImporter) return;
+          resolvedPath = resolve(dirname(realImporter), idPath);
+        } else if (idPath.startsWith("/") || /^[a-z]:[/\\]/i.test(idPath)) {
+          resolvedPath = idPath;
+        } else {
+          return;
+        }
+        const filter = await getFilter();
+        if (!filter(resolvedPath)) return;
+        return intlifyVirtualize(resolvedPath);
+      }
     },
     loadInclude(id) {
-      return INTLIFY_BUNDLE_IMPORT_ID === getVirtualId(id, meta.framework);
+      if (INTLIFY_BUNDLE_IMPORT_ID === getVirtualId(id, meta.framework)) return true;
+      return isIntlifyVirtualId(id);
     },
-    load(id) {
+    async load(id) {
       debug$1("load", id);
       if (INTLIFY_BUNDLE_IMPORT_ID === getVirtualId(id, meta.framework) && resourcePaths.size > 0) {
         const code = generateBundleResources(resourcePaths);
@@ -281,12 +338,78 @@ function resourcePlugin(opts, meta) {
         }
         return result(code);
       }
+      if (isIntlifyVirtualId(id)) {
+        const realId = virtualIdToRealPath.get(id);
+        if (realId.includes("?vue&type=i18n")) {
+          const { filename, query } = parseVueRequest(realId);
+          this.addWatchFile(filename);
+          const sfcSource = readFile(filename);
+          const { descriptor } = getSfcParser()(sfcSource, {
+            sourceMap: ctx.sourceMap,
+            filename
+          });
+          const block = descriptor.customBlocks[query.index];
+          if (!block) return;
+          let source = block.src ? readFile(block.src) : block.content;
+          if (typeof opts.transformI18nBlock === "function") {
+            const modifiedSource = opts.transformI18nBlock(source);
+            if (modifiedSource && typeof modifiedSource === "string") {
+              source = modifiedSource;
+            } else {
+              warn("transformI18nBlock should return a string");
+            }
+          }
+          const langInfo2 = query.lang || opts.defaultSFCLang;
+          const generate2 = getGenerator(langInfo2, generateYAML);
+          const parseOptions2 = getOptions(filename, ctx, query, {
+            ...opts,
+            allowDynamic: false,
+            transformI18nBlock: void 0
+          });
+          const { code: generatedCode } = generate2(source, parseOptions2);
+          return result(generatedCode);
+        }
+        const realPath = realId;
+        this.addWatchFile(realPath);
+        const code = readFile(realPath);
+        const imports = findStaticImports(code);
+        for (const p of imports) {
+          const res = resolve(dirname(realPath), p.specifier);
+          importedResources.add(res);
+        }
+        const langInfo = parse(realPath).ext;
+        const generate = getGenerator(langInfo);
+        const parseOptions = getOptions(realPath, ctx, {}, {
+          ...opts,
+          transformI18nBlock: void 0
+        });
+        try {
+          const { code: generatedCode } = generate(code, parseOptions);
+          return result(generatedCode);
+        } catch (err) {
+          if (err instanceof DynamicResourceError) {
+            error(
+              `Unable to precompile or optimize \`${realPath}\` - excluding from virtual bundle \`${INTLIFY_BUNDLE_IMPORT_ID}\`.
+`,
+              err
+            );
+            return `export default {}`;
+          } else {
+            throw err;
+          }
+        }
+      }
     },
     transformInclude(id) {
       debug$1("transformInclude", id);
       if (meta.framework === "vite") {
         return true;
       }
+      const f = _filter ?? createFilter(...resolveIncludeExclude());
+      if (_filter == null) {
+        _filter = f;
+      }
+      const filterWithImported = (v) => f(v) || importedResources.has(v);
       const { filename, query } = parseVueRequest(id);
       if (filename.endsWith("vue") || filename.endsWith(INTLIFY_BUNDLE_IMPORT_ID)) {
         return true;
@@ -295,12 +418,14 @@ function resourcePlugin(opts, meta) {
       if (!isResourcePath && "issuerPath" in query) {
         isResourcePath = resourcePaths.has(query.issuerPath);
       }
-      return supportedFileExtensionsRE.test(filename) && filter(filename) && isResourcePath;
+      return supportedFileExtensionsRE.test(filename) && filterWithImported(filename) && isResourcePath;
     },
     async transform(code, id) {
+      if (isIntlifyVirtualId(id)) return;
       const { filename, query } = parseVueRequest(id);
       debug$1("transform", id, JSON.stringify(query), filename);
       let langInfo = opts.defaultSFCLang;
+      const filter = await getFilter();
       if (filter(id)) {
         const imports = findStaticImports(code);
         for (const p of imports) {
@@ -317,7 +442,7 @@ function resourcePlugin(opts, meta) {
         });
         debug$1("parseOptions", parseOptions);
         try {
-          const { code: generatedCode, map } = await generate(code, parseOptions);
+          const { code: generatedCode, map } = generate(code, parseOptions);
           debug$1("generated code", generatedCode);
           debug$1("sourcemap", map, ctx.sourceMap);
           if (code === generatedCode) return;
@@ -357,7 +482,7 @@ function resourcePlugin(opts, meta) {
           }
         }
         const generate = getGenerator(langInfo, generateYAML);
-        const { code: generatedCode, map } = await generate(source, parseOptions);
+        const { code: generatedCode, map } = generate(source, parseOptions);
         debug$1("generated code", generatedCode);
         debug$1("sourcemap", map, ctx.sourceMap);
         if (code !== generatedCode) {

package/lib/rspack.cjs

@@ -4,15 +4,16 @@ const unplugin = require('unplugin');
 const index = require('./index.cjs');
 require('debug');
 require('defu');
-require('node:path');
+require('pathe');
 require('@intlify/bundle-utils');
 require('@intlify/shared');
 require('@rollup/pluginutils');
-require('fast-glob');
 require('knitwork');
 require('mlly');
 require('node:crypto');
 require('node:fs');
+require('node:path');
+require('tinyglobby');
 require('vue/compiler-sfc');
 require('picocolors');
 

package/lib/rspack.mjs

@@ -2,15 +2,16 @@ import { createRspackPlugin } from 'unplugin';
 import { unpluginFactory } from './index.mjs';
 import 'debug';
 import 'defu';
-import 'node:path';
+import 'pathe';
 import '@intlify/bundle-utils';
 import '@intlify/shared';
 import '@rollup/pluginutils';
-import 'fast-glob';
 import 'knitwork';
 import 'mlly';
 import 'node:crypto';
 import 'node:fs';
+import 'node:path';
+import 'tinyglobby';
 import 'vue/compiler-sfc';
 import 'picocolors';
 

package/lib/vite.cjs

@@ -4,15 +4,16 @@ const unplugin = require('unplugin');
 const index = require('./index.cjs');
 require('debug');
 require('defu');
-require('node:path');
+require('pathe');
 require('@intlify/bundle-utils');
 require('@intlify/shared');
 require('@rollup/pluginutils');
-require('fast-glob');
 require('knitwork');
 require('mlly');
 require('node:crypto');
 require('node:fs');
+require('node:path');
+require('tinyglobby');
 require('vue/compiler-sfc');
 require('picocolors');
 

package/lib/vite.mjs

@@ -2,15 +2,16 @@ import { createVitePlugin } from 'unplugin';
 import { unpluginFactory } from './index.mjs';
 import 'debug';
 import 'defu';
-import 'node:path';
+import 'pathe';
 import '@intlify/bundle-utils';
 import '@intlify/shared';
 import '@rollup/pluginutils';
-import 'fast-glob';
 import 'knitwork';
 import 'mlly';
 import 'node:crypto';
 import 'node:fs';
+import 'node:path';
+import 'tinyglobby';
 import 'vue/compiler-sfc';
 import 'picocolors';
 

package/lib/webpack.cjs

@@ -4,15 +4,16 @@ const unplugin = require('unplugin');
 const index = require('./index.cjs');
 require('debug');
 require('defu');
-require('node:path');
+require('pathe');
 require('@intlify/bundle-utils');
 require('@intlify/shared');
 require('@rollup/pluginutils');
-require('fast-glob');
 require('knitwork');
 require('mlly');
 require('node:crypto');
 require('node:fs');
+require('node:path');
+require('tinyglobby');
 require('vue/compiler-sfc');
 require('picocolors');
 

package/lib/webpack.mjs

@@ -2,15 +2,16 @@ import { createWebpackPlugin } from 'unplugin';
 import { unpluginFactory } from './index.mjs';
 import 'debug';
 import 'defu';
-import 'node:path';
+import 'pathe';
 import '@intlify/bundle-utils';
 import '@intlify/shared';
 import '@rollup/pluginutils';
-import 'fast-glob';
 import 'knitwork';
 import 'mlly';
 import 'node:crypto';
 import 'node:fs';
+import 'node:path';
+import 'tinyglobby';
 import 'vue/compiler-sfc';
 import 'picocolors';
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@intlify/unplugin-vue-i18n",
   "type": "module",
-  "version": "12.0.0-alpha.2",
+  "version": "12.0.0-alpha.3",
   "description": "unplugin for Vue I18n",
   "author": {
     "name": "kazuya kawaguchi",
@@ -12,6 +12,7 @@
   },
   "peerDependencies": {
     "petite-vue-i18n": "^12.0.0-alpha.2",
+    "vite": "^6.0.0 || ^7.0.0 || ^8.0.0",
     "vue": "^3.2.25",
     "vue-i18n": "^12.0.0-alpha.2"
   },
@@ -19,6 +20,9 @@
     "petite-vue-i18n": {
       "optional": true
     },
+    "vite": {
+      "optional": true
+    },
     "vue-i18n": {
       "optional": true
     }
@@ -28,33 +32,35 @@
     "@rollup/pluginutils": "^5.1.0",
     "debug": "^4.3.3",
     "defu": "^6.1.4",
-    "fast-glob": "^3.2.12",
     "knitwork": "^1.2.0",
     "mlly": "^1.2.0",
+    "pathe": "^2.0.3",
     "picocolors": "^1.0.0",
+    "tinyglobby": "^0.2.15",
     "unplugin": "^2.2.0",
-    "vue": "^3.5.13",
-    "@intlify/bundle-utils": "12.0.0-alpha.2"
+    "vue": "~3.5.34",
+    "@intlify/bundle-utils": "12.0.0-alpha.3"
   },
   "devDependencies": {
     "@intlify/core-base": "next",
     "@rspack/core": "^1.2.7",
     "@types/debug": "^4.1.5",
-    "@types/jsdom": "^16.2.5",
+    "@types/jsdom": "^28.0.0",
     "@types/memory-fs": "^0.3.2",
-    "@types/node": "^22.13.11",
-    "@vitejs/plugin-vue": "^5.2.3",
-    "jsdom": "^25.0.1",
+    "@types/node": "^25.7.0",
+    "@vitejs/plugin-vue": "^6.0.6",
+    "jsdom": "^29.0.0",
     "memory-fs": "^0.5.0",
-    "ts-loader": "^9.5.2",
-    "unbuild": "^3.5.0",
-    "vite": "^6.2.2",
-    "vue-loader": "^16.8.3",
-    "webpack": "^5.92.0",
+    "rollup-vite": "npm:vite@6.4.2",
+    "ts-loader": "~9.5.7",
+    "unbuild": "^3.6.1",
+    "vite": "^8.0.0",
+    "vue-loader": "~17.4.2",
+    "webpack": "~5.106.2",
     "webpack-merge": "^5.9.0"
   },
   "engines": {
-    "node": ">= 20"
+    "node": ">= 22.13"
   },
   "files": [
     "lib",