Remove optimization for @babel/runtime

Author: CompuIves

packages/app/src/sandbox/compile.js

@@ -27,6 +27,8 @@ import getDefinition from '../../../common/templates/index';
 
 import { showRunOnClick } from './status-screen/run-on-click';
 
+import { isBabel7 } from './eval/utils/is-babel-7';
+
 let initializedResizeListener = false;
 let manager: ?Manager = null;
 let actionsEnabled = false;
@@ -112,7 +114,6 @@ const PREINSTALLED_DEPENDENCIES = [
   'react-scripts',
   'react-scripts-ts',
   'parcel-bundler',
-  '@babel/runtime',
   'babel-plugin-check-es2015-constants',
   'babel-plugin-external-helpers',
   'babel-plugin-inline-replace-variables',
@@ -267,8 +268,13 @@ function getDependencies(parsedPackage, templateDefinition, configurations) {
 
   // Always include this, because most sandboxes need this with babel6 and the
   // packager will only include the package.json for it.
-  returnedDependencies['babel-runtime'] =
-    returnedDependencies['babel-runtime'] || '6.26.0';
+  if (isBabel7(d, devDependencies)) {
+    returnedDependencies['@babel/runtime'] =
+      returnedDependencies['@babel/runtime'] || '7.1.2';
+  } else {
+    returnedDependencies['babel-runtime'] =
+      returnedDependencies['babel-runtime'] || '6.26.0';
+  }
 
   preinstalledDependencies.forEach(dep => {
     if (returnedDependencies[dep]) {

packages/app/src/sandbox/eval/loaders/dependency-resolver.js

@@ -1,17 +1,5 @@
 import DependencyNotFoundError from 'sandbox-hooks/errors/dependency-not-found-error';
 
-/**
- * We don't have fancy resolving for @babel/runtime because of optimalization,
- * so we try to alter it the best way we can.
- */
-function alterBabelRuntimeDependencyPath(path: string) {
-  if (path === '@babel/runtime/regenerator') {
-    return '@babel/runtime/regenerator/index';
-  }
-
-  return path;
-}
-
 /**
  * Converts a dependency string to an actual dependency
  *
@@ -20,13 +8,6 @@ function alterBabelRuntimeDependencyPath(path: string) {
  * @returns
  */
 export default function getDependency(dependencyPath: string) {
-  if (dependencyPath.startsWith('@babel/runtime/')) {
-    // We have a precomputed bundle for this, since it's small anyway
-    return require('./@babel-runtime.no-webpack')(
-      alterBabelRuntimeDependencyPath(dependencyPath)
-    );
-  }
-
   if (dependencyPath === 'codesandbox-api') {
     return require('codesandbox-api');
   }

packages/app/src/sandbox/eval/presets/create-react-app/index.js

@@ -9,16 +9,10 @@ import rawTranspiler from '../../transpilers/raw';
 import svgrTranspiler from '../../transpilers/svgr';
 import sassTranspiler from '../../transpilers/sass';
 
-function isVersion2(configurations) {
-  if (
-    configurations &&
-    configurations.package &&
-    configurations.package.parsed &&
-    configurations.package.parsed.dependencies &&
-    configurations.package.parsed.dependencies['react-scripts']
-  ) {
-    const reactScriptsVersion =
-      configurations.package.parsed.dependencies['react-scripts'];
+export function isVersion2(dependencies) {
+  const usedDeps = dependencies || {};
+  if (usedDeps['react-scripts']) {
+    const reactScriptsVersion = usedDeps['react-scripts'];
 
     return (
       /^[a-z]/.test(reactScriptsVersion) ||
@@ -38,7 +32,17 @@ export default function initialize() {
     {
       hasDotEnv: true,
       setup: manager => {
-        if (isVersion2(manager.configurations) && !v2Initialized) {
+        const configurations = manager.configurations;
+
+        if (
+          isVersion2(
+            configurations &&
+              configurations.package &&
+              configurations.package.parsed &&
+              configurations.package.parsed.dependencies
+          ) &&
+          !v2Initialized
+        ) {
           const babelOptions = {
             isV7: true,
             config: {

packages/app/src/sandbox/eval/transpiled-module.js

@@ -400,11 +400,7 @@ export default class TranspiledModule {
         }
       },
       addDependency: (depPath: string, options = {}) => {
-        if (
-          (!this.module.path.startsWith('/node_modules') &&
-            depPath.startsWith('@babel/runtime/')) ||
-          depPath.startsWith('codesandbox-api')
-        ) {
+        if (depPath.startsWith('codesandbox-api')) {
           return;
         }
 
@@ -835,11 +831,7 @@ export default class TranspiledModule {
         }
 
         // So it must be a dependency
-        if (
-          path.startsWith('codesandbox-api') ||
-          (!transpiledModule.module.path.startsWith('/node_modules') &&
-            path.startsWith('@babel/runtime/'))
-        ) {
+        if (path.startsWith('codesandbox-api')) {
           return resolveDependency(path, manager.externals);
         }
 

packages/app/src/sandbox/eval/transpilers/babel/index.js

@@ -7,6 +7,7 @@ import getBabelConfig from './babel-parser';
 import WorkerTranspiler from '../worker-transpiler';
 import { type LoaderContext } from '../../transpiled-module';
 import type { default as Manager } from '../../manager';
+import { isBabel7 } from '../../utils/is-babel-7';
 
 import delay from '../../../utils/delay';
 
@@ -71,14 +72,18 @@ class BabelTranspiler extends WorkerTranspiler {
 
       const loaderOptions = loaderContext.options || {};
 
+      const dependencies =
+        configs.package &&
+        configs.package.parsed &&
+        configs.package.parsed.dependencies;
+
+      const devDependencies =
+        configs.package &&
+        configs.package.parsed &&
+        configs.package.parsed.devDependencies;
+
       const isV7 =
-        loaderContext.options.isV7 ||
-        !!(
-          configs.package &&
-          configs.package.parsed &&
-          configs.package.parsed.devDependencies &&
-          configs.package.parsed.devDependencies['@vue/cli-plugin-babel']
-        );
+        loaderContext.options.isV7 || isBabel7(dependencies, devDependencies);
 
       const babelConfig = getBabelConfig(
         foundConfig || loaderOptions.config,

packages/app/src/sandbox/eval/utils/is-babel-7.js

@@ -0,0 +1,13 @@
+import { isVersion2 } from '../presets/create-react-app';
+
+export function isBabel7(dependencies = {}, devDependencies = {}) {
+  if (devDependencies['@vue/cli-plugin-babel']) {
+    return true;
+  }
+
+  if (isVersion2(dependencies)) {
+    return true;
+  }
+
+  return false;
+}