Remove babel-runtime

Ives van Hoorne · Ives van Hoorne · commit 8ebede2715ff · 2018-03-09T17:19:01.000+01:00
diff --git a/packages/app/config/webpack.common.js b/packages/app/config/webpack.common.js
@@ -384,7 +384,13 @@ module.exports = {
     ),
 
     ...(SANDBOX_ONLY
-      ? []
+      ? [
+          new webpack.optimize.CommonsChunkPlugin({
+            async: true,
+            children: true,
+            minChunks: 2,
+          }),
+        ]
       : [
           // We first create a common chunk between embed and app, to share components
           // and dependencies.
diff --git a/packages/app/src/sandbox/eval/loaders/dependency-resolver.js b/packages/app/src/sandbox/eval/loaders/dependency-resolver.js
@@ -7,39 +7,21 @@ import DependencyNotFoundError from '../../errors/dependency-not-found-error';
  * @param {Object} externals
  * @returns
  */
-export default function getDependency(
-  dependencyPath: string,
-  externals: { [key: string]: string }
-) {
-  // This polyfill is included by default in the sandbox, no external dependency needed.
-  // This is also included in CRA by default, so we keep compatability with
-  // CRA.
-  if (dependencyPath.startsWith('babel-runtime')) {
-    // eslint-disable-next-line global-require, import/no-dynamic-require
-    return require(`./babel-runtime${dependencyPath.replace(
-      'babel-runtime',
-      ''
-    )}`);
-  }
+export default function getDependency(dependencyPath: string) {
+  // // This polyfill is included by default in the sandbox, no external dependency needed.
+  // // This is also included in CRA by default, so we keep compatability with
+  // // CRA.
+  // if (dependencyPath.startsWith('babel-runtime')) {
+  //   // eslint-disable-next-line global-require, import/no-dynamic-require
+  //   return require(`./babel-runtime${dependencyPath.replace(
+  //     'babel-runtime',
+  //     ''
+  //   )}`);
+  // }
 
   if (dependencyPath === 'codesandbox-api') {
     return require('codesandbox-api');
   }
-  const dependencyModule =
-    externals[dependencyPath] || externals[`${dependencyPath}.js`];
-  if (dependencyModule) {
-    const idMatch = dependencyModule.match(/dll_bundle\((\d+)\)/);
-    if (idMatch && idMatch[1]) {
-      try {
-        return window.dll_bundle(idMatch[1]);
-      } catch (e) {
-        if (window.dll_bundle) {
-          // Delete the cache of the throwing dependency
-          delete window.dll_bundle.c[idMatch[1]];
-        }
-        throw e;
-      }
-    }
-  }
+
   throw new DependencyNotFoundError(dependencyPath);
 }
diff --git a/packages/app/src/sandbox/eval/transpiled-module.js b/packages/app/src/sandbox/eval/transpiled-module.js
@@ -746,10 +746,7 @@ export default class TranspiledModule {
         // eslint-disable-line no-unused-vars
         if (/^(\w|@\w)/.test(aliasedPath) && !aliasedPath.includes('!')) {
           // So it must be a dependency
-          if (
-            aliasedPath.startsWith('babel-runtime') ||
-            aliasedPath.startsWith('codesandbox-api')
-          )
+          if (aliasedPath.startsWith('codesandbox-api'))
             return resolveDependency(aliasedPath, manager.externals);
         }
 
diff --git a/packages/app/src/sandbox/eval/transpilers/vue/selector/index.js b/packages/app/src/sandbox/eval/transpilers/vue/selector/index.js
@@ -1,29 +1,15 @@
 // @flow
-import path from 'path';
-
 import Transpiler from '../../';
 import { type LoaderContext } from '../../../transpiled-module';
 
-import parse from '../parser';
-
 class VueSelector extends Transpiler {
   constructor() {
     super('vue-selector');
   }
   doTranspilation(content: string, loaderContext: LoaderContext) {
-    const query = loaderContext.options;
-    const context = query.context;
-    let filename = path.basename(loaderContext.path);
-    filename =
-      filename.substring(0, filename.lastIndexOf(path.extname(filename))) +
-      '.vue';
-    const sourceRoot = path.dirname(path.relative(context, loaderContext.path));
-    const parts = parse(content, filename, false, sourceRoot, query.bustCache);
-    let part = parts[query.type];
-    if (Array.isArray(part)) {
-      part = part[query.index];
-    }
-    return Promise.resolve({ transpiledCode: part.content });
+    return import(/* webpackChunkName: 'vue-selector' */ './loader').then(
+      loader => loader.default(content, loaderContext)
+    );
   }
 }
 
diff --git a/packages/app/src/sandbox/eval/transpilers/vue/selector/loader.js b/packages/app/src/sandbox/eval/transpilers/vue/selector/loader.js
@@ -0,0 +1,20 @@
+import path from 'path';
+import parse from '../parser';
+
+import { type LoaderContext } from '../../../transpiled-module';
+
+export default function(code: string, loaderContext: LoaderContext) {
+  const query = loaderContext.options;
+  const context = query.context;
+  let filename = path.basename(loaderContext.path);
+  filename =
+    filename.substring(0, filename.lastIndexOf(path.extname(filename))) +
+    '.vue';
+  const sourceRoot = path.dirname(path.relative(context, loaderContext.path));
+  const parts = parse(code, filename, false, sourceRoot, query.bustCache);
+  let part = parts[query.type];
+  if (Array.isArray(part)) {
+    part = part[query.index];
+  }
+  return Promise.resolve({ transpiledCode: part.content });
+}
