Skip to content

Commit

Permalink
package.json: Upgrade npm dependencies
Browse files Browse the repository at this point in the history
- Upgrade all dependencies in 'package.json' to latest stable versions.
- Add 'bootstrap' resolution to '^3.3.6' in 'bower.json' to resolve
  version conflicts.

Closes coala#112
  • Loading branch information
sahilarora535 committed Feb 13, 2017
1 parent 38105ae commit 161a91c
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 10 deletions.
5 changes: 4 additions & 1 deletion coalahtml/_coalahtml/bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
"bootstrap": "^3.3.6",
"google-code-prettify": "^1.0.4",
"angular-sanitize": "^1.5.0",
"bootstrap-material-design" : "^0.5.10"
"bootstrap-material-design": "^0.5.10"
},
"resolutions": {
"bootstrap": "^3.3.6"
}
}
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"devDependencies": {
"angular-mocks": "^1.5.0",
"angular-mocks": "^1.6.2",
"chai": "^3.5.0",
"csslint": "^0.10.0",
"jshint": "^2.9.1",
"karma": "^0.13.21",
"csslint": "^1.0.5",
"jshint": "^2.9.4",
"karma": "^1.4.1",
"karma-chai": "^0.1.0",
"karma-coverage": "^0.5.3",
"karma-mocha": "^0.2.2",
"karma-phantomjs-launcher": "^1.0.0",
"mocha": "^2.4.5",
"phantomjs-prebuilt": "^2.1.4"
"karma-coverage": "^1.1.1",
"karma-mocha": "^1.3.0",
"karma-phantomjs-launcher": "^1.0.2",
"mocha": "^3.2.0",
"phantomjs-prebuilt": "^2.1.14"
},
"scripts": {
"test": "./node_modules/.bin/karma start --single-run --browsers PhantomJS"
Expand Down

0 comments on commit 161a91c

Please sign in to comment.