Fix bundling

babel · Nov 16, 2018 · 100886a · 100886a
1 parent fbb093a
commit 100886a
Show file tree

Hide file tree

Showing 4 changed files with 270 additions and 34 deletions.
diff --git a/Gulpfile.js b/Gulpfile.js
@@ -23,6 +23,7 @@ const rollupReplace = require("rollup-plugin-replace");
 const rollupCommonJs = require("rollup-plugin-commonjs");
 const rollupNodeResolve = require("rollup-plugin-node-resolve");
 const rollupNodeGlobals = require("rollup-plugin-node-globals");
+const rollupNodeBuiltins = require("rollup-plugin-node-builtins");
 const uglify = require("gulp-uglify");
 const rollupJson = require("rollup-plugin-json");
 const registerStandalonePackageTask = require("./scripts/gulp-tasks")
@@ -131,14 +132,11 @@ function buildRollup(packages) {
               format,
               name,
             },
-            external: ["fs", "path"],
             plugins: [
               {
                 name: "babel-source",
                 load(id) {
-                  const matches = id.match(
-                    /packages\/(babel-[^/]+|babylon)\/src\//
-                  );
+                  const matches = id.match(/packages\/(babel-[^/]+)\/src\//);
                   if (matches) {
                     // check if browser field exists for this file and replace
                     const packageFolder = path.join(
@@ -172,16 +170,13 @@ function buildRollup(packages) {
                       }
                     }
                   }
+                  return null;
                 },
                 resolveId(importee) {
                   let packageFolderName;
-                  if (importee === "babylon") {
-                    packageFolderName = importee;
-                  } else {
-                    const matches = importee.match(/^@babel\/([^/]+)$/);
-                    if (matches) {
-                      packageFolderName = `babel-${matches[1]}`;
-                    }
+                  const matches = importee.match(/^@babel\/([^/]+)$/);
+                  if (matches) {
+                    packageFolderName = `babel-${matches[1]}`;
                   }
 
                   if (packageFolderName) {
@@ -207,12 +202,15 @@ function buildRollup(packages) {
                       filename.replace(/^(\.\/)?lib\//, "src/")
                     );
                   }
+
+                  return null;
                 },
               },
               rollupJson(),
               rollupNodeResolve({
                 browser: true,
                 jsnext: true,
+                preferBuiltins: true,
               }),
               rollupReplace({
                 "process.env.NODE_ENV": '"production"',
@@ -226,11 +224,11 @@ function buildRollup(packages) {
               rollupBabel({
                 envName: "rollup",
                 babelrc: false,
-                exclude: "**/node_modules/**",
                 extends: "./babel.config.js",
               }),
-              rollupNodeGlobals({ sourceMap: false }),
               rollupCommonJs(),
+              rollupNodeGlobals({ sourceMap: false }),
+              rollupNodeBuiltins(),
             ],
           }),
           source("index.js"),

diff --git a/babel.config.js b/babel.config.js
@@ -100,6 +100,7 @@ module.exports = function(api) {
           "packages/*/test",
           "codemods/*/src",
           "codemods/*/test",
+          "**/node_modules/**",
         ],
         sourceType: "unambiguous",
       },

diff --git a/package.json b/package.json
@@ -58,10 +58,11 @@
     "prettier": "^1.15.1",
     "pump": "^1.0.2",
     "rimraf": "^2.4.3",
-    "rollup": "^0.66.6",
+    "rollup": "^0.67.0",
     "rollup-plugin-babel": "^4.0.3",
     "rollup-plugin-commonjs": "^9.2.0",
     "rollup-plugin-json": "^3.1.0",
+    "rollup-plugin-node-builtins": "^2.1.2",
     "rollup-plugin-node-globals": "^1.4.0",
     "rollup-plugin-node-resolve": "^3.4.0",
     "rollup-plugin-replace": "^2.1.0",