Skip to content

Commit

Permalink
Merge pull request #267 from escardin/master
Browse files Browse the repository at this point in the history
support angular 2.3.x & 2.4.x with release version of rxjs.
  • Loading branch information
chenkie authored Jan 9, 2017
2 parents 159859b + ddf0327 commit bf9f9a8
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 8 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,6 @@ Thumbs.db
!custom.d.ts
.idea/
*.iml
*.metadata.json
*.ngsummary.json
*.ngfactory.ts
20 changes: 12 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
"scripts": {
"dev": "tsc --watch",
"test": "karma start",
"prepublish": "tsc"
"prepublish": "tsc",
"ngc":"ngc"
},
"keywords": [
"angular",
Expand All @@ -24,12 +25,15 @@
},
"main": "angular2-jwt.js",
"typings": "./angular2-jwt.d.ts",
"types": "./angular2-jwt.d.ts",
"homepage": "https://github.com/auth0/angular2-jwt#readme",
"devDependencies": {
"@angular/common": "^2.0.0",
"@angular/core": "^2.0.0",
"@angular/http": "^2.0.0",
"@angular/platform-browser": "^2.0.0",
"@angular/common": "^2.4.2",
"@angular/compiler": "^2.4.2",
"@angular/compiler-cli": "^2.4.2",
"@angular/core": "^2.4.2",
"@angular/http": "^2.4.2",
"@angular/platform-browser": "^2.4.2",
"@types/jasmine": "^2.2.33",
"@types/js-base64": "^2.1.3",
"awesome-typescript-loader": "^2.2.4",
Expand All @@ -45,13 +49,13 @@
"phantomjs-prebuilt": "^2.1.7",
"reflect-metadata": "0.1.8",
"rxjs": "~5.0.0-beta.12",
"typescript": "^2.0.2",
"typescript": ">=2.0.2 <=2.0.10",
"webpack": "^1.13.0",
"zone.js": "~0.6.12"
"zone.js": "~0.7.2"
},
"peerDependencies": {
"@angular/core": "^2.0.0",
"@angular/http": "^2.0.0",
"rxjs": "5.0.0-beta.12"
"rxjs": "^5.0.0"
}
}

0 comments on commit bf9f9a8

Please sign in to comment.