refactor(compiler_cli): move it into modules/@angular and integrate properly into the build

This also does no more depend on a version
on npm for the compiler_cli.

Also runs the tests for tools/metadata

build.sh

@@ -6,7 +6,7 @@ cd `dirname $0`
 
 
 TSCONFIG=./modules/tsconfig.json
-echo "====== (all)COMPILING: \$(npm bin)/ng2tc -p ${TSCONFIG} ====="
+echo "====== (all)COMPILING: \$(npm bin)/tsc -p ${TSCONFIG} ====="
 rm -rf ./dist/all/
 mkdir ./dist/all/
 
@@ -27,8 +27,14 @@ ln -s ../../../../node_modules/angular/angular.js .
 cd -
 
 # compile ts code
-$(npm bin)/ng2tc -p ${TSCONFIG}
-
+# TODO: Right now we have a cycle in that the compiler_cli depends on Angular
+# but we need it to compile Angular.
+# The solution right now is to do 2 compilation runs.
+# Fix this by separating the metadata extraction into a separate binary that does
+# not depend on Angular.
+$(npm bin)/tsc -p ${TSCONFIG}
+NG_TC="node dist/all/@angular/compiler_cli/src/main"
+$NG_TC -p modules/tsconfig.json
 
 rm -rf ./dist/packages-dist
 
@@ -42,20 +48,20 @@ for PACKAGE in \
   http \
   router \
   router-deprecated \
-  upgrade
+  upgrade \
+  compiler_cli
 do
   SRCDIR=./modules/@angular/${PACKAGE}
   DESTDIR=./dist/packages-dist/${PACKAGE}
   UMDES6PATH=${DESTDIR}/esm/${PACKAGE}.umd.js
   UMDES5PATH=${DESTDIR}/${PACKAGE}.umd.js
 
-
   if [[ ${PACKAGE} == "router-deprecated" ]]; then
     echo "======      COMPILING: \$(npm bin)/tsc -p ${SRCDIR}/tsconfig-es5.json        ====="
     $(npm bin)/tsc -p ${SRCDIR}/tsconfig-es5.json
   else
-    echo "======      COMPILING: \$(npm bin)/ng2tc -p ${SRCDIR}/tsconfig-es5.json        ====="
-    $(npm bin)/ng2tc -p ${SRCDIR}/tsconfig-es5.json
+    echo "======      COMPILING: ${NG_TC} -p ${SRCDIR}/tsconfig-es5.json        ====="
+    $NG_TC -p ${SRCDIR}/tsconfig-es5.json
   fi
 
   cp ${SRCDIR}/package.json ${DESTDIR}/
@@ -71,42 +77,43 @@ do
     find ${DESTDIR} -type f -name '*.d.ts' -print0 | xargs -0 sed -i '' -E 's/^( +)abstract ([[:alnum:]]+\:)/\1\2/g'
   fi
 
+  if [[ ${PACKAGE} != compiler_cli ]]; then
+
+    if [[ ${PACKAGE} == "router-deprecated" ]]; then
+      echo "====== (esm)COMPILING: \$(npm bin)/tsc -p ${SRCDIR}/tsconfig-es2015.json ====="
+      $(npm bin)/tsc -p ${SRCDIR}/tsconfig-es2015.json
+    else
+      echo "====== (esm)COMPILING: $NG_TC -p ${SRCDIR}/tsconfig-es2015.json ====="
+      $NG_TC -p ${SRCDIR}/tsconfig-es2015.json
+    fi
+
+    echo "======      BUNDLING: ${SRCDIR} ====="
+    (
+      cd  ${SRCDIR}
+      echo "..."  # here just to have grep match something and not exit with 1
+      ../../../node_modules/.bin/rollup -c rollup.config.js
+    ) 2>&1 | grep -v "as external dependency"
+
+    # workaround for https://github.com/rollup/rollup/issues/626
+    if [[ ${TRAVIS} ]]; then
+      sed -i    "s/ class exports\./ class /g" ${DESTDIR}/esm/${PACKAGE}.umd.js
+    else
+      sed -i '' "s/ class exports\./ class /g" ${DESTDIR}/esm/${PACKAGE}.umd.js
+    fi
+
+    $(npm bin)/tsc  \
+        --out ${UMDES5PATH} \
+        --target es5 \
+        --allowJs \
+        ${UMDES6PATH} \
+        modules/\@angular/manual_typings/globals.d.ts \
+        modules/\@angular/typings/es6-collections/es6-collections.d.ts \
+        modules/\@angular/typings/es6-promise/es6-promise.d.ts
+    rm ${UMDES6PATH}
+
+    cat ./modules/@angular/license-banner.txt > ${UMDES5PATH}.tmp
+    cat ${UMDES5PATH} >> ${UMDES5PATH}.tmp
+    mv ${UMDES5PATH}.tmp ${UMDES5PATH}
 
-  if [[ ${PACKAGE} == "router-deprecated" ]]; then
-    echo "====== (esm)COMPILING: \$(npm bin)/tsc -p ${SRCDIR}/tsconfig-es2015.json ====="
-    $(npm bin)/tsc -p ${SRCDIR}/tsconfig-es2015.json
-  else
-    echo "====== (esm)COMPILING: \$(npm bin)/ng2tc -p ${SRCDIR}/tsconfig-es2015.json ====="
-    $(npm bin)/ng2tc -p ${SRCDIR}/tsconfig-es2015.json
   fi
-
-
-  echo "======      BUNDLING: ${SRCDIR} ====="
-  (
-    cd  ${SRCDIR}
-    echo "..."  # here just to have grep match something and not exit with 1
-    ../../../node_modules/.bin/rollup -c rollup.config.js
-  ) 2>&1 | grep -v "as external dependency"
-
-  # workaround for https://github.com/rollup/rollup/issues/626
-  if [[ ${TRAVIS} ]]; then
-    sed -i    "s/ class exports\./ class /g" ${DESTDIR}/esm/${PACKAGE}.umd.js
-  else
-    sed -i '' "s/ class exports\./ class /g" ${DESTDIR}/esm/${PACKAGE}.umd.js
-  fi
-
-  $(npm bin)/tsc  \
-      --out ${UMDES5PATH} \
-      --target es5 \
-      --allowJs \
-      ${UMDES6PATH} \
-      modules/\@angular/manual_typings/globals.d.ts \
-      modules/\@angular/typings/es6-collections/es6-collections.d.ts \
-      modules/\@angular/typings/es6-promise/es6-promise.d.ts
-  rm ${UMDES6PATH}
-
-  cat ./modules/@angular/license-banner.txt > ${UMDES5PATH}.tmp
-  cat ${UMDES5PATH} >> ${UMDES5PATH}.tmp
-  mv ${UMDES5PATH}.tmp ${UMDES5PATH}
-
 done