From 6e00b8e95d4316542af290e362e2fe1481ac71d8 Mon Sep 17 00:00:00 2001 From: Igor Minar Date: Sun, 18 Dec 2016 17:17:11 -0700 Subject: [PATCH 1/2] build(npm): update angular version in shrinkwrap files --- npm-shrinkwrap.clean.json | 2 +- npm-shrinkwrap.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/npm-shrinkwrap.clean.json b/npm-shrinkwrap.clean.json index 033eb4729d92..5548d7c13bb8 100644 --- a/npm-shrinkwrap.clean.json +++ b/npm-shrinkwrap.clean.json @@ -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", diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index a2574313b777..309aa6f1e3bf 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -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", From e93d126e3701b3a2e666f91d56fac82b7d818968 Mon Sep 17 00:00:00 2001 From: crisbeto Date: Sun, 18 Dec 2016 17:24:50 -0700 Subject: [PATCH 2/2] feat: update to rxjs@5.0.1 and unpin the rxjs peerDeps via ^5.0.1 Now that rxjs is stable and the rxjs team follows semver, we can update and unpin the dependency safely. From now on the Angular application/library developers are in charge of controlling the rxjs version as long as it's newer than 5.0.1. closes #13561 closes #13478 closes #13572 --- modules/@angular/benchpress/package.json | 2 +- modules/@angular/core/package.json | 2 +- modules/@angular/http/package.json | 2 +- modules/@angular/router/package.json | 2 +- npm-shrinkwrap.clean.json | 2 +- npm-shrinkwrap.json | 6 +++--- package.json | 2 +- scripts/ci-lite/offline_compiler_test.sh | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/@angular/benchpress/package.json b/modules/@angular/benchpress/package.json index 4df6a19c8852..5f8de1630e9d 100644 --- a/modules/@angular/benchpress/package.json +++ b/modules/@angular/benchpress/package.json @@ -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" diff --git a/modules/@angular/core/package.json b/modules/@angular/core/package.json index 3cff616c1b55..ceae5fe46e05 100644 --- a/modules/@angular/core/package.json +++ b/modules/@angular/core/package.json @@ -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": { diff --git a/modules/@angular/http/package.json b/modules/@angular/http/package.json index 8469fc1e3570..4000b5525606 100644 --- a/modules/@angular/http/package.json +++ b/modules/@angular/http/package.json @@ -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" }, diff --git a/modules/@angular/router/package.json b/modules/@angular/router/package.json index 27512f156e28..5482a4a4bd7f 100644 --- a/modules/@angular/router/package.json +++ b/modules/@angular/router/package.json @@ -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" } } diff --git a/npm-shrinkwrap.clean.json b/npm-shrinkwrap.clean.json index 5548d7c13bb8..8dd296245559 100644 --- a/npm-shrinkwrap.clean.json +++ b/npm-shrinkwrap.clean.json @@ -5189,7 +5189,7 @@ "dev": true }, "rxjs": { - "version": "5.0.0-rc.4" + "version": "5.0.1" }, "sauce-connect-launcher": { "version": "0.13.0", diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 309aa6f1e3bf..6483a626c183 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -7565,9 +7565,9 @@ "dev": true }, "rxjs": { - "version": "5.0.0-rc.4", - "from": "rxjs@5.0.0-rc.4", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.0.0-rc.4.tgz" + "version": "5.0.1", + "from": "rxjs@5.0.1", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.0.1.tgz" }, "sauce-connect-launcher": { "version": "0.13.0", diff --git a/package.json b/package.json index affbd9402521..28fb4db85817 100644 --- a/package.json +++ b/package.json @@ -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": { diff --git a/scripts/ci-lite/offline_compiler_test.sh b/scripts/ci-lite/offline_compiler_test.sh index 32d9bdc35202..555ebe50a56f 100755 --- a/scripts/ci-lite/offline_compiler_test.sh +++ b/scripts/ci-lite/offline_compiler_test.sh @@ -10,7 +10,7 @@ PKGS=( reflect-metadata@0.1.8 typescript@2.0.2 zone.js@0.6.25 - rxjs@5.0.0-rc.4 + rxjs@5.0.1 @types/{node@6.0.38,jasmine@2.2.33} jasmine@2.4.1 webpack@2.1.0-beta.21