fix: alternative array includes (#857)

closes #851
kazupon · Apr 25, 2020 · dea111b · dea111b
1 parent 6e70740
commit dea111b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/src/components/number.js b/src/components/number.js
@@ -1,6 +1,6 @@
 /* @flow */
 
-import { warn, isObject, numberFormatKeys } from '../util'
+import { warn, isObject, includes, numberFormatKeys } from '../util'
 
 export default {
   name: 'i18n-n',
@@ -43,7 +43,7 @@ export default {
 
       // Filter out number format options only
       options = Object.keys(props.format).reduce((acc, prop) => {
-        if (numberFormatKeys.includes(prop)) {
+        if (includes(numberFormatKeys, prop)) {
           return Object.assign({}, acc, { [prop]: props.format[prop] })
         }
         return acc

diff --git a/src/index.js b/src/index.js
@@ -10,6 +10,7 @@ import {
   isObject,
   looseClone,
   remove,
+  includes,
   merge,
   numberFormatKeys
 } from './util'
@@ -398,7 +399,7 @@ export default class VueI18n {
       // Remove the leading @:, @.case: and the brackets
       const linkPlaceholder: string = link.replace(linkPrefix, '').replace(bracketsMatcher, '')
 
-      if (visitedLinkStack.includes(linkPlaceholder)) {
+      if (includes(visitedLinkStack, linkPlaceholder)) {
         if (process.env.NODE_ENV !== 'production') {
           warn(`Circular reference found. "${link}" is already visited in the chain of ${visitedLinkStack.reverse().join(' <- ')}`)
         }
@@ -462,7 +463,7 @@ export default class VueI18n {
 
   _appendItemToChain (chain: Array<Locale>, item: Locale, blocks: any): any {
     let follow = false
-    if (!chain.includes(item)) {
+    if (!includes(chain, item)) {
       follow = true
       if (item) {
         follow = item[item.length - 1] !== '!'
@@ -931,7 +932,7 @@ export default class VueI18n {
 
         // Filter out number format options only
         options = Object.keys(args[0]).reduce((acc, key) => {
-          if (numberFormatKeys.includes(key)) {
+          if (includes(numberFormatKeys, key)) {
             return Object.assign({}, acc, { [key]: args[0][key] })
           }
           return acc

diff --git a/src/util.js b/src/util.js
@@ -92,6 +92,10 @@ export function remove (arr: Array<any>, item: any): Array<any> | void {
   }
 }
 
+export function includes (arr: Array<any>, item: any): boolean {
+  return !!~arr.indexOf(item)
+}
+
 const hasOwnProperty = Object.prototype.hasOwnProperty
 export function hasOwn (obj: Object | Array<*>, key: string): boolean {
   return hasOwnProperty.call(obj, key)