Skip to content

Update to [email protected] and unpin the rxjs peerDependency #13561

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
IgorMinar wants to merge 2 commits into from
Closed

Update to [email protected] and unpin the rxjs peerDependency #13561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e41a262
build(npm): update angular version in shrinkwrap files
IgorMinar Dec 19, 2016
0f685a3
feat: update to [email protected] and unpin the rxjs peerDeps via ^5.0.1
IgorMinar Dec 19, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/@angular/benchpress/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"dependencies": {
"@angular/core": "^2.0.0-rc.7",
"reflect-metadata": "^0.1.2",
"rxjs": "5.0.0-rc.4",
"rxjs": "^5.0.1",
"jpm": "1.1.4",
"firefox-profile": "0.4.0",
"selenium-webdriver": "^2.53.3"
Expand Down
2 changes: 1 addition & 1 deletion modules/@angular/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"author": "angular",
"license": "MIT",
"peerDependencies": {
"rxjs": "5.0.0-rc.4",
"rxjs": "^5.0.1",
"zone.js": "^0.7.2"
},
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion modules/@angular/http/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"author": "angular",
"license": "MIT",
"peerDependencies": {
"rxjs": "5.0.0-rc.4",
"rxjs": "^5.0.1",
"@angular/core": "0.0.0-PLACEHOLDER",
"@angular/platform-browser": "0.0.0-PLACEHOLDER"
},
Expand Down
2 changes: 1 addition & 1 deletion modules/@angular/router/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@
"@angular/core": "0.0.0-PLACEHOLDER",
"@angular/common": "0.0.0-PLACEHOLDER",
"@angular/platform-browser": "0.0.0-PLACEHOLDER",
"rxjs": "5.0.0-rc.4"
"rxjs": "^5.0.1"
}
}
2 changes: 1 addition & 1 deletion modules/rollup-test/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"rollup-plugin-node-resolve": "^1.5.0",
"rollup-plugin-typescript": "^0.7.3",
"rollup-plugin-uglify": "^0.3.1",
"rxjs-es": "^5.0.0-rc.4",
"rxjs-es": "^5.0.1",

@vicb vicb Dec 19, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rxjs-es ?
Seems outdated, is this folder still used at all ?

@IgorMinar IgorMinar Dec 19, 2016

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's not. we should really remove this whole directory, but I didn't want to do it in this PR.

"typescript": "^1.9.0-dev.20160423",
"uglify-js": "^2.6.2"
},
Expand Down
4 changes: 2 additions & 2 deletions npm-shrinkwrap.clean.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "angular-srcs",
"version": "2.3.0",
"version": "4.0.0-beta.0",
"dependencies": {
"@types/angularjs": {
"version": "1.5.13-alpha",
Expand Down Expand Up @@ -5189,7 +5189,7 @@
"dev": true
},
"rxjs": {
"version": "5.0.0-rc.4"
"version": "5.0.1"
},
"sauce-connect-launcher": {
"version": "0.13.0",
Expand Down
8 changes: 4 additions & 4 deletions npm-shrinkwrap.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"dependencies": {
"core-js": "^2.4.1",
"reflect-metadata": "^0.1.3",
"rxjs": "5.0.0-rc.4",
"rxjs": "^5.0.1",
"zone.js": "^0.7.2"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion scripts/ci-lite/offline_compiler_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ PKGS=(
[email protected]
[email protected]
[email protected]
[email protected].0-rc.4
[email protected].1
@types/{[email protected],[email protected]}
[email protected]
[email protected]
Expand Down