Keep using indexOf in sandbox for now

Author: CompuIves

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.includes(usedDep)) {
+    if (foundWhitelistedDevDependencies.indexOf(usedDep) > -1) {
       if (
         usedDep === '@vue/babel-preset-app' &&
         devDependencies[dep].startsWith('^3')

packages/app/src/sandbox/eval/manager.ts

@@ -604,7 +604,7 @@ export default class Manager {
         );
         const shimmedPath = coreLibraries[aliasedPath] || aliasedPath;
 
-        if (NODE_LIBS.includes(shimmedPath)) {
+        if (NODE_LIBS.indexOf(shimmedPath) > -1) {
           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.includes(shimmedPath)) {
+      if (NODE_LIBS.indexOf(shimmedPath) > -1) {
         this.cachedPaths[dirredPath][path] = shimmedPath;
         return getShimmedModuleFromPath(currentPath, path);
       }

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.includes('jsdom') &&
+    navigator.userAgent.indexOf('jsdom') !== -1 &&
     process.env.NODE_ENV === 'test'
   ) {
     jsdomPath = 'file://' + path.resolve('./static/js/jsdom-4.0.0.min.js');

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.includes(commonjsPluginName)) {
+    if (finalConfig.plugins.indexOf(commonjsPluginName) === -1) {
       finalConfig.plugins = [...finalConfig.plugins, commonjsPluginName];
     }
   } else {

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.includes('//') ||
-    startOfLine.includes('*') ||
-    startOfLine.includes("'") ||
-    startOfLine.includes('"') ||
-    startOfLine.includes('`')
+    startOfLine.indexOf('//') > -1 ||
+    startOfLine.indexOf('*') > -1 ||
+    startOfLine.indexOf("'") > -1 ||
+    startOfLine.indexOf('"') > -1 ||
+    startOfLine.indexOf('`') > -1
   ) {
     return false;
   }

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.includes('macro')
+      const hasMacros = Object.keys(dependencies).some(
+        d => d.indexOf('macro') > -1
       );
 
       const babelConfig = getBabelConfig(

packages/app/src/sandbox/eval/transpilers/babel/worker/babel-worker.js

@@ -65,7 +65,7 @@ self.require = path => {
     return module;
   }
 
-  if (IGNORED_MODULES.includes(path)) {
+  if (IGNORED_MODULES.indexOf(path) > -1) {
     return {};
   }
 
@@ -340,13 +340,13 @@ async function compile(code, customConfig, path, isV7) {
   } catch (e) {
     if (
       !fsInitialized &&
-      (e.message.includes('Cannot find module') || e.code === 'EIO')
+      (e.message.indexOf('Cannot find module') > -1 || e.code === 'EIO')
     ) {
       // BrowserFS was needed but wasn't initialized
       await waitForFs();
 
       await compile(code, customConfig, path);
-    } else if (e.message.includes('Cannot find module')) {
+    } else if (e.message.indexOf('Cannot find module') > -1) {
       // Try to download the file and all dependencies, retry compilation then
       await downloadFromError(e).then(() => {
         resetCache();
@@ -504,19 +504,19 @@ self.addEventListener('message', async event => {
 
   if (!disableCodeSandboxPlugins) {
     if (
-      flattenedPresets.includes('env') &&
-      !Object.keys(Babel.availablePresets).includes('env') &&
+      flattenedPresets.indexOf('env') > -1 &&
+      Object.keys(Babel.availablePresets).indexOf('env') === -1 &&
       version !== 7
     ) {
       Babel.registerPreset('env', Babel.availablePresets.latest);
     }
 
     if (
       version === 7 &&
-      !Object.keys(Babel.availablePresets).includes('env') &&
-      (flattenedPresets.includes('env') ||
-        flattenedPresets.includes('@babel/preset-env') ||
-        flattenedPresets.includes('@vue/app'))
+      Object.keys(Babel.availablePresets).indexOf('env') === -1 &&
+      (flattenedPresets.indexOf('env') > -1 ||
+        flattenedPresets.indexOf('@babel/preset-env') > -1 ||
+        flattenedPresets.indexOf('@vue/app') > -1)
     ) {
       const envPreset = await import(
         /* webpackChunkName: 'babel-preset-env' */ '@babel/preset-env'
@@ -525,8 +525,8 @@ self.addEventListener('message', async event => {
     }
 
     if (
-      flattenedPlugins.includes('transform-vue-jsx') &&
-      !Object.keys(Babel.availablePlugins).includes('transform-vue-jsx')
+      flattenedPlugins.indexOf('transform-vue-jsx') > -1 &&
+      Object.keys(Babel.availablePlugins).indexOf('transform-vue-jsx') === -1
     ) {
       const vuePlugin = await import(
         /* webpackChunkName: 'babel-plugin-transform-vue-jsx' */ 'babel-plugin-transform-vue-jsx'
@@ -535,8 +535,8 @@ self.addEventListener('message', async event => {
     }
 
     if (
-      flattenedPlugins.includes('jsx-pragmatic') &&
-      !Object.keys(Babel.availablePlugins).includes('jsx-pragmatic')
+      flattenedPlugins.indexOf('jsx-pragmatic') > -1 &&
+      Object.keys(Babel.availablePlugins).indexOf('jsx-pragmatic') === -1
     ) {
       const pragmaticPlugin = await import(
         /* webpackChunkName: 'babel-plugin-jsx-pragmatic' */ 'babel-plugin-jsx-pragmatic'
@@ -545,8 +545,8 @@ self.addEventListener('message', async event => {
     }
 
     if (
-      flattenedPlugins.includes('babel-plugin-macros') &&
-      !Object.keys(Babel.availablePlugins).includes('babel-plugin-macros')
+      flattenedPlugins.indexOf('babel-plugin-macros') > -1 &&
+      Object.keys(Babel.availablePlugins).indexOf('babel-plugin-macros') === -1
     ) {
       if (hasMacros) {
         await waitForFs();
@@ -556,8 +556,8 @@ self.addEventListener('message', async event => {
     }
 
     if (
-      flattenedPlugins.includes('transform-cx-jsx') &&
-      !Object.keys(Babel.availablePlugins).includes('transform-cx-jsx')
+      flattenedPlugins.indexOf('transform-cx-jsx') > -1 &&
+      Object.keys(Babel.availablePlugins).indexOf('transform-cx-jsx') === -1
     ) {
       const cxJsxPlugin = await import(
         /* webpackChunkName: 'transform-cx-jsx' */ 'babel-plugin-transform-cx-jsx'

packages/app/src/sandbox/eval/transpilers/babel/worker/dynamic-download.js

@@ -26,7 +26,7 @@ function mkDirByPathSync(targetDir, { isRelativeToScript = false } = {}) {
         throw new Error(`EACCES: permission denied, mkdir '${parentDir}'`);
       }
 
-      const caughtErr = ['EACCES', 'EPERM', 'EISDIR'].includes(err.code);
+      const caughtErr = ['EACCES', 'EPERM', 'EISDIR'].indexOf(err.code) > -1;
       if (!caughtErr || (caughtErr && curDir === path.resolve(targetDir))) {
         throw err; // Throw if it's just the last created dir.
       }
@@ -158,7 +158,7 @@ export async function downloadPath(absolutePath) {
 }
 
 export async function downloadFromError(e) {
-  if (e.message.includes('Cannot find module')) {
+  if (e.message.indexOf('Cannot find module') > -1) {
     return new Promise(res => {
       const dep = e.message.match(/Cannot find module '(.*?)'/)[1];
       const from = e.message.match(/from '(.*?)'/)[1];

packages/app/src/sandbox/eval/transpilers/reason/index.ts

@@ -50,7 +50,7 @@ function getDependencyList(
   const deps =
     cache ||
     listFunction(module.code)
-      .filter(x => !IGNORED_DEPENDENCIES.includes(x))
+      .filter(x => IGNORED_DEPENDENCIES.indexOf(x) === -1)
       .filter(x => !list.has(x));
 
   if (!cache) {

packages/app/src/sandbox/eval/transpilers/sass/worker/sass-worker.js

@@ -67,7 +67,7 @@ const existsPromise = (fs, file) =>
 
           const ext = extname(path).substr(1);
 
-          if (!SUPPORTED_EXTS.includes(ext)) {
+          if (SUPPORTED_EXTS.indexOf(ext) === -1) {
             r(false);
             return;
           }