Revert D5388655: BREAKING: Add regenerator-runtime on demand, based on the files

Differential Revision: D5388655

fbshipit-source-id: 2f92d6ae69f4772195aeca7493f53209388b3ad0

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.10.0",
+  "version": "0.9.0",
   "lerna": "2.0.0-rc.5",
   "npmClient": "yarn",
   "packages": [

packages/metro-bundler/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.10.0",
+  "version": "0.9.0",
   "name": "metro-bundler",
   "description": "🚇 The JavaScript bundler for React Native.",
   "main": "src/index.js",
@@ -19,7 +19,7 @@
     "babel-plugin-external-helpers": "^6.18.0",
     "babel-preset-es2015-node": "^6.1.1",
     "babel-preset-fbjs": "^2.1.4",
-    "babel-preset-react-native": "^2.1.0",
+    "babel-preset-react-native": "^2.0.0",
     "babel-register": "^6.24.1",
     "babylon": "^6.17.0",
     "chalk": "^1.1.1",

packages/metro-bundler/src/JSTransformer/worker/__tests__/constant-folding-test.js

@@ -10,28 +10,26 @@
  */
 'use strict';
 
-/* eslint-disable max-len */
-
+const babel = require('babel-core');
 const constantFolding = require('../constant-folding');
 
-const {transform, transformFromAst} = require('babel-core');
+function parse(code) {
+  return babel.transform(code, {code: false, babelrc: false, compact: true});
+}
 
 const babelOptions = {
   babelrc: false,
   compact: true,
+  retainLines: false,
 };
 
-function toString(ast) {
-  return normalize(transformFromAst(ast, babelOptions).code);
-}
-
-function normalize(code) {
-  return transform(code, babelOptions).code;
+function normalize({code}) {
+  return babel.transform(code, babelOptions).code;
 }
 
 describe('constant expressions', () => {
   it('can optimize conditional expressions with constant conditions', () => {
-    const before = `
+    const code = `
       a(
         'production'=="production",
         'production'!=='development',
@@ -41,97 +39,56 @@ describe('constant expressions', () => {
         'android'==='android' ? {a:1} : {a:0},
         'foo'==='bar' ? b : c,
         f() ? g() : h()
-      );
-    `;
-
-    const after = `
-      a(
-        true,
-        true,
-        2,
-        true,
-        {},
-        {a:1},
-        c,
-        f() ? g() : h()
-      );
-    `;
-
-    const {ast} = constantFolding('arbitrary.js', {code: before});
-    expect(toString(ast)).toEqual(normalize(after));
+      );`;
+    expect(normalize(constantFolding('arbitrary.js', parse(code)))).toEqual(
+      'a(true,true,2,true,{},{a:1},c,f()?g():h());',
+    );
   });
 
   it('can optimize ternary expressions with constant conditions', () => {
-    const before = `
-      var a = true ? 1 : 2;
-      var b = 'android' == 'android'
-        ? ('production' != 'production' ? 'a' : 'A')
-        : 'i';
-    `;
-
-    const after = `
-      var a = 1;
-      var b = 'A';
-    `;
-
-    const {ast} = constantFolding('arbitrary.js', {code: before});
-    expect(toString(ast)).toEqual(normalize(after));
+    const code = `var a = true ? 1 : 2;
+       var b = 'android' == 'android'
+         ? ('production' != 'production' ? 'a' : 'A')
+         : 'i';`;
+    expect(normalize(constantFolding('arbitrary.js', parse(code)))).toEqual(
+      "var a=1;var b='A';",
+    );
   });
 
   it('can optimize logical operator expressions with constant conditions', () => {
-    const before = `
+    const code = `
       var a = true || 1;
       var b = 'android' == 'android' &&
-        'production' != 'production' || null || "A";
-    `;
-
-    const after = `
-      var a = true;
-      var b = "A";
-    `;
-
-    const {ast} = constantFolding('arbitrary.js', {code: before});
-    expect(toString(ast)).toEqual(normalize(after));
+        'production' != 'production' || null || "A";`;
+    expect(normalize(constantFolding('arbitrary.js', parse(code)))).toEqual(
+      'var a=true;var b="A";',
+    );
   });
 
   it('can optimize logical operators with partly constant operands', () => {
-    const before = `
+    const code = `
       var a = "truthy" || z();
       var b = "truthy" && z();
       var c = null && z();
       var d = null || z();
       var e = !1 && z();
     `;
-
-    const after = `
-      var a = "truthy";
-      var b = z();
-      var c = null;
-      var d = z();
-      var e = false;
-    `;
-
-    const {ast} = constantFolding('arbitrary.js', {code: before});
-    expect(toString(ast)).toEqual(normalize(after));
+    expect(normalize(constantFolding('arbitrary.js', parse(code)))).toEqual(
+      'var a="truthy";var b=z();var c=null;var d=z();var e=false;',
+    );
   });
 
   it('can remode an if statement with a falsy constant test', () => {
-    const before = `
+    const code = `
       if ('production' === 'development' || false) {
         var a = 1;
       }
     `;
-
-    // Intentionally empty: all dead code.
-    const after = `
-    `;
-
-    const {ast} = constantFolding('arbitrary.js', {code: before});
-    expect(toString(ast)).toEqual(normalize(after));
+    expect(normalize(constantFolding('arbitrary.js', parse(code)))).toEqual('');
   });
 
   it('can optimize if-else-branches with constant conditions', () => {
-    const before = `
+    const code = `
       if ('production' == 'development') {
         var a = 1;
         var b = a + 2;
@@ -142,20 +99,13 @@ describe('constant expressions', () => {
         var a = 'b';
       }
     `;
-
-    const after = `
-      {
-        var a = 3;
-        var b = a + 4;
-      }
-    `;
-
-    const {ast} = constantFolding('arbitrary.js', {code: before});
-    expect(toString(ast)).toEqual(normalize(after));
+    expect(normalize(constantFolding('arbitrary.js', parse(code)))).toEqual(
+      '{var a=3;var b=a+4;}',
+    );
   });
 
   it('can optimize nested if-else constructs', () => {
-    const before = `
+    const code = `
       if ('ios' === "android") {
         if (true) {
           require('a');
@@ -170,16 +120,8 @@ describe('constant expressions', () => {
         }
       }
     `;
-
-    const after = `
-      {
-        {
-          require('c');
-        }
-      }
-    `;
-
-    const {ast} = constantFolding('arbitrary.js', {code: before});
-    expect(toString(ast)).toEqual(normalize(after));
+    expect(normalize(constantFolding('arbitrary.js', parse(code)))).toEqual(
+      "{{require('c');}}",
+    );
   });
 });

packages/metro-bundler/src/JSTransformer/worker/__tests__/worker-test.js

@@ -275,7 +275,7 @@ describe('code transformation worker:', () => {
       const inlineResult = {map: {version: 3, sources: []}, ast: {}};
       inline.mockReturnValue(inlineResult);
       transformCode(transformer, filename, filename, 'code', options, () => {
-        expect(constantFolding).toBeCalledWith(filename, inlineResult, options);
+        expect(constantFolding).toBeCalledWith(filename, inlineResult);
         done();
       });
     });

packages/metro-bundler/src/JSTransformer/worker/constant-folding.js

@@ -13,9 +13,8 @@
 'use strict';
 
 const babel = require('babel-core');
-const invariant = require('fbjs/lib/invariant');
 
-import type {IntermediateTransformResult} from './types.flow';
+import type {Ast, SourceMap as MappingsMap} from 'babel-core';
 const t = babel.types;
 
 const Conditional = {
@@ -32,7 +31,7 @@ const Conditional = {
   },
 };
 
-const constantFoldingPlugin = {
+const plugin = {
   visitor: {
     BinaryExpression: {
       exit(path) {
@@ -72,32 +71,25 @@ const constantFoldingPlugin = {
   },
 };
 
-const plugin = () => constantFoldingPlugin;
-
 function constantFolding(
   filename: string,
-  transformResult: IntermediateTransformResult,
-  options: {+dev: boolean, +platform: ?string},
-): IntermediateTransformResult {
-  const code = transformResult.code;
-  const babelOptions = {
+  transformResult: {
+    ast: Ast,
+    code?: ?string,
+    map: ?MappingsMap,
+  },
+) {
+  return babel.transformFromAst(transformResult.ast, transformResult.code, {
     filename,
-    plugins: [[plugin, options]],
+    plugins: [plugin],
     inputSourceMap: transformResult.map,
     sourceMaps: true,
     sourceFileName: filename,
-    code: true,
     babelrc: false,
     compact: true,
-  };
-
-  const result = transformResult.ast
-    ? babel.transformFromAst(transformResult.ast, code, babelOptions)
-    : (code && babel.transform(code, babelOptions)) || {};
-  const {ast} = result;
-  invariant(ast != null, 'Missing AST in babel transform results.');
-  return {ast, code: result.code, map: result.map};
+    retainLines: true,
+  });
 }
 
-constantFolding.plugin = constantFoldingPlugin;
+constantFolding.plugin = plugin;
 module.exports = constantFolding;

packages/metro-bundler/src/JSTransformer/worker/index.js

@@ -22,8 +22,7 @@ const minify = require('./minify');
 import type {LogEntry} from '../../Logger/Types';
 import type {MappingsMap} from '../../lib/SourceMap';
 import type {LocalPath} from '../../node-haste/lib/toLocalPath';
-import type {IntermediateTransformResult} from './types.flow';
-import type {Plugins as BabelPlugins} from 'babel-core';
+import type {Ast, Plugins as BabelPlugins} from 'babel-core';
 
 export type TransformedCode = {
   code: string,
@@ -39,7 +38,7 @@ export type Transformer<ExtraOptions: {} = {}> = {
     options: ExtraOptions & TransformOptions,
     plugins?: BabelPlugins,
     src: string,
-  |}) => IntermediateTransformResult,
+  |}) => {ast: ?Ast, code: string, map: ?MappingsMap},
   getCacheKey: () => string,
 };
 
@@ -84,8 +83,6 @@ type TransformCode = (
   Callback<Data>,
 ) => void;
 
-const transformers = [inline, constantFolding];
-
 const transformCode: TransformCode = asyncify(
   (
     transformer: Transformer<*>,
@@ -124,29 +121,17 @@ const transformCode: TransformCode = asyncify(
       'Missing transform results despite having no error.',
     );
 
-    let code;
-    let map;
-
+    var code, map;
     if (options.minify) {
-      let result = transformed;
-      const length = transformers.length;
-
-      for (let i = 0; i < length; i++) {
-        result = transformers[i](filename, result, options);
-      }
-
-      ({code, map} = result);
+      ({code, map} = constantFolding(
+        filename,
+        inline(filename, transformed, options),
+      ));
+      invariant(code != null, 'Missing code from constant-folding transform.');
     } else {
       ({code, map} = transformed);
     }
 
-    invariant(
-      code != null,
-      'The last transformer on the list (' +
-        transformers[transformers.length - 1].name +
-        ') has to output code',
-    );
-
     if (isJson) {
       code = code.replace(/^\w+\.exports=/, '');
     } else {

packages/metro-bundler/src/JSTransformer/worker/inline.js

@@ -15,7 +15,7 @@
 const babel = require('babel-core');
 const invariant = require('fbjs/lib/invariant');
 
-import type {IntermediateTransformResult} from './types.flow';
+import type {Ast, SourceMap as MappingsMap} from 'babel-core';
 const t = babel.types;
 
 const React = {name: 'React'};
@@ -115,16 +115,6 @@ function findProperty(objectExpression, key, fallback) {
   return property ? property.value : fallback();
 }
 
-function checkRequireArgs(args, dependencyId) {
-  const pattern = t.stringLiteral(dependencyId);
-  return (
-    t.isStringLiteral(args[0], pattern) ||
-    (t.isMemberExpression(args[0]) &&
-      t.isNumericLiteral(args[0].property) &&
-      t.isStringLiteral(args[1], pattern))
-  );
-}
-
 const inlinePlugin = {
   visitor: {
     Identifier(path, state) {
@@ -172,11 +162,27 @@ const inlinePlugin = {
 
 const plugin = () => inlinePlugin;
 
+function checkRequireArgs(args, dependencyId) {
+  const pattern = t.stringLiteral(dependencyId);
+  return (
+    t.isStringLiteral(args[0], pattern) ||
+    (t.isMemberExpression(args[0]) &&
+      t.isNumericLiteral(args[0].property) &&
+      t.isStringLiteral(args[1], pattern))
+  );
+}
+
+type AstResult = {
+  ast: Ast,
+  code: ?string,
+  map: ?MappingsMap,
+};
+
 function inline(
   filename: string,
-  transformResult: IntermediateTransformResult,
+  transformResult: {ast?: ?Ast, code: string, map: ?MappingsMap},
   options: {+dev: boolean, +platform: ?string},
-): IntermediateTransformResult {
+): AstResult {
   const code = transformResult.code;
   const babelOptions = {
     filename,
@@ -191,7 +197,7 @@ function inline(
 
   const result = transformResult.ast
     ? babel.transformFromAst(transformResult.ast, code, babelOptions)
-    : (code && babel.transform(code, babelOptions)) || {};
+    : babel.transform(code, babelOptions);
   const {ast} = result;
   invariant(ast != null, 'Missing AST in babel transform results.');
   return {ast, code: result.code, map: result.map};

packages/metro-bundler/src/JSTransformer/worker/types.flow.js

@@ -1,21 +0,0 @@
-/**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * @flow
- * @format
- */
-
-'use strict';
-
-import type {Ast, SourceMap as MappingsMap} from 'babel-core';
-
-export type IntermediateTransformResult = {
-  ast: ?Ast,
-  code: ?string,
-  map: ?MappingsMap,
-};

packages/metro-bundler/yarn.lock

@@ -536,9 +536,9 @@ babel-preset-fbjs@^2.1.4:
     babel-plugin-transform-react-display-name "^6.8.0"
     babel-plugin-transform-react-jsx "^6.8.0"
 
-babel-preset-react-native@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-react-native/-/babel-preset-react-native-2.1.0.tgz#9013ebd82da1c88102bf588810ff59e209ca2b8a"
+babel-preset-react-native@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-react-native/-/babel-preset-react-native-2.0.0.tgz#c26c7066c7399df30926fa03c012ef87f2cce5b7"
   dependencies:
     babel-plugin-check-es2015-constants "^6.5.0"
     babel-plugin-react-transform "2.0.2"