From cd5c8ed1c77b8eb6651508c890486fb77b91fdc5 Mon Sep 17 00:00:00 2001 From: Toru Nagashima Date: Sun, 26 Apr 2015 17:05:08 +0900 Subject: [PATCH] Update deps and slim down npm-scripts. --- mocha-babel-hook.js | 1 + package.json | 25 ++++++++++--------------- test/common.js | 4 ++-- test/mixed.js | 2 +- test/parallel.js | 4 ++-- test/pattern.js | 4 ++-- test/sequential.js | 4 ++-- 7 files changed, 20 insertions(+), 24 deletions(-) diff --git a/mocha-babel-hook.js b/mocha-babel-hook.js index df9501f..bb10324 100644 --- a/mocha-babel-hook.js +++ b/mocha-babel-hook.js @@ -1,3 +1,4 @@ require("babel/register")({ + ignore: /node_modules/, plugins: ["babel-plugin-espower"] }); diff --git a/package.json b/package.json index 3191bf4..2b62c2c 100644 --- a/package.json +++ b/package.json @@ -15,13 +15,9 @@ "scripts": { "clean": "rimraf lib coverage", "lint": "eslint src", - "build": "npm-run-all clean lint build:babel", - "build:babel": "babel src --out-dir lib", - "test": "npm-run-all build test:mocha", - "test:mocha": "istanbul cover node_modules/mocha/bin/_mocha -- test/*.js --require mocha-babel-hook --timeout 30000 --colors", - "testing": "npm-run-all clean --parallel testing:*", - "testing:build": "npm run build:babel -- --watch --source-maps-inline", - "testing:mocha": "npm run test:mocha -- --watch --growl", + "build": "npm-run-all clean lint && babel src --out-dir lib", + "test": "npm run lint && istanbul cover node_modules/mocha/bin/_mocha -- test/*.js --require mocha-babel-hook --colors --timeout 30000", + "testing": "mocha test/*.js --require mocha-babel-hook --colors --timeout 30000 --watch --growl", "coveralls": "cat coverage/lcov.info | coveralls", "test-task:env-check": "node test/tasks/env-check.js", "test-task:append": "node test/tasks/append.js", @@ -33,21 +29,20 @@ "test-task:stdio": "node test/tasks/stdio.js" }, "dependencies": { - "es6-promise": "^2.1.0", + "es6-promise": "^2.1.1", "minimatch": "^2.0.4" }, "devDependencies": { - "babel": "^5.1.10", - "babel-core": "^5.1.10", - "babel-plugin-espower": "^0.1.0", + "babel": "^5.1.13", + "babel-core": "^5.1.13", + "babel-plugin-espower": "^0.2.2", "coveralls": "^2.11.2", - "eslint": "^0.19.0", + "eslint": "^0.20.0", "istanbul": "^0.3.13", "mocha": "^2.2.4", - "npm-run-all": "1.2.2", + "npm-run-all": "^1.2.3", "power-assert": "^0.11.0", - "rimraf": "^2.3.2", - "shelljs": "^0.4.0" + "rimraf": "^2.3.2" }, "repository": { "type": "git", diff --git a/test/common.js b/test/common.js index e9b80b7..24832c7 100644 --- a/test/common.js +++ b/test/common.js @@ -3,8 +3,8 @@ import assert from "power-assert"; import {result, removeResult, BufferStream} from "./lib/util"; // Test targets. -import runAll from "../lib/index"; -import command from "../lib/command"; +import runAll from "../src/index"; +import command from "../src/command"; describe("npm-run-all", () => { beforeEach(removeResult); diff --git a/test/mixed.js b/test/mixed.js index 817e2eb..1aa7184 100644 --- a/test/mixed.js +++ b/test/mixed.js @@ -2,7 +2,7 @@ import assert from "power-assert"; import {result, removeResult} from "./lib/util"; // Test targets. -import command from "../lib/command"; +import command from "../src/command"; describe("npm-run-all", () => { beforeEach(removeResult); diff --git a/test/parallel.js b/test/parallel.js index 76f1a22..99c4698 100644 --- a/test/parallel.js +++ b/test/parallel.js @@ -2,8 +2,8 @@ import assert from "power-assert"; import {result, removeResult} from "./lib/util"; // Test targets. -import runAll from "../lib/index"; -import command from "../lib/command"; +import runAll from "../src/index"; +import command from "../src/command"; describe("npm-run-all", () => { beforeEach(removeResult); diff --git a/test/pattern.js b/test/pattern.js index 584dc87..61729a7 100644 --- a/test/pattern.js +++ b/test/pattern.js @@ -2,8 +2,8 @@ import assert from "power-assert"; import {result, removeResult} from "./lib/util"; // Test targets. -import runAll from "../lib/index"; -import command from "../lib/command"; +import runAll from "../src/index"; +import command from "../src/command"; describe("npm-run-all should run matched tasks if gived glob like patterns.", () => { beforeEach(removeResult); diff --git a/test/sequential.js b/test/sequential.js index 5e2e0a7..4fd40ef 100644 --- a/test/sequential.js +++ b/test/sequential.js @@ -2,8 +2,8 @@ import assert from "power-assert"; import {result, removeResult} from "./lib/util"; // Test targets. -import runAll from "../lib/index"; -import command from "../lib/command"; +import runAll from "../src/index"; +import command from "../src/command"; describe("npm-run-all", () => { beforeEach(removeResult);