fix(unplugin-vue-i18n): exclude locales when using mixed locales #329 (…

…#366)
intlify · May 16, 2024 · cbbf632 · cbbf632
1 parent 68f63aa
commit cbbf632
Show file tree

Hide file tree

Showing 6 changed files with 282 additions and 54 deletions.
diff --git a/packages/bundle-utils/src/json.ts b/packages/bundle-utils/src/json.ts
@@ -65,7 +65,6 @@ export function generate(
     escapeHtml,
     jit
   } as CodeGenOptions
-  const generator = createCodeGenerator(options)
 
   let ast = parseJSON(value, { filePath: filename })
 
@@ -81,6 +80,14 @@ export function generate(
     ast = parseJSON(value, { filePath: filename })
   }
 
+  if (locale && onlyLocales?.length && !onlyLocales.includes(locale)) {
+    value = JSON.stringify({})
+    ast = parseJSON(value, { filePath: filename })
+    options.locale = ''
+    options.source = undefined
+  }
+
+  const generator = createCodeGenerator(options)
   const codeMaps = _generate(generator, ast, options)
 
   const { code, map } = generator.context()

diff --git a/packages/bundle-utils/src/yaml.ts b/packages/bundle-utils/src/yaml.ts
@@ -65,7 +65,6 @@ export function generate(
     escapeHtml,
     jit
   } as CodeGenOptions
-  const generator = createCodeGenerator(options)
 
   let ast = parseYAML(value, { filePath: filename })
 
@@ -81,6 +80,14 @@ export function generate(
     ast = parseYAML(value, { filePath: filename })
   }
 
+  if (locale && onlyLocales?.length && !onlyLocales.includes(locale)) {
+    value = JSON.stringify({})
+    ast = parseYAML(value, { filePath: filename })
+    options.locale = ''
+    options.source = undefined
+  }
+
+  const generator = createCodeGenerator(options)
   const codeMaps = _generate(generator, ast, options)
 
   const { code, map } = generator.context()

diff --git a/packages/unplugin-vue-i18n/test/fixtures/locale-mix-json.vue b/packages/unplugin-vue-i18n/test/fixtures/locale-mix-json.vue
@@ -0,0 +1,13 @@
+<i18n lang="json">
+{
+  "en": {
+    "hello": "hello world!"
+  }
+}
+</i18n>
+
+<i18n locale="ja" lang="json">
+{
+  "hello": "こんにちは、世界！"
+}
+</i18n>
diff --git a/packages/unplugin-vue-i18n/test/fixtures/locale-mix-yaml.vue b/packages/unplugin-vue-i18n/test/fixtures/locale-mix-yaml.vue
@@ -0,0 +1,8 @@
+<i18n lang="yaml">
+en:
+  hello: hello world!
+</i18n>
+
+<i18n locale="ja" lang="yaml">
+hello: こんにちは、世界！
+</i18n>