From 7ea13f835c01277988bc3cad9fc7d8a6a772d27a Mon Sep 17 00:00:00 2001
From: Tadeu Zagallo <tadeuzagallo@fb.com>
Date: Tue, 10 Nov 2015 10:51:41 -0800
Subject: [PATCH] Use the previously upgraded transforms

Summary: public

Move all the transforms that had been previously upgraded to be the default now.

Reviewed By: vjeux

Differential Revision: D2631308

fb-gh-sync-id: a2120a9850c98ce65784b77598baa123121246ab
---
 .../babel-plugin-system-import/6/index.js     | 63 -------------------
 .../babel-plugin-system-import/index.js       | 50 +++++++--------
 2 files changed, 24 insertions(+), 89 deletions(-)
 delete mode 100644 react-packager/src/transforms/babel-plugin-system-import/6/index.js

diff --git a/react-packager/src/transforms/babel-plugin-system-import/6/index.js b/react-packager/src/transforms/babel-plugin-system-import/6/index.js
deleted file mode 100644
index 8a6cbcf0..00000000
--- a/react-packager/src/transforms/babel-plugin-system-import/6/index.js
+++ /dev/null
@@ -1,63 +0,0 @@
- /**
-  * Copyright (c) 2015-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.
-  *
-  */
-/*jslint node: true */
-'use strict';
-
-const t = require('babel-types');
-
-/**
- * Transforms asynchronous module importing into a function call
- * that includes which bundle needs to be loaded
- *
- * Transforms:
- *
- *  System.import('moduleA')
- *
- * to:
- *
- *  loadBundles('bundleA')
- */
-module.exports = function() {
-  return {
-    visitor: {
-      CallExpression: function (path, state) {
-        if (!isAppropriateSystemImportCall(path.node)) {
-          return;
-        }
-
-        var bundlesLayout = state.opts.bundlesLayout;
-        var bundleID = bundlesLayout.getBundleIDForModule(
-          path.node.arguments[0].value
-        );
-
-        var bundles = bundleID.split('.');
-        bundles.splice(0, 1);
-        bundles = bundles.map(function(id) {
-          return t.stringLiteral('bundle.' + id);
-        });
-
-        path.replaceWith(t.callExpression(
-          t.identifier('loadBundles'),
-          [t.arrayExpression(bundles)]
-        ));
-      },
-    },
-  };
-};
-
-function isAppropriateSystemImportCall(node) {
-  return (
-    node.callee.type === 'MemberExpression' &&
-    node.callee.object.name === 'System' &&
-    node.callee.property.name === 'import' &&
-    node.arguments.length === 1 &&
-    node.arguments[0].type === 'StringLiteral'
-  );
-}
diff --git a/react-packager/src/transforms/babel-plugin-system-import/index.js b/react-packager/src/transforms/babel-plugin-system-import/index.js
index 21ef64c0..8a6cbcf0 100644
--- a/react-packager/src/transforms/babel-plugin-system-import/index.js
+++ b/react-packager/src/transforms/babel-plugin-system-import/index.js
@@ -10,7 +10,7 @@
 /*jslint node: true */
 'use strict';
 
-var t = require('babel-core').types;
+const t = require('babel-types');
 
 /**
  * Transforms asynchronous module importing into a function call
@@ -24,34 +24,32 @@ var t = require('babel-core').types;
  *
  *  loadBundles('bundleA')
  */
-module.exports = function systemImportTransform(babel) {
-  return new babel.Transformer('system-import', {
-    CallExpression: function(node, parent, scope, state) {
-      if (!isAppropriateSystemImportCall(node, parent)) {
-        return node;
-      }
+module.exports = function() {
+  return {
+    visitor: {
+      CallExpression: function (path, state) {
+        if (!isAppropriateSystemImportCall(path.node)) {
+          return;
+        }
 
-      var bundlesLayout = state.opts.extra.bundlesLayout;
-      var bundleID = bundlesLayout.getBundleIDForModule(
-        node.arguments[0].value
-      );
+        var bundlesLayout = state.opts.bundlesLayout;
+        var bundleID = bundlesLayout.getBundleIDForModule(
+          path.node.arguments[0].value
+        );
 
-      var bundles = bundleID.split('.');
-      bundles.splice(0, 1);
-      bundles = bundles.map(function(id) {
-        return t.literal('bundle.' + id);
-      });
+        var bundles = bundleID.split('.');
+        bundles.splice(0, 1);
+        bundles = bundles.map(function(id) {
+          return t.stringLiteral('bundle.' + id);
+        });
 
-      return t.callExpression(
-        t.identifier('loadBundles'),
-        [t.arrayExpression(bundles)]
-      );
+        path.replaceWith(t.callExpression(
+          t.identifier('loadBundles'),
+          [t.arrayExpression(bundles)]
+        ));
+      },
     },
-
-    metadata: {
-      group: 'fb'
-    }
-  });
+  };
 };
 
 function isAppropriateSystemImportCall(node) {
@@ -60,6 +58,6 @@ function isAppropriateSystemImportCall(node) {
     node.callee.object.name === 'System' &&
     node.callee.property.name === 'import' &&
     node.arguments.length === 1 &&
-    node.arguments[0].type === 'Literal'
+    node.arguments[0].type === 'StringLiteral'
   );
 }