Skip to content

Commit

Permalink
Merge pull request #149 from mattlewis92/ng6-upgrade
Browse files Browse the repository at this point in the history
feat(angular): Drop Angular v4 support, add Angular v6 support
  • Loading branch information
christopherthielen authored May 13, 2018
2 parents ff0eb17 + 79fcf3d commit a1f5983
Show file tree
Hide file tree
Showing 2 changed files with 359 additions and 200 deletions.
29 changes: 15 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,26 +17,26 @@
},
"license": "MIT",
"dependencies": {
"@uirouter/angular": "1.1.0",
"@uirouter/angularjs": "1.0.16",
"@uirouter/core": "5.0.18"
"@uirouter/angular": "2.0.0",
"@uirouter/angularjs": "1.0.17",
"@uirouter/core": "5.0.19"
},
"peerDependencies": {
"@angular/core": "^4.0.0 || ^5.0.0",
"@angular/upgrade": "^4.0.0 || ^5.0.0",
"@angular/core": "^5.0.0 || ^6.0.0",
"@angular/upgrade": "^5.0.0 || ^6.0.0",
"angular": "^1.5.0"
},
"devDependencies": {
"@angular/common": "^4.0.0",
"@angular/compiler": "^4.0.0",
"@angular/compiler-cli": "^4.0.0",
"@angular/core": "^4.0.0",
"@angular/platform-browser": "^4.0.0",
"@angular/platform-browser-dynamic": "^4.0.0",
"@angular/upgrade": "^4.0.0",
"@angular/common": "^5.0.0",
"@angular/compiler": "^5.0.0",
"@angular/compiler-cli": "^5.0.0",
"@angular/core": "^5.0.0",
"@angular/platform-browser": "^5.0.0",
"@angular/platform-browser-dynamic": "^5.0.0",
"@angular/upgrade": "^5.0.0",
"@types/angular": "^1.6.43",
"@types/jquery": "^3.3.1",
"@uirouter/publish-scripts": "^2.3.12",
"@uirouter/publish-scripts": "^2.3.18",
"angular": "^1.6.10",
"husky": "^0.14.3",
"prettier": "^1.12.1",
Expand All @@ -46,7 +46,8 @@
"rollup-plugin-node-resolve": "^3.2.0",
"rollup-plugin-sourcemaps": "^0.4.2",
"rollup-plugin-uglify": "^3.0.0",
"rxjs": "^5.5.6",
"rxjs": "^6.1.0",
"rxjs-compat": "^6.1.0",
"shx": "^0.2.2",
"typescript": "^2.8.3",
"zone.js": "^0.8.20"
Expand Down
Loading

0 comments on commit a1f5983

Please sign in to comment.