Merge pull request #7 from cypress-io/issue-5-dirty-cache-take-2

Actually ensure browserify cache is clean
cypress-io · Dec 6, 2017 · f49e9dc · f49e9dc
2 parents 2b2df9f + 6ac0c31
commit f49e9dc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/index.js b/index.js
@@ -35,8 +35,6 @@ const defaultOptions = {
       ],
     ],
     plugin: [],
-    cache: {},
-    packageCache: {},
   },
   watchifyOptions: {
     // ignore watching the following or the user's system can get bogged down
@@ -92,7 +90,11 @@ const preprocessor = (options = {}) => {
     log(`output: ${outputPath}`)
 
     // allow user to override default options
-    const browserifyOptions = Object.assign({}, defaultOptions.browserifyOptions, options.browserifyOptions)
+    const browserifyOptions = Object.assign({}, defaultOptions.browserifyOptions, options.browserifyOptions, {
+      // these must always be new objects or 'update' events will not fire
+      cache: {},
+      packageCache: {},
+    })
     const watchifyOptions = Object.assign({}, defaultOptions.watchifyOptions, options.watchifyOptions)
 
     // we need to override and control entries

diff --git a/test/index_spec.js b/test/index_spec.js
@@ -126,8 +126,8 @@ describe('browserify preprocessor', function () {
         const run = preprocessor(this.options)
         return run(this.file)
         .then(() => {
-          browserify.lastCall.args[0].cache = { foo: 'bar' }
-          browserify.lastCall.args[0].packageCache = { foo: 'bar' }
+          browserify.lastCall.args[0].cache.foo = 'bar'
+          browserify.lastCall.args[0].packageCache.foo = 'bar'
           this.file.on.withArgs('close').yield()
 
           return run(this.file)