Fix typings for bundled definitions

Author: devversion

tools/gulp/tasks/release.ts

@@ -1,21 +1,18 @@
 import {spawn} from 'child_process';
-import {existsSync, statSync, copySync} from 'fs-extra';
+import {existsSync, statSync, copySync, writeFileSync} from 'fs-extra';
 import {join} from 'path';
 import {task, src, dest} from 'gulp';
 import {execTask, sequenceTask} from '../util/task_helpers';
-import {DIST_RELEASE, DIST_BUNDLES, DIST_MATERIAL, COMPONENTS_DIR} from '../constants';
+import {
+  DIST_RELEASE, DIST_BUNDLES, DIST_MATERIAL, COMPONENTS_DIR, LICENSE_BANNER
+} from '../constants';
 import * as minimist from 'minimist';
 
 /** Parse command-line arguments for release task. */
 const argv = minimist(process.argv.slice(3));
 
-// Capture all d.ts files output by typescript compilation except for the
-// special files generated by ngc.
-const typingsGlob = [
-  join(DIST_MATERIAL, '**', '*.d.ts'),
-  `!${join(DIST_MATERIAL, 'index.d.ts')}`,
-  `!${join(DIST_MATERIAL, 'public_api.d.ts')}`,
-];
+// Capture all d.ts files output by typescript compilation.
+const typingsGlob = join(DIST_MATERIAL, '**', '*.d.ts');
 
 const assetsGlob = join(COMPONENTS_DIR, '+(package.json|README.md)');
 
@@ -43,29 +40,38 @@ task(':package:release', [
 /** Copy metatadata.json and associated d.ts files to the root of the package structure. */
 task(':package:metadata', () => {
   // See: https://github.com/angular/angular/blob/master/build.sh#L293-L294
-  copySync(join(DIST_MATERIAL, 'public_api.d.ts'), join(DIST_RELEASE, 'public_api.d.ts'));
-  copySync(join(DIST_MATERIAL, 'index.d.ts'), join(DIST_RELEASE, 'material.d.ts'));
   copySync(join(DIST_MATERIAL, 'index.metadata.json'),
       join(DIST_RELEASE, 'material.metadata.json'));
 });
 
 task(':package:assets', () => src(assetsGlob).pipe(dest(DIST_RELEASE)));
 
 /** Copy all d.ts except the special flat typings from ngc to typings/ in the release package. */
-task(':package:typings', () => src(typingsGlob).pipe(dest(join(DIST_RELEASE, 'typings'))));
+task(':package:typings', () => {
+  return src(typingsGlob)
+    .pipe(dest(join(DIST_RELEASE, 'typings')))
+    .on('end', () => createTypingFile());
+});
 
 /** Copy umd bundles to the root of the release package. */
 task(':package:umd', () => src(umdGlob).pipe((dest(join(DIST_RELEASE, 'bundles')))));
 
-/** Copy fesm bundles to @angular/material in the release package */
-task(':package:fesm', () => src(fesmGlob).pipe(dest(join(DIST_RELEASE, '@angular', 'material'))));
+/** Copy primary entry-point FESM bundles to the @angular/ directory. */
+task(':package:fesm', () => src(fesmGlob).pipe(dest(join(DIST_RELEASE, '@angular'))));
 
 /** Make sure we're logged in. */
 task(':publish:whoami', execTask('npm', ['whoami'], {
   silent: true,
   errMessage: 'You must be logged in to publish.'
 }));
 
+/** Create a typing file that links to the bundled definitions of NGC. */
+function createTypingFile() {
+  writeFileSync(join(DIST_RELEASE, 'material.d.ts'),
+    LICENSE_BANNER + '\nexport * from "./typings/index";'
+  );
+}
+
 task(':publish:logout', execTask('npm', ['logout']));