Merge pull request #77 from JessicaSachs/master

IE11 Compatibility: Replacing String.includes usages with String.indexOf
davestewart · Dec 16, 2019 · 141e85d · 141e85d
2 parents 55b0720 + 3f2bce7
commit 141e85d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/src/services/paths.js b/src/services/paths.js
@@ -19,7 +19,7 @@ import { isObject } from '../utils/object'
  */
 export function makePaths (path, props, fnResolver) {
   // handle wildcards
-  if (typeof path === 'string' && path.includes('*')) {
+  if (typeof path === 'string' && path.indexOf('*') > -1) {
     return makePathsHash(fnResolver(path))
   }
 
@@ -68,7 +68,7 @@ export function makePaths (path, props, fnResolver) {
  */
 export function makePath (path, target = '') {
   path = path.replace(/\/+$/, '')
-  const value = path.includes('@')
+  const value = path.indexOf('@') > -1
     ? path + '.' + target
     : path + '/' + target
   return value

diff --git a/src/services/resolver.js b/src/services/resolver.js
@@ -108,7 +108,7 @@ export function resolve (store, path) {
 
   // parent
   let modPath, trgName
-  if (statePath.includes('/')) {
+  if (statePath.indexOf('/') > -1) {
     const keys = statePath.split('/')
     trgName = keys.pop()
     modPath = keys.join('/')
@@ -128,7 +128,7 @@ export function resolve (store, path) {
     module: modPath,
     target: statePath,
     name: trgName.replace('!', ''),
-    isDynamic: path.includes(':'),
+    isDynamic: path.indexOf(':') > -1,
 
     /**
      * Returns properties about the targeted member
@@ -167,7 +167,7 @@ export function resolve (store, path) {
  */
 export function getError(path, resolver, aName, a, bName, b) {
   let error = `[Vuex Pathify] Unable to map path '${path}':`
-  if (path.includes('!')) {
+  if (path.indexOf('!') > -1) {
     error += `
     - Did not find ${aName} or ${bName} named '${resolver.name}' on ${resolver.module ? `module '${resolver.module}'`: 'root store'}`
   }

diff --git a/src/services/store.js b/src/services/store.js
@@ -104,7 +104,7 @@ export function makeGetter (store, path, stateOnly) {
  * @returns {*}
  */
 function getValueIfEnabled(expr, source, path) {
-  if (!options.deep && expr.includes('@')) {
+  if (!options.deep && expr.indexOf('@') > -1) {
     console.error(`[Vuex Pathify] Unable to access sub-property for path '${expr}':
     - Set option 'deep' to 1 to allow it`)
     return

diff --git a/src/services/wildcards.js b/src/services/wildcards.js
@@ -116,7 +116,7 @@ export function resolveHandlers (path, hash) {
  */
 export function init (path, state) {
   // only wildcards in final path segment are supported
-  if (path.includes('*') && /\*.*[/@.]/.test(path)) {
+  if (path.indexOf('*') > -1 && /\*.*[/@.]/.test(path)) {
     console.error(`[Vuex Pathify] Invalid wildcard placement for path '${path}':
     - Wildcards may only be used in the last segment of a path`)
     return false