WIP: fix package.json's and tsconfigs for http, router, testing and upgrade

IgorMinar · IgorMinar · commit b64919007254 · 2016-04-24T13:49:51.000-07:00
diff --git a/bump-versions.sh b/bump-versions.sh
@@ -8,7 +8,10 @@ for PACKAGE in \
   common \
   http \
   platform-browser \
-  platform-server
+  platform-server \
+  router \
+  testing \
+  upgrade
 do
   SRCDIR=./modules/angular2/${PACKAGE}
   echo "====== BUMPING version for: ${SRCDIR} ====="
diff --git a/modules/angular2/examples/router/ts/can_activate/index.html b/modules/angular2/examples/router/ts/can_activate/index.html
@@ -4,7 +4,6 @@
   <title>Routing canActivate Lifecycle Example</title>
   <base href="/">
 
-  <script src="http://cdn.rawgit.com/google/traceur-compiler/90da568c7aa8e53ea362db1fc211fbb4f65b5e94/bin/traceur-runtime.js"></script>
   <script src="http://cdnjs.cloudflare.com/ajax/libs/systemjs/0.18.4/system.js"></script>
   <script>System.config({ baseURL: '/', defaultJSExtensions: true});</script>
   <script src="/bundle/angular2.dev.js"></script>
diff --git a/modules/angular2/examples/router/ts/reuse/reuse_example.ts b/modules/angular2/examples/router/ts/reuse/reuse_example.ts
@@ -1,15 +1,14 @@
 import {Component, provide} from '@angular/core';
 import {bootstrap} from '@angular/platform-browser';
 import {
-  CanActivate,
   RouteConfig,
   ComponentInstruction,
   ROUTER_DIRECTIVES,
   CanReuse,
   RouteParams,
   OnReuse
 } from '@angular/router';
-import {APP_BASE_HREF} from '@angular/platform/common';
+import {APP_BASE_HREF} from '@angular/common';
 
 
 // #docregion reuseCmp
diff --git a/modules/angular2/http/package.json b/modules/angular2/http/package.json
@@ -7,12 +7,9 @@
   "typings": "http.d.ts",
   "author": "angular",
   "license": "MIT",
-  "dependencies": {
-    "reflect-metadata": "^0.1.2",
+
+  "peerDependencies": {
     "rxjs": "5.0.0-beta.2",
-    "zone.js": "^0.6.6",
-    "@angular/core": "*",
-    "@angular/common": "*",
-    "@angular/compiler": "*"
+    "@angular/core": "*"
   }
 }
diff --git a/modules/angular2/http/tsconfig.json b/modules/angular2/http/tsconfig.json
@@ -8,8 +8,7 @@
     "moduleResolution": "node",
     "outDir": "../../../dist/packages-dist/http/",
     "paths": {
-      "@angular/core": ["../../../dist/packages-dist/core/core.d.ts"],
-      "@angular/common": ["../../../dist/packages-dist/common/common.d.ts"]
+      "@angular/core": ["../../../dist/packages-dist/core/core.d.ts"]
     },
     "rootDir": ".",
     "sourceMap": true,
diff --git a/modules/angular2/platform-browser/src/animate/animation_builder_mock.ts b/modules/angular2/platform-browser/src/animate/animation_builder_mock.ts
diff --git a/modules/angular2/platform/tsconfig-server.json b/modules/angular2/platform/tsconfig-server.json
diff --git a/modules/angular2/router/package.json b/modules/angular2/router/package.json
@@ -7,12 +7,9 @@
   "author": "angular",
   "license": "MIT",
 
-  "dependencies": {
-    "reflect-metadata": "^0.1.2",
-    "rxjs": "5.0.0-beta.2",
-    "zone.js": "^0.6.6",
+  "peerDependencies": {
     "@angular/core": "*",
     "@angular/common": "*",
-    "@angular/compiler": "*"
+    "@angular/platform-browser": "*"
   }
 }
diff --git a/modules/angular2/router/tsconfig.json b/modules/angular2/router/tsconfig.json
@@ -4,7 +4,7 @@
     "declaration": true,
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
-    "module": "es2015",
+    "module": "commonjs",
     "moduleResolution": "node",
     "outDir": "../../../dist/packages-dist/router/",
     "paths": {
@@ -15,10 +15,13 @@
     "rootDir": ".",
     "sourceMap": true,
     "sourceRoot": ".",
-    "target": "es2015"
+    "target": "es5"
   },
   "files": [
     "index.ts",
+    "../typings/es6-collections/es6-collections.d.ts",
+    "../typings/es6-promise/es6-promise.d.ts",
+    "../manual_typings/globals.d.ts",
     "../../../node_modules/zone.js/dist/zone.js.d.ts"
   ]
 }
