Use Array.includes instead of Array.indexOf (codesandbox#2339)

MichaelDeBoey · SaraVieira · commit 382b09f06f70 · 2019-08-30T11:52:57.000-05:00
diff --git a/packages/app/src/app/components/CodeEditor/CodeMirror/elements.js b/packages/app/src/app/components/CodeEditor/CodeMirror/elements.js
@@ -10,9 +10,7 @@ const fontFamilies = (...families) =>
   families
     .filter(Boolean)
     .map(family => (family === 'Dank Mono' ? 'dm' : family))
-    .map(family =>
-      family.indexOf(' ') !== -1 ? JSON.stringify(family) : family
-    )
+    .map(family => (family.includes(' ') ? JSON.stringify(family) : family))
     .join(', ');
 
 export const Container = styled.div`
diff --git a/packages/app/src/app/components/CodeEditor/Monaco/MonacoReactComponent.js b/packages/app/src/app/components/CodeEditor/Monaco/MonacoReactComponent.js
@@ -106,10 +106,10 @@ class MonacoEditor extends React.PureComponent {
 
   render() {
     const { width, height } = this.props;
-    const fixedWidth =
-      width.toString().indexOf('%') !== -1 ? width : `${width}px`;
-    const fixedHeight =
-      height.toString().indexOf('%') !== -1 ? height : `${height}px`;
+    const fixedWidth = width.toString().includes('%') ? width : `${width}px`;
+    const fixedHeight = height.toString().includes('%')
+      ? height
+      : `${height}px`;
     const style = {
       width: fixedWidth,
       height: fixedHeight,
diff --git a/packages/app/src/app/components/CodeEditor/Monaco/workers/fetch-dependency-typings.js b/packages/app/src/app/components/CodeEditor/Monaco/workers/fetch-dependency-typings.js
@@ -236,7 +236,7 @@ async function fetchAndAddDependencies(dependencies) {
   await Promise.all(
     depNames.map(async dep => {
       try {
-        if (loadedTypings.indexOf(dep) === -1) {
+        if (!loadedTypings.includes(dep)) {
           loadedTypings.push(dep);
 
           const depVersion = await doFetch(
diff --git a/packages/app/src/app/components/CodeEditor/Monaco/workers/linter/monkeypatch-babel-eslint.js b/packages/app/src/app/components/CodeEditor/Monaco/workers/linter/monkeypatch-babel-eslint.js
@@ -55,7 +55,7 @@ export default function monkeypatch(modules, eslintOptions) {
   ]);
   var visitorKeysMap = Object.keys(t.VISITOR_KEYS).reduce(function(acc, key) {
     var value = t.VISITOR_KEYS[key];
-    if (flowFlippedAliasKeys.indexOf(value) === -1) {
+    if (!flowFlippedAliasKeys.includes(value)) {
       acc[key] = value;
     }
     return acc;
diff --git a/packages/app/src/app/components/CodeEditor/VSCode/MonacoReactComponent.js b/packages/app/src/app/components/CodeEditor/VSCode/MonacoReactComponent.js
@@ -185,7 +185,7 @@ class MonacoEditor extends React.PureComponent {
     document.getElementById('root').className = document
       .getElementById('root')
       .className.split(' ')
-      .filter(x => ['monaco-shell', 'vs-dark'].indexOf(x) === -1)
+      .filter(x => !['monaco-shell', 'vs-dark'].includes(x))
       .join(' ');
 
     Promise.all(groupsToClose.map(g => g.closeAllEditors()))
@@ -212,9 +212,9 @@ class MonacoEditor extends React.PureComponent {
   render() {
     const { width, height } = this.props;
     const fixedWidth =
-      width && width.toString().indexOf('%') !== -1 ? width : `${width}px`;
+      width && width.toString().includes('%') ? width : `${width}px`;
     const fixedHeight =
-      height && height.toString().indexOf('%') !== -1 ? height : `${height}px`;
+      height && height.toString().includes('%') ? height : `${height}px`;
     const style = {
       width: fixedWidth,
       height: fixedHeight,
diff --git a/packages/app/src/app/overmind/effects/moduleRecover.ts b/packages/app/src/app/overmind/effects/moduleRecover.ts
@@ -44,7 +44,7 @@ export default {
     );
 
     return modules
-      .filter(m => localKeys.indexOf(getKey(currentId, m.shortid)) > -1)
+      .filter(m => localKeys.includes(getKey(currentId, m.shortid)))
       .map(module => {
         const key = getKey(currentId, module.shortid);
 
diff --git a/packages/app/src/app/overmind/namespaces/live/state.ts b/packages/app/src/app/overmind/namespaces/live/state.ts
@@ -45,18 +45,16 @@ export const state: State = {
     return (
       state.isLive &&
       (state.roomInfo.mode === 'open' ||
-        state.roomInfo.ownerIds.indexOf(liveUserId) > -1 ||
-        state.roomInfo.editorIds.indexOf(liveUserId) > -1)
+        state.roomInfo.ownerIds.includes(liveUserId) ||
+        state.roomInfo.editorIds.includes(liveUserId))
     );
   },
   isCurrentEditor: state => {
     return state.isEditor(state.liveUserId);
   },
 
   isOwner: state => {
-    return (
-      state.isLive && state.roomInfo.ownerIds.indexOf(state.liveUserId) > -1
-    );
+    return state.isLive && state.roomInfo.ownerIds.includes(state.liveUserId);
   },
   liveUsersByModule: state => {
     const usersByModule = {};
diff --git a/packages/app/src/app/pages/Dashboard/Content/SandboxGrid/index.js b/packages/app/src/app/pages/Dashboard/Content/SandboxGrid/index.js
@@ -60,8 +60,8 @@ class SandboxGrid extends React.Component<*, State> {
       const indexedSandboxes = sandboxes.map((sandbox, i) => ({ sandbox, i }));
 
       // We need to select a range
-      const firstIndexInfo = indexedSandboxes.find(
-        ({ sandbox }) => selectedSandboxes.indexOf(sandbox.id) > -1
+      const firstIndexInfo = indexedSandboxes.find(({ sandbox }) =>
+        selectedSandboxes.includes(sandbox.id)
       );
 
       const [id] = ids;
@@ -88,10 +88,10 @@ class SandboxGrid extends React.Component<*, State> {
     if (additive) {
       track('Dashboard - Sandbox Additive Selection');
       sandboxIds = store.dashboard.selectedSandboxes.filter(
-        id => ids.indexOf(id) === -1
+        id => !ids.includes(id)
       );
       const additiveIds = ids.filter(
-        id => store.dashboard.selectedSandboxes.indexOf(id) === -1
+        id => !store.dashboard.selectedSandboxes.includes(id)
       );
 
       sandboxIds = uniq([...sandboxIds, ...additiveIds]);
diff --git a/packages/app/src/app/pages/Dashboard/Content/routes/TeamView/AddTeamMember/index.js b/packages/app/src/app/pages/Dashboard/Content/routes/TeamView/AddTeamMember/index.js
@@ -26,7 +26,7 @@ const AddTeamMember = ({ teamId, signals }) => (
         e.preventDefault();
         e.stopPropagation();
 
-        let isEmail = input.value.indexOf('@') > -1;
+        let isEmail = input.value.includes('@');
 
         track('Team - Add Member', { email: isEmail });
 
diff --git a/packages/app/src/app/pages/Dashboard/Sidebar/SandboxesItem/folder-drop-target.js b/packages/app/src/app/pages/Dashboard/Sidebar/SandboxesItem/folder-drop-target.js
@@ -73,7 +73,7 @@ function addSandboxesToCollection(props, item) {
         });
 
         oldFolderCacheData.me.collection.sandboxes = oldFolderCacheData.me.collection.sandboxes.filter(
-          x => selectedSandboxes.indexOf(x.id) === -1
+          x => !selectedSandboxes.includes(x.id)
         );
 
         cache.writeQuery({
diff --git a/packages/app/src/app/pages/Dashboard/queries.js b/packages/app/src/app/pages/Dashboard/queries.js
@@ -333,7 +333,7 @@ export function unmakeTemplates(selectedSandboxes, teamId) {
 
         const data = immer(oldTemplatesCache, draft => {
           draft.me.templates = draft.me.templates.filter(
-            x => selectedSandboxes.indexOf(x.sandbox.id) === -1
+            x => !selectedSandboxes.includes(x.sandbox.id)
           );
         });
 
@@ -382,7 +382,7 @@ export function makeTemplates(selectedSandboxes, teamId, collections) {
 
                 const data = immer(oldFolderCacheData, draft => {
                   draft.me.collection.sandboxes = oldFolderCacheData.me.collection.sandboxes.filter(
-                    x => selectedSandboxes.indexOf(x.id) === -1
+                    x => !selectedSandboxes.includes(x.id)
                   );
                 });
 
@@ -460,7 +460,7 @@ export function permanentlyDeleteSandboxes(selectedSandboxes) {
           me: {
             ...oldDeleteCache.me,
             sandboxes: oldDeleteCache.me.sandboxes.filter(
-              x => selectedSandboxes.indexOf(x.id) === -1
+              x => !selectedSandboxes.includes(x.id)
             ),
           },
         };
@@ -505,7 +505,7 @@ export function deleteSandboxes(selectedSandboxes, collections = []) {
 
             const data = immer(oldFolderCacheData, draft => {
               draft.me.collection.sandboxes = oldFolderCacheData.me.collection.sandboxes.filter(
-                x => selectedSandboxes.indexOf(x.id) === -1
+                x => !selectedSandboxes.includes(x.id)
               );
             });
 
diff --git a/packages/app/src/app/pages/Sandbox/Editor/Workspace/Files/DirectoryEntry/DirectoryChildren/index.js b/packages/app/src/app/pages/Sandbox/Editor/Workspace/Files/DirectoryEntry/DirectoryChildren/index.js
@@ -48,7 +48,7 @@ class DirectoryChildren extends React.Component {
             x =>
               !(
                 x.directoryShortid == null &&
-                HIDDEN_DIRECTORIES.indexOf(x.title) > -1
+                HIDDEN_DIRECTORIES.includes(x.title)
               )
           )
           .map(dir => (
diff --git a/packages/app/src/app/pages/Sandbox/Editor/Workspace/items/Live/LiveInfo.js b/packages/app/src/app/pages/Sandbox/Editor/Workspace/items/Live/LiveInfo.js
@@ -174,20 +174,17 @@ class LiveInfo extends React.Component {
       followingUserId,
     } = this.props;
 
-    const owners = roomInfo.users.filter(u => ownerIds.indexOf(u.id) > -1);
+    const owners = roomInfo.users.filter(u => ownerIds.includes(u.id));
 
     const editors = sortBy(
       roomInfo.users.filter(
-        u =>
-          roomInfo.editorIds.indexOf(u.id) > -1 && ownerIds.indexOf(u.id) === -1
+        u => roomInfo.editorIds.includes(u.id) && !ownerIds.includes(u.id)
       ),
       'username'
     );
     const otherUsers = sortBy(
       roomInfo.users.filter(
-        u =>
-          ownerIds.indexOf(u.id) === -1 &&
-          roomInfo.editorIds.indexOf(u.id) === -1
+        u => !ownerIds.includes(u.id) && !roomInfo.editorIds.includes(u.id)
       ),
       'username'
     );
diff --git a/packages/app/src/app/pages/Sandbox/Editor/Workspace/items/Server/Tasks.tsx b/packages/app/src/app/pages/Sandbox/Editor/Workspace/items/Server/Tasks.tsx
@@ -78,7 +78,7 @@ export default class Tasks extends React.PureComponent<Props> {
     }
 
     const commands = Object.keys(this.props.package.scripts).filter(
-      x => blacklistedScripts.indexOf(x) === -1
+      x => !blacklistedScripts.includes(x)
     );
 
     return (
diff --git a/packages/app/src/app/pages/Sandbox/index.js b/packages/app/src/app/pages/Sandbox/index.js
@@ -65,7 +65,7 @@ class SandboxPage extends React.Component {
     }
 
     if (store.editor.error) {
-      const isGithub = this.props.match.params.id.indexOf('github') > -1;
+      const isGithub = this.props.match.params.id.includes('github');
       const hasPrivateAccess = store.user && store.user.integrations.github;
       return (
         <React.Fragment>
diff --git a/packages/app/src/app/pages/common/Modals/PreferencesModal/Appearance/index.js b/packages/app/src/app/pages/common/Modals/PreferencesModal/Appearance/index.js
@@ -60,8 +60,7 @@ function EditorSettings({ store, signals }) {
               </a>{' '}
               as default font, you can also use locally installed fonts
             </SubDescription>
-            {fontOptions.indexOf(store.preferences.settings.fontFamily) ===
-              -1 && (
+            {!fontOptions.includes(store.preferences.settings.fontFamily) && (
               <PreferenceText
                 style={{ marginTop: '1rem' }}
                 placeholder="Enter your custom font"
diff --git a/packages/app/src/app/store/actions.js b/packages/app/src/app/store/actions.js
@@ -169,9 +169,7 @@ export function setCurrentModuleShortid({ props, state }) {
   const sandbox = props.sandbox;
 
   // Only change the module shortid if it doesn't exist in the new sandbox
-  if (
-    sandbox.modules.map(m => m.shortid).indexOf(currentModuleShortid) === -1
-  ) {
+  if (!sandbox.modules.map(m => m.shortid).includes(currentModuleShortid)) {
     const parsedConfigs = parseSandboxConfigurations(sandbox);
     const module = defaultOpenedModule(sandbox, parsedConfigs);
 
diff --git a/packages/app/src/app/store/modules/editor/computed.js b/packages/app/src/app/store/modules/editor/computed.js
@@ -1,5 +1,5 @@
 export function isModuleSynced(moduleShortid) {
-  return this.changedModuleShortids.indexOf(moduleShortid) === -1;
+  return !this.changedModuleShortids.includes(moduleShortid);
 }
 
 function getModuleParents(modules, directories, id) {
diff --git a/packages/app/src/app/store/modules/live/computed.js b/packages/app/src/app/store/modules/live/computed.js
@@ -2,7 +2,7 @@ export function isEditor(liveUserId) {
   return (
     this.isLive &&
     (this.roomInfo.mode === 'open' ||
-      this.roomInfo.ownerIds.indexOf(liveUserId) > -1 ||
-      this.roomInfo.editorIds.indexOf(liveUserId) > -1)
+      this.roomInfo.ownerIds.includes(liveUserId) ||
+      this.roomInfo.editorIds.includes(liveUserId))
   );
 }
diff --git a/packages/app/src/app/store/modules/live/getters.js b/packages/app/src/app/store/modules/live/getters.js
@@ -3,7 +3,7 @@ export function isCurrentEditor() {
 }
 
 export function isOwner() {
-  return this.isLive && this.roomInfo.ownerIds.indexOf(this.liveUserId) > -1;
+  return this.isLive && this.roomInfo.ownerIds.includes(this.liveUserId);
 }
 
 export function liveUsersByModule() {
diff --git a/packages/app/src/app/store/modules/server/actions.js b/packages/app/src/app/store/modules/server/actions.js
@@ -164,7 +164,7 @@ export function showPortOpenedNotifications({ state, props, controller }) {
   const openedPorts = getOpenedBrowserPorts(state.get('editor.devToolTabs'));
 
   addedPorts.forEach(port => {
-    if (!port.main && openedPorts.indexOf(port.port) === -1) {
+    if (!(port.main || openedPorts.includes(port.port))) {
       notificationState.addNotification({
         title: `Port ${port.port} Opened`,
         message: `The server is listening on port ${
diff --git a/packages/app/src/embed/components/App/index.js b/packages/app/src/embed/components/App/index.js
@@ -49,8 +49,8 @@ type State = {
 
 const isSafari = () => {
   const ua = navigator.userAgent.toLowerCase();
-  if (ua.indexOf('safari') !== -1) {
-    return ua.indexOf('chrome') === -1;
+  if (ua.includes('safari')) {
+    return !ua.includes('chrome');
   }
 
   return false;
@@ -112,8 +112,8 @@ export default class App extends React.PureComponent<
         runOnClick === false
           ? false
           : runOnClick ||
-            navigator.appVersion.indexOf('X11') !== -1 ||
-            navigator.appVersion.indexOf('Linux') !== -1 ||
+            navigator.appVersion.includes('X11') ||
+            navigator.appVersion.includes('Linux') ||
             isSafari(),
       verticalMode,
       highlightedLines: highlightedLines || [],
diff --git a/packages/app/src/sandbox/compile.ts b/packages/app/src/sandbox/compile.ts
@@ -254,7 +254,7 @@ function getDependencies(parsedPackage, templateDefinition, configurations) {
   Object.keys(devDependencies).forEach(dep => {
     const usedDep = DEPENDENCY_ALIASES[dep] || dep;
 
-    if (foundWhitelistedDevDependencies.indexOf(usedDep) > -1) {
+    if (foundWhitelistedDevDependencies.includes(usedDep)) {
       if (
         usedDep === '@vue/babel-preset-app' &&
         devDependencies[dep].startsWith('^3')
diff --git a/packages/app/src/sandbox/eval/manager.ts b/packages/app/src/sandbox/eval/manager.ts
@@ -604,7 +604,7 @@ export default class Manager {
         );
         const shimmedPath = coreLibraries[aliasedPath] || aliasedPath;
 
-        if (NODE_LIBS.indexOf(shimmedPath) > -1) {
+        if (NODE_LIBS.includes(shimmedPath)) {
           this.cachedPaths[dirredPath][path] = shimmedPath;
           promiseResolve(getShimmedModuleFromPath(currentPath, path));
           return;
@@ -708,7 +708,7 @@ export default class Manager {
       );
       const shimmedPath = coreLibraries[aliasedPath] || aliasedPath;
 
-      if (NODE_LIBS.indexOf(shimmedPath) > -1) {
+      if (NODE_LIBS.includes(shimmedPath)) {
         this.cachedPaths[dirredPath][path] = shimmedPath;
         return getShimmedModuleFromPath(currentPath, path);
       }
diff --git a/packages/app/src/sandbox/eval/tests/jest-lite.ts b/packages/app/src/sandbox/eval/tests/jest-lite.ts
@@ -60,7 +60,7 @@ let jsdomPromise = null;
 const getJSDOM = () => {
   let jsdomPath = '/static/js/jsdom-4.0.0.min.js';
   if (
-    navigator.userAgent.indexOf('jsdom') !== -1 &&
+    navigator.userAgent.includes('jsdom') &&
     process.env.NODE_ENV === 'test'
   ) {
     jsdomPath = 'file://' + path.resolve('./static/js/jsdom-4.0.0.min.js');
diff --git a/packages/app/src/sandbox/eval/transpilers/babel/babel-parser.js b/packages/app/src/sandbox/eval/transpilers/babel/babel-parser.js
@@ -53,7 +53,7 @@ export default function getBabelConfig(
     : 'transform-es2015-modules-commonjs';
 
   if (finalConfig.plugins) {
-    if (finalConfig.plugins.indexOf(commonjsPluginName) === -1) {
+    if (!finalConfig.plugins.includes(commonjsPluginName)) {
       finalConfig.plugins = [...finalConfig.plugins, commonjsPluginName];
     }
   } else {
diff --git a/packages/app/src/sandbox/eval/transpilers/babel/check.js b/packages/app/src/sandbox/eval/transpilers/babel/check.js
@@ -9,11 +9,11 @@ function checkComment(match) {
   // If it's in a comment or string, we're extremely aggressive here because
   // transpiling is absolutely our last resort.
   if (
-    startOfLine.indexOf('//') > -1 ||
-    startOfLine.indexOf('*') > -1 ||
-    startOfLine.indexOf("'") > -1 ||
-    startOfLine.indexOf('"') > -1 ||
-    startOfLine.indexOf('`') > -1
+    startOfLine.includes('//') ||
+    startOfLine.includes('*') ||
+    startOfLine.includes("'") ||
+    startOfLine.includes('"') ||
+    startOfLine.includes('`')
   ) {
     return false;
   }
diff --git a/packages/app/src/sandbox/eval/transpilers/babel/index.ts b/packages/app/src/sandbox/eval/transpilers/babel/index.ts
@@ -89,8 +89,8 @@ class BabelTranspiler extends WorkerTranspiler {
       const isV7 =
         loaderContext.options.isV7 || isBabel7(dependencies, devDependencies);
 
-      const hasMacros = Object.keys(dependencies).some(
-        d => d.indexOf('macro') > -1
+      const hasMacros = Object.keys(dependencies).some(d =>
+        d.includes('macro')
       );
 
       const babelConfig = getBabelConfig(
diff --git a/packages/app/src/sandbox/eval/transpilers/babel/worker/babel-worker.js b/packages/app/src/sandbox/eval/transpilers/babel/worker/babel-worker.js
diff --git a/packages/app/src/sandbox/eval/transpilers/babel/worker/dynamic-download.js b/packages/app/src/sandbox/eval/transpilers/babel/worker/dynamic-download.js
diff --git a/packages/app/src/sandbox/eval/transpilers/reason/index.ts b/packages/app/src/sandbox/eval/transpilers/reason/index.ts
diff --git a/packages/app/src/sandbox/eval/transpilers/sass/worker/sass-worker.js b/packages/app/src/sandbox/eval/transpilers/sass/worker/sass-worker.js
diff --git a/packages/common/src/utils/analytics.ts b/packages/common/src/utils/analytics.ts

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ export default function monkeypatch(modules, eslintOptions) {`
`55`	`55`	`]);`
`56`	`56`	`var visitorKeysMap = Object.keys(t.VISITOR_KEYS).reduce(function(acc, key) {`
`57`	`57`	`var value = t.VISITOR_KEYS[key];`
`58`		`- if (flowFlippedAliasKeys.indexOf(value) === -1) {`
	`58`	`+ if (!flowFlippedAliasKeys.includes(value)) {`
`59`	`59`	`acc[key] = value;`
`60`	`60`	`}`
`61`	`61`	`return acc;`