Merge branch 'master' into boneskull/rollup-umd

karma.conf.js

@@ -155,6 +155,7 @@ module.exports = config => {
 
   if (MOCHA_TEST !== 'requirejs') {
     cfg.files.unshift(
+      require.resolve('sinon/pkg/sinon.js'),
       require.resolve('unexpected/unexpected'),
       {
         pattern: require.resolve('unexpected/unexpected.js.map'),

lib/cli/cli.js

@@ -52,7 +52,7 @@ exports.main = (argv = process.argv.slice(2)) => {
       debug('caught error sometime before command handler: %O', err);
       yargs.showHelp();
       console.error(`\n${symbols.error} ${ansi.red('ERROR:')} ${msg}`);
-      yargs.exit(1);
+      process.exitCode = 1;
     })
     .help('help', 'Show usage information & exit')
     .alias('help', 'h')

package.json

@@ -80,13 +80,13 @@
   "devDependencies": {
     "@11ty/eleventy": "^0.10.0",
     "@11ty/eleventy-plugin-inclusive-language": "^1.0.0",
-    "@babel/preset-env": "^7.10.2",
+    "@babel/preset-env": "^7.10.4",
     "@mocha/docdash": "^2.1.3",
-    "@rollup/plugin-babel": "^5.0.3",
-    "@rollup/plugin-commonjs": "^11.0.2",
-    "@rollup/plugin-json": "^4.0.2",
+    "@rollup/plugin-babel": "^5.0.4",
+    "@rollup/plugin-commonjs": "^13.0.0",
+    "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-multi-entry": "^3.0.1",
-    "@rollup/plugin-node-resolve": "^7.1.1",
+    "@rollup/plugin-node-resolve": "^8.1.0",
     "assetgraph-builder": "^8.0.1",
     "autoprefixer": "^9.7.4",
     "babel-eslint": "^10.1.0",
@@ -134,7 +134,7 @@
     "requirejs": "^2.3.6",
     "rewiremock": "^3.14.1",
     "rimraf": "^3.0.2",
-    "rollup": "^2.10.2",
+    "rollup": "^2.18.2",
     "rollup-plugin-node-builtins": "^2.1.2",
     "rollup-plugin-node-globals": "^1.4.0",
     "rollup-plugin-visualizer": "^3.3.2",

rollup.config.js

@@ -49,7 +49,13 @@ const config = {
       ],
       babelHelpers: 'bundled'
     })
-  ]
+  ],
+  onwarn: (warning, warn) => {
+    if (warning.code === 'CIRCULAR_DEPENDENCY') return;
+
+    // Use default for everything else
+    warn(warning);
+  }
 };
 
 if (!process.env.CI) {

scripts/karma-rollup-plugin.js

@@ -34,7 +34,6 @@ const fs = require('fs');
 const path = require('path');
 const uuid = require('uuid');
 const rollup = require('rollup');
-const glob = require('glob');
 const minimatch = require('minimatch');
 const loadConfigFile = require('rollup/dist/loadConfigFile');
 const multiEntry = require('@rollup/plugin-multi-entry');
@@ -58,15 +57,12 @@ function framework(fileConfigs, pluginConfig, basePath, preprocessors) {
       )
     );
 
-  const bundleFiles = [
-    ...new Set(bundlePatterns.map(pattern => glob.sync(pattern)).flat())
-  ];
-
   const bundleFilename = `${uuid.v4()}.rollup.js`;
   let bundleLocation = path.resolve(
     pluginConfig.bundleDirPath ? pluginConfig.bundleDirPath : os.tmpdir(),
     bundleFilename
   );
+
   if (process.platform === 'win32') {
     bundleLocation = bundleLocation.replace(/\\/g, '/');
   }
@@ -75,7 +71,7 @@ function framework(fileConfigs, pluginConfig, basePath, preprocessors) {
   preprocessors[bundleLocation] = ['rollup'];
 
   // Save file mapping for later
-  fileMap.set(bundleLocation, bundleFiles);
+  fileMap.set(bundleLocation, bundlePatterns);
 
   // Remove all file match patterns that were included in bundle
   // And inject the bundle in their place.
@@ -121,18 +117,27 @@ function bundlePreprocessor(config) {
 
   return async function(content, file, done) {
     const {options, warnings} = await configPromise;
-    const pluginConfig = options[0].plugins || [];
-    const outputConfig = options[0].output || [];
+
+    const config = options[0];
+    const pluginConfig = config.plugins || [];
+    const outputConfig = {
+      ...(config.output ? config.output[0] : {}),
+      globals: {sinon: 'sinon'},
+      file: file.path
+    };
 
     warnings.flush();
 
     const bundle = await rollup.rollup({
       input: fileMap.get(file.path),
-      plugins: [...pluginConfig, multiEntry({exports: false})]
+      plugins: [...pluginConfig, multiEntry({exports: false})],
+      external: ['sinon'],
+      onwarn: config.onwarn
     });
-    const {output} = await bundle.generate(outputConfig[0]);
 
-    await bundle.write({...outputConfig[0], file: file.path});
+    const {output} = await bundle.generate(outputConfig);
+
+    await bundle.write(outputConfig);
     console.error(`wrote bundle to ${file.path}`);
 
     done(null, output[0].code);

test/integration/init.spec.js

@@ -23,19 +23,39 @@ describe('init command', function() {
     } catch (ignored) {}
   });
 
-  it('should break if no path supplied', function(done) {
-    invokeMocha(
-      ['init'],
-      function(err, result) {
-        if (err) {
-          return done(err);
-        }
-        expect(result, 'to have failed');
-        expect(result.output, 'to match', /not enough non-option arguments/i);
-        done();
-      },
-      {stdio: 'pipe'}
-    );
+  describe('when no path is supplied', function() {
+    it('should fail', function(done) {
+      invokeMocha(
+        ['init'],
+        function(err, result) {
+          if (err) {
+            return done(err);
+          }
+          expect(
+            result,
+            'to have failed with output',
+            /not enough non-option arguments/i
+          );
+          done();
+        },
+        {stdio: 'pipe'}
+      );
+    });
+    it('should not throw', function(done) {
+      invokeMocha(
+        ['init'],
+        function(err, result) {
+          if (err) {
+            return done(err);
+          }
+          expect(result, 'to have failed').and('not to satisfy', {
+            output: /throw/i
+          });
+          done();
+        },
+        {stdio: 'pipe'}
+      );
+    });
   });
 
   it('should create some files in the dest dir', function(done) {