diff --git a/modules/angular2/testing/package.json b/modules/angular2/testing/package.json
@@ -7,9 +7,7 @@
   "author": "angular",
   "license": "MIT",
 
-  "dependencies": {
-    "reflect-metadata": "^0.1.2",
-    "rxjs": "5.0.0-beta.2",
+  "peerDependencies": {
     "zone.js": "^0.6.6",
     "@angular/core": "*",
     "@angular/common": "*",
diff --git a/modules/angular2/testing/tsconfig.json b/modules/angular2/testing/tsconfig.json
@@ -4,23 +4,22 @@
     "declaration": true,
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
-    "module": "es2015",
+    "module": "commonjs",
     "moduleResolution": "node",
     "outDir": "../../../dist/packages-dist/testing/",
     "paths": {
-      "@angular/core": ["../../../dist/packages-dist/core/core.d.ts"],
-      "@angular/common": ["../../../dist/packages-dist/common/common.d.ts"],
-      "@angular/compiler": ["../../../dist/packages-dist/compiler/compiler.d.ts"],
-      "@angular/platform-browser": ["../../../dist/packages-dist/platform-browser/platform_browser.d.ts"]
+      "@angular/core": ["../../../dist/packages-dist/core/core.d.ts"]
     },
     "rootDir": ".",
     "sourceMap": true,
     "sourceRoot": ".",
-    "target": "es2015"
+    "target": "es5"
   },
   "files": [
     "index.ts",
-    "../typings/jasmine/jasmine.d.ts",
+    "../typings/es6-collections/es6-collections.d.ts",
+    "../typings/es6-promise/es6-promise.d.ts",
+    "../manual_typings/globals.d.ts",
     "../../../node_modules/zone.js/dist/zone.js.d.ts"
   ]
 }
diff --git a/modules/angular2/upgrade/package.json b/modules/angular2/upgrade/package.json
@@ -7,12 +7,9 @@
   "author": "angular",
   "license": "MIT",
 
-  "dependencies": {
-    "reflect-metadata": "^0.1.2",
-    "rxjs": "5.0.0-beta.2",
-    "zone.js": "^0.6.6",
+  "peerDependencies": {
     "@angular/core": "*",
-    "@angular/common": "*",
-    "@angular/compiler": "*"
+    "@angular/compiler": "*",
+    "@angular/platform-browser": "*"
   }
 }
diff --git a/modules/angular2/upgrade/tsconfig.json b/modules/angular2/upgrade/tsconfig.json
@@ -4,7 +4,7 @@
     "declaration": true,
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
-    "module": "es2015",
+    "module": "commonjs",
     "moduleResolution": "node",
     "outDir": "../../../dist/packages-dist/upgrade/",
     "paths": {
@@ -16,10 +16,13 @@
     "rootDir": ".",
     "sourceMap": true,
     "sourceRoot": ".",
-    "target": "es2015"
+    "target": "es5"
   },
   "files": [
     "index.ts",
+    "../typings/es6-collections/es6-collections.d.ts",
+    "../typings/es6-promise/es6-promise.d.ts",
+    "../manual_typings/globals.d.ts",
     "../../../node_modules/zone.js/dist/zone.js.d.ts"
   ]
 }
diff --git a/modules/rollup-test/package.json b/modules/rollup-test/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "xxx",
+  "name": "rollup-test",
   "version": "1.0.0",
   "description": "",
   "main": "index.js",
diff --git a/publish-igorminar.sh b/publish-igorminar.sh
@@ -8,7 +8,10 @@ for PACKAGE in \
   common \
   http \
   platform-browser \
-  platform-server
+  platform-server \
+  router \
+  testing \
+  upgrade
 do
   DESTDIR=./dist/packages-dist/${PACKAGE}
   echo "====== PUBLISHING: ${DESTDIR} ====="

Original file line number	Diff line number	Diff line change
`@@ -7,12 +7,9 @@`
`7`	`7`	`"author": "angular",`
`8`	`8`	`"license": "MIT",`
`9`	`9`
`10`		`- "dependencies": {`
`11`		`- "reflect-metadata": "^0.1.2",`
`12`		`- "rxjs": "5.0.0-beta.2",`
`13`		`- "zone.js": "^0.6.6",`
	`10`	`+ "peerDependencies": {`
`14`	`11`	`"@angular/core": "*",`
`15`	`12`	`"@angular/common": "*",`
`16`		`- "@angular/compiler": "*"`
	`13`	`+ "@angular/platform-browser": "*"`
`17`	`14`	`}`
`18`	`15`	`}`