@intlify/unplugin-vue-i18n 11.2.4 → 11.2.6

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;
@@ -322,16 +319,22 @@ function resourcePlugin({
           }
         }
       },
-      async handleHotUpdate({ file, server }) {
-        if (RE_RESOURCE_FORMAT.test(file)) {
-          const module2 = server.moduleGraph.getModuleById(
-            asVirtualId(INTLIFY_BUNDLE_IMPORT_ID, meta.framework)
-          );
-          if (module2) {
-            server.moduleGraph.invalidateModule(module2);
-            return [module2];
-          }
+      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;
+        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));
         }
+        if (affected.size === modules.length) return;
+        return [...affected];
       }
     },
     webpack(compiler) {
@@ -392,7 +395,7 @@ function resourcePlugin({
             return intlifyVirtualize(virtualKey);
           }
           const idPath = id.split("?")[0];
-          if (!RE_RESOURCE_FORMAT.test(idPath)) return;
+          if (!/\.json5?$/.test(idPath)) return;
           let resolvedPath;
           if (idPath.startsWith(".")) {
             const realImporter = importer && isIntlifyVirtualId(importer) ? virtualIdToRealPath.get(importer) : importer;
@@ -405,6 +408,8 @@ function resourcePlugin({
           }
           const filter = await getFilter();
           if (!filter(resolvedPath)) return;
+          const stat = await node_fs.promises.stat(resolvedPath).catch(() => null);
+          if (!stat?.isFile()) return;
           return intlifyVirtualize(resolvedPath);
         }
       }
@@ -415,7 +420,10 @@ function resourcePlugin({
         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 })
+            ];
           }
           resourcePaths = resourcePaths.filter((el, pos) => resourcePaths.indexOf(el) === pos);
           const code = await generateBundleResources(resourcePaths, isProduction, {
@@ -963,15 +971,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;
@@ -996,7 +1009,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;
   }
@@ -1007,16 +1020,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
   };
@@ -1321,8 +1330,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

@@ -4,12 +4,11 @@ import { isArray, isString, isBoolean, assign, isEmptyObject, isNumber, generate
 import { normalize, parse, 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';
 
@@ -310,16 +309,22 @@ function resourcePlugin({
           }
         }
       },
-      async handleHotUpdate({ file, server }) {
-        if (RE_RESOURCE_FORMAT.test(file)) {
-          const module2 = server.moduleGraph.getModuleById(
-            asVirtualId(INTLIFY_BUNDLE_IMPORT_ID, meta.framework)
-          );
-          if (module2) {
-            server.moduleGraph.invalidateModule(module2);
-            return [module2];
-          }
+      handleHotUpdate({ file, modules, server }) {
+        const key = normalize(file);
+        const virtualId = realPathToVirtualId.get(key);
+        const inBundle = !!(include && createFilter(include, exclude)(key));
+        if (!virtualId && !inBundle) 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));
         }
+        if (affected.size === modules.length) return;
+        return [...affected];
       }
     },
     webpack(compiler) {
@@ -380,7 +385,7 @@ function resourcePlugin({
             return intlifyVirtualize(virtualKey);
           }
           const idPath = id.split("?")[0];
-          if (!RE_RESOURCE_FORMAT.test(idPath)) return;
+          if (!/\.json5?$/.test(idPath)) return;
           let resolvedPath;
           if (idPath.startsWith(".")) {
             const realImporter = importer && isIntlifyVirtualId(importer) ? virtualIdToRealPath.get(importer) : importer;
@@ -393,6 +398,8 @@ function resourcePlugin({
           }
           const filter = await getFilter();
           if (!filter(resolvedPath)) return;
+          const stat = await promises.stat(resolvedPath).catch(() => null);
+          if (!stat?.isFile()) return;
           return intlifyVirtualize(resolvedPath);
         }
       }
@@ -403,7 +410,10 @@ function resourcePlugin({
         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 })
+            ];
           }
           resourcePaths = resourcePaths.filter((el, pos) => resourcePaths.indexOf(el) === pos);
           const code = await generateBundleResources(resourcePaths, isProduction, {
@@ -951,15 +961,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;
@@ -984,7 +999,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;
   }
@@ -995,16 +1010,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
   };
@@ -1309,8 +1320,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.4",
+  "version": "11.2.6",
   "description": "unplugin for Vue I18n",
   "author": {
     "name": "kazuya kawaguchi",
@@ -27,7 +27,6 @@
     }
   },
   "dependencies": {
-    "@eslint-community/eslint-utils": "^4.4.0",
     "@intlify/shared": "~11.4.2",
     "@intlify/vue-i18n-extensions": "^8.0.0",
     "@rollup/pluginutils": "^5.1.0",
@@ -35,11 +34,11 @@
     "@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.4"
+    "@intlify/bundle-utils": "11.2.6"
   },
   "devDependencies": {
     "@intlify/core-base": "next",