From 08242a082c74a9edc493076aa41384e66b87fb15 Mon Sep 17 00:00:00 2001 From: Friedel Ziegelmayer Date: Tue, 17 May 2016 11:19:19 +0200 Subject: [PATCH 1/4] feat: upgrade dependencies to their latest versions --- package.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 4a600dbd5..50031d615 100644 --- a/package.json +++ b/package.json @@ -298,25 +298,25 @@ "eslint": "^2.3.0", "eslint-config-standard": "^5.1.0", "eslint-plugin-promise": "^1.0.8", - "eslint-plugin-react": "^4.0.0", + "eslint-plugin-react": "^5.1.1", "eslint-plugin-standard": "^1.3.1", "ghooks": "^1.1.0", - "grunt": "^0.4", + "grunt": "^1.0.0", "grunt-auto-release": "^0.0.6", "grunt-browserify": "^5.0.0", - "grunt-bump": "^0.7.0", + "grunt-bump": "^0.8.0", "grunt-cli": "^1.1.0", "grunt-contrib-watch": "^1.0.0", "grunt-conventional-changelog": "^6.0.1", - "grunt-conventional-github-releaser": "^0.5.0", - "grunt-cucumberjs": "^0.8.7", + "grunt-conventional-github-releaser": "^1.0.0", + "grunt-cucumberjs": "^0.9.1", "grunt-eslint": "^18.0.0", "grunt-mocha-test": "^0.12.7", "grunt-npm": "0.0.2", "jasmine-core": "^2.3.4", "json3": "^3.3.2", "karma-browserify": "^5.0.1", - "karma-browserstack-launcher": "^0.1.10", + "karma-browserstack-launcher": "^1.0.0", "karma-chai": "^0.1.0", "karma-chrome-launcher": "*", "karma-coffee-preprocessor": "*", @@ -325,17 +325,17 @@ "karma-firefox-launcher": "*", "karma-growl-reporter": "*", "karma-html2js-preprocessor": "*", - "karma-jasmine": "~0.3.5", + "karma-jasmine": "^1.0.2", "karma-junit-reporter": "*", "karma-live-preprocessor": "*", - "karma-mocha": "0.2.1", + "karma-mocha": "^1.0.1", "karma-mocha-reporter": "^2.0.0", "karma-ng-scenario": "*", "karma-phantomjs-launcher": "*", "karma-qunit": "*", "karma-requirejs": "*", "karma-sauce-launcher": "*", - "karma-script-launcher": "^0.2.0", + "karma-script-launcher": "^1.0.0", "load-grunt-tasks": "^3.1.0", "mkdirp": "^0.5.0", "mocha": "^2.4.1", From 0b8dc2ce742d88c64f3ec4a2fa944a6c9f182f96 Mon Sep 17 00:00:00 2001 From: Friedel Ziegelmayer Date: Tue, 17 May 2016 11:21:52 +0200 Subject: [PATCH 2/4] feat: add support for node 6 --- .travis.yml | 5 +++-- appveyor.yml | 1 + docs/intro/01-installation.md | 2 +- docs/intro/04-faq.md | 2 +- package.json | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9173ee6f2..5c20f6ca1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,8 +3,9 @@ language: node_js node_js: - "0.10" - "0.12" - - "4" - - "5" + - 4 + - 5 + - 6 env: global: diff --git a/appveyor.yml b/appveyor.yml index 883710b9d..95b976729 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,6 +5,7 @@ environment: - nodejs_version: "0.12" - nodejs_version: "4" - nodejs_version: "5" + - nodejs_version: "6" matrix: fast_finish: true diff --git a/docs/intro/01-installation.md b/docs/intro/01-installation.md index 9bfd3ea1b..de8233954 100644 --- a/docs/intro/01-installation.md +++ b/docs/intro/01-installation.md @@ -5,7 +5,7 @@ Karma runs on [Node.js] and is available as an [NPM] package. On Mac or Linux we recommend using [NVM](https://github.com/creationix/nvm). On Windows, download Node.js from [the official site](https://nodejs.org/) or use the [NVM PowerShell Module](https://www.powershellgallery.com/packages/nvm). -Note: Karma currently works on Node.js **0.10**, **0.12.x**, **4.x**, and **5.x**. See [FAQ] for more info. +Note: Karma currently works on Node.js **0.10**, **0.12.x**, **4.x**, **5.x**, and **6.x**. See [FAQ] for more info. ## Installing Karma and plugins diff --git a/docs/intro/04-faq.md b/docs/intro/04-faq.md index 8b365455f..35fa7e9d0 100644 --- a/docs/intro/04-faq.md +++ b/docs/intro/04-faq.md @@ -25,7 +25,7 @@ The latest stable version from NPM (`npm install karma`). See [versioning] for m ### Which version of Node.js does Karma run with? -Karma works on all LTS versions node in active maintenance state (see [LTS docs](https://github.com/nodejs/LTS/blob/master/README.md) for more info) as well as the latest stable version. That is **0.12.x**, **4.x** and **5.x** at this point. Additionally, Node **0.10** is currently supported. +Karma works on all LTS versions node in active maintenance state (see [LTS docs](https://github.com/nodejs/LTS/blob/master/README.md) for more info) as well as the latest stable version. That is **0.12.x**, **4.x**, **5.x** and **6.x** at this point. Additionally, Node **0.10** is currently supported. [mailing list]: https://groups.google.com/d/forum/karma-users diff --git a/package.json b/package.json index 50031d615..06e92c893 100644 --- a/package.json +++ b/package.json @@ -357,7 +357,7 @@ "karma": "./bin/karma" }, "engines": { - "node": "0.10 || 0.12 || 4 || 5" + "node": "0.10 || 0.12 || 4 || 5 || 6" }, "version": "0.13.22", "license": "MIT", From dfc4ac303aae1f2043af53a3ffaa5cbacc106368 Mon Sep 17 00:00:00 2001 From: Friedel Ziegelmayer Date: Tue, 17 May 2016 11:45:58 +0200 Subject: [PATCH 3/4] chore: update npm on all node versions too many troubles with peer dependencies on npm@2 due to the post grunt 1.0 eco system --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 5c20f6ca1..4f9a5cd82 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,7 @@ env: before_install: - npm config set loglevel warn - g++-4.8 --version + - npm install -g npm addons: firefox: From afd294659e11abbce51afc8a3a507c4f13852fef Mon Sep 17 00:00:00 2001 From: Friedel Ziegelmayer Date: Tue, 17 May 2016 13:30:56 +0200 Subject: [PATCH 4/4] chore: upgrade npm on appveyor as well --- appveyor.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 95b976729..1d037dd1b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -14,6 +14,9 @@ install: # Install Node.js - ps: Install-Product node $env:nodejs_version + # Upgrade npm + - npm install -g npm + # Output our current versions for debugging - node --version - npm --version