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

package/lib/index.cjs

@@ -140,7 +140,7 @@ 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 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"));
@@ -148,7 +148,7 @@ function resourcePlugin(opts, meta) {
   const importedResources = /* @__PURE__ */ new Set();
   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];
+    return opts.include ? [[...opts.include, customBlockInclude], opts.exclude] : [[customBlockInclude], void 0];
   }
   function resolveIncludeExcludeForLegacy() {
     const customBlockInclude = meta.framework === "vite" ? RE_SFC_I18N_CUSTOM_BLOCK : RE_SFC_I18N_WEBPACK_CUSTOM_BLOCK;
@@ -171,22 +171,6 @@ function resourcePlugin(opts, meta) {
     }
     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,
@@ -206,7 +190,7 @@ function resourcePlugin(opts, meta) {
   }
   function result(code) {
     if (meta.framework === "vite") {
-      return { code, map: { mappings: "" } };
+      return { code, map: { mappings: "" }, moduleType: "js" };
     }
     return { code };
   }
@@ -315,101 +299,24 @@ function resourcePlugin(opts, meta) {
       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) {
-      if (INTLIFY_BUNDLE_IMPORT_ID === getVirtualId(id, meta.framework)) return true;
-      return isIntlifyVirtualId(id);
+      return INTLIFY_BUNDLE_IMPORT_ID === getVirtualId(id, meta.framework);
     },
     async load(id) {
       debug$1("load", id);
-      if (INTLIFY_BUNDLE_IMPORT_ID === getVirtualId(id, meta.framework) && resourcePaths.size > 0) {
+      if (INTLIFY_BUNDLE_IMPORT_ID === getVirtualId(id, meta.framework)) {
+        if (resourcePaths.size === 0) {
+          warn(
+            `\`${INTLIFY_BUNDLE_IMPORT_ID}\` is imported, but no locale resources match \`include\``
+          );
+        }
         const code = generateBundleResources(resourcePaths);
         for (const p of resourcePaths) {
           this.addWatchFile(p);
         }
         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);
@@ -432,7 +339,6 @@ function resourcePlugin(opts, meta) {
       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;
@@ -493,7 +399,7 @@ function resourcePlugin(opts, meta) {
           }
         }
         const generate = getGenerator(langInfo, bundleUtils.generateYAML);
-        const { code: generatedCode, map } = generate(source, parseOptions);
+        const { code: generatedCode, map } = /\.?[cm]?[jt]s$/.test(langInfo) ? generateJsTsBlock(generate, source, parseOptions) : generate(source, parseOptions);
         debug$1("generated code", generatedCode);
         debug$1("sourcemap", map, ctx.sourceMap);
         if (code !== generatedCode) {
@@ -507,17 +413,28 @@ function getGenerator(ext, fallback = bundleUtils.generateJSON) {
   if (/\.?json5?$/.test(ext)) {
     return bundleUtils.generateJSON;
   }
-  if (/\.ya?ml$/.test(ext)) {
+  if (/\.?ya?ml$/.test(ext)) {
     return bundleUtils.generateYAML;
   }
-  if (/\.[c|m]?js$/.test(ext)) {
+  if (/\.?[cm]?js$/.test(ext)) {
     return bundleUtils.generateJavaScript;
   }
-  if (/\.[c|m]?ts$/.test(ext)) {
+  if (/\.?[cm]?ts$/.test(ext)) {
     return bundleUtils.generateTypescript;
   }
   return fallback;
 }
+function generateJsTsBlock(generate, source, options) {
+  try {
+    return generate(source, options);
+  } catch (error2) {
+    try {
+      return generate(`export default ${source.replace(/^[\s;]+/, "")}`, options);
+    } catch (wrappedError) {
+      throw /^\s*export\s+default\b/m.test(source) ? error2 : wrappedError;
+    }
+  }
+}
 async function loadWebpack() {
   const mod = await import('webpack');
   return mod.default || mod;
@@ -580,7 +497,7 @@ function getCode(source, filename, sourceMap, query, parser, meta) {
   const result = parser(readFile(filename), { sourceMap, filename });
   const block = result.descriptor.customBlocks[query.index];
   if (block) {
-    const code = block.src ? readFile(block.src) : block.content;
+    const code = block.src ? readFile(resolveBlockSrc(block.src, filename)) : block.content;
     debug$1(`getCode (${meta.framework}) ${query.index} from SFC`, code);
     return code;
   }
@@ -628,6 +545,12 @@ function getOptions(filename, ctx, query, opts) {
     isGlobal: false
   });
 }
+function resolveBlockSrc(src, sfcFilename) {
+  if (src.startsWith(".") || !src.startsWith("/") && !/^[a-z]:[/\\]/i.test(src)) {
+    return node_path.resolve(node_path.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

@@ -129,7 +129,7 @@ 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 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"));
@@ -137,7 +137,7 @@ function resourcePlugin(opts, meta) {
   const importedResources = /* @__PURE__ */ new Set();
   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];
+    return opts.include ? [[...opts.include, customBlockInclude], opts.exclude] : [[customBlockInclude], void 0];
   }
   function resolveIncludeExcludeForLegacy() {
     const customBlockInclude = meta.framework === "vite" ? RE_SFC_I18N_CUSTOM_BLOCK : RE_SFC_I18N_WEBPACK_CUSTOM_BLOCK;
@@ -160,22 +160,6 @@ function resourcePlugin(opts, meta) {
     }
     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,
@@ -195,7 +179,7 @@ function resourcePlugin(opts, meta) {
   }
   function result(code) {
     if (meta.framework === "vite") {
-      return { code, map: { mappings: "" } };
+      return { code, map: { mappings: "" }, moduleType: "js" };
     }
     return { code };
   }
@@ -304,101 +288,24 @@ function resourcePlugin(opts, meta) {
       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) {
-      if (INTLIFY_BUNDLE_IMPORT_ID === getVirtualId(id, meta.framework)) return true;
-      return isIntlifyVirtualId(id);
+      return INTLIFY_BUNDLE_IMPORT_ID === getVirtualId(id, meta.framework);
     },
     async load(id) {
       debug$1("load", id);
-      if (INTLIFY_BUNDLE_IMPORT_ID === getVirtualId(id, meta.framework) && resourcePaths.size > 0) {
+      if (INTLIFY_BUNDLE_IMPORT_ID === getVirtualId(id, meta.framework)) {
+        if (resourcePaths.size === 0) {
+          warn(
+            `\`${INTLIFY_BUNDLE_IMPORT_ID}\` is imported, but no locale resources match \`include\``
+          );
+        }
         const code = generateBundleResources(resourcePaths);
         for (const p of resourcePaths) {
           this.addWatchFile(p);
         }
         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);
@@ -421,7 +328,6 @@ function resourcePlugin(opts, meta) {
       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;
@@ -482,7 +388,7 @@ function resourcePlugin(opts, meta) {
           }
         }
         const generate = getGenerator(langInfo, generateYAML);
-        const { code: generatedCode, map } = generate(source, parseOptions);
+        const { code: generatedCode, map } = /\.?[cm]?[jt]s$/.test(langInfo) ? generateJsTsBlock(generate, source, parseOptions) : generate(source, parseOptions);
         debug$1("generated code", generatedCode);
         debug$1("sourcemap", map, ctx.sourceMap);
         if (code !== generatedCode) {
@@ -496,17 +402,28 @@ function getGenerator(ext, fallback = generateJSON) {
   if (/\.?json5?$/.test(ext)) {
     return generateJSON;
   }
-  if (/\.ya?ml$/.test(ext)) {
+  if (/\.?ya?ml$/.test(ext)) {
     return generateYAML;
   }
-  if (/\.[c|m]?js$/.test(ext)) {
+  if (/\.?[cm]?js$/.test(ext)) {
     return generateJavaScript;
   }
-  if (/\.[c|m]?ts$/.test(ext)) {
+  if (/\.?[cm]?ts$/.test(ext)) {
     return generateTypescript;
   }
   return fallback;
 }
+function generateJsTsBlock(generate, source, options) {
+  try {
+    return generate(source, options);
+  } catch (error2) {
+    try {
+      return generate(`export default ${source.replace(/^[\s;]+/, "")}`, options);
+    } catch (wrappedError) {
+      throw /^\s*export\s+default\b/m.test(source) ? error2 : wrappedError;
+    }
+  }
+}
 async function loadWebpack() {
   const mod = await import('webpack');
   return mod.default || mod;
@@ -569,7 +486,7 @@ function getCode(source, filename, sourceMap, query, parser, meta) {
   const result = parser(readFile(filename), { sourceMap, filename });
   const block = result.descriptor.customBlocks[query.index];
   if (block) {
-    const code = block.src ? readFile(block.src) : block.content;
+    const code = block.src ? readFile(resolveBlockSrc(block.src, filename)) : block.content;
     debug$1(`getCode (${meta.framework}) ${query.index} from SFC`, code);
     return code;
   }
@@ -617,6 +534,12 @@ function getOptions(filename, ctx, query, opts) {
     isGlobal: false
   });
 }
+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,7 +1,7 @@
 {
   "name": "@intlify/unplugin-vue-i18n",
   "type": "module",
-  "version": "12.0.0-alpha.3",
+  "version": "12.0.0-alpha.4",
   "description": "unplugin for Vue I18n",
   "author": {
     "name": "kazuya kawaguchi",
@@ -38,8 +38,8 @@
     "picocolors": "^1.0.0",
     "tinyglobby": "^0.2.15",
     "unplugin": "^2.2.0",
-    "vue": "~3.5.34",
-    "@intlify/bundle-utils": "12.0.0-alpha.3"
+    "vue": "~3.6.0-rc.12",
+    "@intlify/bundle-utils": "12.0.0-alpha.4"
   },
   "devDependencies": {
     "@intlify/core-base": "next",
@@ -51,7 +51,7 @@
     "@vitejs/plugin-vue": "^6.0.6",
     "jsdom": "^29.0.0",
     "memory-fs": "^0.5.0",
-    "rollup-vite": "npm:vite@6.4.2",
+    "rollup-vite": "npm:vite@6.4.4",
     "ts-loader": "~9.5.7",
     "unbuild": "^3.6.1",
     "vite": "^8.0.0",