chore: bump versions of Angular and devkit betas (#13359)

jelbourn · web-flow · commit 8ed012990687 · 2018-09-30T07:43:48.000-07:00
We can't bump to Angular 7 RC because it requires TypeScript 3.1, and
devkit/schematics hasn't published a version w/ TypeScript 3.1 yet.
Since it's a full dependency there (and not a peer dependency), the
version mismatch breaks our schematics.

For going to Angular 7 beta.7, we need to now explicitly unset some of
the `angularCompilerOptions` in the `tsconfig-test` because they're now
inherited.

For going to devkit/schematics v6 beta 4, we need to update some imports
around the `WorkspaceProject` class. There seem to now be two
incompatible versions of this class in the devkit, so we'll need to sort
that out soon.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -25,15 +25,15 @@
     "breaking-changes": "gulp breaking-changes"
   },
   "version": "7.0.0-beta.2",
-  "requiredAngularVersion": ">=7.0.0-beta.5",
+  "requiredAngularVersion": ">=7.0.0-beta.7",
   "dependencies": {
-    "@angular/animations": "7.0.0-beta.5",
-    "@angular/common": "7.0.0-beta.5",
-    "@angular/compiler": "7.0.0-beta.5",
-    "@angular/core": "7.0.0-beta.5",
-    "@angular/elements": "7.0.0-beta.5",
-    "@angular/forms": "7.0.0-beta.5",
-    "@angular/platform-browser": "7.0.0-beta.5",
+    "@angular/animations": "7.0.0-beta.7",
+    "@angular/common": "7.0.0-beta.7",
+    "@angular/compiler": "7.0.0-beta.7",
+    "@angular/core": "7.0.0-beta.7",
+    "@angular/elements": "7.0.0-beta.7",
+    "@angular/forms": "7.0.0-beta.7",
+    "@angular/platform-browser": "7.0.0-beta.7",
     "@webcomponents/custom-elements": "^1.1.0",
     "core-js": "^2.4.1",
     "rxjs": "^6.3.2",
@@ -43,20 +43,20 @@
     "zone.js": "^0.8.26"
   },
   "devDependencies": {
-    "@angular-devkit/core": "^0.9.0-beta.3",
-    "@angular-devkit/schematics": "^0.9.0-beta.3",
-    "@angular/bazel": "7.0.0-beta.5",
-    "@angular/compiler-cli": "7.0.0-beta.5",
-    "@angular/http": "7.0.0-beta.5",
-    "@angular/platform-browser-dynamic": "7.0.0-beta.5",
-    "@angular/platform-server": "7.0.0-beta.5",
-    "@angular/router": "7.0.0-beta.5",
-    "@angular/upgrade": "7.0.0-beta.5",
+    "@angular-devkit/core": "7.0.0-beta.4",
+    "@angular-devkit/schematics": "7.0.0-beta.4",
+    "@angular/bazel": "7.0.0-beta.7",
+    "@angular/compiler-cli": "7.0.0-beta.7",
+    "@angular/http": "7.0.0-beta.7",
+    "@angular/platform-browser-dynamic": "7.0.0-beta.7",
+    "@angular/platform-server": "7.0.0-beta.7",
+    "@angular/router": "7.0.0-beta.7",
+    "@angular/upgrade": "7.0.0-beta.7",
     "@bazel/ibazel": "0.3.1",
     "@bazel/typescript": "^0.18.0",
     "@google-cloud/storage": "^1.1.1",
     "@octokit/rest": "^15.9.4",
-    "@schematics/angular": "^0.9.0-beta.2",
+    "@schematics/angular": "7.0.0-beta.4",
     "@types/chalk": "^0.4.31",
     "@types/fs-extra": "^4.0.3",
     "@types/glob": "^5.0.33",
diff --git a/src/cdk-experimental/tsconfig-tests.json b/src/cdk-experimental/tsconfig-tests.json
@@ -16,7 +16,12 @@
   "angularCompilerOptions": {
     "strictMetadataEmit": true,
     "skipTemplateCodegen": true,
-    "emitDecoratorMetadata": true
+    "emitDecoratorMetadata": true,
+
+    // Unset options inherited from tsconfig-build
+    "annotateForClosureCompiler": false,
+    "flatModuleOutFile": null,
+    "flatModuleId": null,
   },
   "include": [
     // Include the index.ts for each secondary entry-point
diff --git a/src/cdk/schematics/utils/ast.ts b/src/cdk/schematics/utils/ast.ts
@@ -6,16 +6,18 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {WorkspaceProject} from '@angular-devkit/core/src/workspace';
 import {SchematicsException, Tree} from '@angular-devkit/schematics';
 import {Schema as ComponentOptions} from '@schematics/angular/component/schema';
 import {addImportToModule} from '@schematics/angular/utility/ast-utils';
 import {InsertChange} from '@schematics/angular/utility/change';
-import {getWorkspace, WorkspaceProject} from '@schematics/angular/utility/config';
+import {getWorkspace} from '@schematics/angular/utility/config';
 import {findModuleFromOptions as internalFindModule} from '@schematics/angular/utility/find-module';
 import {getAppModulePath} from '@schematics/angular/utility/ng-ast-utils';
 import {getProjectMainFile} from './project-main-file';
 import {ts} from './version-agnostic-typescript';
 
+
 /** Reads file given path and returns TypeScript source file. */
 export function getSourceFile(host: Tree, path: string) {
   const buffer = host.read(path);
diff --git a/src/cdk/schematics/utils/build-component.ts b/src/cdk/schematics/utils/build-component.ts
@@ -181,7 +181,9 @@ export function buildComponent(options: ComponentOptions,
       .forEach(optionName => options[optionName] = defaultComponentOptions[optionName]);
 
     if (options.path === undefined) {
-      options.path = buildDefaultPath(project);
+      // TODO(jelbourn): figure out if the need for this `as any` is a bug due to two different
+      // incompatible `WorkspaceProject` classes in @angular-devkit
+      options.path = buildDefaultPath(project as any);
     }
 
     options.module = findModuleFromOptions(host, options);
diff --git a/src/cdk/schematics/utils/get-project.ts b/src/cdk/schematics/utils/get-project.ts
@@ -6,14 +6,15 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {WorkspaceProject, WorkspaceSchema} from '@schematics/angular/utility/config';
+import {WorkspaceSchema, WorkspaceProject} from '@angular-devkit/core/src/workspace';
 
 /**
  * Finds the specified project configuration in the workspace. Throws an error if the project
  * couldn't be found.
  */
-export function getProjectFromWorkspace(workspace: WorkspaceSchema,
-                                        projectName?: string): WorkspaceProject {
+export function getProjectFromWorkspace(
+    workspace: WorkspaceSchema,
+    projectName?: string): WorkspaceProject {
 
   const project = workspace.projects[projectName || workspace.defaultProject!];
 
@@ -22,5 +23,4 @@ export function getProjectFromWorkspace(workspace: WorkspaceSchema,
   }
 
   return project;
-
 }
diff --git a/src/cdk/schematics/utils/project-main-file.ts b/src/cdk/schematics/utils/project-main-file.ts
@@ -6,8 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {WorkspaceProject} from '@angular-devkit/core/src/workspace';
 import {SchematicsException} from '@angular-devkit/schematics';
-import {WorkspaceProject} from '@schematics/angular/utility/config';
 import {getProjectTargetOptions} from './project-targets';
 
 /** Looks for the main TypeScript file in the given project and returns its path. */
diff --git a/src/cdk/schematics/utils/project-style-file.ts b/src/cdk/schematics/utils/project-style-file.ts
@@ -7,7 +7,7 @@
  */
 
 import {normalize} from '@angular-devkit/core';
-import {WorkspaceProject} from '@schematics/angular/utility/config';
+import {WorkspaceProject} from '@angular-devkit/core/src/workspace';
 import {getProjectTargetOptions} from './project-targets';
 
 /** Regular expression that matches all possible Angular CLI default style files. */
diff --git a/src/cdk/schematics/utils/project-targets.ts b/src/cdk/schematics/utils/project-targets.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {WorkspaceProject} from '@schematics/angular/utility/config';
+import {WorkspaceProject} from '@angular-devkit/core/src/workspace';
 
 /** Resolves the architect options for the build target of the given project. */
 export function getProjectTargetOptions(project: WorkspaceProject, buildTarget: string) {
diff --git a/src/cdk/schematics/utils/schematic-options.ts b/src/cdk/schematics/utils/schematic-options.ts
@@ -6,7 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {WorkspaceProject} from '@schematics/angular/utility/config';
+import {WorkspaceProject} from '@angular-devkit/core/src/workspace';
+
 
 /**
  * Returns the default options for the `@schematics/angular:component` schematic which would
diff --git a/src/cdk/tsconfig-tests.json b/src/cdk/tsconfig-tests.json
@@ -21,7 +21,12 @@
     "strictMetadataEmit": true,
     "skipTemplateCodegen": true,
     "emitDecoratorMetadata": true,
-    "fullTemplateTypeCheck": true
+    "fullTemplateTypeCheck": true,
+
+    // Unset options inherited from tsconfig-build
+    "annotateForClosureCompiler": false,
+    "flatModuleOutFile": null,
+    "flatModuleId": null,
   },
   "include": [
     // Include the index.ts for each secondary entry-point
diff --git a/src/lib/schematics/ng-add/fonts/head-element.ts b/src/lib/schematics/ng-add/fonts/head-element.ts
@@ -6,12 +6,13 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {WorkspaceProject} from '@angular-devkit/core/src/workspace';
 import {SchematicsException, Tree} from '@angular-devkit/schematics';
 import {getChildElementIndentation} from '@angular/cdk/schematics';
-import {WorkspaceProject} from '@schematics/angular/utility/config';
 import {DefaultTreeDocument, DefaultTreeElement, parse as parseHtml} from 'parse5';
 import {getIndexHtmlPath} from './project-index-html';
 
+
 /** Appends the given element HTML fragment to the index.html head tag. */
 export function appendElementToHead(host: Tree, project: WorkspaceProject, elementHtml: string) {
   const indexPath = getIndexHtmlPath(project);
diff --git a/src/lib/schematics/ng-add/fonts/project-index-html.ts b/src/lib/schematics/ng-add/fonts/project-index-html.ts
@@ -6,9 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {WorkspaceProject} from '@angular-devkit/core/src/workspace';
 import {SchematicsException} from '@angular-devkit/schematics';
 import {getProjectTargetOptions} from '@angular/cdk/schematics';
-import {WorkspaceProject} from '@schematics/angular/utility/config';
+
 
 /** Looks for the index HTML file in the given project and returns its path. */
 export function getIndexHtmlPath(project: WorkspaceProject): string {
diff --git a/src/lib/schematics/ng-add/index.spec.ts b/src/lib/schematics/ng-add/index.spec.ts
@@ -1,4 +1,5 @@
 import {normalize} from '@angular-devkit/core';
+import {WorkspaceProject} from '@angular-devkit/core/src/workspace';
 import {Tree} from '@angular-devkit/schematics';
 import {SchematicTestRunner} from '@angular-devkit/schematics/testing';
 import {
@@ -7,7 +8,7 @@ import {
   getProjectStyleFile,
   getProjectTargetOptions,
 } from '@angular/cdk/schematics';
-import {getWorkspace, WorkspaceProject} from '@schematics/angular/utility/config';
+import {getWorkspace} from '@schematics/angular/utility/config';
 import {getFileContent} from '@schematics/angular/utility/test';
 import {getIndexHtmlPath} from './fonts/project-index-html';
 
diff --git a/src/lib/schematics/ng-add/theming/theming.ts b/src/lib/schematics/ng-add/theming/theming.ts
@@ -7,14 +7,15 @@
  */
 
 import {normalize} from '@angular-devkit/core';
+import {WorkspaceProject, WorkspaceSchema} from '@angular-devkit/core/src/workspace';
 import {SchematicsException, Tree} from '@angular-devkit/schematics';
 import {
   getProjectFromWorkspace,
   getProjectStyleFile,
   getProjectTargetOptions,
 } from '@angular/cdk/schematics';
 import {InsertChange} from '@schematics/angular/utility/change';
-import {getWorkspace, WorkspaceProject, WorkspaceSchema} from '@schematics/angular/utility/config';
+import {getWorkspace} from '@schematics/angular/utility/config';
 import {join} from 'path';
 import {Schema} from '../schema';
 import {createCustomTheme} from './custom-theme';
diff --git a/src/lib/tsconfig-tests.json b/src/lib/tsconfig-tests.json
@@ -17,7 +17,12 @@
     "strictMetadataEmit": true,
     "skipTemplateCodegen": true,
     "emitDecoratorMetadata": true,
-    "fullTemplateTypeCheck": true
+    "fullTemplateTypeCheck": true,
+
+    // Unset options inherited from tsconfig-build
+    "annotateForClosureCompiler": false,
+    "flatModuleOutFile": null,
+    "flatModuleId": null,
   },
   "include": [
     "**/*.spec.ts",
diff --git a/src/material-examples/tsconfig-tests.json b/src/material-examples/tsconfig-tests.json
@@ -13,7 +13,12 @@
     "strictMetadataEmit": true,
     "skipTemplateCodegen": true,
     "emitDecoratorMetadata": true,
-    "fullTemplateTypeCheck": true
+    "fullTemplateTypeCheck": true,
+
+    // Unset options inherited from tsconfig-build
+    "annotateForClosureCompiler": false,
+    "flatModuleOutFile": null,
+    "flatModuleId": null,
   },
   "include": [
     "**/*.spec.ts",
diff --git a/src/material-experimental/tsconfig-tests.json b/src/material-experimental/tsconfig-tests.json
@@ -13,7 +13,12 @@
     "strictMetadataEmit": true,
     "skipTemplateCodegen": true,
     "emitDecoratorMetadata": true,
-    "fullTemplateTypeCheck": true
+    "fullTemplateTypeCheck": true,
+
+    // Unset options inherited from tsconfig-build
+    "annotateForClosureCompiler": false,
+    "flatModuleOutFile": null,
+    "flatModuleId": null,
   },
   "include": [
     "**/*.spec.ts",
diff --git a/src/material-moment-adapter/tsconfig-tests.json b/src/material-moment-adapter/tsconfig-tests.json
@@ -13,7 +13,12 @@
     "strictMetadataEmit": true,
     "skipTemplateCodegen": true,
     "emitDecoratorMetadata": true,
-    "fullTemplateTypeCheck": true
+    "fullTemplateTypeCheck": true,
+
+    // Unset options inherited from tsconfig-build
+    "annotateForClosureCompiler": false,
+    "flatModuleOutFile": null,
+    "flatModuleId": null,
   },
   "include": [
     "**/*.spec.ts",

Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,9 @@ export function buildComponent(options: ComponentOptions,`
`181`	`181`	`.forEach(optionName => options[optionName] = defaultComponentOptions[optionName]);`
`182`	`182`
`183`	`183`	`if (options.path === undefined) {`
`184`		`- options.path = buildDefaultPath(project);`
	`184`	+ // TODO(jelbourn): figure out if the need for this `as any` is a bug due to two different
	`185`	+ // incompatible `WorkspaceProject` classes in @angular-devkit
	`186`	`+ options.path = buildDefaultPath(project as any);`
`185`	`187`	`}`
`186`	`188`
`187`	`189`	`options.module = findModuleFromOptions(host, options);`