fix: sync & inherit locale

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

@@ -52,6 +52,7 @@
     "jest-watch-typeahead": "^0.6.0",
     "lerna-changelog": "^1.0.1",
     "minimist": "^1.2.5",
+    "npm-run-all": "^4.1.5",
     "opener": "^1.5.1",
     "prettier": "^2.0.0",
     "puppeteer": "^2.1.1",
@@ -98,24 +99,26 @@
     "build:sourcemap": "yarn build --sourcemap",
     "build:type": "yarn build --types",
     "build:watch": "tsc -p . --watch",
-    "clean": "yarn clean:type && yarn clean:dist && yarn clean:docs && yarn clean:cache && yarn clean:coverage",
-    "clean:cache": "rm -rf ./node_modules/.rts2_cache",
+    "clean": "npm-run-all --parallel clean:*",
+    "clean:cache": "yarn clean:cache:rollup && yarn clean:cache:jest",
+    "clean:cache:rollup": "rm -rf ./node_modules/.rts2_cache",
+    "clean:cache:jest": "jest --clearCache",
     "clean:coverage": "rm -rf ./coverage",
     "clean:dist": "rm -rf ./dist/**",
     "clean:docs": "rm -rf ./docs",
     "clean:type": "rm -rf ./types/** ./temp ./dist/vue-i18n.d.ts",
     "coverage": "opener coverage/lcov-report/index.html",
-    "dev:docs": "yarn build:type && yarn docs:api",
+    "dev:docs": "npm-run-all build:type docs:api",
     "dev:e2e": "jest --runInBand --config ./jest.e2e.config.js",
     "docs:api": "api-documenter markdown -i ./temp -o docs",
-    "fix": "yarn lint:fix && yarn format:fix",
+    "fix": "npm-run-all --parallel lint:fix format:fix",
     "format": "prettier --config .prettierrc --ignore-path .prettierignore '**/*.{js,json,html}'",
     "format:fix": "yarn format --write",
     "lint": "eslint ./src ./test ./e2e ./benchmark --ext .js,.ts",
     "lint:fix": "yarn lint --fix",
     "release:prepare": "shipjs prepare",
     "release:trigger": "shipjs trigger",
-    "test": "yarn lint && yarn test:cover && yarn test:e2e",
+    "test": "npm-run-all lint clean:cache:jest test:cover test:e2e",
     "test:cover": "yarn test:unit --coverage",
     "test:e2e": "yarn build && jest --runInBand --config ./jest.e2e.config.js",
     "test:type": "tsc -p . --noEmit",

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!'
       }
     }