feat: support vue-i18n v9.1 (#188)

intlify · Apr 8, 2021 · 21d5b56 · 21d5b56
1 parent 9813825
commit 21d5b56
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 25 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,7 @@ tests/e2e/projects/vue-i18n-js/
 tests/e2e/projects/vue-i18n-ts/
 tests/output.json
 .DS_Store
+.env
 *.log
 *.swp
 *~
diff --git a/client-addon/.postcssrc.js b/client-addon/.postcssrc.js
@@ -2,4 +2,4 @@ module.exports = {
   plugins: {
     autoprefixer: {}
   }
-}
+}
diff --git a/client-addon/babel.config.js b/client-addon/babel.config.js
@@ -1,5 +1,3 @@
 module.exports = {
-  presets: [
-    '@vue/cli-plugin-babel/preset'
-  ]
+  presets: ['@vue/cli-plugin-babel/preset']
 }
diff --git a/client-addon/public/index.html b/client-addon/public/index.html
@@ -1,15 +1,18 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+    <meta charset="utf-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <meta name="viewport" content="width=device-width,initial-scale=1.0" />
+    <link rel="icon" href="<%= BASE_URL %>favicon.ico" />
     <title>client-addon</title>
   </head>
   <body>
     <noscript>
-      <strong>We're sorry but client-addon doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
+      <strong
+        >We're sorry but client-addon doesn't work properly without JavaScript
+        enabled. Please enable it to continue.</strong
+      >
     </noscript>
     <div id="app"></div>
     <!-- built files will be auto injected -->

diff --git a/client-addon/src/utils.js b/client-addon/src/utils.js
@@ -1,16 +1,20 @@
 import { unflatten } from 'flat'
 
-export function isObject (obj) {
+export function isObject(obj) {
   return obj !== null && typeof obj === 'object'
 }
 
-export function hasChildPaths (path, paths) {
-  if (!path) { return false }
+export function hasChildPaths(path, paths) {
+  if (!path) {
+    return false
+  }
 
-  const localeMessages = unflatten(paths.reduce((val, path) => {
-    val[path] = ''
-    return val
-  }, {}))
+  const localeMessages = unflatten(
+    paths.reduce((val, path) => {
+      val[path] = ''
+      return val
+    }, {})
+  )
   const splits = path.split('.')
 
   // TODO: should be more strogly checking ...

diff --git a/generator/index.js b/generator/index.js
@@ -52,8 +52,8 @@ module.exports = (api, options, rootOptions) => {
     }
 
     if (isVue3) {
-      pkg.dependencies['vue-i18n'] = '^9.0.0'
-      pkg.devDependencies['@intlify/vue-i18n-loader'] = '^2.0.0'
+      pkg.dependencies['vue-i18n'] = '^9.1.0'
+      pkg.devDependencies['@intlify/vue-i18n-loader'] = '^2.1.0'
       pkg.vue.pluginOptions.i18n['enableLegacy'] = enableLegacy
       pkg.vue.pluginOptions.i18n['runtimeOnly'] = false
       pkg.vue.pluginOptions.i18n['compositionOnly'] = !!enableLegacy

diff --git a/index.js b/index.js
@@ -59,7 +59,7 @@ module.exports = (api, options) => {
         {
           __VUE_I18N_LEGACY_API__: legacyApiFlag,
           __VUE_I18N_FULL_INSTALL__: installFlag,
-          __INTLIFY_PROD_DEVTOOLS__: 'false'
+          __VUE_I18N_PROD_DEVTOOLS__: 'false'
         }
       ])
       debug(

diff --git a/tests/unit/generator-vue3.spec.js b/tests/unit/generator-vue3.spec.js
@@ -28,8 +28,8 @@ test('javascript: legacy', async () => {
   expect(sfc).toMatch(`import { defineComponent } from 'vue'`)
   expect(sfc).toMatch(`export default defineComponent({`)
   const pack = files['package.json']
-  expect(pack).toMatch(`"vue-i18n": "^9.0.0"`)
-  expect(pack).toMatch(`"@intlify/vue-i18n-loader": "^2.0.0"`)
+  expect(pack).toMatch(`"vue-i18n": "^9.1.0"`)
+  expect(pack).toMatch(`"@intlify/vue-i18n-loader": "^2.1.0"`)
 })
 
 test('javascript: composition', async () => {
@@ -62,8 +62,8 @@ test('javascript: composition', async () => {
   expect(sfc).toMatch(`export default defineComponent({`)
   expect(sfc).toMatch(`const { t } = useI18n({`)
   const pack = files['package.json']
-  expect(pack).toMatch(`"vue-i18n": "^9.0.0"`)
-  expect(pack).toMatch(`"@intlify/vue-i18n-loader": "^2.0.0"`)
+  expect(pack).toMatch(`"vue-i18n": "^9.1.0"`)
+  expect(pack).toMatch(`"@intlify/vue-i18n-loader": "^2.1.0"`)
 })
 
 test('typescript: composition', async () => {
@@ -107,6 +107,6 @@ test('typescript: composition', async () => {
   expect(sfc).toMatch(`export default defineComponent({`)
   expect(sfc).toMatch(`const { t } = useI18n({`)
   const pack = files['package.json']
-  expect(pack).toMatch(`"vue-i18n": "^9.0.0"`)
-  expect(pack).toMatch(`"@intlify/vue-i18n-loader": "^2.0.0"`)
+  expect(pack).toMatch(`"vue-i18n": "^9.1.0"`)
+  expect(pack).toMatch(`"@intlify/vue-i18n-loader": "^2.1.0"`)
 })