build(tsc): Use angular2-template-compiler in place of tsc

This gives us tsickle pre-processing of Decorators, and produces .metadata.json files for users to consume in their offline compilation.
2016-05-01 18:23:16 -07:00 · 2016-05-01 18:23:16 -07:00 · 57240c85a5
parent a66cdb469f
commit 57240c85a5
23 changed files with 89 additions and 6 deletions
--- a/build.sh
+++ b/build.sh
@ -6,9 +6,9 @@ cd `dirname $0`


 TSCONFIG=./modules/tsconfig.json
-echo "====== (all)COMPILING: \$(npm bin)/tsc -p ${TSCONFIG} ====="
+echo "====== (all)COMPILING: \$(npm bin)/ng2tc -p ${TSCONFIG} ====="
 rm -rf ./dist/all/
-$(npm bin)/tsc -p ${TSCONFIG}
+$(npm bin)/ng2tc -p ${TSCONFIG}


 rm -rf ./dist/packages-dist
@ -30,8 +30,8 @@ do
  UMDES5PATH=${DESTDIR}/${PACKAGE}.umd.js


-  echo "======      COMPILING: \$(npm bin)/tsc -p ${SRCDIR}/tsconfig.json        ====="
-  $(npm bin)/tsc -p ${SRCDIR}/tsconfig.json
+  echo "======      COMPILING: \$(npm bin)/ng2tc -p ${SRCDIR}/tsconfig.json        ====="
+  $(npm bin)/ng2tc -p ${SRCDIR}/tsconfig.json
  cp ${SRCDIR}/package.json ${DESTDIR}/


@ -44,8 +44,8 @@ do
  fi


-  echo "====== (esm)COMPILING: \$(npm bin)/tsc -p ${SRCDIR}/tsconfig-es2015.json ====="
-  $(npm bin)/tsc -p ${SRCDIR}/tsconfig-es2015.json
+  echo "====== (esm)COMPILING: \$(npm bin)/ng2tc -p ${SRCDIR}/tsconfig-es2015.json ====="
+  $(npm bin)/ng2tc -p ${SRCDIR}/tsconfig-es2015.json


  echo "======      BUNDLING: ${SRCDIR} ====="
