@intlify/unplugin-vue-i18n 11.2.5 → 11.2.7

package/README.md

@@ -238,6 +238,18 @@ export default defineConfig({
 
 unplugin-vue-i18n will automatically merge locale files into `@intlify/unplugin-vue-i18n/messages`. This allows locales to be split across multiple files, for example `src/locales/fruits/en.json` and `src/locales/vegetables/en.json`.
 
+> [!NOTE]
+> On v11, `@intlify/unplugin-vue-i18n/messages` bundles JSON and YAML resources only. JS / TS resources under `include` are left out of it, and the plugin warns about them. v12 bundles JS / TS resources too.
+
+To load JS / TS resources at once on v11, import them directly, or collect them with `import.meta.glob`:
+
+```ts
+const modules = import.meta.glob('./src/locales/*.{ts,js}', { eager: true, import: 'default' })
+const messages = Object.fromEntries(
+  Object.entries(modules).map(([path, m]) => [path.replace(/^.*\/|\.[jt]s$/g, ''), m])
+)
+```
+
 ### Types
 
 If you want type definition of `@intlify/unplugin-vue-i18n/messages`, add `unplugin-vue-i18n/messages` to `compilerOptions.types` of your tsconfig:

package/lib/index.cjs

@@ -8,22 +8,19 @@ const shared = require('@intlify/shared');
 const pathe = require('pathe');
 const bundleUtils = require('@intlify/bundle-utils');
 const pluginutils = require('@rollup/pluginutils');
-const fg = require('fast-glob');
 const node_fs = require('node:fs');
+const tinyglobby = require('tinyglobby');
 const compilerSfc = require('vue/compiler-sfc');
 const pc = require('picocolors');
 const path = require('node:path');
-const eslintUitls = require('@eslint-community/eslint-utils');
 const vueI18nExtensions = require('@intlify/vue-i18n-extensions');
 const scopeManager = require('@typescript-eslint/scope-manager');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
 
 const createDebug__default = /*#__PURE__*/_interopDefaultCompat(createDebug);
-const fg__default = /*#__PURE__*/_interopDefaultCompat(fg);
 const pc__default = /*#__PURE__*/_interopDefaultCompat(pc);
 const path__default = /*#__PURE__*/_interopDefaultCompat(path);
-const eslintUitls__default = /*#__PURE__*/_interopDefaultCompat(eslintUitls);
 
 function normalizeGlobOption(val) {
   if (!val) return void 0;
@@ -181,7 +178,6 @@ const VIRTUAL_PREFIX = "virtual:";
 const RE_RESOURCE_FORMAT = /\.(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 VITE_VIRTUAL_PREFIX = "virtual:intlify-i18n-";
 const debug$3 = createDebug__default(resolveNamespace("resource"));
 function resourcePlugin({
   onlyLocales,
@@ -207,7 +203,7 @@ function resourcePlugin({
   }
   function resolveIncludeExcludeForLegacy() {
     const customBlockInclude = meta.framework === "vite" ? RE_SFC_I18N_CUSTOM_BLOCK : RE_SFC_I18N_WEBPACK_CUSTOM_BLOCK;
-    return include ? [[...include, customBlockInclude], void 0] : [void 0, ["**/**"]];
+    return include ? [[...include, customBlockInclude], exclude] : [void 0, ["**/**"]];
   }
   let _filter = null;
   async function getFilter() {
@@ -232,28 +228,13 @@ function resourcePlugin({
   let isProduction = false;
   let sourceMap = false;
   let hasViteJsonPlugin = false;
+  let warnedScriptResources = false;
   const vueI18nAliasName = module;
   debug$3(`vue-i18n alias name: ${vueI18nAliasName}`);
   let vuePlugin = null;
   const getSfcParser = () => {
     return vuePlugin ? getVueCompiler(vuePlugin).parse : compilerSfc.parse;
   };
-  const virtualIdToRealPath = /* @__PURE__ */ new Map();
-  const realPathToVirtualId = /* @__PURE__ */ new Map();
-  let virtualCounter = 0;
-  function intlifyVirtualize(realPath) {
-    const normalized = pathe.normalize(realPath);
-    let virtualId = realPathToVirtualId.get(normalized);
-    if (!virtualId) {
-      virtualId = `${VITE_VIRTUAL_PREFIX}${virtualCounter++}`;
-      virtualIdToRealPath.set(virtualId, normalized);
-      realPathToVirtualId.set(normalized, virtualId);
-    }
-    return virtualId;
-  }
-  function isIntlifyVirtualId(id) {
-    return virtualIdToRealPath.has(id);
-  }
   return {
     name: resolveNamespace("resource"),
     /**
@@ -324,18 +305,12 @@ function resourcePlugin({
       },
       handleHotUpdate({ file, modules, server }) {
         const key = pathe.normalize(file);
-        const virtualId = realPathToVirtualId.get(key);
-        const inBundle = !!(include && pluginutils.createFilter(include, exclude)(key));
-        if (!virtualId && !inBundle) return;
+        if (!(include && pluginutils.createFilter(include, exclude)(key))) return;
         const affected = new Set(modules);
-        const addById = (id) => {
-          const mod = id && server.moduleGraph.getModuleById(id);
-          if (mod) affected.add(mod);
-        };
-        addById(virtualId);
-        if (inBundle) {
-          addById(asVirtualId(INTLIFY_BUNDLE_IMPORT_ID, meta.framework));
-        }
+        const mod = server.moduleGraph.getModuleById(
+          asVirtualId(INTLIFY_BUNDLE_IMPORT_ID, meta.framework)
+        );
+        if (mod) affected.add(mod);
         if (affected.size === modules.length) return;
         return [...affected];
       }
@@ -380,153 +355,77 @@ function resourcePlugin({
       }
     },
     resolveId: {
-      async handler(id, importer) {
+      async handler(id) {
         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)) {
-            const { filename, query } = parseVueRequest(id);
-            let virtualKey = id;
-            if (query.src && importer) {
-              const importerPath = (isIntlifyVirtualId(importer) ? virtualIdToRealPath.get(importer) : importer).split("?")[0];
-              if (importerPath.endsWith(".vue")) {
-                const resolvedSidecar = pathe.resolve(pathe.dirname(importerPath), filename);
-                virtualKey = id.replace(filename, resolvedSidecar);
-              }
-            }
-            return intlifyVirtualize(virtualKey);
-          }
-          const idPath = id.split("?")[0];
-          if (!RE_RESOURCE_FORMAT.test(idPath)) return;
-          let resolvedPath;
-          if (idPath.startsWith(".")) {
-            const realImporter = importer && isIntlifyVirtualId(importer) ? virtualIdToRealPath.get(importer) : importer;
-            if (!realImporter) return;
-            resolvedPath = pathe.resolve(pathe.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);
+    },
     load: {
       async handler(id) {
         debug$3("load", id);
         if (INTLIFY_BUNDLE_IMPORT_ID === getVirtualId(id, meta.framework) && include) {
           let resourcePaths = [];
           for (const inc of include) {
-            resourcePaths = [...resourcePaths, ...await fg__default(inc)];
+            resourcePaths = [
+              ...resourcePaths,
+              ...await tinyglobby.glob(inc, {
+                cwd: process.cwd(),
+                expandDirectories: false,
+                absolute: true,
+                ignore: exclude
+              })
+            ];
           }
           resourcePaths = resourcePaths.filter((el, pos) => resourcePaths.indexOf(el) === pos);
+          if (!warnedScriptResources) {
+            const scripts = resourcePaths.filter((path) => /\.[cm]?[jt]s$/.test(path)).sort();
+            if (scripts.length > 0) {
+              warnedScriptResources = true;
+              const listed = scripts.slice(0, 10).map((path) => pathe.relative(process.cwd(), path));
+              const more = scripts.length > listed.length ? `, and ${scripts.length - listed.length} more` : "";
+              warn(
+                `JS / TS files under \`include\` are not bundled into \`${INTLIFY_BUNDLE_IMPORT_ID}\` (v11 bundles JSON / YAML only): ${listed.join(", ")}${more}. Import them directly, or collect them with \`import.meta.glob\`.`
+              );
+            }
+          }
+          for (const path of resourcePaths) {
+            if (/\.(?:json5?|ya?ml)$/.test(path)) {
+              this.addWatchFile(path);
+            }
+          }
           const code = await generateBundleResources(resourcePaths, isProduction, {
             forceStringify,
             strictMessage,
             escapeHtml,
             usedKeyFilter: collector ? (keyPath) => collector.shouldKeepKey(keyPath) : void 0
           });
-          return {
-            moduleType: "js",
-            code,
-            map: { mappings: "" }
-          };
-        }
-        if (isIntlifyVirtualId(id)) {
-          const realId = virtualIdToRealPath.get(id);
-          if (realId.includes("?vue&type=i18n")) {
-            const { filename, query } = parseVueRequest(realId);
-            let source;
-            if (query.src) {
-              this.addWatchFile(filename);
-              source = await node_fs.promises.readFile(filename, "utf-8");
-            } else {
-              this.addWatchFile(filename);
-              const sfcSource = await node_fs.promises.readFile(filename, "utf-8");
-              const { descriptor } = getSfcParser()(sfcSource, {
-                sourceMap,
-                filename
-              });
-              const block = descriptor.customBlocks[query.index];
-              if (!block) return;
-              source = block.content;
-            }
-            if (typeof transformI18nBlock === "function") {
-              const modifiedSource = transformI18nBlock(source);
-              if (modifiedSource && typeof modifiedSource === "string") {
-                source = modifiedSource;
-              } else {
-                warn("transformI18nBlock should return a string");
-              }
-            }
-            let langInfo2 = defaultSFCLang;
-            if (shared.isString(query.lang)) {
-              langInfo2 = query.src ? query.lang === "i18n" ? defaultSFCLang : query.lang : query.lang;
-            }
-            if (/\.?[cm]?[jt]s$/.test(langInfo2)) {
-              source = `export default ${source.replace(/^[\s;]+/, "")}`;
-            }
-            const generate2 = getGenerator(langInfo2, bundleUtils.generateYAML);
-            const isGlobalBlock = globalSFCScope || !!query.global;
-            const parseOptions2 = getOptions(
-              filename,
-              isProduction,
-              query,
-              sourceMap,
-              {
-                isGlobal: globalSFCScope,
-                allowDynamic,
-                jit: true,
-                strictMessage,
-                escapeHtml,
-                onlyLocales,
-                forceStringify,
-                usedKeyFilter: collector && isGlobalBlock ? (keyPath) => collector.shouldKeepKey(keyPath) : void 0
-              }
-            );
-            const { code: generatedCode2 } = await generate2(source, parseOptions2);
-            return {
-              moduleType: "js",
-              code: generatedCode2,
-              map: { mappings: "" }
-            };
+          if (meta.framework !== "vite") {
+            return { code };
           }
-          this.addWatchFile(realId);
-          const code = await node_fs.promises.readFile(realId, "utf-8");
-          const langInfo = pathe.parse(realId).ext;
-          const generate = getGenerator(langInfo);
-          const parseOptions = getOptions(
-            realId,
-            isProduction,
-            {},
-            sourceMap,
-            {
-              isGlobal: globalSFCScope,
-              allowDynamic,
-              strictMessage,
-              escapeHtml,
-              jit: true,
-              onlyLocales,
-              forceStringify,
-              usedKeyFilter: collector ? (keyPath) => collector.shouldKeepKey(keyPath) : void 0
-            }
-          );
-          const { code: generatedCode } = await generate(code, parseOptions);
           return {
             moduleType: "js",
-            code: generatedCode,
+            code,
             map: { mappings: "" }
           };
         }
       }
     },
+    // webpack puts the transform loader on every module this lets through. A loader in the chain
+    // stops html-webpack-plugin from rendering its template, and turns binary assets into UTF-8
+    // text, so let through only what `transform` handles (the same filter as the one in it)
+    transformInclude(id) {
+      if (meta.framework !== "webpack") {
+        return true;
+      }
+      _filter ??= pluginutils.createFilter(...resolveIncludeExclude());
+      return _filter(id);
+    },
     transform: {
       async handler(code, id) {
-        if (isIntlifyVirtualId(id)) return;
         const filter = await getFilter();
         if (!filter(id)) {
           return;
@@ -535,7 +434,7 @@ function resourcePlugin({
         debug$3("transform", id, JSON.stringify(query), filename);
         let langInfo = defaultSFCLang;
         let inSourceMap;
-        if (!query.vue) {
+        if (!query.vue && RE_RESOURCE_FORMAT.test(id)) {
           langInfo = pathe.parse(filename).ext;
           const generate = getGenerator(langInfo);
           const parseOptions = getOptions(
@@ -610,10 +509,7 @@ function resourcePlugin({
                 warn("transformI18nBlock should return a string");
               }
             }
-            if (/\.?[cm]?[jt]s$/.test(langInfo)) {
-              source = `export default ${source.replace(/^[\s;]+/, "")}`;
-            }
-            const { code: generatedCode, map } = await generate(source, parseOptions);
+            const { code: generatedCode, map } = /\.?[cm]?[jt]s$/.test(langInfo) ? await generateJsTsBlock(generate, source, parseOptions) : await generate(source, parseOptions);
             debug$3("generated code", generatedCode);
             debug$3("sourcemap", map, sourceMap);
             if (code === generatedCode) return;
@@ -644,6 +540,17 @@ function getGenerator(ext, fallback = bundleUtils.generateJSON) {
   }
   return fallback;
 }
+async function generateJsTsBlock(generate, source, options) {
+  try {
+    return await generate(source, options);
+  } catch (error2) {
+    try {
+      return await generate(`export default ${source.replace(/^[\s;]+/, "")}`, options);
+    } catch (wrappedError) {
+      throw /^\s*export\s+default\b/m.test(source) ? error2 : wrappedError;
+    }
+  }
+}
 function normalizeConfigResolveAlias(resolve2, framework) {
   if (resolve2 && resolve2.alias) {
     return resolve2;
@@ -969,15 +876,20 @@ function getImportLocalName(scope, source, imported) {
   return null;
 }
 function getImportDeclaration(scope, source) {
-  const tracker = new eslintUitls__default.ReferenceTracker(scope);
-  const traceMap = {
-    [source]: {
-      [eslintUitls__default.ReferenceTracker.ESM]: true,
-      [eslintUitls__default.ReferenceTracker.READ]: true
+  const program = scope.block;
+  const importDecl = program.body.find(
+    (node) => node.type === tsEstree.AST_NODE_TYPES.ImportDeclaration && node.source.value === source
+  );
+  return importDecl ? importDecl : null;
+}
+function findVariable(scope, name) {
+  for (let current = scope; current != null; current = current.upper) {
+    const variable = current.set.get(name);
+    if (variable != null) {
+      return variable;
     }
-  };
-  const refs = Array.from(tracker.iterateEsmReferences(traceMap));
-  return refs.length ? refs[0].node : null;
+  }
+  return null;
 }
 function isImportedIdentifierInImportClause(node) {
   return "imported" in node;
@@ -1002,7 +914,7 @@ const EMPTY_NODE_RETURN = {
   returnStatement: null
 };
 function getCallExpressionAndReturnStatement(scope, local) {
-  const variable = eslintUitls__default.findVariable(scope, local);
+  const variable = findVariable(scope, local);
   if (variable == null) {
     return EMPTY_NODE_RETURN;
   }
@@ -1013,16 +925,12 @@ function getCallExpressionAndReturnStatement(scope, local) {
     return EMPTY_NODE_RETURN;
   }
   let returnStatement = null;
-  if (callExpressionRef.from.type === "function" && callExpressionRef.from.block.type === tsEstree.AST_NODE_TYPES.FunctionExpression && // @ts-expect-error -- FIXME: type error
-  callExpressionRef.from.block.parent.type === tsEstree.AST_NODE_TYPES.Property && // @ts-expect-error -- FIXME: type error
-  callExpressionRef.from.block.parent.key.type === tsEstree.AST_NODE_TYPES.Identifier && // @ts-expect-error -- FIXME: type error
-  callExpressionRef.from.block.parent.key.name === "setup") {
+  if (callExpressionRef.from.type === "function" && callExpressionRef.from.block.type === tsEstree.AST_NODE_TYPES.FunctionExpression && callExpressionRef.from.block.parent.type === tsEstree.AST_NODE_TYPES.Property && callExpressionRef.from.block.parent.key.type === tsEstree.AST_NODE_TYPES.Identifier && callExpressionRef.from.block.parent.key.name === "setup") {
     returnStatement = callExpressionRef.from.block.body.body.find((statement) => {
       return statement.type === tsEstree.AST_NODE_TYPES.ReturnStatement;
     });
   }
   return {
-    // @ts-expect-error -- FIXME: type error
     callExpression: callExpressionRef.identifier.parent,
     returnStatement
   };
@@ -1327,8 +1235,10 @@ function treeShakingPlugin(resolvedOptions, collector) {
       const treeShaking = resolvedOptions.treeShaking;
       const patterns = treeShaking?.scanPatterns || [`${projectRoot}/src/**/*.{vue,ts,js,tsx,jsx}`];
       debug$1("scanning patterns:", patterns);
-      const files = await fg__default(patterns, {
+      const files = await tinyglobby.glob(patterns, {
+        cwd: process.cwd(),
         ignore: ["**/node_modules/**"],
+        expandDirectories: false,
         absolute: true
       });
       debug$1(`found ${files.length} source files to scan`);

package/lib/index.mjs

@@ -1,15 +1,14 @@
 import createDebug from 'debug';
 import { createUnplugin } from 'unplugin';
 import { isArray, isString, isBoolean, assign, isEmptyObject, isNumber, generateCodeFrame } from '@intlify/shared';
-import { normalize, parse, resolve, dirname } from 'pathe';
+import { normalize, parse, relative, resolve, dirname } from 'pathe';
 import { generateJSON, generateYAML, generateJavaScript, generateTypescript } from '@intlify/bundle-utils';
 import { createFilter } from '@rollup/pluginutils';
-import fg from 'fast-glob';
 import { promises } from 'node:fs';
+import { glob } from 'tinyglobby';
 import { parse as parse$1 } from 'vue/compiler-sfc';
 import pc from 'picocolors';
 import path from 'node:path';
-import eslintUitls from '@eslint-community/eslint-utils';
 import { transformVTDirective } from '@intlify/vue-i18n-extensions';
 import { analyze } from '@typescript-eslint/scope-manager';
 
@@ -169,7 +168,6 @@ const VIRTUAL_PREFIX = "virtual:";
 const RE_RESOURCE_FORMAT = /\.(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 VITE_VIRTUAL_PREFIX = "virtual:intlify-i18n-";
 const debug$3 = createDebug(resolveNamespace("resource"));
 function resourcePlugin({
   onlyLocales,
@@ -195,7 +193,7 @@ function resourcePlugin({
   }
   function resolveIncludeExcludeForLegacy() {
     const customBlockInclude = meta.framework === "vite" ? RE_SFC_I18N_CUSTOM_BLOCK : RE_SFC_I18N_WEBPACK_CUSTOM_BLOCK;
-    return include ? [[...include, customBlockInclude], void 0] : [void 0, ["**/**"]];
+    return include ? [[...include, customBlockInclude], exclude] : [void 0, ["**/**"]];
   }
   let _filter = null;
   async function getFilter() {
@@ -220,28 +218,13 @@ function resourcePlugin({
   let isProduction = false;
   let sourceMap = false;
   let hasViteJsonPlugin = false;
+  let warnedScriptResources = false;
   const vueI18nAliasName = module;
   debug$3(`vue-i18n alias name: ${vueI18nAliasName}`);
   let vuePlugin = null;
   const getSfcParser = () => {
     return vuePlugin ? getVueCompiler(vuePlugin).parse : parse$1;
   };
-  const virtualIdToRealPath = /* @__PURE__ */ new Map();
-  const realPathToVirtualId = /* @__PURE__ */ new Map();
-  let virtualCounter = 0;
-  function intlifyVirtualize(realPath) {
-    const normalized = normalize(realPath);
-    let virtualId = realPathToVirtualId.get(normalized);
-    if (!virtualId) {
-      virtualId = `${VITE_VIRTUAL_PREFIX}${virtualCounter++}`;
-      virtualIdToRealPath.set(virtualId, normalized);
-      realPathToVirtualId.set(normalized, virtualId);
-    }
-    return virtualId;
-  }
-  function isIntlifyVirtualId(id) {
-    return virtualIdToRealPath.has(id);
-  }
   return {
     name: resolveNamespace("resource"),
     /**
@@ -312,18 +295,12 @@ function resourcePlugin({
       },
       handleHotUpdate({ file, modules, server }) {
         const key = normalize(file);
-        const virtualId = realPathToVirtualId.get(key);
-        const inBundle = !!(include && createFilter(include, exclude)(key));
-        if (!virtualId && !inBundle) return;
+        if (!(include && createFilter(include, exclude)(key))) return;
         const affected = new Set(modules);
-        const addById = (id) => {
-          const mod = id && server.moduleGraph.getModuleById(id);
-          if (mod) affected.add(mod);
-        };
-        addById(virtualId);
-        if (inBundle) {
-          addById(asVirtualId(INTLIFY_BUNDLE_IMPORT_ID, meta.framework));
-        }
+        const mod = server.moduleGraph.getModuleById(
+          asVirtualId(INTLIFY_BUNDLE_IMPORT_ID, meta.framework)
+        );
+        if (mod) affected.add(mod);
         if (affected.size === modules.length) return;
         return [...affected];
       }
@@ -368,153 +345,77 @@ function resourcePlugin({
       }
     },
     resolveId: {
-      async handler(id, importer) {
+      async handler(id) {
         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)) {
-            const { filename, query } = parseVueRequest(id);
-            let virtualKey = id;
-            if (query.src && importer) {
-              const importerPath = (isIntlifyVirtualId(importer) ? virtualIdToRealPath.get(importer) : importer).split("?")[0];
-              if (importerPath.endsWith(".vue")) {
-                const resolvedSidecar = resolve(dirname(importerPath), filename);
-                virtualKey = id.replace(filename, resolvedSidecar);
-              }
-            }
-            return intlifyVirtualize(virtualKey);
-          }
-          const idPath = id.split("?")[0];
-          if (!RE_RESOURCE_FORMAT.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);
+    },
     load: {
       async handler(id) {
         debug$3("load", id);
         if (INTLIFY_BUNDLE_IMPORT_ID === getVirtualId(id, meta.framework) && include) {
           let resourcePaths = [];
           for (const inc of include) {
-            resourcePaths = [...resourcePaths, ...await fg(inc)];
+            resourcePaths = [
+              ...resourcePaths,
+              ...await glob(inc, {
+                cwd: process.cwd(),
+                expandDirectories: false,
+                absolute: true,
+                ignore: exclude
+              })
+            ];
           }
           resourcePaths = resourcePaths.filter((el, pos) => resourcePaths.indexOf(el) === pos);
+          if (!warnedScriptResources) {
+            const scripts = resourcePaths.filter((path) => /\.[cm]?[jt]s$/.test(path)).sort();
+            if (scripts.length > 0) {
+              warnedScriptResources = true;
+              const listed = scripts.slice(0, 10).map((path) => relative(process.cwd(), path));
+              const more = scripts.length > listed.length ? `, and ${scripts.length - listed.length} more` : "";
+              warn(
+                `JS / TS files under \`include\` are not bundled into \`${INTLIFY_BUNDLE_IMPORT_ID}\` (v11 bundles JSON / YAML only): ${listed.join(", ")}${more}. Import them directly, or collect them with \`import.meta.glob\`.`
+              );
+            }
+          }
+          for (const path of resourcePaths) {
+            if (/\.(?:json5?|ya?ml)$/.test(path)) {
+              this.addWatchFile(path);
+            }
+          }
           const code = await generateBundleResources(resourcePaths, isProduction, {
             forceStringify,
             strictMessage,
             escapeHtml,
             usedKeyFilter: collector ? (keyPath) => collector.shouldKeepKey(keyPath) : void 0
           });
-          return {
-            moduleType: "js",
-            code,
-            map: { mappings: "" }
-          };
-        }
-        if (isIntlifyVirtualId(id)) {
-          const realId = virtualIdToRealPath.get(id);
-          if (realId.includes("?vue&type=i18n")) {
-            const { filename, query } = parseVueRequest(realId);
-            let source;
-            if (query.src) {
-              this.addWatchFile(filename);
-              source = await promises.readFile(filename, "utf-8");
-            } else {
-              this.addWatchFile(filename);
-              const sfcSource = await promises.readFile(filename, "utf-8");
-              const { descriptor } = getSfcParser()(sfcSource, {
-                sourceMap,
-                filename
-              });
-              const block = descriptor.customBlocks[query.index];
-              if (!block) return;
-              source = block.content;
-            }
-            if (typeof transformI18nBlock === "function") {
-              const modifiedSource = transformI18nBlock(source);
-              if (modifiedSource && typeof modifiedSource === "string") {
-                source = modifiedSource;
-              } else {
-                warn("transformI18nBlock should return a string");
-              }
-            }
-            let langInfo2 = defaultSFCLang;
-            if (isString(query.lang)) {
-              langInfo2 = query.src ? query.lang === "i18n" ? defaultSFCLang : query.lang : query.lang;
-            }
-            if (/\.?[cm]?[jt]s$/.test(langInfo2)) {
-              source = `export default ${source.replace(/^[\s;]+/, "")}`;
-            }
-            const generate2 = getGenerator(langInfo2, generateYAML);
-            const isGlobalBlock = globalSFCScope || !!query.global;
-            const parseOptions2 = getOptions(
-              filename,
-              isProduction,
-              query,
-              sourceMap,
-              {
-                isGlobal: globalSFCScope,
-                allowDynamic,
-                jit: true,
-                strictMessage,
-                escapeHtml,
-                onlyLocales,
-                forceStringify,
-                usedKeyFilter: collector && isGlobalBlock ? (keyPath) => collector.shouldKeepKey(keyPath) : void 0
-              }
-            );
-            const { code: generatedCode2 } = await generate2(source, parseOptions2);
-            return {
-              moduleType: "js",
-              code: generatedCode2,
-              map: { mappings: "" }
-            };
+          if (meta.framework !== "vite") {
+            return { code };
           }
-          this.addWatchFile(realId);
-          const code = await promises.readFile(realId, "utf-8");
-          const langInfo = parse(realId).ext;
-          const generate = getGenerator(langInfo);
-          const parseOptions = getOptions(
-            realId,
-            isProduction,
-            {},
-            sourceMap,
-            {
-              isGlobal: globalSFCScope,
-              allowDynamic,
-              strictMessage,
-              escapeHtml,
-              jit: true,
-              onlyLocales,
-              forceStringify,
-              usedKeyFilter: collector ? (keyPath) => collector.shouldKeepKey(keyPath) : void 0
-            }
-          );
-          const { code: generatedCode } = await generate(code, parseOptions);
           return {
             moduleType: "js",
-            code: generatedCode,
+            code,
             map: { mappings: "" }
           };
         }
       }
     },
+    // webpack puts the transform loader on every module this lets through. A loader in the chain
+    // stops html-webpack-plugin from rendering its template, and turns binary assets into UTF-8
+    // text, so let through only what `transform` handles (the same filter as the one in it)
+    transformInclude(id) {
+      if (meta.framework !== "webpack") {
+        return true;
+      }
+      _filter ??= createFilter(...resolveIncludeExclude());
+      return _filter(id);
+    },
     transform: {
       async handler(code, id) {
-        if (isIntlifyVirtualId(id)) return;
         const filter = await getFilter();
         if (!filter(id)) {
           return;
@@ -523,7 +424,7 @@ function resourcePlugin({
         debug$3("transform", id, JSON.stringify(query), filename);
         let langInfo = defaultSFCLang;
         let inSourceMap;
-        if (!query.vue) {
+        if (!query.vue && RE_RESOURCE_FORMAT.test(id)) {
           langInfo = parse(filename).ext;
           const generate = getGenerator(langInfo);
           const parseOptions = getOptions(
@@ -598,10 +499,7 @@ function resourcePlugin({
                 warn("transformI18nBlock should return a string");
               }
             }
-            if (/\.?[cm]?[jt]s$/.test(langInfo)) {
-              source = `export default ${source.replace(/^[\s;]+/, "")}`;
-            }
-            const { code: generatedCode, map } = await generate(source, parseOptions);
+            const { code: generatedCode, map } = /\.?[cm]?[jt]s$/.test(langInfo) ? await generateJsTsBlock(generate, source, parseOptions) : await generate(source, parseOptions);
             debug$3("generated code", generatedCode);
             debug$3("sourcemap", map, sourceMap);
             if (code === generatedCode) return;
@@ -632,6 +530,17 @@ function getGenerator(ext, fallback = generateJSON) {
   }
   return fallback;
 }
+async function generateJsTsBlock(generate, source, options) {
+  try {
+    return await generate(source, options);
+  } catch (error2) {
+    try {
+      return await generate(`export default ${source.replace(/^[\s;]+/, "")}`, options);
+    } catch (wrappedError) {
+      throw /^\s*export\s+default\b/m.test(source) ? error2 : wrappedError;
+    }
+  }
+}
 function normalizeConfigResolveAlias(resolve2, framework) {
   if (resolve2 && resolve2.alias) {
     return resolve2;
@@ -957,15 +866,20 @@ function getImportLocalName(scope, source, imported) {
   return null;
 }
 function getImportDeclaration(scope, source) {
-  const tracker = new eslintUitls.ReferenceTracker(scope);
-  const traceMap = {
-    [source]: {
-      [eslintUitls.ReferenceTracker.ESM]: true,
-      [eslintUitls.ReferenceTracker.READ]: true
+  const program = scope.block;
+  const importDecl = program.body.find(
+    (node) => node.type === tsEstree.AST_NODE_TYPES.ImportDeclaration && node.source.value === source
+  );
+  return importDecl ? importDecl : null;
+}
+function findVariable(scope, name) {
+  for (let current = scope; current != null; current = current.upper) {
+    const variable = current.set.get(name);
+    if (variable != null) {
+      return variable;
     }
-  };
-  const refs = Array.from(tracker.iterateEsmReferences(traceMap));
-  return refs.length ? refs[0].node : null;
+  }
+  return null;
 }
 function isImportedIdentifierInImportClause(node) {
   return "imported" in node;
@@ -990,7 +904,7 @@ const EMPTY_NODE_RETURN = {
   returnStatement: null
 };
 function getCallExpressionAndReturnStatement(scope, local) {
-  const variable = eslintUitls.findVariable(scope, local);
+  const variable = findVariable(scope, local);
   if (variable == null) {
     return EMPTY_NODE_RETURN;
   }
@@ -1001,16 +915,12 @@ function getCallExpressionAndReturnStatement(scope, local) {
     return EMPTY_NODE_RETURN;
   }
   let returnStatement = null;
-  if (callExpressionRef.from.type === "function" && callExpressionRef.from.block.type === tsEstree.AST_NODE_TYPES.FunctionExpression && // @ts-expect-error -- FIXME: type error
-  callExpressionRef.from.block.parent.type === tsEstree.AST_NODE_TYPES.Property && // @ts-expect-error -- FIXME: type error
-  callExpressionRef.from.block.parent.key.type === tsEstree.AST_NODE_TYPES.Identifier && // @ts-expect-error -- FIXME: type error
-  callExpressionRef.from.block.parent.key.name === "setup") {
+  if (callExpressionRef.from.type === "function" && callExpressionRef.from.block.type === tsEstree.AST_NODE_TYPES.FunctionExpression && callExpressionRef.from.block.parent.type === tsEstree.AST_NODE_TYPES.Property && callExpressionRef.from.block.parent.key.type === tsEstree.AST_NODE_TYPES.Identifier && callExpressionRef.from.block.parent.key.name === "setup") {
     returnStatement = callExpressionRef.from.block.body.body.find((statement) => {
       return statement.type === tsEstree.AST_NODE_TYPES.ReturnStatement;
     });
   }
   return {
-    // @ts-expect-error -- FIXME: type error
     callExpression: callExpressionRef.identifier.parent,
     returnStatement
   };
@@ -1315,8 +1225,10 @@ function treeShakingPlugin(resolvedOptions, collector) {
       const treeShaking = resolvedOptions.treeShaking;
       const patterns = treeShaking?.scanPatterns || [`${projectRoot}/src/**/*.{vue,ts,js,tsx,jsx}`];
       debug$1("scanning patterns:", patterns);
-      const files = await fg(patterns, {
+      const files = await glob(patterns, {
+        cwd: process.cwd(),
         ignore: ["**/node_modules/**"],
+        expandDirectories: false,
         absolute: true
       });
       debug$1(`found ${files.length} source files to scan`);

package/lib/vite.cjs

@@ -7,12 +7,11 @@ require('@intlify/shared');
 require('pathe');
 require('@intlify/bundle-utils');
 require('@rollup/pluginutils');
-require('fast-glob');
 require('node:fs');
+require('tinyglobby');
 require('vue/compiler-sfc');
 require('picocolors');
 require('node:path');
-require('@eslint-community/eslint-utils');
 require('@intlify/vue-i18n-extensions');
 require('@typescript-eslint/scope-manager');
 

package/lib/vite.mjs

@@ -5,12 +5,11 @@ import '@intlify/shared';
 import 'pathe';
 import '@intlify/bundle-utils';
 import '@rollup/pluginutils';
-import 'fast-glob';
 import 'node:fs';
+import 'tinyglobby';
 import 'vue/compiler-sfc';
 import 'picocolors';
 import 'node:path';
-import '@eslint-community/eslint-utils';
 import '@intlify/vue-i18n-extensions';
 import '@typescript-eslint/scope-manager';
 

package/lib/webpack.cjs

@@ -7,12 +7,11 @@ require('@intlify/shared');
 require('pathe');
 require('@intlify/bundle-utils');
 require('@rollup/pluginutils');
-require('fast-glob');
 require('node:fs');
+require('tinyglobby');
 require('vue/compiler-sfc');
 require('picocolors');
 require('node:path');
-require('@eslint-community/eslint-utils');
 require('@intlify/vue-i18n-extensions');
 require('@typescript-eslint/scope-manager');
 

package/lib/webpack.mjs

@@ -5,12 +5,11 @@ import '@intlify/shared';
 import 'pathe';
 import '@intlify/bundle-utils';
 import '@rollup/pluginutils';
-import 'fast-glob';
 import 'node:fs';
+import 'tinyglobby';
 import 'vue/compiler-sfc';
 import 'picocolors';
 import 'node:path';
-import '@eslint-community/eslint-utils';
 import '@intlify/vue-i18n-extensions';
 import '@typescript-eslint/scope-manager';
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intlify/unplugin-vue-i18n",
-  "version": "11.2.5",
+  "version": "11.2.7",
   "description": "unplugin for Vue I18n",
   "author": {
     "name": "kazuya kawaguchi",
@@ -27,19 +27,18 @@
     }
   },
   "dependencies": {
-    "@eslint-community/eslint-utils": "^4.4.0",
-    "@intlify/shared": "~11.4.2",
+    "@intlify/shared": "~11.4.15",
     "@intlify/vue-i18n-extensions": "^8.0.0",
     "@rollup/pluginutils": "^5.1.0",
     "@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",
+    "tinyglobby": "^0.2.15",
     "unplugin": "^2.3.4",
     "vue": "~3.5.34",
-    "@intlify/bundle-utils": "11.2.5"
+    "@intlify/bundle-utils": "11.2.7"
   },
   "devDependencies": {
     "@intlify/core-base": "next",
@@ -55,6 +54,7 @@
     "unbuild": "^3.6.1",
     "vite": "^8.0.0",
     "rollup-vite": "npm:vite@6.3.5",
+    "vite7": "npm:vite@^7.0.0",
     "vue-loader": "~17.4.2",
     "webpack": "~5.106.2",
     "webpack-merge": "^5.9.0"