Update Rollup version to 1.19.4 and fix breaking changes

package.json

@@ -72,12 +72,12 @@
     "random-seed": "^0.3.0",
     "react-lifecycles-compat": "^3.0.2",
     "rimraf": "^2.6.1",
-    "rollup": "^0.52.1",
-    "rollup-plugin-babel": "^3.0.1",
-    "rollup-plugin-commonjs": "^8.2.6",
+    "rollup": "^1.7.3",
+    "rollup-plugin-babel": "^3.0.7",
+    "rollup-plugin-commonjs": "^9.2.1",
     "rollup-plugin-node-resolve": "^2.1.1",
-    "rollup-plugin-prettier": "^0.3.0",
-    "rollup-plugin-replace": "^2.0.0",
+    "rollup-plugin-prettier": "^0.6.0",
+    "rollup-plugin-replace": "^2.1.0",
     "rollup-plugin-strip-banner": "^0.2.0",
     "semver": "^5.5.0",
     "targz": "^1.0.1",

scripts/babel/__tests__/remove-getters-test.js

@@ -0,0 +1,79 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+'use strict';
+
+const babel = require('babel-core');
+const removeGetters = require('../remove-getters');
+
+function transform(input) {
+  return babel.transform(input, {
+    plugins: [removeGetters],
+  }).code;
+}
+
+function compare(input, output) {
+  const compiled = transform(input);
+  expect(compiled).toEqual(output);
+}
+
+describe('remove-getters', () => {
+  it('should remove getters', () => {
+    compare(
+      `const object = {
+  get prop() {
+    return variable;
+  }
+};`,
+      `const object = {
+  prop: variable
+};`
+    );
+  });
+
+  it('should not remove other methods or properties', () => {
+    compare(
+      `const object = {
+  prop: 'foo',
+  method() {
+    return 'bar';
+  }
+};`,
+      `const object = {
+  prop: 'foo',
+  method() {
+    return 'bar';
+  }
+};`
+    );
+  });
+
+  it('should ignore when finding getters with a different syntax from the ones generated by Rollup', () => {
+    compare(
+      `var passiveBrowserEventsSupported = false;
+try {
+  var options = {
+    get passive() {
+      passiveBrowserEventsSupported = true;
+    }
+  };
+} catch (err) {
+  passiveBrowserEventsSupported = false;
+}`,
+
+      `var passiveBrowserEventsSupported = false;
+try {
+  var options = {
+    get passive() {
+      passiveBrowserEventsSupported = true;
+    }
+  };
+} catch (err) {
+  passiveBrowserEventsSupported = false;
+}`
+    );
+  });
+});

scripts/babel/remove-getters.js

@@ -0,0 +1,75 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+'use strict';
+
+module.exports = ({types: t}) => {
+  return {
+    visitor: {
+      ObjectMethod: path => {
+        // Turns this code:
+        //
+        // get prop() {
+        //   return variable;
+        // }
+        //
+        // into this:
+        //
+        // prop: variable;
+        if (path.node.kind !== 'get') {
+          return;
+        }
+
+        const keyNode = path.node.key;
+        const isValidKey = t.isIdentifier(keyNode);
+        if (!isValidKey) {
+          return;
+          /*
+            Similar to Rollup.legacy behaviour.
+            Not all getters code usage can be transformed in meaningful way.
+            Simply return and don't throw error.
+
+            This code based contains getters which can't be transformed but is guarded by using a try catch block.
+
+            e.g. getters which has a side effect.
+
+            var passiveBrowserEventsSupported = false;
+            try {
+              var options = {
+                  get passive() {
+                    passiveBrowserEventsSupported = true;
+                  },
+              };
+            } catch(err) {
+              passiveBrowserEventsSupported = false;
+            }
+          */
+        }
+
+        const bodyNode = path.node.body;
+        const isValidBody =
+          bodyNode.body.length === 1 &&
+          t.isReturnStatement(bodyNode.body[0]) &&
+          t.isIdentifier(bodyNode.body[0].argument);
+        if (!isValidBody) {
+          /*
+            Similar to Rollup.legacy behaviour.
+            Not all getters code usage can be transformed in meaningful way.
+            Simply return and don't throw error.
+          */
+          return;
+        }
+
+        const prop = keyNode.name;
+        const variable = bodyNode.body[0].argument.name;
+
+        path.replaceWith(
+          t.objectProperty(t.identifier(prop), t.identifier(variable))
+        );
+      },
+    },
+  };
+};