--- a/modules/@angular/common/tsconfig-es2015.json
+++ b/modules/@angular/common/tsconfig-es2015.json
@ -1,4 +1,7 @@
 {
+  "angularCompilerOptions": {
+    "skipTemplateCodegen": true
+  },
  "compilerOptions": {
    "baseUrl": ".",
    "declaration": true,
--- a/modules/@angular/common/tsconfig.json
+++ b/modules/@angular/common/tsconfig.json
@ -1,4 +1,7 @@
 {
+  "angularCompilerOptions": {
+    "skipTemplateCodegen": true
+  },
  "compilerOptions": {
    "baseUrl": ".",
    "declaration": true,
--- a/modules/@angular/compiler/tsconfig-es2015.json
+++ b/modules/@angular/compiler/tsconfig-es2015.json
@ -1,4 +1,7 @@
 {
+  "angularCompilerOptions": {
+    "skipTemplateCodegen": true
+  },
  "compilerOptions": {
    "baseUrl": ".",
    "declaration": true,
--- a/modules/@angular/compiler/tsconfig.json
+++ b/modules/@angular/compiler/tsconfig.json
@ -1,4 +1,7 @@
 {
+  "angularCompilerOptions": {
+    "skipTemplateCodegen": true
+  },
  "compilerOptions": {
    "baseUrl": ".",
    "declaration": true,
--- a/modules/@angular/core/tsconfig-es2015.json
+++ b/modules/@angular/core/tsconfig-es2015.json
@ -1,4 +1,7 @@
 {
+  "angularCompilerOptions": {
+    "skipTemplateCodegen": true
+  },
  "compilerOptions": {
    "baseUrl": ".",
    "declaration": true,
--- a/modules/@angular/core/tsconfig.json
+++ b/modules/@angular/core/tsconfig.json
@ -1,4 +1,7 @@
 {
+  "angularCompilerOptions": {
+    "skipTemplateCodegen": true
+  },
  "compilerOptions": {
    "baseUrl": ".",
    "declaration": true,
--- a/modules/@angular/http/tsconfig-es2015.json
+++ b/modules/@angular/http/tsconfig-es2015.json
@ -1,4 +1,7 @@
 {
+  "angularCompilerOptions": {
+    "skipTemplateCodegen": true
+  },
  "compilerOptions": {
    "baseUrl": ".",
    "declaration": true,
--- a/modules/@angular/http/tsconfig.json
+++ b/modules/@angular/http/tsconfig.json
@ -1,4 +1,7 @@
 {
+  "angularCompilerOptions": {
+    "skipTemplateCodegen": true
+  },
  "compilerOptions": {
    "baseUrl": ".",
    "declaration": true,
--- a/modules/@angular/platform-browser-dynamic/tsconfig-es2015.json
+++ b/modules/@angular/platform-browser-dynamic/tsconfig-es2015.json
@ -1,4 +1,7 @@
 {
+  "angularCompilerOptions": {
+    "skipTemplateCodegen": true
+  },
  "compilerOptions": {
    "baseUrl": ".",
    "declaration": true,
--- a/modules/@angular/platform-browser-dynamic/tsconfig.json
+++ b/modules/@angular/platform-browser-dynamic/tsconfig.json
@ -1,4 +1,7 @@
 {
+  "angularCompilerOptions": {
+    "skipTemplateCodegen": true
+  },
  "compilerOptions": {
    "baseUrl": ".",
    "declaration": true,
--- a/modules/@angular/platform-browser/tsconfig-es2015.json
+++ b/modules/@angular/platform-browser/tsconfig-es2015.json
@ -1,4 +1,7 @@
 {
+  "angularCompilerOptions": {
+    "skipTemplateCodegen": true
+  },
  "compilerOptions": {
    "baseUrl": ".",
    "declaration": true,
--- a/modules/@angular/platform-browser/tsconfig.json
+++ b/modules/@angular/platform-browser/tsconfig.json
@ -1,4 +1,7 @@
 {
+  "angularCompilerOptions": {
+    "skipTemplateCodegen": true
+  },
  "compilerOptions": {
    "baseUrl": ".",
    "declaration": true,
--- a/modules/@angular/platform-server/tsconfig-es2015.json
+++ b/modules/@angular/platform-server/tsconfig-es2015.json
@ -1,4 +1,7 @@
 {
+  "angularCompilerOptions": {
+    "skipTemplateCodegen": true
+  },
  "compilerOptions": {
    "baseUrl": ".",
    "declaration": true,
--- a/modules/@angular/platform-server/tsconfig.json
+++ b/modules/@angular/platform-server/tsconfig.json
@ -1,4 +1,7 @@
 {
+  "angularCompilerOptions": {
+    "skipTemplateCodegen": true
+  },
  "compilerOptions": {
    "baseUrl": ".",
    "declaration": true,
--- a/modules/@angular/router/tsconfig-es2015.json
+++ b/modules/@angular/router/tsconfig-es2015.json
@ -1,4 +1,7 @@
 {
+  "angularCompilerOptions": {
+    "skipTemplateCodegen": true
+  },
  "compilerOptions": {
    "baseUrl": ".",
    "declaration": true,
--- a/modules/@angular/router/tsconfig.json
+++ b/modules/@angular/router/tsconfig.json
@ -1,4 +1,7 @@
 {
+  "angularCompilerOptions": {
+    "skipTemplateCodegen": true
+  },
  "compilerOptions": {
    "baseUrl": ".",
    "declaration": true,
--- a/modules/@angular/upgrade/tsconfig-es2015.json
+++ b/modules/@angular/upgrade/tsconfig-es2015.json
@ -1,4 +1,7 @@
 {
+  "angularCompilerOptions": {
+    "skipTemplateCodegen": true
+  },
  "compilerOptions": {
    "baseUrl": ".",
    "declaration": true,
--- a/modules/@angular/upgrade/tsconfig.json
+++ b/modules/@angular/upgrade/tsconfig.json
@ -1,4 +1,7 @@
 {
+  "angularCompilerOptions": {
+    "skipTemplateCodegen": true
+  },
  "compilerOptions": {
    "baseUrl": ".",
    "declaration": true,
--- a/modules/tsconfig.json
+++ b/modules/tsconfig.json
@ -1,4 +1,7 @@
 {
+  "angularCompilerOptions": {
+    "skipTemplateCodegen": true
+  },
  "compilerOptions": {
    "baseUrl": ".",
    "declaration": true,
--- a/npm-shrinkwrap.clean.json
+++ b/npm-shrinkwrap.clean.json
@ -54,6 +54,13 @@
    "angular-mocks": {
      "version": "1.5.0"
    },
+    "angular2": {
+      "version": "2.0.0-beta.17",
+      "resolved": "git://github.com/angular/angular.git#08cbd5481d04255864f5ff8e33d0756d4ec4c440"
+    },
+    "angular2-template-compiler": {
+      "version": "0.1.5"
+    },
    "ansi": {
      "version": "0.3.0"
    },
@ -5361,6 +5368,9 @@
        }
      }
    },
+    "ts-metadata-collector": {
+      "version": "0.1.1"
+    },
    "ts2dart": {
      "version": "0.9.10",
      "dependencies": {
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@ -88,6 +88,16 @@
      "from": "angular-mocks@1.5.0",
      "resolved": "https://registry.npmjs.org/angular-mocks/-/angular-mocks-1.5.0.tgz"
    },
+    "angular2": {
+      "version": "2.0.0-beta.17",
+      "from": "angular/angular#2.0.0-build.cacdead.js",
+      "resolved": "git://github.com/angular/angular.git#08cbd5481d04255864f5ff8e33d0756d4ec4c440"
+    },
+    "angular2-template-compiler": {
+      "version": "0.1.5",
+      "from": "angular2-template-compiler@0.1.5",
+      "resolved": "file:dist/js/cjs/compiler_cli"
+    },
    "ansi": {
      "version": "0.3.0",
      "from": "ansi@>=0.3.0 <0.4.0",
@ -8549,6 +8559,11 @@
        }
      }
    },
+    "ts-metadata-collector": {
+      "version": "0.1.1",
+      "from": "ts-metadata-collector@>=0.1.0 <0.2.0",
+      "resolved": "file:dist/tools/metadata"
+    },
    "ts2dart": {
      "version": "0.9.10",
      "from": "ts2dart@>=0.9.9 <0.10.0",
--- a/package.json
+++ b/package.json
@ -28,6 +28,7 @@
    "angular": "^1.5.0",
    "angular-animate": "^1.5.0",
    "angular-mocks": "^1.5.0",
+    "angular2-template-compiler": "^0.1.5",
    "base64-js": "^0.0.8",
    "bower": "^1.3.12",
    "broccoli": "^0.16.9",