Showing with 1,077 additions and 408 deletions.

+7 −0 .babelrc

+1 −1 Gruntfile.js

+25 −24 package.json

+1 −6 rollup.config.js

+1 −1 test/cli/watch.js

+1,042 −376 yarn.lock
diff --git a/.babelrc b/.babelrc
@@ -0,0 +1,7 @@
+{
+    "presets": [
+        // Don't transpile modules since Rollup does that
+        [ "env", { modules: false } ]
+    ],
+    "plugins": [ "external-helpers" ]
+}
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -251,7 +251,7 @@ module.exports = function( grunt ) {
 		var testName = file.split( "/test/" ).pop().replace( ".html", "" );
 		var reportPath = path.join( "build/report/phantom", testName + ".json" );
 
-		fs.createFileSync( reportPath );
+		fs.ensureFileSync( reportPath );
 		fs.writeJsonSync( reportPath, coverage, { spaces: 0 } );
 	} );
 

diff --git a/package.json b/package.json
@@ -31,46 +31,47 @@
     "LICENSE.txt"
   ],
   "dependencies": {
-    "chokidar": "1.6.1",
-    "commander": "2.9.0",
+    "chokidar": "1.7.0",
+    "commander": "2.12.2",
     "exists-stat": "1.0.0",
-    "findup-sync": "0.4.3",
-    "js-reporters": "1.2.0",
-    "resolve": "1.3.2",
-    "walk-sync": "0.3.1"
+    "findup-sync": "2.0.0",
+    "js-reporters": "1.2.1",
+    "resolve": "1.5.0",
+    "walk-sync": "0.3.2"
   },
   "devDependencies": {
-    "async": "2.1.4",
-    "babel-plugin-external-helpers": "6.18.0",
-    "babel-preset-es2015": "6.18.0",
-    "browserstack-runner": "0.4.4",
+    "async": "2.6.0",
+    "babel-core": "6.26.0",
+    "babel-plugin-external-helpers": "6.22.0",
+    "babel-preset-env": "1.6.1",
+    "browserstack-runner": "0.7.0",
     "co": "4.6.0",
-    "commitplease": "2.7.6",
-    "eslint-config-jquery": "1.0.0",
-    "eslint-plugin-html": "3.1.1",
+    "commitplease": "3.1.0",
+    "eslint-config-jquery": "1.0.1",
+    "eslint-plugin-html": "4.0.1",
     "eslint-plugin-qunit": "3.2.0",
-    "execa": "0.6.1",
-    "fixturify": "0.3.3",
-    "fs-extra": "1.0.0",
+    "execa": "0.8.0",
+    "fixturify": "0.3.4",
+    "fs-extra": "5.0.0",
     "grunt": "1.0.1",
     "grunt-cli": "1.2.0",
     "grunt-concurrent": "2.3.1",
     "grunt-contrib-connect": "1.0.2",
     "grunt-contrib-copy": "1.0.0",
-    "grunt-contrib-qunit": "1.3.0",
+    "grunt-contrib-qunit": "2.0.0",
     "grunt-contrib-watch": "1.0.0",
     "grunt-coveralls": "1.0.1",
-    "grunt-eslint": "20.0.0",
+    "grunt-eslint": "20.1.0",
     "grunt-git-authors": "3.2.0",
-    "grunt-istanbul": "0.7.2",
-    "grunt-rollup": "1.0.1",
+    "grunt-istanbul": "0.8.0",
+    "grunt-rollup": "8.2.0",
     "grunt-search": "0.1.8",
     "load-grunt-tasks": "3.5.2",
     "npm-reporter": "file:./test/cli/fixtures/npm-reporter",
-    "proxyquire": "1.7.11",
-    "requirejs": "2.3.2",
-    "rollup-plugin-babel": "2.6.1",
-    "semver": "5.3.0"
+    "proxyquire": "1.8.0",
+    "requirejs": "2.3.5",
+    "rollup-plugin-babel": "3.0.2",
+    "semver": "5.4.1"
   },
   "scripts": {
     "browserstack": "grunt build && sh build/run-browserstack.sh",

diff --git a/rollup.config.js b/rollup.config.js
@@ -7,12 +7,7 @@ module.exports = {
 	exports: "none",
 	plugins: [
 		babel( {
-			presets: [
-
-				// Use ES2015 but don't transpile modules since Rollup does that
-				[ "es2015", { modules: false } ]
-			],
-			plugins: [ "external-helpers" ]
+			exclude: "node_modules/**"
 		} )
 	],
 

diff --git a/test/cli/watch.js b/test/cli/watch.js
@@ -36,7 +36,7 @@ function kill( execution, signal ) {
 
 QUnit.module( "CLI Watch", function( hooks ) {
 	hooks.beforeEach( function() {
-		fs.mkdirpSync( fixturePath );
+		fs.ensureDirSync( fixturePath );
 		fixturify.writeSync( fixturePath, {
 			"setup.js": "QUnit.on('runEnd', function() { process.send('runEnd'); });"
 		} );