@intlify/unplugin-vue-i18n 1.4.0 → 1.6.0

package/README.md

@@ -225,6 +225,8 @@ export default defineConfig({
   ],
 })
 ```
+unplugin-vue-i18n will automatically merge locale files into `@intlify/unplugin-vue-i18n/messages`. This allows locales to be split across multiple files, for example `src/locales/fruits/en.json` and `src/locales/vegetables/en.json`.
+
 ### Types
 
 If you want type definition of `@intlify/unplugin-vue-i18n/messages`, add `unplugin-vue-i18n/messages` to `compilerOptions.types` of your tsconfig:
@@ -279,13 +281,13 @@ This plugin will automatically select and bundle `petite-vue-i18n` build accordi
 
   If nothing is specified for this option, i.e. `undefined`, nothing is done to the resource in the above format.
 
-  > ⚠️ NOTE: 
+  > ⚠️ NOTE:
   `json` resources matches this option, it will be handled **before the internal json plugin of bundler, and will not be processed afterwards**, else the option doesn't match, the bundler side will handle.
 
-  > ⚠️ NOTE: 
+  > ⚠️ NOTE:
   `yaml` resources don't support multi documentation with `|`, alias with `&` and `*`, tags with `! `, `@`, etc. Only simple data structures.
 
-  > ⚠️ NOTE: 
+  > ⚠️ NOTE:
   `js` and `ts` resources are set **simple export (`export default`) as locale messages object, as default**.
 
   ```js
@@ -297,7 +299,7 @@ This plugin will automatically select and bundle `petite-vue-i18n` build accordi
 
   If you need to use programmatically dynamic resource construction, you would be enable `allowDynamic` option. about details, see the section.
 
-  > ⚠️ NOTE: 
+  > ⚠️ NOTE:
   If you use the `js` and `ts` resources formats, set the paths, so your application code is not targeted. We recommend that resources be isolated from the application code.
 
 
@@ -352,12 +354,12 @@ This plugin will automatically select and bundle `petite-vue-i18n` build accordi
 
   Whether locale mesages should be compiled by JIT (Just in Time) compilation with vue-i18n's message compiler.
 
-  > ⚠️ NOTE: 
+  > ⚠️ NOTE:
   This option works with vue-i18n v9.3 and later.
 
   JIT compilation has been supported since vue-i18n v9.3. This means that since v9 was released until now, the message compiler compiles to executable JavaScript code, however it did not work in the CSP environment. Also, since this was an AOT (Ahead of Time) compilation, it was not possible to dynamically retrieve locale messages from the back-end Database and compose locale mesages with programatic.
 
