refactor: More generic build.sh file

2017-03-02 13:54:35 -08:00
parent 1efd508217
commit da8ea350b2
41 changed files with 345 additions and 476 deletions
--- a/packages/animations/package.json
+++ b/packages/animations/package.json
@ -5,7 +5,7 @@
  "main": "./bundles/animations.umd.js",
  "module": "./@angular/animations.es5.js",
  "es2015": "./@angular/animations.js",
-  "typings": "./typings/animations/index.d.ts",
+  "typings": "./typings/animations.d.ts",
  "author": "angular",
  "license": "MIT",
  "peerDependencies": {
--- a/packages/benchpress/package.json
+++ b/packages/benchpress/package.json
@ -3,7 +3,7 @@
  "version": "0.1.0",
  "description": "Benchpress - a framework for e2e performance tests",
  "main": "index.js",
-  "typings": "./typings/index.d.ts",
+  "typings": "./index.d.ts",
  "dependencies": {
    "@angular/core": "^2.0.0-rc.7",
    "reflect-metadata": "^0.1.2",
--- a/packages/common/package.json
+++ b/packages/common/package.json
@ -5,7 +5,7 @@
  "main": "./bundles/common.umd.js",
  "module": "./@angular/common.es5.js",
  "es2015": "./@angular/common.js",
-  "typings": "./typings/index.d.ts",
+  "typings": "./typings/common.d.ts",
  "author": "angular",
  "license": "MIT",
  "peerDependencies": {
--- a/packages/common/testing/package.json
+++ b/packages/common/testing/package.json
@ -1,5 +1,5 @@
 {
-  "typings": "../typings/testing/index.d.ts",
+  "typings": "../typings/testing.d.ts",
  "main": "../bundles/common-testing.umd.js",
  "module": "../@angular/common/testing.es5.js",
  "es2015": "../@angular/common/testing.js"
--- a/packages/compiler-cli/esm5/index.ts
+++ b/packages/compiler-cli/esm5/index.ts
@ -1,15 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-/**
- * @module
- * @description
- * Entry point for all public APIs of the compiler-cli/esm5 package.
- */
-
-export * from '../index';
--- a/packages/compiler-cli/esm5/tsconfig-build.json
+++ b/packages/compiler-cli/esm5/tsconfig-build.json
@ -1,7 +0,0 @@
-{
-  "extends": "../tsconfig-build",
-  "compilerOptions": {
-    "module": "es2015",
-    "moduleResolution": "node"
-  }
-}
--- a/packages/compiler-cli/package.json
+++ b/packages/compiler-cli/package.json
@ -3,7 +3,7 @@
  "version": "0.0.0-PLACEHOLDER",
  "description": "Angular - the compiler CLI for Node.js",
  "main": "index.js",
-  "typings": "./typings/index.d.ts",
+  "typings": "index.d.ts",
  "bin": {
    "ngc": "./src/main.js",
    "ng-xi18n": "./src/extract_i18n.js"
--- a/packages/compiler/es5/index.ts
+++ b/packages/compiler/es5/index.ts
@ -1,15 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-/**
- * @module
- * @description
- * Entry point for all public APIs of the compiler/testing package.
- */
-
-export * from '../index';
--- a/packages/compiler/es5/rollup.config.js
+++ b/packages/compiler/es5/rollup.config.js
@ -1,22 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export default {
-  entry: '../../../dist/packages-dist/compiler/es5/index.js',
-  dest: '../../../dist/packages-dist/compiler/bundles/compiler.umd.js',
-  format: 'umd',
-  moduleName: 'ng.compiler',
-  globals: {
-    '@angular/core': 'ng.core',
-    'rxjs/Observable': 'Rx',
-    'rxjs/Subject': 'Rx',
-  },
-  plugins: [
-    //    nodeResolve({ jsnext: true, main: true }),
-  ]
-};
--- a/packages/compiler/es5/tsconfig-build.json
+++ b/packages/compiler/es5/tsconfig-build.json
@ -1,12 +0,0 @@
-
-{
-  "extends": "../tsconfig-build",
-
-  "compilerOptions": {
-    "target": "es5"
-  },
-  "files": [
-    "index.ts",
-    "../../../node_modules/zone.js/dist/zone.js.d.ts"
-  ]
-}
--- a/packages/compiler/esm5/index.ts
+++ b/packages/compiler/esm5/index.ts
@ -1,15 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-/**
- * @module
- * @description
- * Entry point for all public APIs of the compiler/esm5 package.
- */
-
-export * from '../index';
--- a/packages/compiler/esm5/tsconfig-build.json
+++ b/packages/compiler/esm5/tsconfig-build.json
@ -1,11 +0,0 @@
-{
-  "extends": "../tsconfig-build",
-
-  "compilerOptions": {
-    "target": "es5"
-  },
-  "files": [
-    "index.ts",
-    "../../../node_modules/zone.js/dist/zone.js.d.ts"
-  ]
-}
--- a/packages/compiler/package.json
+++ b/packages/compiler/package.json
@ -5,7 +5,7 @@
  "main": "./bundles/compiler.umd.js",
  "module": "./@angular/compiler.es5.js",
  "es2015": "./@angular/compiler.js",
-  "typings": "./typings/index.d.ts",
+  "typings": "./typings/compiler.d.ts",
  "author": "angular",
  "license": "MIT",
  "peerDependencies": {
--- a/packages/compiler/testing/package.json
+++ b/packages/compiler/testing/package.json
@ -1,5 +1,5 @@
 {
-  "typings": "../typings/testing/index.d.ts",
+  "typings": "../typings/testing.d.ts",
  "main": "../bundles/compiler-testing.umd.js",
  "module": "../@angular/compiler/testing.es5.js",
  "es2015": "../@angular/compiler/testing.js"
--- a/packages/core/esm5/index.ts
+++ b/packages/core/esm5/index.ts
@ -1,15 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-/**
- * @module
- * @description
- * Entry point for all public APIs of the core/esm5 package.
- */
-
-export * from './src/core';
--- a/packages/core/esm5/tsconfig-build.json
+++ b/packages/core/esm5/tsconfig-build.json
@ -1,11 +0,0 @@
-{
-  "extends": "../tsconfig-build",
-  "compilerOptions": {
-      "target": "es5"
-  },
-  "files": [
-    "index.ts",
-    "../../../node_modules/zone.js/dist/zone.js.d.ts",
-    "../../system.d.ts"
-  ]
-}
--- a/packages/core/package.json
+++ b/packages/core/package.json
@ -5,7 +5,7 @@
  "main": "./bundles/core.umd.js",
  "module": "./@angular/core.es5.js",
  "es2015": "./@angular/core.js",
-  "typings": "./typings/index.d.ts",
+  "typings": "./typings/core.d.ts",
  "author": "angular",
  "license": "MIT",
  "peerDependencies": {
--- a/packages/core/testing/package.json
+++ b/packages/core/testing/package.json
@ -1,5 +1,5 @@
 {
-  "typings": "../typings/testing/index.d.ts",
+  "typings": "../typings/testing.d.ts",
  "main": "../bundles/core-testing.umd.js",
  "module": "../@angular/core/testing.es5.js",
  "es2015": "../@angular/core/testing.js"
--- a/packages/core/tsconfig-build.json
+++ b/packages/core/tsconfig-build.json
@ -17,8 +17,7 @@
    "lib": ["es2015", "dom"],
    "skipLibCheck": true,
    // don't auto-discover @types/node, it results in a ///<reference in the .d.ts output
-    "types": [],
-    "preserveConstEnums": true
+    "types": []
  },
  "files": [
    "public_api.ts",
--- a/packages/forms/package.json
+++ b/packages/forms/package.json
@ -5,7 +5,7 @@
  "main": "./bundles/forms.umd.js",
  "module": "./@angular/forms.es5.js",
  "es2015": "./@angular/forms.js",
-  "typings": "./typings/index.d.ts",
+  "typings": "./typings/forms.d.ts",
  "author": "angular",
  "license": "MIT",
  "peerDependencies": {
--- a/packages/http/package.json
+++ b/packages/http/package.json
@ -5,7 +5,7 @@
  "main": "./bundles/http.umd.js",
  "module": "./@angular/http.es5.js",
  "es2015": "./@angular/http.js",
-  "typings": "./typings/index.d.ts",
+  "typings": "./typings/http.d.ts",
  "author": "angular",
  "license": "MIT",
  "peerDependencies": {
--- a/packages/http/testing/package.json
+++ b/packages/http/testing/package.json
@ -1 +1,6 @@
-{"typings": "../typings/testing/index.d.ts", "main": "../bundles/http-testing.umd.js", "module": "../@angular/http/testing.es5.js", "es2015": "../@angular/http/testing.js"}
+{
+  "typings": "../typings/testing.d.ts",
+  "main": "../bundles/http-testing.umd.js",
+  "module": "../@angular/http/testing.es5.js",
+  "es2015": "../@angular/http/testing.js"
+}
--- a/packages/language-service/package.json
+++ b/packages/language-service/package.json
@ -2,9 +2,9 @@
  "name": "@angular/language-service",
  "version": "0.0.0-PLACEHOLDER",
  "description": "Angular - language services",
-  "main": "bundles/language-service.umd.js",
-  "module": "index.js",
-  "typings": "index.d.ts",
+  "main": "./bundles/language-service.umd.js",
+  "module": "./@angular/language-service.es5.js",
+  "typings": "./typings/language-service.d.ts",
  "author": "angular",
  "license": "MIT",
  "repository": {
--- a/packages/platform-browser-dynamic/package.json
+++ b/packages/platform-browser-dynamic/package.json
@ -5,7 +5,7 @@
  "main": "./bundles/platform-browser-dynamic.umd.js",
  "module": "./@angular/platform-browser-dynamic.es5.js",
  "es2015": "./@angular/platform-browser-dynamic.js",
-  "typings": "./typings/index.d.ts",
+  "typings": "./typings/platform-browser-dynamic.d.ts",
  "author": "angular",
  "license": "MIT",
  "peerDependencies": {
--- a/packages/platform-browser-dynamic/testing/package.json
+++ b/packages/platform-browser-dynamic/testing/package.json
@ -1,5 +1,5 @@
 {
-  "typings": "../typings/testing/index.d.ts",
+  "typings": "../typings/testing.d.ts",
  "main": "../bundles/platform-browser-dynamic-testing.umd.js",
  "module": "../@angular/platform-browser-dynamic/testing.es5.js",
  "es2015": "../@angular/platform-browser-dynamic/testing.js"
--- a/packages/platform-browser/animations/package.json
+++ b/packages/platform-browser/animations/package.json
@ -1,5 +1,5 @@
 {
-  "typings": "../typings/animations/animations.d.ts",
+  "typings": "../typings/animations.d.ts",
  "main": "../bundles/platform-browser-animations.umd.js",
  "module": "../@angular/platform-browser/animations.es5.js",
  "es2015": "../@angular/platform-browser/animations.js"
--- a/packages/platform-browser/animations/testing/package.json
+++ b/packages/platform-browser/animations/testing/package.json
@ -1 +1,6 @@
-{"typings": "../../typings/animations/testing/index.d.ts", "main": "../../bundles/platform-browser-animations-testing.umd.js", "module": "../../@angular/platform-browser/animations/testing.es5.js", "es2015": "../../@angular/platform-browser/animations/testing.js"}
+{
+  "typings": "../../typings/animations/testing.d.ts",
+  "main": "../../bundles/platform-browser-animations-testing.umd.js",
+  "module": "../../@angular/platform-browser/animations/testing.es5.js",
+  "es2015": "../../@angular/platform-browser/animations/testing.js"
+}
--- a/packages/platform-browser/package.json
+++ b/packages/platform-browser/package.json
@ -5,7 +5,7 @@
  "main": "./bundles/platform-browser.umd.js",
  "module": "./@angular/platform-browser.es5.js",
  "es2015": "./@angular/platform-browser.js",
-  "typings": "./typings/index.d.ts",
+  "typings": "./typings/platform-browser.d.ts",
  "author": "angular",
  "license": "MIT",
  "peerDependencies": {
--- a/packages/platform-browser/testing/package.json
+++ b/packages/platform-browser/testing/package.json
@ -1,5 +1,5 @@
 {
-  "typings": "../typings/testing/index.d.ts",
+  "typings": "../typings/testing.d.ts",
  "main": "../bundles/platform-browser-testing.umd.js",
  "module": "../@angular/platform-browser/testing.es5.js",
  "es2015": "../@angular/platform-browser/testing.js"
--- a/packages/platform-server/package.json
+++ b/packages/platform-server/package.json
@ -5,7 +5,7 @@
  "main": "./bundles/platform-server.umd.js",
  "module": "./@angular/platform-server.es5.js",
  "es2015": "./@angular/platform-server.js",
-  "typings": "./typings/index.d.ts",
+  "typings": "./typings/platform-server.d.ts",
  "author": "angular",
  "license": "MIT",
  "peerDependencies": {
--- a/packages/platform-server/testing/package.json
+++ b/packages/platform-server/testing/package.json
@ -0,0 +1,6 @@
+{
+  "typings": "../typings/testing.d.ts",
+  "main": "../bundles/platform-server-testing.umd.js",
+  "module": "../@angular/platform-server/testing.es5.js",
+  "es2015": "../@angular/platform-server/testing.js"
+}
--- a/packages/platform-webworker-dynamic/package.json
+++ b/packages/platform-webworker-dynamic/package.json
@ -5,7 +5,7 @@
  "main": "./bundles/platform-webworker-dynamic.umd.js",
  "module": "./@angular/platform-webworker-dynamic.es5.js",
  "es2015": "./@angular/platform-webworker-dynamic.js",
-  "typings": "./typings/index.d.ts",
+  "typings": "./typings/platform-webworker-dynamic.d.ts",
  "author": "angular",
  "license": "MIT",
  "peerDependencies": {
--- a/packages/platform-webworker/package.json
+++ b/packages/platform-webworker/package.json
@ -5,7 +5,7 @@
  "main": "./bundles/platform-webworker.umd.js",
  "module": "./@angular/platform-webworker.es5.js",
  "es2015": "./@angular/platform-webworker.js",
-  "typings": "./typings/index.d.ts",
+  "typings": "./typings/platform-webworker.d.ts",
  "author": "angular",
  "license": "MIT",
  "peerDependencies": {
--- a/packages/router/package.json
+++ b/packages/router/package.json
@ -5,7 +5,7 @@
  "main": "./bundles/router.umd.js",
  "module": "./@angular/router.es5.js",
  "es2015": "./@angular/router.js",
-  "typings": "./typings/index.d.ts",
+  "typings": "./typings/router.d.ts",
  "keywords": [
    "angular",
    "router"
--- a/packages/router/testing/package.json
+++ b/packages/router/testing/package.json
@ -1,5 +1,5 @@
 {
-  "typings": "../typings/testing/index.d.ts",
+  "typings": "../typings/testing.d.ts",
  "main": "../bundles/router-testing.umd.js",
  "module": "../@angular/router/testing.es5.js",
  "es2015": "../@angular/router/testing.js"
--- a/packages/router/testingmvsconfig-json.json
+++ b/packages/router/testingmvsconfig-json.json
@ -1,18 +0,0 @@
-{
-  "extends": "../tsconfig",
-  "compilerOptions": {
-    "paths": {
-      "@angular/core": ["../../../dist/packages/core"],
-      "@angular/common": ["../../../dist/packages/common"],
-      "@angular/common/testing": ["../../../dist/packages/common/testing"],
-      "@angular/platform-browser": ["../../../dist/packages/platform-browser"],
-      "@angular/router": ["../../../dist/packages/router"]
-    }
-  },
-  "files": [
-    "index.ts"
-  ],
-  "angularCompilerOptions": {
-    "strictMetadataEmit": true
-  }
-}
--- a/packages/router/upgrade/package.json
+++ b/packages/router/upgrade/package.json
@ -1,5 +1,5 @@
 {
-  "typings": "../typings/upgrade/upgrade.d.ts",
+  "typings": "../typings/upgrade.d.ts",
  "main": "../bundles/router-upgrade.umd.js",
  "module": "../@angular/router/upgrade.es5.js",
  "es2015": "../@angular/router/upgrade.js"
--- a/packages/tsconfig.json
+++ b/packages/tsconfig.json
@ -26,6 +26,13 @@
    "types": ["angularjs"]
  },
  "exclude": [
+    "angular1_router",
+    "benchmarks/e2e_test/old",
+    "benchmarks/src/old",
+    "benchmarks/src/**/index_aot.ts",
+    "benchmarks_external",
+    "payload_tests",
+    "rollup-test",
    "compiler-cli/integrationtest"
  ]
 }
--- a/packages/upgrade/package.json
+++ b/packages/upgrade/package.json
@ -5,7 +5,7 @@
  "main": "./bundles/upgrade.umd.js",
  "module": "./@angular/upgrade.es5.js",
  "es2015": "./@angular/upgrade.js",
-  "typings": "./typings/upgrade/index.d.ts",
+  "typings": "./typings/upgrade.d.ts",
  "author": "angular",
  "license": "MIT",
  "peerDependencies": {
--- a/packages/upgrade/static/package.json
+++ b/packages/upgrade/static/package.json
@ -1,5 +1,5 @@
 {
-  "typings": "../typings/static/index.d.ts",
+  "typings": "../typings/static.d.ts",
  "main": "../bundles/upgrade-static.umd.js",
  "module": "../@angular/upgrade/static.es5.js",
  "es2015": "../@angular/upgrade/static.js"