scripts/rollup/build.js

@@ -2,6 +2,7 @@
 
 const {rollup} = require('rollup');
 const babel = require('rollup-plugin-babel');
+const babelCore = require('babel-core');
 const closure = require('./plugins/closure-plugin');
 const commonjs = require('rollup-plugin-commonjs');
 const prettier = require('rollup-plugin-prettier');
@@ -357,6 +358,23 @@ function getPlugins(
     }),
     // We still need CommonJS for external deps like object-assign.
     commonjs(),
+    isFBBundle && {
+      renderChunk(source) {
+        // Run a final Babel pass after Rollup bundle.
+        const babelOptions = {
+          ast: false,
+          babelrc: false,
+          compact: false,
+          plugins: [
+            // This is needed because Rollup outputs getters, but we can't use
+            // getters in www.
+            require('../babel/remove-getters'),
+          ],
+        };
+        const result = babelCore.transform(source, babelOptions);
+        return result.code;
+      },
+    },
     // Apply dead code elimination and/or minification.
     isProduction &&
       closure(
@@ -378,7 +396,7 @@ function getPlugins(
     shouldStayReadable && prettier({parser: 'babylon'}),
     // License and haste headers, top-level `if` blocks.
     {
-      transformBundle(source) {
+      renderChunk(source) {
         return Wrappers.wrapBundle(
           source,
           bundleType,
@@ -502,11 +520,6 @@ async function createBundle(bundle, bundleType) {
       bundle.moduleType,
       pureExternalModules
     ),
-    // We can't use getters in www.
-    legacy:
-      bundleType === FB_WWW_DEV ||
-      bundleType === FB_WWW_PROD ||
-      bundleType === FB_WWW_PROFILING,
   };
   const [mainOutputPath, ...otherOutputPaths] = Packaging.getBundleOutputPaths(
     bundleType,
@@ -559,7 +572,11 @@ function handleRollupWarning(warning) {
     return;
   }
 
-  if (typeof warning.code === 'string') {
+  const ignoredRollupWarnings = ['CIRCULAR_DEPENDENCY'];
+
+  if (ignoredRollupWarnings.indexOf(warning.code) !== -1) {
+    // Ignored
+  } else if (typeof warning.code === 'string') {
     // This is a warning coming from Rollup itself.
     // These tend to be important (e.g. clashes in namespaced exports)
     // so we'll fail the build on any of them.

scripts/rollup/plugins/closure-plugin.js

@@ -22,7 +22,7 @@ function compile(flags) {
 module.exports = function closure(flags = {}) {
   return {
     name: 'scripts/rollup/plugins/closure-plugin',
-    async transformBundle(code) {
+    async renderChunk(code) {
       const inputFile = tmp.fileSync();
       const tempPath = inputFile.name;
       flags = Object.assign({}, flags, {js: tempPath});

scripts/rollup/plugins/sizes-plugin.js

@@ -11,11 +11,15 @@ const gzip = require('gzip-size');
 module.exports = function sizes(options) {
   return {
     name: 'scripts/rollup/plugins/sizes-plugin',
-    ongenerate(bundle, obj) {
-      const size = Buffer.byteLength(obj.code);
-      const gzipSize = gzip.sync(obj.code);
-
-      options.getSize(size, gzipSize);
+    generateBundle(outputOptions, bundle, isWrite) {
+      Object.keys(bundle).forEach(id => {
+        const chunk = bundle[id];
+        if (chunk && chunk.code) {
+          const size = Buffer.byteLength(chunk.code);
+          const gzipSize = gzip.sync(chunk.code);
+          options.getSize(size, gzipSize);
+        }
+      });
     },
   };
 };

scripts/rollup/plugins/strip-unused-imports.js

@@ -9,7 +9,7 @@
 module.exports = function stripUnusedImports(pureExternalModules) {
   return {
     name: 'scripts/rollup/plugins/strip-unused-imports',
-    transformBundle(code) {
+    renderChunk(code) {
       pureExternalModules.forEach(module => {
         // Ideally this would use a negative lookbehind: (?<!= *)
         // But this isn't supported by the Node <= 8.9.