Skip to content
This repository has been archived by the owner on Dec 7, 2018. It is now read-only.

Commit

Permalink
updated to angular 2.3 and other dependencies. Temporary removed phan…
Browse files Browse the repository at this point in the history
…tomjs due to angular/angular#13301
  • Loading branch information
Ks89 committed Dec 11, 2016
1 parent e8a17fa commit f3c141d
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ function getBrowsers() {
if (process.env.CI) {
return ['PhantomJS'];
} else {
return ['PhantomJS', 'Chrome', 'Firefox'];
return [/*'PhantomJS', */'Chrome', 'Firefox'];
}
}

Expand Down
30 changes: 15 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,16 @@
"coveralls": "coveralls < ./coverage/lcov.info"
},
"dependencies": {
"@angular/common": "2.2.3",
"@angular/compiler": "2.2.3",
"@angular/compiler-cli": "2.2.3",
"@angular/core": "2.2.3",
"@angular/forms": "2.2.3",
"@angular/http": "2.2.3",
"@angular/platform-browser": "2.2.3",
"@angular/platform-browser-dynamic": "2.2.3",
"@angular/platform-server": "2.2.3",
"@angular/router": "3.2.3",
"@angular/common": "^2.3.0",
"@angular/compiler": "^2.3.0",
"@angular/compiler-cli": "^2.3.0",
"@angular/core": "^2.3.0",
"@angular/forms": "^2.3.0",
"@angular/http": "^2.3.0",
"@angular/platform-browser": "^2.3.0",
"@angular/platform-browser-dynamic": "^2.3.0",
"@angular/platform-server": "^2.3.0",
"@angular/router": "^3.3.0",
"@ng-bootstrap/ng-bootstrap": "^1.0.0-alpha.14",
"angular2-image-popup": "^1.1.1",
"angular2-ladda": "^1.0.6",
Expand All @@ -59,7 +59,7 @@
"ng2-simple-page-scroll": "^1.0.3-beta",
"ng2-validators": "^1.6.1",
"reflect-metadata": "^0.1.8",
"rxjs": "^5.0.0-beta.12",
"rxjs": "5.0.0-rc.4",
"tether": "^1.3.8",
"webpack-merge": "^1.0.1",
"zone.js": "^0.7.2"
Expand All @@ -74,7 +74,7 @@
"angular2-template-loader": "^0.6.0",
"autoprefixer": "^6.5.3",
"awesome-typescript-loader": "^2.2.4",
"browser-sync": "^2.18.2",
"browser-sync": "^2.18.5",
"browser-sync-webpack-plugin": "^1.1.3",
"chunk-manifest-webpack-plugin": "^1.0.0",
"codelyzer": "2.0.0-beta.1",
Expand Down Expand Up @@ -104,7 +104,7 @@
"karma-sourcemap-loader": "^0.3.7",
"karma-webpack": "^1.8.0",
"mkdirp": "^0.5.1",
"node-sass": "^3.13.0",
"node-sass": "^4.0.0",
"node-static": "^0.7.8",
"null-loader": "^0.1.1",
"phantomjs-prebuilt": "^2.1.14",
Expand All @@ -118,7 +118,7 @@
"style-loader": "^0.13.1",
"to-string-loader": "^1.1.5",
"ts-loader": "^1.3.1",
"ts-node": "^1.7.1",
"ts-node": "^1.7.2",
"tslint": "^4.0.2",
"tslint-loader": "^3.2.0",
"typescript": "2.0.10",
Expand All @@ -127,6 +127,6 @@
"webpack-dev-server": "^2.1.0-beta.11",
"webpack-manifest-plugin": "^1.1.0",
"webpack-md5-hash": "^0.0.5",
"webpack-merge": "^1.1.0"
"webpack-merge": "^1.1.1"
}
}

0 comments on commit f3c141d

Please sign in to comment.