From 65ef8be366acb257cfe7bac5b1da555d9c5416a2 Mon Sep 17 00:00:00 2001 From: SyntaxRules Date: Sat, 17 Nov 2018 19:21:21 -0700 Subject: [PATCH 1/2] chore(deps): Update to latest dependecies for all --- package.json | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/package.json b/package.json index 6bb5e35..3a43dd5 100644 --- a/package.json +++ b/package.json @@ -17,30 +17,30 @@ "test": "grunt test" }, "dependencies": { - "angular": "^1.3.2", - "showdown": "1.x", - "angular-sanitize": "^1.3.2" + "angular": "^1.7.5", + "showdown": "^1.9.0", + "angular-sanitize": "^1.7.5" }, "devDependencies": { - "angular-mocks": "^1.4.3", - "chai": "^1.10.0", - "grunt": "^0.4.5", - "grunt-contrib-concat": "^0.5.0", - "grunt-contrib-jshint": "^0.10.0", - "grunt-contrib-uglify": "^0.6.0", - "grunt-conventional-changelog": "^1.1.0", - "grunt-jscs": "^1.2.0", - "grunt-karma": "^0.11.2", + "angular-mocks": "^1.7.5", + "chai": "^4.2.0", + "grunt": "^1.0.3", + "grunt-contrib-concat": "^1.0.1", + "grunt-contrib-jshint": "^2.0.0", + "grunt-contrib-uglify": "^4.0.0", + "grunt-conventional-changelog": "^6.1.0", + "grunt-jscs": "^3.0.1", + "grunt-karma": "^3.0.0", "grunt-simple-mocha": "^0.4.0", - "jscs": "^1.10.0", - "karma": "^0.12.37", + "jscs": "^3.0.7", + "karma": "^3.1.1", "karma-chai": "^0.1.0", - "karma-coverage": "^0.4.2", - "karma-mocha": "^0.2.0", - "karma-phantomjs-launcher": "^0.2.0", + "karma-coverage": "^1.1.2", + "karma-mocha": "^1.3.0", + "karma-phantomjs-launcher": "^1.0.4", "mocha": "*", - "phantomjs": "^1.9.17", - "should": "^4.4.2", - "source-map-support": "^0.2.9" + "phantomjs": "^2.1.7", + "should": "^13.2.3", + "source-map-support": "^0.5.9" } } From f688e0cf5e36181842cbc3fb783b88ef5a7ef2e0 Mon Sep 17 00:00:00 2001 From: SyntaxRules Date: Mon, 19 Nov 2018 21:23:38 -0700 Subject: [PATCH 2/2] chore(deps): Update travisci, bower and jscs to compatible versions --- .jscs.json | 3 +-- .travis.yml | 9 ++++++--- bower.json | 8 ++++---- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.jscs.json b/.jscs.json index f3d0acb..c21e21f 100644 --- a/.jscs.json +++ b/.jscs.json @@ -1,5 +1,4 @@ { - "validateIndentation": 2, "requireCurlyBraces": [ "if", "else", @@ -81,7 +80,7 @@ "disallowSpacesInsideObjectBrackets": "all", "disallowSpacesInsideArrayBrackets": "all", "disallowSpacesInsideParentheses": true, - "validateJSDoc": { + "jsDoc": { "checkParamNames": true, "requireParamTypes": true }, diff --git a/.travis.yml b/.travis.yml index fe7f552..7c86311 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,10 @@ language: node_js node_js: - - "0.10" - - "0.12" + - "6" + - "8" + - "10" before_install: - - npm install -g npm@latest - npm install -g grunt-cli before_script: @@ -17,3 +17,6 @@ cache: directories: - node_modules - bower_components + +# scripts +script: grunt test \ No newline at end of file diff --git a/bower.json b/bower.json index b962728..1eb0139 100644 --- a/bower.json +++ b/bower.json @@ -22,9 +22,9 @@ "url": "https://github.com/showdownjs/ng-showdown.git" }, "dependencies": { - "showdown": "1.x", - "angular": ">=1.3.0 <2.0.0", - "angular-sanitize": ">=1.3.0 <2.0.0" + "showdown": "^1.9.0", + "angular": "^1.7.5", + "angular-sanitize": "^1.7.5" }, "keywords": [ "markdown", @@ -36,6 +36,6 @@ ], "license": "https://github.com/showdownjs/ng-showdown/blob/master/license.txt", "devDependencies": { - "angular-mocks": "~1.4.3" + "angular-mocks": "^1.7.5" } }