@intlify/unplugin-vue-i18n 11.2.3 → 11.2.5

package/lib/index.cjs

@@ -177,11 +177,11 @@ function getDescriptor(filename, code, options) {
 }
 
 const INTLIFY_BUNDLE_IMPORT_ID = "@intlify/unplugin-vue-i18n/messages";
-const VIRTUAL_PREFIX = "\0";
+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 = "\0intlify-i18n-";
+const VITE_VIRTUAL_PREFIX = "virtual:intlify-i18n-";
 const debug$3 = createDebug__default(resolveNamespace("resource"));
 function resourcePlugin({
   onlyLocales,
@@ -242,11 +242,12 @@ function resourcePlugin({
   const realPathToVirtualId = /* @__PURE__ */ new Map();
   let virtualCounter = 0;
   function intlifyVirtualize(realPath) {
-    let virtualId = realPathToVirtualId.get(realPath);
+    const normalized = pathe.normalize(realPath);
+    let virtualId = realPathToVirtualId.get(normalized);
     if (!virtualId) {
       virtualId = `${VITE_VIRTUAL_PREFIX}${virtualCounter++}`;
-      virtualIdToRealPath.set(virtualId, realPath);
-      realPathToVirtualId.set(realPath, virtualId);
+      virtualIdToRealPath.set(virtualId, normalized);
+      realPathToVirtualId.set(normalized, virtualId);
     }
     return virtualId;
   }
@@ -321,16 +322,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) {
@@ -379,7 +386,16 @@ function resourcePlugin({
         }
         if (meta.framework === "vite" && !hasViteJsonPlugin) {
           if (id.includes("?vue&type=i18n") && /[?&]lang\.(?:json|json5)(?:$|&)/.test(id)) {
-            return intlifyVirtualize(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;
@@ -424,15 +440,21 @@ function resourcePlugin({
           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;
+            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") {
@@ -715,7 +737,7 @@ async function getCode(source, filename, sourceMap, query, parser, framework = "
       });
       const block = result.descriptor.customBlocks[index];
       if (block) {
-        const code = block.src ? await getRaw(block.src) : block.content;
+        const code = block.src ? await getRaw(resolveBlockSrc(block.src, filename)) : block.content;
         debug$3(`getCode (webpack) ${index} from SFC`, code);
         return code;
       } else {
@@ -789,6 +811,12 @@ function getOptions(filename, isProduction, query, sourceMap, {
     });
   }
 }
+function resolveBlockSrc(src, sfcFilename) {
+  if (src.startsWith(".") || !src.startsWith("/") && !/^[a-z]:[/\\]/i.test(src)) {
+    return pathe.resolve(pathe.dirname(sfcFilename), src);
+  }
+  return src;
+}
 function getVirtualId(id, framework = "vite") {
   return framework === "vite" ? id.startsWith(VIRTUAL_PREFIX) ? id.slice(VIRTUAL_PREFIX.length) : "" : id;
 }

package/lib/index.mjs

@@ -165,11 +165,11 @@ function getDescriptor(filename, code, options) {
 }
 
 const INTLIFY_BUNDLE_IMPORT_ID = "@intlify/unplugin-vue-i18n/messages";
-const VIRTUAL_PREFIX = "\0";
+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 = "\0intlify-i18n-";
+const VITE_VIRTUAL_PREFIX = "virtual:intlify-i18n-";
 const debug$3 = createDebug(resolveNamespace("resource"));
 function resourcePlugin({
   onlyLocales,
@@ -230,11 +230,12 @@ function resourcePlugin({
   const realPathToVirtualId = /* @__PURE__ */ new Map();
   let virtualCounter = 0;
   function intlifyVirtualize(realPath) {
-    let virtualId = realPathToVirtualId.get(realPath);
+    const normalized = normalize(realPath);
+    let virtualId = realPathToVirtualId.get(normalized);
     if (!virtualId) {
       virtualId = `${VITE_VIRTUAL_PREFIX}${virtualCounter++}`;
-      virtualIdToRealPath.set(virtualId, realPath);
-      realPathToVirtualId.set(realPath, virtualId);
+      virtualIdToRealPath.set(virtualId, normalized);
+      realPathToVirtualId.set(normalized, virtualId);
     }
     return virtualId;
   }
@@ -309,16 +310,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) {
@@ -367,7 +374,16 @@ function resourcePlugin({
         }
         if (meta.framework === "vite" && !hasViteJsonPlugin) {
           if (id.includes("?vue&type=i18n") && /[?&]lang\.(?:json|json5)(?:$|&)/.test(id)) {
-            return intlifyVirtualize(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;
@@ -412,15 +428,21 @@ function resourcePlugin({
           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;
+            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") {
@@ -703,7 +725,7 @@ async function getCode(source, filename, sourceMap, query, parser, framework = "
       });
       const block = result.descriptor.customBlocks[index];
       if (block) {
-        const code = block.src ? await getRaw(block.src) : block.content;
+        const code = block.src ? await getRaw(resolveBlockSrc(block.src, filename)) : block.content;
         debug$3(`getCode (webpack) ${index} from SFC`, code);
         return code;
       } else {
@@ -777,6 +799,12 @@ function getOptions(filename, isProduction, query, sourceMap, {
     });
   }
 }
+function resolveBlockSrc(src, sfcFilename) {
+  if (src.startsWith(".") || !src.startsWith("/") && !/^[a-z]:[/\\]/i.test(src)) {
+    return resolve(dirname(sfcFilename), src);
+  }
+  return src;
+}
 function getVirtualId(id, framework = "vite") {
   return framework === "vite" ? id.startsWith(VIRTUAL_PREFIX) ? id.slice(VIRTUAL_PREFIX.length) : "" : id;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intlify/unplugin-vue-i18n",
-  "version": "11.2.3",
+  "version": "11.2.5",
   "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.3"
+    "@intlify/bundle-utils": "11.2.5"
   },
   "devDependencies": {
     "@intlify/core-base": "next",