From 3ae856ab8b06e5f7d0a79b93d9c24cc9db26dec0 Mon Sep 17 00:00:00 2001 From: Alex Eagle Date: Sun, 1 May 2016 18:48:38 -0700 Subject: [PATCH] build(tsc): Use angular2-template-compiler in place of tsc This lets us down-level Decorators with tsickle and produce .metadata.json files for users to reference when offline-compiling their app. --- build.sh | 12 +++++------ modules/@angular/common/tsconfig-es2015.json | 3 +++ modules/@angular/common/tsconfig.json | 3 +++ .../@angular/compiler/tsconfig-es2015.json | 3 +++ modules/@angular/compiler/tsconfig.json | 3 +++ modules/@angular/core/tsconfig-es2015.json | 3 +++ modules/@angular/core/tsconfig.json | 3 +++ modules/@angular/http/tsconfig-es2015.json | 3 +++ modules/@angular/http/tsconfig.json | 3 +++ .../tsconfig-es2015.json | 3 +++ .../platform-browser-dynamic/tsconfig.json | 3 +++ .../platform-browser/tsconfig-es2015.json | 3 +++ .../@angular/platform-browser/tsconfig.json | 3 +++ .../platform-server/tsconfig-es2015.json | 3 +++ .../@angular/platform-server/tsconfig.json | 3 +++ modules/@angular/router/tsconfig-es2015.json | 3 +++ modules/@angular/router/tsconfig.json | 3 +++ modules/@angular/upgrade/tsconfig-es2015.json | 3 +++ modules/@angular/upgrade/tsconfig.json | 3 +++ modules/tsconfig.json | 3 +++ npm-shrinkwrap.clean.json | 12 ++++++++++- npm-shrinkwrap.json | 21 ++++++++++++++++--- package.json | 1 + 23 files changed, 93 insertions(+), 10 deletions(-) diff --git a/build.sh b/build.sh index 6c32b40797..9263449503 100755 --- 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} =====" diff --git a/modules/@angular/common/tsconfig-es2015.json b/modules/@angular/common/tsconfig-es2015.json index 8608568c02..e2777e8390 100644 --- 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, diff --git a/modules/@angular/common/tsconfig.json b/modules/@angular/common/tsconfig.json index 3bb02d7d91..d2a895ed3f 100644 --- a/modules/@angular/common/tsconfig.json +++ b/modules/@angular/common/tsconfig.json @@ -1,4 +1,7 @@ { + "angularCompilerOptions": { + "skipTemplateCodegen": true + }, "compilerOptions": { "baseUrl": ".", "declaration": true, diff --git a/modules/@angular/compiler/tsconfig-es2015.json b/modules/@angular/compiler/tsconfig-es2015.json index e3eff4974c..0748be28df 100644 --- 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, diff --git a/modules/@angular/compiler/tsconfig.json b/modules/@angular/compiler/tsconfig.json index b184b16d68..47f94011d4 100644 --- a/modules/@angular/compiler/tsconfig.json +++ b/modules/@angular/compiler/tsconfig.json @@ -1,4 +1,7 @@ { + "angularCompilerOptions": { + "skipTemplateCodegen": true + }, "compilerOptions": { "baseUrl": ".", "declaration": true, diff --git a/modules/@angular/core/tsconfig-es2015.json b/modules/@angular/core/tsconfig-es2015.json index 78b6280696..2fddf77860 100644 --- 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, diff --git a/modules/@angular/core/tsconfig.json b/modules/@angular/core/tsconfig.json index 3b7834904d..1775327c41 100644 --- a/modules/@angular/core/tsconfig.json +++ b/modules/@angular/core/tsconfig.json @@ -1,4 +1,7 @@ { + "angularCompilerOptions": { + "skipTemplateCodegen": true + }, "compilerOptions": { "baseUrl": ".", "declaration": true, diff --git a/modules/@angular/http/tsconfig-es2015.json b/modules/@angular/http/tsconfig-es2015.json index 0aae89c028..33f9dbe4ea 100644 --- 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, diff --git a/modules/@angular/http/tsconfig.json b/modules/@angular/http/tsconfig.json index 610e0bc930..8ca797bb6b 100644 --- a/modules/@angular/http/tsconfig.json +++ b/modules/@angular/http/tsconfig.json @@ -1,4 +1,7 @@ { + "angularCompilerOptions": { + "skipTemplateCodegen": true + }, "compilerOptions": { "baseUrl": ".", "declaration": true, diff --git a/modules/@angular/platform-browser-dynamic/tsconfig-es2015.json b/modules/@angular/platform-browser-dynamic/tsconfig-es2015.json index e48a4b6ecc..8a784c2485 100644 --- 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, diff --git a/modules/@angular/platform-browser-dynamic/tsconfig.json b/modules/@angular/platform-browser-dynamic/tsconfig.json index 94000ba24b..a5db5574b7 100644 --- 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, diff --git a/modules/@angular/platform-browser/tsconfig-es2015.json b/modules/@angular/platform-browser/tsconfig-es2015.json index e3dca138a1..836d3c6b4c 100644 --- 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, diff --git a/modules/@angular/platform-browser/tsconfig.json b/modules/@angular/platform-browser/tsconfig.json index 4b64f213a0..fbde0e5900 100644 --- 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, diff --git a/modules/@angular/platform-server/tsconfig-es2015.json b/modules/@angular/platform-server/tsconfig-es2015.json index a8cc7b7659..926644da94 100644 --- 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, diff --git a/modules/@angular/platform-server/tsconfig.json b/modules/@angular/platform-server/tsconfig.json index 1ff19ad813..12d6d2c108 100644 --- 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, diff --git a/modules/@angular/router/tsconfig-es2015.json b/modules/@angular/router/tsconfig-es2015.json index e13e77b3ea..a952fd0126 100644 --- 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, diff --git a/modules/@angular/router/tsconfig.json b/modules/@angular/router/tsconfig.json index a7727259d2..ff8568d7ef 100644 --- a/modules/@angular/router/tsconfig.json +++ b/modules/@angular/router/tsconfig.json @@ -1,4 +1,7 @@ { + "angularCompilerOptions": { + "skipTemplateCodegen": true + }, "compilerOptions": { "baseUrl": ".", "declaration": true, diff --git a/modules/@angular/upgrade/tsconfig-es2015.json b/modules/@angular/upgrade/tsconfig-es2015.json index 15106250a4..7c9d657a37 100644 --- 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, diff --git a/modules/@angular/upgrade/tsconfig.json b/modules/@angular/upgrade/tsconfig.json index 12eb9587ed..5b38c01ffd 100644 --- a/modules/@angular/upgrade/tsconfig.json +++ b/modules/@angular/upgrade/tsconfig.json @@ -1,4 +1,7 @@ { + "angularCompilerOptions": { + "skipTemplateCodegen": true + }, "compilerOptions": { "baseUrl": ".", "declaration": true, diff --git a/modules/tsconfig.json b/modules/tsconfig.json index 56c76c81bf..d1907a5054 100644 --- a/modules/tsconfig.json +++ b/modules/tsconfig.json @@ -1,4 +1,7 @@ { + "angularCompilerOptions": { + "skipTemplateCodegen": true + }, "compilerOptions": { "baseUrl": ".", "declaration": true, diff --git a/npm-shrinkwrap.clean.json b/npm-shrinkwrap.clean.json index 074272a383..ecf35c5f26 100644 --- 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": { @@ -5434,7 +5444,7 @@ } }, "tsickle": { - "version": "0.1.0", + "version": "0.1.1", "dependencies": { "source-map": { "version": "0.4.4" diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 83894efbf0..e2179b6fdc 100644 --- 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 <0.2.0", + "resolved": "https://registry.npmjs.org/angular2-template-compiler/-/angular2-template-compiler-0.1.5.tgz" + }, "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": "https://registry.npmjs.org/ts-metadata-collector/-/ts-metadata-collector-0.1.1.tgz" + }, "ts2dart": { "version": "0.9.10", "from": "ts2dart@>=0.9.9 <0.10.0", @@ -8666,9 +8681,9 @@ } }, "tsickle": { - "version": "0.1.0", - "from": "tsickle@latest", - "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.1.0.tgz", + "version": "0.1.1", + "from": "tsickle@0.1.1", + "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.1.1.tgz", "dependencies": { "source-map": { "version": "0.4.4", diff --git a/package.json b/package.json index fc1eacf3ff..835f82fbac 100644 --- 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",