-  > ⚠️ NOTE: 
+  > ⚠️ NOTE:
   Enabling JIT compilation causes the message compiler to generate AST objects for locale mesages instead of JavaScript code. If you pre-compile locale messages with a tool such as the [Intlify CLI](https://github.com/intlify/cli) and import them dynamically, you need to rebuild that resource.
 
   About JIT compilation, See [here](https://vue-i18n.intlify.dev/guide/advanced/optimization.html#jit-compilation)
@@ -371,10 +373,10 @@ Whether to tree-shake message compiler when we will be bundling.
 
 If do you will use this option, you need to enable `jitCompilation` option.
 
-> ⚠️ NOTE: 
+> ⚠️ NOTE:
 This option works with vue-i18n v9.3 and later.
 
-> ⚠️ NOTE: 
+> ⚠️ NOTE:
 If you enable this option, **you should check  resources in your application are pre-compiled with this plugin.** If you will be loading resources dynamically from the back-end via the API, enabling this option do not work because there is not message compiler.
 
 ### `ssr`
@@ -384,7 +386,7 @@ If you enable this option, **you should check  resources in your application are
 
   Whether to bundle vue-i18n module for SSR at build time
 
-  > ⚠️ NOTE: 
+  > ⚠️ NOTE:
   This option works with vue-i18n v9.4 and later.
 
 ### `runtimeOnly`
@@ -393,7 +395,7 @@ If you enable this option, **you should check  resources in your application are
 - **Default:** `true`
 
   Whether or not to automatically use Vue I18n **runtime-only** in production build, set `vue-i18n.runtime.esm-bundler.js` in the `vue-i18n` field of bundler config, the below:
-  
+
   ```
   - vite config: `resolve.alias`
   - webpack config: `resolve.alias`
@@ -545,6 +547,24 @@ If you enable this option, **you should check  resources in your application are
 
   > ⚠️ Note that if you set `bridge: true`, the bundle size will increase. It is recommended to disable this mode after the migration from vue-i18n@v8.26 to vue-i18n@v9.x is completed.
 
+### `legacy`
+
+- **Type:** `boolean`
+- **Default:** `false`
+
+  This option supports Vue I18n v8.x compatibility for resources in i18n custom blocks.
+
+  > ⚠️ To work for Vue 2.7, the value of `vueVersion` must be set to `'v2.7'`.
+
+### `vueVersion`
+
+- **Type:** `string`
+- **Default:** `undefined`
+
+  The version of Vue that will be used by Vue I18n. This option is enabled when the `legacy` option is `true`.
+
+  Available values are `'v2.6'` and `'v2.7'`.
+
 ### `esm`
 
 - **Type:** `boolean`

package/lib/index.cjs

@@ -131,6 +131,9 @@ const unplugin = unplugin$1.createUnplugin((options = {}, meta) => {
   const useClassComponent = !!options.useClassComponent;
   const bridge = !!options.bridge;
   debug("bridge", bridge);
+  const legacy = !!options.legacy;
+  debug("legacy", legacy);
+  const vueVersion = shared.isString(options.vueVersion) ? options.vueVersion : void 0;
   const runtimeOnly = shared.isBoolean(options.runtimeOnly) ? options.runtimeOnly : true;
   debug("runtimeOnly", runtimeOnly);
   const jitCompilation = !!options.jitCompilation;
@@ -307,6 +310,8 @@ const unplugin = unplugin$1.createUnplugin((options = {}, meta) => {
                   strictMessage,
                   escapeHtml,
                   bridge,
+                  legacy,
+                  vueVersion,
                   jit: jitCompilation,
                   onlyLocales,
                   exportESM: esm,
@@ -522,6 +527,8 @@ const unplugin = unplugin$1.createUnplugin((options = {}, meta) => {
               isGlobal: globalSFCScope,
               useClassComponent,
               bridge,
+              legacy,
+              vueVersion,
               jit: jitCompilation,
               strictMessage,
               escapeHtml,
@@ -629,10 +636,29 @@ async function generateBundleResources(resources, query, isProduction, {
       codes.push(`${JSON.stringify(name)}: ${code}`);
     }
   }
-  return `export default {
-  ${codes.join(`,
-`)}
-}`;
+  return `const isObject = (item) => item && typeof item === 'object' && !Array.isArray(item);
+
+const mergeDeep = (target, ...sources) => {
+  if (!sources.length) return target;
+  const source = sources.shift();
+
+  if (isObject(target) && isObject(source)) {
+    for (const key in source) {
+      if (isObject(source[key])) {
+        if (!target[key]) Object.assign(target, { [key]: {} });
+        mergeDeep(target[key], source[key]);
+      } else {
+        Object.assign(target, { [key]: source[key] });
+      }
+    }
+  }
+
+  return mergeDeep(target, ...sources);
+}
+
+export default mergeDeep({},
+  ${codes.map((code) => `{${code}}`).join(",\n")}
+);`;
 }
 async function getCode(source, filename, sourceMap, query, framework = "vite") {
   const { index, issuerPath } = query;
@@ -671,6 +697,8 @@ function getOptions(filename, isProduction, query, sourceMap, {
   forceStringify = false,
   isGlobal = false,
   bridge = false,
+  legacy = false,
+  vueVersion = "v2.6",
   onlyLocales = [],
   exportESM = true,
   useClassComponent = false,
@@ -690,6 +718,8 @@ function getOptions(filename, isProduction, query, sourceMap, {
     strictMessage,
     escapeHtml,
     bridge,
+    legacy,
+    vueVersion,
     jit,
     onlyLocales,
     exportESM,

package/lib/index.d.cts

@@ -1,6 +1,7 @@
 import * as _unplugin from 'unplugin';
 import { PluginOptions } from './types.cjs';
 export { SFCLangFormat } from './types.cjs';
+import '@intlify/bundle-utils';
 
 declare const unplugin: _unplugin.UnpluginInstance<PluginOptions, boolean>;
 

package/lib/index.d.mts

@@ -1,6 +1,7 @@
 import * as _unplugin from 'unplugin';
 import { PluginOptions } from './types.mjs';
 export { SFCLangFormat } from './types.mjs';
+import '@intlify/bundle-utils';
 
 declare const unplugin: _unplugin.UnpluginInstance<PluginOptions, boolean>;
 

package/lib/index.d.ts

@@ -1,6 +1,7 @@
 import * as _unplugin from 'unplugin';
 import { PluginOptions } from './types.js';
 export { SFCLangFormat } from './types.js';
+import '@intlify/bundle-utils';
 
 declare const unplugin: _unplugin.UnpluginInstance<PluginOptions, boolean>;
 

package/lib/index.mjs

@@ -119,6 +119,9 @@ const unplugin = createUnplugin((options = {}, meta) => {
   const useClassComponent = !!options.useClassComponent;
   const bridge = !!options.bridge;
   debug("bridge", bridge);
+  const legacy = !!options.legacy;
+  debug("legacy", legacy);
+  const vueVersion = isString(options.vueVersion) ? options.vueVersion : void 0;
   const runtimeOnly = isBoolean(options.runtimeOnly) ? options.runtimeOnly : true;
   debug("runtimeOnly", runtimeOnly);
   const jitCompilation = !!options.jitCompilation;
@@ -295,6 +298,8 @@ const unplugin = createUnplugin((options = {}, meta) => {
                   strictMessage,
                   escapeHtml,
                   bridge,
+                  legacy,
+                  vueVersion,
                   jit: jitCompilation,
                   onlyLocales,
                   exportESM: esm,
@@ -510,6 +515,8 @@ const unplugin = createUnplugin((options = {}, meta) => {
               isGlobal: globalSFCScope,
               useClassComponent,
               bridge,
+              legacy,
+              vueVersion,
               jit: jitCompilation,
               strictMessage,
               escapeHtml,
@@ -617,10 +624,29 @@ async function generateBundleResources(resources, query, isProduction, {
       codes.push(`${JSON.stringify(name)}: ${code}`);
     }
   }
-  return `export default {
-  ${codes.join(`,
-`)}
-}`;
+  return `const isObject = (item) => item && typeof item === 'object' && !Array.isArray(item);
+
+const mergeDeep = (target, ...sources) => {
+  if (!sources.length) return target;
+  const source = sources.shift();
+
+  if (isObject(target) && isObject(source)) {
+    for (const key in source) {
+      if (isObject(source[key])) {
+        if (!target[key]) Object.assign(target, { [key]: {} });
+        mergeDeep(target[key], source[key]);
+      } else {
+        Object.assign(target, { [key]: source[key] });
+      }
+    }
+  }
+
+  return mergeDeep(target, ...sources);
+}
+
+export default mergeDeep({},
+  ${codes.map((code) => `{${code}}`).join(",\n")}
+);`;
 }
 async function getCode(source, filename, sourceMap, query, framework = "vite") {
   const { index, issuerPath } = query;
@@ -659,6 +685,8 @@ function getOptions(filename, isProduction, query, sourceMap, {
   forceStringify = false,
   isGlobal = false,
   bridge = false,
+  legacy = false,
+  vueVersion = "v2.6",
   onlyLocales = [],
   exportESM = true,
   useClassComponent = false,
@@ -678,6 +706,8 @@ function getOptions(filename, isProduction, query, sourceMap, {
     strictMessage,
     escapeHtml,
     bridge,
+    legacy,
+    vueVersion,
     jit,
     onlyLocales,
     exportESM,

package/lib/types.d.cts

@@ -1,3 +1,5 @@
+import { CodeGenOptions } from '@intlify/bundle-utils';
+
 type SFCLangFormat = 'json' | 'json5' | 'yml' | 'yaml';
 interface PluginOptions {
     include?: string | string[];
@@ -14,6 +16,8 @@ interface PluginOptions {
     defaultSFCLang?: SFCLangFormat;
     globalSFCScope?: boolean;
     bridge?: boolean;
+    legacy?: boolean;
+    vueVersion?: CodeGenOptions['vueVersion'];
     useClassComponent?: boolean;
     useVueI18nImportName?: boolean;
     strictMessage?: boolean;

package/lib/types.d.mts

@@ -1,3 +1,5 @@
+import { CodeGenOptions } from '@intlify/bundle-utils';
+
 type SFCLangFormat = 'json' | 'json5' | 'yml' | 'yaml';
 interface PluginOptions {
     include?: string | string[];
@@ -14,6 +16,8 @@ interface PluginOptions {
     defaultSFCLang?: SFCLangFormat;
     globalSFCScope?: boolean;
     bridge?: boolean;
+    legacy?: boolean;
+    vueVersion?: CodeGenOptions['vueVersion'];
     useClassComponent?: boolean;
     useVueI18nImportName?: boolean;
     strictMessage?: boolean;

package/lib/types.d.ts

@@ -1,3 +1,5 @@
+import { CodeGenOptions } from '@intlify/bundle-utils';
+
 type SFCLangFormat = 'json' | 'json5' | 'yml' | 'yaml';
 interface PluginOptions {
     include?: string | string[];
@@ -14,6 +16,8 @@ interface PluginOptions {
     defaultSFCLang?: SFCLangFormat;
     globalSFCScope?: boolean;
     bridge?: boolean;
+    legacy?: boolean;
+    vueVersion?: CodeGenOptions['vueVersion'];
     useClassComponent?: boolean;
     useVueI18nImportName?: boolean;
     strictMessage?: boolean;

package/lib/vite.d.cts

@@ -1,5 +1,6 @@
 import * as vite from 'vite';
 import { PluginOptions } from './types.cjs';
+import '@intlify/bundle-utils';
 
 declare const _default: (options: PluginOptions) => vite.Plugin | vite.Plugin[];
 

package/lib/vite.d.mts

@@ -1,5 +1,6 @@
 import * as vite from 'vite';
 import { PluginOptions } from './types.mjs';
+import '@intlify/bundle-utils';
 
 declare const _default: (options: PluginOptions) => vite.Plugin | vite.Plugin[];
 

package/lib/vite.d.ts

@@ -1,5 +1,6 @@
 import * as vite from 'vite';
 import { PluginOptions } from './types.js';
+import '@intlify/bundle-utils';
 
 declare const _default: (options: PluginOptions) => vite.Plugin | vite.Plugin[];
 

package/lib/webpack.d.cts

@@ -1,5 +1,6 @@
 import * as webpack from 'webpack';
 import { PluginOptions } from './types.cjs';
+import '@intlify/bundle-utils';
 
 declare const _default: (options: PluginOptions) => webpack.WebpackPluginInstance;
 

package/lib/webpack.d.mts

@@ -1,5 +1,6 @@
 import * as webpack from 'webpack';
 import { PluginOptions } from './types.mjs';
+import '@intlify/bundle-utils';
 
 declare const _default: (options: PluginOptions) => webpack.WebpackPluginInstance;
 

package/lib/webpack.d.ts

@@ -1,5 +1,6 @@
 import * as webpack from 'webpack';
 import { PluginOptions } from './types.js';
+import '@intlify/bundle-utils';
 
 declare const _default: (options: PluginOptions) => webpack.WebpackPluginInstance;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intlify/unplugin-vue-i18n",
-  "version": "1.4.0",
+  "version": "1.6.0",
   "description": "unplugin for Vue I18n",
   "author": {
     "name": "kazuya kawaguchi",