fix test for error throwing. also, tweak test env

.gitignore

@@ -1,6 +1,9 @@
 tmp
 dist
 
+# awesome-typescript-loader
+.awcache
+
 # npm
 node_modules
-npm-debug.log
+npm-debug.log

tasks/ts-types.js

@@ -24,11 +24,14 @@ gulp.task('ts-types:raw', function() {
   })
 })
 
+/*
+if this task is run at the same time as webpack:watch, it forces webpack:watch to wait
+for this to be done for some reason. wait for the initial fullcalendar.js file to be
+written (which is when webpack:watch resolves) so that gulp.watch has something to grab
+onto, and then watch for changes in the *output* of fullcalendar.js, guaranteeing that
+webpack goes first.
+*/
 gulp.task('ts-types:watch', [ 'webpack:watch' ], function() {
-  // HACK
-  // if we watched src/**/*.js files,
-  // it blocked webpack compilation until dts-generator finished for some reason.
-  // instead, wait until we know core compilation has finished before rerunning dts-generator.
   gulp.watch('dist/fullcalendar.js', [ 'ts-types' ])
 })
 

tasks/webpack.js

@@ -15,20 +15,24 @@ gulp.task('webpack:dev', function() {
   return createStream(true)
 })
 
-gulp.task('webpack:watch', function() {
-  createStream(true, true)
+/*
+this task will be considered done after initial compile
+*/
+gulp.task('webpack:watch', function(done) {
+  createStream(true, true, done)
 })
 
 
 const jsFilter = filter([ '**/*.js' ], { restore: true })
 const localeFilter = filter([ '**/locale-all.js', '**/locale/*.js' ], { restore: true })
 
-function createStream(enableDev, enableWatch) {
+function createStream(isDev, isWatch, doneCallback) {
+  let doneCallbackCalled = false
   let stream = gulp.src([]) // don't pass in any files. webpack handles that
     .pipe(
       webpack(Object.assign({}, webpackConfig, {
-        devtool: enableDev ? 'source-map' : false, // also 'inline-source-map'
-        watch: enableWatch || false
+        devtool: isDev ? 'source-map' : false, // also 'inline-source-map'
+        watch: isWatch ? true : false
       }))
     )
     .pipe(
@@ -62,7 +66,7 @@ function createStream(enableDev, enableWatch) {
     }))
     .pipe(jsFilter.restore)
 
-  if (!enableDev) {
+  if (!isDev) {
     stream = stream
       .pipe(localeFilter)
       .pipe(uglify()) // uglify only the locale files, then bring back other files to stream
@@ -72,4 +76,10 @@ function createStream(enableDev, enableWatch) {
   return stream.pipe(
     gulp.dest(webpackConfig.output.path)
   )
+  .on('data', function() {
+    if (doneCallback && !doneCallbackCalled) {
+      doneCallbackCalled = true
+      setTimeout(doneCallback, 100) // HACK: for some reason files not written an this point, so wait
+    }
+  })
 }

tests/legacy/hiddenDays.js

@@ -82,7 +82,7 @@ describe('hiddenDays', function() {
       }
       expect(function() {
         $('#cal').fullCalendar(options)
-      }).toThrow('invalid hiddenDays')
+      }).toThrow(new Error('invalid hiddenDays'))
     })
   })
 })

webpack.config.js

@@ -61,7 +61,10 @@ module.exports = {
     rules: [
       {
         test: /\.(ts|js)$/,
-        loader: 'awesome-typescript-loader'
+        loader: 'awesome-typescript-loader',
+        options: {
+          useCache: true
+        }
       },
       {
         test: /\.css$/,
@@ -83,6 +86,11 @@ module.exports = {
     new webpack.BannerPlugin(BANNER)
   ],
 
+  watchOptions: {
+    aggregateTimeout: 100,
+    ignored: /node_modules/
+  },
+
   output: {
     library: 'FullCalendar', // gulp will strip this out for plugins
     libraryTarget: 'umd',