@intlify/unplugin-vue-i18n 11.2.0 → 11.2.1

package/lib/index.cjs

@@ -10,9 +10,9 @@ const bundleUtils = require('@intlify/bundle-utils');
 const pluginutils = require('@rollup/pluginutils');
 const fg = require('fast-glob');
 const node_fs = require('node:fs');
-const path = require('node:path');
 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');
@@ -21,8 +21,8 @@ function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'defau
 
 const createDebug__default = /*#__PURE__*/_interopDefaultCompat(createDebug);
 const fg__default = /*#__PURE__*/_interopDefaultCompat(fg);
-const path__default = /*#__PURE__*/_interopDefaultCompat(path);
 const pc__default = /*#__PURE__*/_interopDefaultCompat(pc);
+const path__default = /*#__PURE__*/_interopDefaultCompat(path);
 const eslintUitls__default = /*#__PURE__*/_interopDefaultCompat(eslintUitls);
 
 function normalizeGlobOption(val) {
@@ -178,13 +178,10 @@ function getDescriptor(filename, code, options) {
 
 const INTLIFY_BUNDLE_IMPORT_ID = "@intlify/unplugin-vue-i18n/messages";
 const VIRTUAL_PREFIX = "\0";
-const RE_INTLIFY_BUNDLE_IMPORT_ID = new RegExp(`^${INTLIFY_BUNDLE_IMPORT_ID}$`);
-const RE_VIRTUAL_PREFIXED_INTLIFY_BUNDLE_IMPORT_ID = new RegExp(
-  `^${VIRTUAL_PREFIX}${INTLIFY_BUNDLE_IMPORT_ID}$`
-);
 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 = "\0intlify-i18n-";
 const debug$3 = createDebug__default(resolveNamespace("resource"));
 function resourcePlugin({
   onlyLocales,
@@ -241,6 +238,21 @@ function resourcePlugin({
   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) {
+    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);
+  }
   return {
     name: resolveNamespace("resource"),
     /**
@@ -361,17 +373,33 @@ function resourcePlugin({
       }
     },
     resolveId: {
-      filter: {
-        id: RE_INTLIFY_BUNDLE_IMPORT_ID
-      },
-      handler(id) {
-        return asVirtualId(id, meta.framework);
+      async handler(id, 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 (!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);
+        }
       }
     },
     load: {
-      filter: {
-        id: RE_VIRTUAL_PREFIXED_INTLIFY_BUNDLE_IMPORT_ID
-      },
       async handler(id) {
         debug$3("load", id);
         if (INTLIFY_BUNDLE_IMPORT_ID === getVirtualId(id, meta.framework) && include) {
@@ -392,10 +420,91 @@ function resourcePlugin({
             map: { mappings: "" }
           };
         }
+        if (isIntlifyVirtualId(id)) {
+          const realId = virtualIdToRealPath.get(id);
+          if (realId.includes("?vue&type=i18n")) {
+            const { filename, query } = parseVueRequest(realId);
+            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;
+            let source = block.src ? await node_fs.promises.readFile(block.src, "utf-8") : 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: "" }
+            };
+          }
+          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,
+            map: { mappings: "" }
+          };
+        }
       }
     },
     transform: {
       async handler(code, id) {
+        if (isIntlifyVirtualId(id)) return;
         const filter = await getFilter();
         if (!filter(id)) {
           return;
@@ -405,7 +514,7 @@ function resourcePlugin({
         let langInfo = defaultSFCLang;
         let inSourceMap;
         if (!query.vue) {
-          langInfo = path.parse(filename).ext;
+          langInfo = pathe.parse(filename).ext;
           const generate = getGenerator(langInfo);
           const parseOptions = getOptions(
             filename,
@@ -513,23 +622,23 @@ function getGenerator(ext, fallback = bundleUtils.generateJSON) {
   }
   return fallback;
 }
-function normalizeConfigResolveAlias(resolve, framework) {
-  if (resolve && resolve.alias) {
-    return resolve;
+function normalizeConfigResolveAlias(resolve2, framework) {
+  if (resolve2 && resolve2.alias) {
+    return resolve2;
   }
-  if (!resolve) {
+  if (!resolve2) {
     if (framework === "vite") {
       return { alias: [] };
     } else if (framework === "webpack") {
       return { alias: {} };
     }
-  } else if (!resolve.alias) {
+  } else if (!resolve2.alias) {
     if (framework === "vite") {
-      resolve.alias = [];
-      return resolve;
+      resolve2.alias = [];
+      return resolve2;
     } else if (framework === "webpack") {
-      resolve.alias = {};
-      return resolve;
+      resolve2.alias = {};
+      return resolve2;
     }
   }
 }
@@ -547,7 +656,7 @@ async function generateBundleResources(resources, isProduction, {
   for (const res of resources) {
     debug$3(`${res} bundle loading ...`);
     if (/\.(json5?|ya?ml)$/.test(res)) {
-      const { ext, name } = path.parse(res);
+      const { ext, name } = pathe.parse(res);
       const source = await getRaw(res);
       const generate = /json5?/.test(ext) ? bundleUtils.generateJSON : bundleUtils.generateYAML;
       const parseOptions = getOptions(res, isProduction, {}, false, {

package/lib/index.mjs

@@ -1,14 +1,14 @@
 import createDebug from 'debug';
 import { createUnplugin } from 'unplugin';
 import { isArray, isString, isBoolean, assign, isEmptyObject, isNumber, generateCodeFrame } from '@intlify/shared';
-import { normalize } from 'pathe';
+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 path, { parse } from 'node:path';
 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';
@@ -166,13 +166,10 @@ function getDescriptor(filename, code, options) {
 
 const INTLIFY_BUNDLE_IMPORT_ID = "@intlify/unplugin-vue-i18n/messages";
 const VIRTUAL_PREFIX = "\0";
-const RE_INTLIFY_BUNDLE_IMPORT_ID = new RegExp(`^${INTLIFY_BUNDLE_IMPORT_ID}$`);
-const RE_VIRTUAL_PREFIXED_INTLIFY_BUNDLE_IMPORT_ID = new RegExp(
-  `^${VIRTUAL_PREFIX}${INTLIFY_BUNDLE_IMPORT_ID}$`
-);
 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 = "\0intlify-i18n-";
 const debug$3 = createDebug(resolveNamespace("resource"));
 function resourcePlugin({
   onlyLocales,
@@ -229,6 +226,21 @@ function resourcePlugin({
   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) {
+    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);
+  }
   return {
     name: resolveNamespace("resource"),
     /**
@@ -349,17 +361,33 @@ function resourcePlugin({
       }
     },
     resolveId: {
-      filter: {
-        id: RE_INTLIFY_BUNDLE_IMPORT_ID
-      },
-      handler(id) {
-        return asVirtualId(id, meta.framework);
+      async handler(id, 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 (!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);
+        }
       }
     },
     load: {
-      filter: {
-        id: RE_VIRTUAL_PREFIXED_INTLIFY_BUNDLE_IMPORT_ID
-      },
       async handler(id) {
         debug$3("load", id);
         if (INTLIFY_BUNDLE_IMPORT_ID === getVirtualId(id, meta.framework) && include) {
@@ -380,10 +408,91 @@ function resourcePlugin({
             map: { mappings: "" }
           };
         }
+        if (isIntlifyVirtualId(id)) {
+          const realId = virtualIdToRealPath.get(id);
+          if (realId.includes("?vue&type=i18n")) {
+            const { filename, query } = parseVueRequest(realId);
+            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;
+            let source = block.src ? await promises.readFile(block.src, "utf-8") : 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: "" }
+            };
+          }
+          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,
+            map: { mappings: "" }
+          };
+        }
       }
     },
     transform: {
       async handler(code, id) {
+        if (isIntlifyVirtualId(id)) return;
         const filter = await getFilter();
         if (!filter(id)) {
           return;
@@ -501,23 +610,23 @@ function getGenerator(ext, fallback = generateJSON) {
   }
   return fallback;
 }
-function normalizeConfigResolveAlias(resolve, framework) {
-  if (resolve && resolve.alias) {
-    return resolve;
+function normalizeConfigResolveAlias(resolve2, framework) {
+  if (resolve2 && resolve2.alias) {
+    return resolve2;
   }
-  if (!resolve) {
+  if (!resolve2) {
     if (framework === "vite") {
       return { alias: [] };
     } else if (framework === "webpack") {
       return { alias: {} };
     }
-  } else if (!resolve.alias) {
+  } else if (!resolve2.alias) {
     if (framework === "vite") {
-      resolve.alias = [];
-      return resolve;
+      resolve2.alias = [];
+      return resolve2;
     } else if (framework === "webpack") {
-      resolve.alias = {};
-      return resolve;
+      resolve2.alias = {};
+      return resolve2;
     }
   }
 }

package/lib/vite.cjs

@@ -9,9 +9,9 @@ require('@intlify/bundle-utils');
 require('@rollup/pluginutils');
 require('fast-glob');
 require('node:fs');
-require('node:path');
 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

@@ -7,9 +7,9 @@ import '@intlify/bundle-utils';
 import '@rollup/pluginutils';
 import 'fast-glob';
 import 'node:fs';
-import 'node:path';
 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

@@ -9,9 +9,9 @@ require('@intlify/bundle-utils');
 require('@rollup/pluginutils');
 require('fast-glob');
 require('node:fs');
-require('node:path');
 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

@@ -7,9 +7,9 @@ import '@intlify/bundle-utils';
 import '@rollup/pluginutils';
 import 'fast-glob';
 import 'node:fs';
-import 'node:path';
 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.0",
+  "version": "11.2.1",
   "description": "unplugin for Vue I18n",
   "author": {
     "name": "kazuya kawaguchi",
@@ -39,7 +39,7 @@
     "picocolors": "^1.0.0",
     "unplugin": "^2.3.4",
     "vue": "~3.5.34",
-    "@intlify/bundle-utils": "11.2.0"
+    "@intlify/bundle-utils": "11.2.1"
   },
   "devDependencies": {
     "@intlify/core-base": "next",
@@ -47,13 +47,13 @@
     "@types/jsdom": "^16.2.5",
     "@types/memory-fs": "^0.3.2",
     "@types/node": "^25.7.0",
-    "@vitejs/plugin-vue": "5.2.4",
+    "@vitejs/plugin-vue": "^6.0.6",
     "jsdom": "^25.0.1",
     "memory-fs": "^0.5.0",
     "source-map-js": "^1.2.1",
     "ts-loader": "~9.5.7",
     "unbuild": "^3.6.1",
-    "vite": "6.3.5",
+    "vite": "^8.0.0",
     "rollup-vite": "npm:vite@6.3.5",
     "vue-loader": "~17.4.2",
     "webpack": "~5.106.2",