Fix AOT task

Author: devversion

src/demo-app/tsconfig-aot.json

@@ -4,7 +4,7 @@
   "compilerOptions": {
     "experimentalDecorators": true,
     "paths": {
-      "@angular/material": ["../material"]
+      "@angular/material": ["./material"]
     }
   },
   "files": [

tools/gulp/tasks/aot.ts

@@ -1,32 +1,21 @@
 import {task} from 'gulp';
-import {DIST_DEMOAPP, SOURCE_ROOT} from '../constants';
-import {sequenceTask} from '../util/task_helpers';
+import {copySync} from 'fs-extra';
+import {DIST_DEMOAPP, DIST_RELEASE} from '../constants';
+import {sequenceTask, execNodeTask} from '../util/task_helpers';
 import {join} from 'path';
-import {Program, CompilerHost} from 'typescript';
-import {
-  main as tsc, CodeGenerator, AngularCompilerOptions, NgcCliOptions
-} from '@angular/compiler-cli';
 
-const tsconfigFile = join(SOURCE_ROOT, 'demo-app', 'tsconfig-aot.json');
+const tsconfigFile = join(DIST_DEMOAPP, 'tsconfig-aot.json');
 
 /** Builds the demo-app and library. To be able to run NGC, apply the metadata workaround. */
-task('aot:deps', sequenceTask('build:devapp', 'library:build:fix-metadata'));
+task('aot:deps', sequenceTask('build:devapp', ':package:release', 'aot:copy-release'));
 
-/** After building the demo-app, run the Angular compiler to verify that all components work. */
-task('aot:build', ['aot:deps'], () => runAngularCompiler());
+// As a workaround for https://github.com/angular/angular/issues/12249, we need to
+// copy the Material ESM output inside of the demo-app output.
+task('aot:copy-release', () => {
+  copySync(DIST_RELEASE, join(DIST_DEMOAPP, 'material'));
+});
 
-/**
- * Angular does not expose a public function to run the Angular compiler.
- * Creating the CodeGenerator from NGC and using it inside of tsc-wrapped is the same. */
-function runAngularCompiler() {
-  return tsc(tsconfigFile, {basePath: DIST_DEMOAPP}, codegen);
-}
-
-/**
- * Codgen function from the @angular/compiler-cli package.
- * See: https://github.com/angular/angular/blob/master/packages/compiler-cli/src/main.ts
- */
-function codegen(ngOptions: AngularCompilerOptions, cliOptions: NgcCliOptions, program: Program,
-    host: CompilerHost) {
-  return CodeGenerator.create(ngOptions, cliOptions, program, host).codegen();
-}
+/** Build the demo-app and a release to confirm that the library is AOT-compatible. */
+task('aot:build', ['aot:deps'], execNodeTask(
+  '@angular/compiler-cli', 'ngc', ['-p', tsconfigFile]
+));

tools/gulp/tasks/library.ts

@@ -1,4 +1,4 @@
-import {task, watch, src, dest} from 'gulp';
+import {task, watch} from 'gulp';
 import {join} from 'path';
 import {main as tsc} from '@angular/tsc-wrapped';
 import {SOURCE_ROOT, DIST_BUNDLES, DIST_MATERIAL, UGLIFYJS_OPTIONS} from '../constants';
@@ -10,7 +10,6 @@ import {writeFileSync} from 'fs';
 
 // There are no type definitions available for these imports.
 const inlineResources = require('../../../scripts/release/inline-resources');
-const gulpRename = require('gulp-rename');
 const uglify = require('uglify-js');
 
 const libraryRoot = join(SOURCE_ROOT, 'lib');
@@ -38,17 +37,6 @@ task('library:watch', () => {
   watch(join(libraryRoot, '**/*.html'), ['library:build', triggerLivereload]);
 });
 
-/**
- * Workaround for a @angular/tsc-wrapped issue, where the compiler looks for component assets
- * in the wrong folder. This issue only appears for bundled metadata files.
- * As a workaround, we just copy all assets next to the metadata bundle.
- **/
-task('library:build:fix-metadata', () => {
-  return src('**/*.+(html|css)', { cwd: materialDir })
-    .pipe(gulpRename({dirname: ''}))
-    .pipe(dest(materialDir));
-});
-
 /**
  * TypeScript compilation tasks. Tasks are creating ESM, FESM, UMD bundles for releases.
  **/

tools/gulp/tasks/release.ts

@@ -8,18 +8,19 @@ import {
 } from '../constants';
 import * as minimist from 'minimist';
 
+// There are no type definitions available for these imports.
+const gulpRename = require('gulp-rename');
+
 /** Parse command-line arguments for release task. */
 const argv = minimist(process.argv.slice(3));
 
-// Capture all d.ts files output by typescript compilation.
-const typingsGlob = join(DIST_MATERIAL, '**', '*.d.ts');
-
+// Matches all Typescript definition files for Material.
+const typingsGlob = join(DIST_MATERIAL, '**/*.d.ts');
+// Matches the "package.json" and "README.md" file that needs to be shipped.
 const assetsGlob = join(COMPONENTS_DIR, '+(package.json|README.md)');
-
-// Capture all UMD bundles.
+// Matches all UMD bundles inside of the bundles distribution.
 const umdGlob = join(DIST_BUNDLES, '*.umd.*');
-
-// Capture all flat ESM bunldes (e.g., "material.js" and "material.es5.js")
+// Matches all flat ESM bundles (e.g material.js and material.es5.js)
 const fesmGlob = [join(DIST_BUNDLES, '*.js'), `!${umdGlob}`];
 
 task('build:release', sequenceTask(
@@ -29,13 +30,24 @@ task('build:release', sequenceTask(
 
 /** Task that combines intermediate build artifacts into the release package structure. */
 task(':package:release', [
+  ':package:fix-metadata',
   ':package:metadata',
   ':package:typings',
   ':package:umd',
   ':package:fesm',
   ':package:assets'
 ]);
 
+/**
+ * Workaround for a @angular/tsc-wrapped issue, where the compiler looks for component assets
+ * in the wrong folder. This issue only appears for bundled metadata files.
+ * As a workaround, we just copy all assets next to the metadata bundle.
+ **/
+task(':package:fix-metadata', () => {
+  return src('**/*.+(html|css)', { cwd: DIST_MATERIAL })
+  .pipe(gulpRename({dirname: ''}))
+  .pipe(dest(DIST_RELEASE));
+});
 
 /** Copy metatadata.json and associated d.ts files to the root of the package structure. */
 task(':package:metadata', () => {