From b41d978d00ddbe31341e06d4d4e52e6ca1de20ad Mon Sep 17 00:00:00 2001 From: JC Brand Date: Thu, 6 Apr 2017 22:28:35 +0200 Subject: [PATCH] Update sinon to 2.1.0 and eslint to 3.19.0 Also update clean-css --- Makefile | 2 +- docs/CHANGES.md | 9 +++++++-- package.json | 6 +++--- tests/runner.js | 2 +- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index d3e6b99d0..8856acf37 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ PHANTOMJS ?= ./node_modules/.bin/phantomjs RJS ?= ./node_modules/.bin/r.js PO2JSON ?= ./node_modules/.bin/po2json SASS ?= ./.bundle/bin/sass -CLEANCSS ?= ./node_modules/.bin/cleancss +CLEANCSS ?= ./node_modules/clean-css-cli/bin/cleancss SPHINXBUILD ?= ./bin/sphinx-build SPHINXOPTS = diff --git a/docs/CHANGES.md b/docs/CHANGES.md index ba08efeab..0c52a659c 100755 --- a/docs/CHANGES.md +++ b/docs/CHANGES.md @@ -2,8 +2,13 @@ ## 3.0.2 (Unreleased) -- Update Jasmine from 1.3.1 to 2.5.3 and Phantomjs from 1.9.7-1 to 2.1.14 [jcbrand] -- Update moment.js to 2.18.1 [jcbrand] +Dependency updates: +- Jasmine 2.5.3 +- Phantomjs 2.1.14 +- moment 2.18.1 +- sinon 2.1.0 +- eslint 3.19.0 + ## 3.0.1 (2017-04-04) diff --git a/package.json b/package.json index 31de1c1a0..c1547d287 100644 --- a/package.json +++ b/package.json @@ -39,9 +39,9 @@ "backbone.overview": "0.0.3", "bootstrap": "^3.3.7", "bourbon": "^4.3.2", - "clean-css": "^3.4.19", + "clean-css-cli": "^4.0.10", "es6-promise": "^4.1.0", - "eslint": "^3.16.1", + "eslint": "^3.19.0", "eslint-plugin-lodash": "^2.3.3", "font-awesome": "^4.7.0", "greenkeeper": "^4.1.0", @@ -65,7 +65,7 @@ "pluggable.js": "1.0.0", "po2json": "^0.4.4", "requirejs": "2.3.3", - "sinon": "^1.17.3", + "sinon": "^2.1.0", "snyk": "^1.21.2", "strophe.js": "1.2.13", "strophejs-plugin-disco": "0.0.1", diff --git a/tests/runner.js b/tests/runner.js index db2bd9205..5605cb10f 100644 --- a/tests/runner.js +++ b/tests/runner.js @@ -4,7 +4,7 @@ config.paths.mock = "tests/mock"; config.paths['wait-until-promise'] = "node_modules/wait-until-promise/index"; config.paths['test-utils'] = "tests/utils"; -config.paths.sinon = "node_modules/sinon/lib/sinon"; +config.paths.sinon = "node_modules/sinon/pkg/sinon"; config.paths.transcripts = "converse-logs/converse-logs"; config.paths.jasmine = "node_modules/jasmine-core/lib/jasmine-core/jasmine"; config.paths.boot = "node_modules/jasmine-core/lib/jasmine-core/boot";