From d3b54cd1b82ae9134cf2ddf7ef00bf03b2b30d69 Mon Sep 17 00:00:00 2001 From: guybedford Date: Fri, 4 Mar 2016 18:20:19 +0200 Subject: [PATCH 1/7] angular2 override --- package-overrides/npm/angular2@2.0.0-beta.8.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 package-overrides/npm/angular2@2.0.0-beta.8.json diff --git a/package-overrides/npm/angular2@2.0.0-beta.8.json b/package-overrides/npm/angular2@2.0.0-beta.8.json new file mode 100644 index 0000000..b559347 --- /dev/null +++ b/package-overrides/npm/angular2@2.0.0-beta.8.json @@ -0,0 +1,14 @@ +{ + "dependencies": { + "zone.js": "npm:zone.js@0.6.2", + "rxjs": "npm:rxjs@5.0.0-beta.2", + "reflect-metadata": "npm:reflect-metadata@0.1.3" + }, + "ignore": [ + "examples" + ], + "map":{ + "crypto": "@empty" + }, + "jspmNodeConversion": false +} From 3fc5127aae737cacf32023afc6f0672760c7078d Mon Sep 17 00:00:00 2001 From: guybedford Date: Tue, 8 Mar 2016 12:04:35 +0200 Subject: [PATCH 2/7] angular override feedback --- package-overrides/npm/angular2@2.0.0-beta.8.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/package-overrides/npm/angular2@2.0.0-beta.8.json b/package-overrides/npm/angular2@2.0.0-beta.8.json index b559347..9fbc04d 100644 --- a/package-overrides/npm/angular2@2.0.0-beta.8.json +++ b/package-overrides/npm/angular2@2.0.0-beta.8.json @@ -1,14 +1,14 @@ { + "main": false, "dependencies": { - "zone.js": "npm:zone.js@0.6.2", - "rxjs": "npm:rxjs@5.0.0-beta.2", - "reflect-metadata": "npm:reflect-metadata@0.1.3" + "reflect-metadata": "npm:reflect-metadata@^0.1.3", + "rxjs": "npm:rxjs@^5.0.0-beta.2", + "zone.js": "npm:zone.js@^0.5.15" }, - "ignore": [ - "examples" - ], - "map":{ - "crypto": "@empty" + "peerDependencies": { + "reflect-metadata": "npm:reflect-metadata@^0.1.3", + "rxjs": "npm:rxjs@^5.0.0-beta.2", + "zone.js": "npm:zone.js@^0.5.15" }, "jspmNodeConversion": false } From 097117d791d3b770d5736f7a2a5171c6d16f1adc Mon Sep 17 00:00:00 2001 From: guybedford Date: Sun, 13 Mar 2016 10:18:29 +0200 Subject: [PATCH 3/7] remove zone.js dependency on es6-promise --- package-overrides/npm/zone.js@0.5.15.json | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 package-overrides/npm/zone.js@0.5.15.json diff --git a/package-overrides/npm/zone.js@0.5.15.json b/package-overrides/npm/zone.js@0.5.15.json new file mode 100644 index 0000000..33703d5 --- /dev/null +++ b/package-overrides/npm/zone.js@0.5.15.json @@ -0,0 +1,3 @@ +{ + "dependencies": {} +} \ No newline at end of file From 242db22ace7aecb0527b74e8293d310728f0f307 Mon Sep 17 00:00:00 2001 From: guybedford Date: Sun, 13 Mar 2016 10:21:45 +0200 Subject: [PATCH 4/7] use single-file zone.js build for faster loading --- package-overrides/npm/zone.js@0.5.15.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package-overrides/npm/zone.js@0.5.15.json b/package-overrides/npm/zone.js@0.5.15.json index 33703d5..9d10719 100644 --- a/package-overrides/npm/zone.js@0.5.15.json +++ b/package-overrides/npm/zone.js@0.5.15.json @@ -1,3 +1,10 @@ { + "main": "dist/zone.js", + "jspmNodeConversion":false, + "shim": { + "dist/zone": { + "exports": ["Zone", "zone"] + } + }, "dependencies": {} } \ No newline at end of file From e6ba59e9c1c93c1f49df21b5f03240dc83653060 Mon Sep 17 00:00:00 2001 From: guybedford Date: Sun, 13 Mar 2016 10:24:23 +0200 Subject: [PATCH 5/7] reflect metadata doesnt need node shims --- package-overrides/npm/reflect-metadata@0.1.3.json | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 package-overrides/npm/reflect-metadata@0.1.3.json diff --git a/package-overrides/npm/reflect-metadata@0.1.3.json b/package-overrides/npm/reflect-metadata@0.1.3.json new file mode 100644 index 0000000..e532d6a --- /dev/null +++ b/package-overrides/npm/reflect-metadata@0.1.3.json @@ -0,0 +1,3 @@ +{ + "jspmNodeConversion": false +} \ No newline at end of file From 6449bde5222d55723c93dc72e6b05a15b7c54bc0 Mon Sep 17 00:00:00 2001 From: guybedford Date: Sun, 13 Mar 2016 10:32:51 +0200 Subject: [PATCH 6/7] auto-load reflect metadata --- package-overrides/npm/angular2@2.0.0-beta.8.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/package-overrides/npm/angular2@2.0.0-beta.8.json b/package-overrides/npm/angular2@2.0.0-beta.8.json index 9fbc04d..57d4663 100644 --- a/package-overrides/npm/angular2@2.0.0-beta.8.json +++ b/package-overrides/npm/angular2@2.0.0-beta.8.json @@ -10,5 +10,10 @@ "rxjs": "npm:rxjs@^5.0.0-beta.2", "zone.js": "npm:zone.js@^0.5.15" }, - "jspmNodeConversion": false + "jspmNodeConversion": false, + "meta": { + "src/core/util/decorators.js": { + "deps": ["reflect-metadata"] + } + } } From 22c5cfc39a1303e8a89a723e5ead29c454781f15 Mon Sep 17 00:00:00 2001 From: guybedford Date: Sun, 13 Mar 2016 10:39:30 +0200 Subject: [PATCH 7/7] remove directories.lib zone.js jspm 0.16 --- package-overrides/npm/zone.js@0.5.15.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package-overrides/npm/zone.js@0.5.15.json b/package-overrides/npm/zone.js@0.5.15.json index 9d10719..791118d 100644 --- a/package-overrides/npm/zone.js@0.5.15.json +++ b/package-overrides/npm/zone.js@0.5.15.json @@ -1,5 +1,6 @@ { "main": "dist/zone.js", + "directories": {}, "jspmNodeConversion":false, "shim": { "dist/zone": {