build: resolve review comments on flat modules PR and fix more bugs (#14660)

2017-02-23 16:39:44 -08:00
parent 4b54c0e23f
commit c53621be8e
32 changed files with 60 additions and 200 deletions
--- a/modules/@angular/.babelrc
+++ b/modules/@angular/.babelrc
@ -1,5 +0,0 @@
-{
-  "presets": [
-    ["es2015", { "modules": false }]
-  ]
-}
--- a/modules/@angular/animations/.babelrc
+++ b/modules/@angular/animations/.babelrc
@ -10,5 +10,5 @@
    },
    "exactGlobals": true
  }]],
-  "moduleId": "@angular/animation"
+  "moduleId": "@angular/animations"
 }
--- a/modules/@angular/animations/.babelrc-testing
+++ b/modules/@angular/animations/.babelrc-testing
@ -1,14 +0,0 @@
-
-{
-  "presets": ["es2015"],
-  "plugins": [["transform-es2015-modules-umd", {
-    "globals": {
-      "@angular/core": "ng.core",
-      "@angular/animations": "ng.animations",
-      "rxjs/Observable": "Rx",
-      "rxjs/Subject": "Rx"
-    },
-    "exactGlobals": true
-  }]],
-  "moduleId": "@angular/animation/testing"
-}
--- a/modules/@angular/benchpress/tsconfig-build.json
+++ b/modules/@angular/benchpress/tsconfig-build.json
@ -18,7 +18,6 @@
    // don't auto-discover @types/node, it results in a ///<reference in the .d.ts output
    "types": []
  },
-  "exclude": ["integrationtest"],
  "files": [
    "index.ts",
    "../../../node_modules/@types/node/index.d.ts",
--- a/modules/@angular/common/tsconfig-testing.json
+++ b/modules/@angular/common/tsconfig-testing.json
@ -2,7 +2,6 @@
  "extends": "./tsconfig-build",

  "compilerOptions": {
-    "outDir": "../../../dist/packages-dist/common",
    "paths": {
      "@angular/core": ["../../../dist/packages-dist/core/"],
      "@angular/common": ["../../../dist/packages-dist/common"]
--- a/modules/@angular/compiler/tsconfig-testing.json
+++ b/modules/@angular/compiler/tsconfig-testing.json
@ -4,7 +4,6 @@
  "compilerOptions": {
    // Test that we rely on decorator downleveling
    "emitDecoratorMetadata": false,
-    "outDir": "../../../dist/packages-dist/compiler",
    "paths": {
      "@angular/core": ["../../../dist/packages-dist/core"],
      "@angular/core/testing": ["../../../dist/packages-dist/core/testing"],
--- a/modules/@angular/core/.babelrc
+++ b/modules/@angular/core/.babelrc
@ -8,6 +8,7 @@
    },
    "exactGlobals": true
  }]],
-  "moduleId": "@angular/core"
+  "moduleId": "@angular/core",
+  "compact": false
 }

--- a/modules/@angular/core/.babelrc-testing
+++ b/modules/@angular/core/.babelrc-testing
@ -9,4 +9,4 @@
    "exactGlobals": true
  }]],
  "moduleId": "@angular/core/testing"
-}
+}
--- a/modules/@angular/core/tsconfig-testing.json
+++ b/modules/@angular/core/tsconfig-testing.json
@ -2,7 +2,6 @@
  "extends": "./tsconfig-build",

  "compilerOptions": {
-    "outDir": "../../../dist/packages-dist/core",
    "paths": {
      "rxjs/*": ["../../../node_modules/rxjs/*"],
      "@angular/core": ["../../../dist/packages-dist/core"]
--- a/modules/@angular/http/.babelrc
+++ b/modules/@angular/http/.babelrc
@ -1,10 +1,8 @@
-
 {
  "presets": ["es2015"],
  "plugins": [["transform-es2015-modules-umd", {
    "globals": {
      "@angular/core": "ng.core",
-      "@angular/compiler": "ng.compiler",
      "@angular/platform-browser": "ng.platformBrowser",
      "@angular/http": "ng.http",
      "rxjs/Observable": "Rx",
--- a/modules/@angular/http/.babelrc-testing
+++ b/modules/@angular/http/.babelrc-testing
@ -1,10 +1,8 @@
-
 {
  "presets": ["es2015"],
  "plugins": [["transform-es2015-modules-umd", {
    "globals": {
      "@angular/core": "ng.core",
-      "@angular/compiler": "ng.compiler",
      "@angular/platform-browser": "ng.platformBrowser",
      "@angular/http": "ng.http",
      "@angular/http/testing": "ng.http.testing",
--- a/modules/@angular/http/tsconfig-testing.json
+++ b/modules/@angular/http/tsconfig-testing.json
@ -1,7 +1,6 @@
 {
  "extends": "./tsconfig-build",
  "compilerOptions": {
-    "outDir": "../../../dist/packages-dist/http",
    "paths": {
      "@angular/core": ["../../../dist/packages-dist/core"],
      "@angular/http": ["../../../dist/packages-dist/http"],
--- a/modules/@angular/platform-browser-dynamic/tsconfig-testing.json
+++ b/modules/@angular/platform-browser-dynamic/tsconfig-testing.json
@ -1,7 +1,6 @@
 {
  "extends": "./tsconfig-build",
  "compilerOptions": {
-    "outDir": "../../../dist/packages-dist/platform-browser-dynamic",
    "paths": {
      "@angular/core": ["../../../dist/packages-dist/core"],
      "@angular/core/testing": ["../../../dist/packages-dist/core/testing"],
--- a/modules/@angular/platform-browser/tsconfig-testing.json
+++ b/modules/@angular/platform-browser/tsconfig-testing.json
@ -1,7 +1,6 @@
 {
  "extends": "./tsconfig-build",
  "compilerOptions": {
-    "outDir": "../../../dist/packages-dist/platform-browser",
    "paths": {
      "@angular/core": ["../../../dist/packages-dist/core"],
      "@angular/core/testing": ["../../../dist/packages-dist/core/testing"],
--- a/modules/@angular/platform-server/tsconfig-testing.json
+++ b/modules/@angular/platform-server/tsconfig-testing.json
@ -1,7 +1,6 @@
 {
  "extends": "./tsconfig-build",
  "compilerOptions": {
-    "outDir": "../../../dist/packages-dist/platform-server",
    "paths": {
      "@angular/core": ["../../../dist/packages-dist/core"],
      "@angular/core/testing": ["../../../dist/packages-dist/core/testing"],
--- a/modules/@angular/router/tsconfig-testing.json
+++ b/modules/@angular/router/tsconfig-testing.json
@ -1,7 +1,6 @@
 {
  "extends": "./tsconfig-build",
  "compilerOptions": {
-    "outDir": "../../../dist/packages-dist/router",
    "paths": {
      "@angular/core": ["../../../dist/packages-dist/core"],
      "@angular/common": ["../../../dist/packages-dist/common"],
--- a/modules/@angular/upgrade/tsconfig-static.json
+++ b/modules/@angular/upgrade/tsconfig-static.json
@ -1,4 +1,3 @@
-
 {
  "extends": "./tsconfig-build",
  "compilerOptions": {