Merge branch 'master' of github.com:intlify/vue-i18n-next

Author: kazupon

e2e/fallback/component.test.js

@@ -8,7 +8,9 @@
 
     test('initial rendering', async () => {
       await expect(page).toMatch('こんにちは、世界')
-      await expect(page).toMatch('Component1 locale messages: hello component1')
+      await expect(page).toMatch(
+        'Component1 locale messages: こんにちは、component1'
+      )
       await expect(page).toMatch(
         'Fallback global locale messages: おはよう、世界！'
       )

e2e/scope/local.test.js

@@ -11,7 +11,7 @@
         text: 'こんにちは、世界！'
       })
       await expect(page).toMatchElement('#app div.child p', {
-        text: 'Hi there!'
+        text: 'やあ！'
       })
     })
 

package.json

@@ -57,7 +57,7 @@
     "prettier": "^2.0.0",
     "puppeteer": "^2.1.1",
     "rollup": "^2.3.0",
-    "rollup-plugin-terser": "^5.2.0",
+    "rollup-plugin-terser": "^6.0.0",
     "rollup-plugin-typescript2": "^0.27.0",
     "set-tz": "^0.2.0",
     "shipjs": "^0.19.0",

src/composer.ts

@@ -285,7 +285,9 @@ export function createComposer(
   const { __root } = options
   const _isGlobal = __root === undefined
 
-  let _inheritLocale = !!options.inheritLocale
+  let _inheritLocale = isBoolean(options.inheritLocale)
+    ? options.inheritLocale
+    : true
 
   const _locale = ref<Locale>(
     // prettier-ignore

src/legacy.ts

@@ -201,7 +201,7 @@ function convertComposerOptions(
   const warnHtmlMessage = isString(options.warnHtmlInMessage)
     ? options.warnHtmlInMessage !== 'off'
     : true
-  const inheritLocale = !!options.sync
+  const inheritLocale = isBoolean(options.sync) ? options.sync : true
 
   if (__DEV__ && options.formatter) {
     warn(getWarnMessage(I18nWarnCodes.NOT_SUPPORTED_FORMATTER))

test/composer.test.ts

@@ -57,19 +57,19 @@ describe('inheritLocale', () => {
       locale: 'ja',
       __root: root
     })
-    expect(inheritLocale).toEqual(false)
-    expect(locale.value).toEqual('ja')
+    expect(inheritLocale).toEqual(true)
+    expect(locale.value).toEqual('en')
   })
 
   test('initialize with composer option', () => {
     const root = createComposer({ locale: 'en' })
     const { inheritLocale, locale } = createComposer({
       locale: 'ja',
-      inheritLocale: true,
+      inheritLocale: false,
       __root: root
     })
-    expect(inheritLocale).toEqual(true)
-    expect(locale.value).toEqual('en')
+    expect(inheritLocale).toEqual(false)
+    expect(locale.value).toEqual('ja')
   })
 
   test('sync root locale, fallbackLocale', async () => {

test/i18n.test.ts

@@ -50,6 +50,7 @@ describe('useI18n', () => {
       template: `<p>foo</p>`,
       setup() {
         composer = useI18n({
+          inheritLocale: false,
           locale: 'en',
           messages: {
             en: {
@@ -115,6 +116,7 @@ describe('useI18n', () => {
       template: `<div>parent</div><Leaf />`,
       setup() {
         parent = useI18n({
+          inheritLocale: false,
           locale: 'en',
           messages: {
             en: {

test/mixin.test.ts

@@ -23,6 +23,7 @@ describe('beforeCreate', () => {
       template: `<p>{{ $t('bye') }}</p>`,
       i18n: {
         locale: 'ja',
+        sync: false,
         messages: {
           ja: {
             bye: 'さようなら'
@@ -47,7 +48,7 @@ describe('beforeCreate', () => {
     })
 
     const messages = {
-      'en-US': {
+      en: {
         bye: 'good bye!'
       }
     }

yarn.lock

@@ -2,7 +2,7 @@
 # yarn lockfile v1
 
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.5.5", "@babel/code-frame@^7.8.3":
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz#33e25903d7481181534e12ec0a25f16b6fcf419e"
   integrity sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==
@@ -2545,11 +2545,6 @@ estraverse@^5.1.0:
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.1.0.tgz#374309d39fd935ae500e7b92e8a6b4c720e59642"
   integrity sha512-FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw==
 
-estree-walker@^0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.1.tgz#53049143f40c6eb918b23671d1fe3219f3a1b362"
-  integrity sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==
-
 estree-walker@^0.8.1:
   version "0.8.1"
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.8.1.tgz#6230ce2ec9a5cb03888afcaf295f97d90aa52b79"
@@ -4200,14 +4195,6 @@ jest-watcher@^26.0.0, jest-watcher@^26.0.1:
     jest-util "^26.0.1"
     string-length "^4.0.1"
 
-jest-worker@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.9.0.tgz#5dbfdb5b2d322e98567898238a9697bcce67b3e5"
-  integrity sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==
-  dependencies:
-    merge-stream "^2.0.0"
-    supports-color "^6.1.0"
-
 jest-worker@^26.0.0:
   version "26.0.0"
   resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.0.0.tgz#4920c7714f0a96c6412464718d0c58a3df3fb066"
@@ -5852,16 +5839,15 @@ rimraf@^3.0.0:
   dependencies:
     glob "^7.1.3"
 
-rollup-plugin-terser@^5.2.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-terser/-/rollup-plugin-terser-5.3.0.tgz#9c0dd33d5771df9630cd027d6a2559187f65885e"
-  integrity sha512-XGMJihTIO3eIBsVGq7jiNYOdDMb3pVxuzY0uhOE/FM4x/u9nQgr3+McsjzqBn3QfHIpNSZmFnpoKAwHBEcsT7g==
+rollup-plugin-terser@^6.0.0:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-terser/-/rollup-plugin-terser-6.0.1.tgz#aebdcc83a3b61e307944861ad2e8e2362b89b992"
+  integrity sha512-XUPB2wwtgQV0A1eq4HXavfkOYL8MqX2ghU3uxvjRQYbUo0QEE3Tjupk7d7hNd1Yfm91xrpQHlbnVI01sf2s3bA==
   dependencies:
-    "@babel/code-frame" "^7.5.5"
-    jest-worker "^24.9.0"
-    rollup-pluginutils "^2.8.2"
-    serialize-javascript "^2.1.2"
-    terser "^4.6.2"
+    "@babel/code-frame" "^7.8.3"
+    jest-worker "^26.0.0"
+    serialize-javascript "^3.0.0"
+    terser "^4.7.0"
 
 rollup-plugin-typescript2@^0.27.0:
   version "0.27.0"
@@ -5874,13 +5860,6 @@ rollup-plugin-typescript2@^0.27.0:
     resolve "1.15.1"
     tslib "1.11.1"
 
-rollup-pluginutils@^2.8.2:
-  version "2.8.2"
-  resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz#72f2af0748b592364dbd3389e600e5a9444a351e"
-  integrity sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==
-  dependencies:
-    estree-walker "^0.6.1"
-
 rollup@^2.3.0:
   version "2.7.6"
   resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.7.6.tgz#8e6682e64ca65eb33b896dcce902696f0415ce1a"
@@ -6000,11 +5979,6 @@ sentence-case@^3.0.3:
     tslib "^1.10.0"
     upper-case-first "^2.0.1"
 
-serialize-javascript@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61"
-  integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==
-
 serialize-javascript@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-3.0.0.tgz#492e489a2d77b7b804ad391a5f5d97870952548e"
@@ -6503,13 +6477,6 @@ supports-color@^5.3.0:
   dependencies:
     has-flag "^3.0.0"
 
-supports-color@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
-  integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==
-  dependencies:
-    has-flag "^3.0.0"
-
 supports-color@^7.0.0, supports-color@^7.1.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1"
@@ -6589,10 +6556,10 @@ terminal-link@^2.0.0:
     ansi-escapes "^4.2.1"
     supports-hyperlinks "^2.0.0"
 
-terser@^4.6.2:
-  version "4.6.13"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.13.tgz#e879a7364a5e0db52ba4891ecde007422c56a916"
-  integrity sha512-wMvqukYgVpQlymbnNbabVZbtM6PN63AzqexpwJL8tbh/mRT9LE5o+ruVduAGL7D6Fpjl+Q+06U5I9Ul82odAhw==
+terser@^4.7.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-4.7.0.tgz#15852cf1a08e3256a80428e865a2fa893ffba006"
+  integrity sha512-Lfb0RiZcjRDXCC3OSHJpEkxJ9Qeqs6mp2v4jf2MHfy8vGERmVDuvjXdd/EnP5Deme5F2yBRBymKmKHCBg2echw==
   dependencies:
     commander "^2.20.0"
     source-map "~0.6.1"