fix: downgrade rollup to fix ES module bundling

filestack · Jul 19, 2018 · 6c05b40 · 6c05b40
1 parent 4b4f9a6
commit 6c05b40
Show file tree

Hide file tree

Showing 4 changed files with 151 additions and 23 deletions.
diff --git a/karma.conf.js b/karma.conf.js
@@ -81,7 +81,7 @@ module.exports = function karmaConfig(config) {
       },
       electron: {
         base: 'Electron',
-        flags: ['--show'],
+        // flags: ['--show'],
       },
     },
     browsers: process.env.CI ? [

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -66,7 +66,7 @@
     "fs-jetpack": "^1.2.0",
     "gh-pages": "^1.2.0",
     "gulp": "^3.9.1",
-    "gulp-better-rollup": "^3.3.0",
+    "gulp-better-rollup": "3.1.0",
     "gulp-rename": "^1.3.0",
     "gulp-replace": "^0.6.1",
     "gulp-rollup": "^2.16.2",
@@ -86,7 +86,7 @@
     "mocha": "^5.2.0",
     "nyc": "^12.0.2",
     "opn-cli": "^3.1.0",
-    "rollup": "^0.62.0",
+    "rollup": "^0.57.0",
     "rollup-plugin-alias": "^1.4.0",
     "rollup-plugin-commonjs": "^9.1.3",
     "rollup-plugin-node-builtins": "^2.1.2",

diff --git a/rollup.config.js b/rollup.config.js
@@ -40,21 +40,26 @@ const namedExports = {
 
 const plugins = [
   alias(adapters),
-  builtins(),
   nodeResolve({
     browser: true,
+    preferBuiltins: true,
   }),
   commonjs({
     include: 'node_modules/**',
     namedExports: namedExports,
   }),
-  globals(),
   replace({
     'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV),
     'process.env.TEST_ENV': JSON.stringify(process.env.TEST_ENV),
   }),
 ];
 
+// We use Node style testing so the Karma bundle needs some Node globals
+if (process.env.TEST_ENV) {
+  plugins.push(builtins());
+  plugins.push(globals());
+}
+
 module.exports = {
   input: 'build/module/index.js',
   onwarn: function(warning) {