include default options

Author: chrisbreiding

cjsxify.js

@@ -0,0 +1,11 @@
+// wrapper for cjsxify to prevent coffee script from rewriting Error.prepareStackTrace
+
+// hold onto the original
+const prepareStackTrace = Error.prepareStackTrace
+
+const cjsxify = require('cjsxify')
+
+// restore
+Error.prepareStackTrace = prepareStackTrace
+
+module.exports = cjsxify

index.js

@@ -11,10 +11,41 @@ const log = require('debug')('cypress:browserify')
 
 const bundles = {}
 
+const defaults = {
+  extensions: ['.js', '.jsx', '.coffee', '.cjsx'],
+  watchOptions: {
+    ignoreWatch: [
+      '**/.git/**',
+      '**/.nyc_output/**',
+      '**/.sass-cache/**',
+      '**/bower_components/**',
+      '**/coverage/**',
+      '**/node_modules/**',
+    ],
+  },
+  transforms: [
+    {
+      transform: require.resolve('./cjsxify'),
+      options: {},
+    },
+    {
+      transform: require.resolve('babelify'),
+      options: {
+        ast: false,
+        babelrc: false,
+        plugins: ['babel-plugin-add-module-exports'].map(require.resolve),
+        presets: ['babel-preset-env', 'babel-preset-react'].map(require.resolve),
+      },
+    },
+  ],
+}
+
 module.exports = (config, userOptions = {}) => {
   log('received user options', userOptions)
 
   return (filePath, util) => {
+    log('get', filePath)
+
     if (bundles[filePath]) {
       log(`already have bundle for ${filePath}`)
       return bundles[filePath]
@@ -28,22 +59,22 @@ module.exports = (config, userOptions = {}) => {
 
     const bundler = browserify({
       entries: [filePath],
-      extensions: userOptions.extensions || ['.js'],
+      extensions: options.extensions,
       cache: {},
       packageCache: {},
     })
 
     if (shouldWatch) {
       log('watching')
-      bundler.plugin(watchify, userOptions.watchifyOptions || {})
+      bundler.plugin(watchify, options.watchOptions || {})
     }
 
-    const onBundle = userOptions.onBundle
+    const onBundle = options.onBundle
     if (typeof onBundle === 'function') {
       onBundle(bundler)
     }
 
-    const transforms = userOptions.transforms
+    const transforms = options.transforms
     if (Object.prototype.toString.call(transforms) === '[object Array]') {
       transforms.forEach((transform) => {
         bundler.transform(transform.transform, transform.options)

package.json

@@ -69,8 +69,13 @@
     "sinon-chai": "2.13.0"
   },
   "dependencies": {
+    "babel-plugin-add-module-exports": "^0.2.1",
+    "babel-preset-env": "^1.6.0",
+    "babel-preset-react": "^6.24.1",
+    "babelify": "^7.3.0",
     "bluebird": "3.5.0",
     "browserify": "14.4.0",
+    "cjsxify": "^0.3.0",
     "debug": "3.0.1",
     "fs-extra": "4.0.1",
     "watchify": "3.9.0"

test/index_spec.js

@@ -45,7 +45,9 @@ describe('browserify preprocessor', function () {
 
     sandbox.stub(fs, 'ensureDirAsync').resolves()
 
-    this.config = {}
+    this.config = {
+      isTextTerminal: true,
+    }
     this.userOptions = {}
     this.filePath = 'path/to/file.js'
     this.outputPath = 'output/output.js'
@@ -62,7 +64,7 @@ describe('browserify preprocessor', function () {
 
   describe('exported function', function () {
     it('receives user options and returns a preprocessor function', function () {
-      expect(preprocessor(this.userOptions)).to.be.a('function')
+      expect(preprocessor(this.config, this.userOptions)).to.be.a('function')
     })
   })
 
@@ -86,7 +88,7 @@ describe('browserify preprocessor', function () {
         browserify.reset()
         browserify.returns(this.bundlerApi)
 
-        const run = preprocessor(this.userOptions)
+        const run = preprocessor(this.config, this.userOptions)
         return run(this.filePath, this.util)
         .then(() => {
           return run(this.filePath, this.util)
@@ -104,7 +106,7 @@ describe('browserify preprocessor', function () {
 
       it('specifies default extensions if none provided', function () {
         return this.run().then(() => {
-          expect(browserify.lastCall.args[0].extensions).to.eql(['.js'])
+          expect(browserify.lastCall.args[0].extensions).to.eql(['.js', '.jsx', '.coffee', '.cjsx'])
         })
       })
 
@@ -122,9 +124,25 @@ describe('browserify preprocessor', function () {
         })
       })
 
-      it('includes watchifyOptions if provided', function () {
+      it('use default watchOptions if not provided', function () {
+        this.config.isTextTerminal = false
+        return this.run().then(() => {
+          expect(this.bundlerApi.plugin).to.be.calledWith(watchify, {
+            ignoreWatch: [
+              '**/.git/**',
+              '**/.nyc_output/**',
+              '**/.sass-cache/**',
+              '**/bower_components/**',
+              '**/coverage/**',
+              '**/node_modules/**',
+            ],
+          })
+        })
+      })
+
+      it('includes watchOptions if provided', function () {
         this.config.isTextTerminal = false
-        this.userOptions.watchifyOptions = { ignoreWatch: ['node_modules'] }
+        this.userOptions.watchOptions = { ignoreWatch: ['node_modules'] }
         return this.run().then(() => {
           expect(this.bundlerApi.plugin).to.be.calledWith(watchify, {
             ignoreWatch: ['node_modules'],
@@ -133,7 +151,6 @@ describe('browserify preprocessor', function () {
       })
 
       it('does not watch when isTextTerminal is true', function () {
-        this.config.isTextTerminal = true
         return this.run().then(() => {
           expect(this.bundlerApi.plugin).not.to.be.called
         })
@@ -210,7 +227,6 @@ describe('browserify preprocessor', function () {
       })
 
       it('does not close bundler when isTextTerminal is true and onClose callback is called', function () {
-        this.config.isTextTerminal = true
         return this.run().then(() => {
           this.util.onClose.lastCall.args[0]()
           expect(this.bundlerApi.close).not.to.be.called