🐛 bug(index): evaluate availabilities lazily (fix #477) (#483) by @ga…

…mtiq
kazupon · Dec 15, 2018 · b66f02e · b66f02e
1 parent 402092b
commit b66f02e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/src/index.js b/src/index.js
@@ -9,9 +9,7 @@ import {
   isObject,
   looseClone,
   remove,
-  merge,
-  canUseDateTimeFormat,
-  canUseNumberFormat
+  merge
 } from './util'
 import BaseFormatter from './format'
 import I18nPath from './path'
@@ -688,9 +686,20 @@ export default class VueI18n {
   }
 }
 
-VueI18n.availabilities = {
-  dateTimeFormat: canUseDateTimeFormat,
-  numberFormat: canUseNumberFormat
-}
+let availabilities: IntlAvailability
+// $FlowFixMe
+Object.defineProperty(VueI18n, 'availabilities', {
+  get () {
+    if (!availabilities) {
+      const intlDefined = typeof Intl !== 'undefined'
+      availabilities = {
+        dateTimeFormat: intlDefined && typeof Intl.DateTimeFormat !== 'undefined',
+        numberFormat: intlDefined && typeof Intl.NumberFormat !== 'undefined'
+      }
+    }
+
+    return availabilities
+  }
+})
 VueI18n.install = install
 VueI18n.version = '__VERSION__'
diff --git a/src/util.js b/src/util.js
@@ -120,9 +120,3 @@ export function looseEqual (a: any, b: any): boolean {
     return false
   }
 }
-
-export const canUseDateTimeFormat: boolean =
-  typeof Intl !== 'undefined' && typeof Intl.DateTimeFormat !== 'undefined'
-
-export const canUseNumberFormat: boolean =
-  typeof Intl !== 'undefined' && typeof Intl.NumberFormat !== 'undefined'