build: prepare TypeScript 4.7

crisbeto · dgp1130 · commit 0892f5910afe · 2022-05-06T15:51:04.000-07:00
Expands the version range to allow TypeScript 4.7 and makes the necessary code changes in order to support it. (cherry picked from commit 0301cf6)
diff --git a/goldens/public-api/angular_devkit/schematics/index.md b/goldens/public-api/angular_devkit/schematics/index.md
@@ -71,7 +71,7 @@ export function applyContentTemplate<T>(options: T): FileOperator;
 export function applyPathTemplate<T extends PathTemplateData>(data: T, options?: PathTemplateOptions): FileOperator;
 
 // @public (undocumented)
-export function applyTemplates<T>(options: T): Rule;
+export function applyTemplates<T extends object>(options: T): Rule;
 
 // @public (undocumented)
 export function applyToSubtree(path: string, rules: Rule[]): Rule;
@@ -904,11 +904,11 @@ export class TaskScheduler {
     // (undocumented)
     finalize(): ReadonlyArray<TaskInfo>;
     // (undocumented)
-    schedule<T>(taskConfiguration: TaskConfiguration<T>): TaskId;
+    schedule<T extends object>(taskConfiguration: TaskConfiguration<T>): TaskId;
 }
 
 // @public (undocumented)
-export function template<T>(options: T): Rule;
+export function template<T extends object>(options: T): Rule;
 
 // @public (undocumented)
 export const TEMPLATE_FILENAME_RE: RegExp;
@@ -939,7 +939,7 @@ export const TreeSymbol: symbol;
 // @public
 export interface TypedSchematicContext<CollectionMetadataT extends object, SchematicMetadataT extends object> {
     // (undocumented)
-    addTask<T>(task: TaskConfigurationGenerator<T>, dependencies?: Array<TaskId>): TaskId;
+    addTask<T extends object>(task: TaskConfigurationGenerator<T>, dependencies?: Array<TaskId>): TaskId;
     // (undocumented)
     readonly debug: boolean;
     // (undocumented)
diff --git a/goldens/public-api/angular_devkit/schematics/testing/index.md b/goldens/public-api/angular_devkit/schematics/testing/index.md
@@ -25,9 +25,9 @@ export class SchematicTestRunner {
     // (undocumented)
     registerCollection(collectionName: string, collectionPath: string): void;
     // (undocumented)
-    runExternalSchematicAsync<SchematicSchemaT>(collectionName: string, schematicName: string, opts?: SchematicSchemaT, tree?: Tree_2): Observable<UnitTestTree>;
+    runExternalSchematicAsync<SchematicSchemaT extends object>(collectionName: string, schematicName: string, opts?: SchematicSchemaT, tree?: Tree_2): Observable<UnitTestTree>;
     // (undocumented)
-    runSchematicAsync<SchematicSchemaT>(schematicName: string, opts?: SchematicSchemaT, tree?: Tree_2): Observable<UnitTestTree>;
+    runSchematicAsync<SchematicSchemaT extends object>(schematicName: string, opts?: SchematicSchemaT, tree?: Tree_2): Observable<UnitTestTree>;
     // (undocumented)
     get tasks(): TaskConfiguration[];
 }
diff --git a/package.json b/package.json
@@ -169,7 +169,7 @@
     "magic-string": "0.26.1",
     "mini-css-extract-plugin": "2.6.0",
     "minimatch": "5.0.1",
-    "ng-packagr": "14.0.0-next.5",
+    "ng-packagr": "14.0.0-next.8",
     "node-fetch": "^2.2.0",
     "npm-package-arg": "9.0.2",
     "open": "8.4.0",
diff --git a/packages/angular/cli/src/command-builder/architect-base-command-module.ts b/packages/angular/cli/src/command-builder/architect-base-command-module.ts
@@ -32,7 +32,7 @@ export interface MissingTargetChoice {
   value: string;
 }
 
-export abstract class ArchitectBaseCommandModule<T>
+export abstract class ArchitectBaseCommandModule<T extends object>
   extends CommandModule<T>
   implements CommandModuleImplementation<T>
 {
diff --git a/packages/angular/cli/src/command-builder/utilities/command.ts b/packages/angular/cli/src/command-builder/utilities/command.ts
@@ -12,7 +12,7 @@ import { CommandContext, CommandModule, CommandModuleImplementation } from '../c
 export const demandCommandFailureMessage = `You need to specify a command before moving on. Use '--help' to view the available commands.`;
 
 export function addCommandModuleToYargs<
-  T,
+  T extends object,
   U extends Partial<CommandModuleImplementation> & {
     new (context: CommandContext): Partial<CommandModuleImplementation> & CommandModule;
   },
diff --git a/packages/angular_devkit/architect/src/create-builder.ts b/packages/angular_devkit/architect/src/create-builder.ts
@@ -202,7 +202,7 @@ export function createBuilder<OptT = json.JsonObject, OutT extends BuilderOutput
         context.reportRunning();
         let result;
         try {
-          result = fn(i.options as OptT, context);
+          result = fn(i.options as unknown as OptT, context);
           if (isBuilderOutput(result)) {
             result = of(result);
           } else if (!isObservable(result) && isAsyncIterable(result)) {
diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
@@ -80,7 +80,7 @@
     "ng-packagr": "^14.0.0 || ^14.0.0-next",
     "protractor": "^7.0.0",
     "tailwindcss": "^2.0.0 || ^3.0.0",
-    "typescript": "~4.6.2"
+    "typescript": ">=4.6.2 <4.8"
   },
   "peerDependenciesMeta": {
     "@angular/localize": {
diff --git a/packages/angular_devkit/build_angular/src/testing/builder-harness.ts b/packages/angular_devkit/build_angular/src/testing/builder-harness.ts
@@ -113,7 +113,7 @@ export class BuilderHarness<T> {
     return this;
   }
 
-  withBuilderTarget<O>(
+  withBuilderTarget<O extends object>(
     target: string,
     handler: BuilderHandlerFn<O & json.JsonObject>,
     options?: O,
@@ -178,12 +178,12 @@ export class BuilderHarness<T> {
       getOptions: async (project, target, configuration) => {
         this.validateProjectName(project);
         if (target === this.targetName) {
-          return this.options.get(configuration ?? null) ?? {};
+          return (this.options.get(configuration ?? null) ?? {}) as json.JsonObject;
         } else if (configuration !== undefined) {
           // Harness builder targets currently do not support configurations
           return {};
         } else {
-          return (this.builderTargets.get(target)?.options as json.JsonObject) || {};
+          return (this.builderTargets.get(target)?.options || {}) as json.JsonObject;
         }
       },
       hasTarget: async (project, target) => {
diff --git a/packages/angular_devkit/core/src/json/schema/registry.ts b/packages/angular_devkit/core/src/json/schema/registry.ts
@@ -402,7 +402,7 @@ export class CoreSchemaRegistry implements SchemaRegistry {
       throw new Error(source);
     }
 
-    this._sourceMap.set(source, provider);
+    this._sourceMap.set(source, provider as unknown as SmartDefaultProvider<{}>);
 
     if (!this._smartDefaultKeyword) {
       this._smartDefaultKeyword = true;
diff --git a/packages/angular_devkit/core/src/utils/object.ts b/packages/angular_devkit/core/src/utils/object.ts
@@ -12,7 +12,7 @@ export function deepCopy<T>(value: T): T {
   if (Array.isArray(value)) {
     return value.map((o) => deepCopy(o)) as unknown as T;
   } else if (value && typeof value === 'object') {
-    const valueCasted = value as {
+    const valueCasted = value as unknown as {
       [copySymbol]?: T;
       toJSON?: () => string;
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
diff --git a/packages/angular_devkit/core/src/workspace/json/reader_spec.ts b/packages/angular_devkit/core/src/workspace/json/reader_spec.ts
@@ -317,7 +317,7 @@ describe('JSON WorkspaceDefinition Tracks Workspace Changes', () => {
 
     const workspace = await readJsonWorkspace('', host);
 
-    Object.assign(workspace.extensions['x-foo'], { x: 9, y: 8 }, { z: 7 });
+    Object.assign(workspace.extensions['x-foo']!, { x: 9, y: 8 }, { z: 7 });
     expect(workspace.extensions['x-foo']).toEqual({
       is: ['good', 'great', 'awesome'],
       x: 9,
@@ -355,7 +355,7 @@ describe('JSON WorkspaceDefinition Tracks Workspace Changes', () => {
     const workspace = await readJsonWorkspace('', host);
 
     workspace.extensions['x-foo'] = Object.assign(
-      workspace.extensions['x-foo'],
+      workspace.extensions['x-foo']!,
       { x: 9, y: 8 },
       { z: 7 },
     );
diff --git a/packages/angular_devkit/schematics/src/engine/engine.ts b/packages/angular_devkit/schematics/src/engine/engine.ts
@@ -141,7 +141,7 @@ export class TaskScheduler {
     return new Set(tasks);
   }
 
-  schedule<T>(taskConfiguration: TaskConfiguration<T>): TaskId {
+  schedule<T extends object>(taskConfiguration: TaskConfiguration<T>): TaskId {
     const dependencies = this._mapDependencies(taskConfiguration.dependencies);
     const priority = this._calculatePriority(dependencies);
 
@@ -275,7 +275,10 @@ export class SchematicEngine<CollectionT extends object, SchematicT extends obje
     const host = this._host;
     this._taskSchedulers.push(taskScheduler);
 
-    function addTask<T>(task: TaskConfigurationGenerator<T>, dependencies?: Array<TaskId>): TaskId {
+    function addTask<T extends object>(
+      task: TaskConfigurationGenerator<T>,
+      dependencies?: Array<TaskId>,
+    ): TaskId {
       const config = task.toConfiguration();
 
       if (!host.hasTaskExecutor(config.name)) {
diff --git a/packages/angular_devkit/schematics/src/engine/interface.ts b/packages/angular_devkit/schematics/src/engine/interface.ts
@@ -198,7 +198,10 @@ export interface TypedSchematicContext<
   readonly schematic: Schematic<CollectionMetadataT, SchematicMetadataT>;
   readonly strategy: MergeStrategy;
   readonly interactive: boolean;
-  addTask<T>(task: TaskConfigurationGenerator<T>, dependencies?: Array<TaskId>): TaskId;
+  addTask<T extends object>(
+    task: TaskConfigurationGenerator<T>,
+    dependencies?: Array<TaskId>,
+  ): TaskId;
 }
 
 /**
diff --git a/packages/angular_devkit/schematics/src/rules/template.ts b/packages/angular_devkit/schematics/src/rules/template.ts
@@ -163,24 +163,24 @@ export function renameTemplateFiles(): Rule {
   );
 }
 
-export function template<T>(options: T): Rule {
+export function template<T extends object>(options: T): Rule {
   return chain([
     contentTemplate(options),
     // Force cast to PathTemplateData. We need the type for the actual pathTemplate() call,
     // but in this case we cannot do anything as contentTemplate are more permissive.
     // Since values are coerced to strings in PathTemplates it will be fine in the end.
-    pathTemplate((options as {}) as PathTemplateData),
+    pathTemplate(options as {} as PathTemplateData),
   ]);
 }
 
-export function applyTemplates<T>(options: T): Rule {
+export function applyTemplates<T extends object>(options: T): Rule {
   return forEach(
     when(
       (path) => path.endsWith('.template'),
       composeFileOperators([
         applyContentTemplate(options),
         // See above for this weird cast.
-        applyPathTemplate((options as {}) as PathTemplateData),
+        applyPathTemplate(options as {} as PathTemplateData),
         (entry) => {
           return {
             content: entry.content,
diff --git a/packages/angular_devkit/schematics/testing/schematic-test-runner.ts b/packages/angular_devkit/schematics/testing/schematic-test-runner.ts
@@ -78,7 +78,7 @@ export class SchematicTestRunner {
     this._engineHost.registerCollection(collectionName, collectionPath);
   }
 
-  runSchematicAsync<SchematicSchemaT>(
+  runSchematicAsync<SchematicSchemaT extends object>(
     schematicName: string,
     opts?: SchematicSchemaT,
     tree?: Tree,
@@ -92,7 +92,7 @@ export class SchematicTestRunner {
       .pipe(map((tree) => new UnitTestTree(tree)));
   }
 
-  runExternalSchematicAsync<SchematicSchemaT>(
+  runExternalSchematicAsync<SchematicSchemaT extends object>(
     collectionName: string,
     schematicName: string,
     opts?: SchematicSchemaT,
diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
@@ -23,7 +23,7 @@
   "dependencies": {},
   "peerDependencies": {
     "@angular/compiler-cli": "^14.0.0 || ^14.0.0-next",
-    "typescript": "~4.6.2",
+    "typescript": ">=4.6.2 <4.8",
     "webpack": "^5.54.0"
   },
   "devDependencies": {
diff --git a/packages/ngtools/webpack/src/ivy/host.ts b/packages/ngtools/webpack/src/ivy/host.ts
@@ -210,35 +210,40 @@ export function augmentHostWithNgcc(
 
   if (host.resolveTypeReferenceDirectives) {
     const baseResolveTypeReferenceDirectives = host.resolveTypeReferenceDirectives;
-    host.resolveTypeReferenceDirectives = function (names: string[], ...parameters) {
+    host.resolveTypeReferenceDirectives = function (
+      names: string[] | ts.FileReference[],
+      ...parameters
+    ) {
       return names.map((name) => {
-        const result = baseResolveTypeReferenceDirectives.call(host, [name], ...parameters);
+        const fileName = typeof name === 'string' ? name : name.fileName;
+        const result = baseResolveTypeReferenceDirectives.call(host, [fileName], ...parameters);
 
         if (result[0] && ngcc) {
-          ngcc.processModule(name, result[0]);
+          ngcc.processModule(fileName, result[0]);
         }
 
         return result[0];
       });
     };
   } else {
     host.resolveTypeReferenceDirectives = function (
-      moduleNames: string[],
+      moduleNames: string[] | ts.FileReference[],
       containingFile: string,
       redirectedReference: ts.ResolvedProjectReference | undefined,
       options: ts.CompilerOptions,
     ) {
       return moduleNames.map((name) => {
+        const fileName = typeof name === 'string' ? name : name.fileName;
         const result = ts.resolveTypeReferenceDirective(
-          name,
+          fileName,
           containingFile,
           options,
           host,
           redirectedReference,
         ).resolvedTypeReferenceDirective;
 
         if (result && ngcc) {
-          ngcc.processModule(name, result);
+          ngcc.processModule(fileName, result);
         }
 
         return result;
diff --git a/packages/schematics/angular/utility/latest-versions/package.json b/packages/schematics/angular/utility/latest-versions/package.json
@@ -11,7 +11,7 @@
     "karma-jasmine-html-reporter": "~1.7.0",
     "karma-jasmine": "~5.0.0",
     "karma": "~6.3.0",
-    "ng-packagr": "^14.0.0-next.2",
+    "ng-packagr": "^14.0.0-next.8",
     "rxjs": "~7.5.0",
     "tslib": "^2.3.0",
     "ts-node": "~10.7.0",
diff --git a/tests/legacy-cli/e2e/tests/misc/third-party-decorators.ts b/tests/legacy-cli/e2e/tests/misc/third-party-decorators.ts
@@ -6,10 +6,13 @@ import { updateJsonFile } from '../../utils/project';
 export default async function () {
   await updateJsonFile('package.json', (packageJson) => {
     // Install ngrx
-    packageJson['dependencies']['@ngrx/effects'] = '^9.1.0';
-    packageJson['dependencies']['@ngrx/schematics'] = '^9.1.0';
-    packageJson['dependencies']['@ngrx/store'] = '^9.1.0';
-    packageJson['dependencies']['@ngrx/store-devtools'] = '^9.1.0';
+    packageJson['dependencies']['@ngrx/effects'] = '^13.2.0';
+    packageJson['dependencies']['@ngrx/schematics'] = '^13.2.0';
+    packageJson['dependencies']['@ngrx/store'] = '^13.2.0';
+    packageJson['dependencies']['@ngrx/store-devtools'] = '^13.2.0';
+
+    // TODO(crisbeto): ngrx hasn't been updated for TS 4.7 yet.
+    packageJson['devDependencies']['typescript'] = '~4.6.2';
   });
 
   await installWorkspacePackages();
diff --git a/yarn.lock b/yarn.lock
@@ -177,7 +177,6 @@
 
 "@angular/dev-infra-private@https://github.com/angular/dev-infra-private-builds.git#54c89d2b5ea8a35006eafdcd4e24abab6a7c73b6":
   version "0.0.0-d9f50abe777f5077aee75a35f2fe65bb478638b5"
-  uid "54c89d2b5ea8a35006eafdcd4e24abab6a7c73b6"
   resolved "https://github.com/angular/dev-infra-private-builds.git#54c89d2b5ea8a35006eafdcd4e24abab6a7c73b6"
   dependencies:
     "@angular-devkit/build-angular" "14.0.0-next.13"
@@ -5349,7 +5348,7 @@ glob-to-regexp@^0.4.1:
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
   integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
 
-glob@8.0.1, glob@^8.0.1:
+glob@8.0.1, glob@^8.0.0, glob@^8.0.1:
   version "8.0.1"
   resolved "https://registry.yarnpkg.com/glob/-/glob-8.0.1.tgz#00308f5c035aa0b2a447cd37ead267ddff1577d3"
   integrity sha512-cF7FYZZ47YzmCu7dDy50xSRRfO3ErRfrXuLZcNIuyiJEco0XSrGtuilG19L5xp3NcwTx7Gn+X6Tv3fmsUPTbow==
@@ -5372,7 +5371,7 @@ glob@^6.0.1:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.0, glob@^7.0.3, glob@^7.0.6, glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7, glob@^7.2.0:
+glob@^7.0.0, glob@^7.0.3, glob@^7.0.6, glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
   integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
@@ -7198,10 +7197,10 @@ next-tick@1, next-tick@^1.1.0:
   resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.1.0.tgz#1836ee30ad56d67ef281b22bd199f709449b35eb"
   integrity sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==
 
-ng-packagr@14.0.0-next.5:
-  version "14.0.0-next.5"
-  resolved "https://registry.yarnpkg.com/ng-packagr/-/ng-packagr-14.0.0-next.5.tgz#40a308b358b1294c673e5bcaee6f656bda7d50b8"
-  integrity sha512-eaGDbrYRuQ17NzkasfFGdjEz1lhevLB4Sp4dCLbqJhormKwOSCtTwuxzKBcdNCzG0sJ0PBAWznuaateUvhFyAQ==
+ng-packagr@14.0.0-next.8:
+  version "14.0.0-next.8"
+  resolved "https://registry.yarnpkg.com/ng-packagr/-/ng-packagr-14.0.0-next.8.tgz#51b7c6bf8f4dce8cffa2063b22ae3142c8714354"
+  integrity sha512-xFIFVVgOHd8wIESq+SKgEQrYB24H0+sqb53ySHpdN5KLnVGbZ52BUtPfOOcscwwd+zaeE1RuKBhPfCbfxiiILA==
   dependencies:
     "@rollup/plugin-json" "^4.1.0"
     "@rollup/plugin-node-resolve" "^13.1.3"
@@ -7214,7 +7213,7 @@ ng-packagr@14.0.0-next.5:
     dependency-graph "^0.11.0"
     esbuild-wasm "^0.14.29"
     find-cache-dir "^3.3.2"
-    glob "^7.2.0"
+    glob "^8.0.0"
     injection-js "^2.4.0"
     jsonc-parser "^3.0.0"
     less "^4.1.2"
@@ -9030,7 +9029,6 @@ sass@1.51.0, sass@^1.49.9:
 
 "sauce-connect-proxy@https://saucelabs.com/downloads/sc-4.7.1-linux.tar.gz":
   version "0.0.0"
-  uid e5d7f82ad98251a653d1b0537f1103e49eda5e11
   resolved "https://saucelabs.com/downloads/sc-4.7.1-linux.tar.gz#e5d7f82ad98251a653d1b0537f1103e49eda5e11"
 
 saucelabs@^1.5.0:

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ export interface MissingTargetChoice {`
`32`	`32`	`value: string;`
`33`	`33`	`}`
`34`	`34`
`35`		`-export abstract class ArchitectBaseCommandModule<T>`
	`35`	`+export abstract class ArchitectBaseCommandModule<T extends object>`
`36`	`36`	`extends CommandModule<T>`
`37`	`37`	`implements CommandModuleImplementation<T>`
`38`	`38`	`{`
Original file line number	Diff line number	Diff line change
`@@ -402,7 +402,7 @@ export class CoreSchemaRegistry implements SchemaRegistry {`
`402`	`402`	`throw new Error(source);`
`403`	`403`	`}`
`404`	`404`
`405`		`- this._sourceMap.set(source, provider);`
	`405`	`+ this._sourceMap.set(source, provider as unknown as SmartDefaultProvider<{}>);`
`406`	`406`
`407`	`407`	`if (!this._smartDefaultKeyword) {`
`408`	`408`	`this._smartDefaultKeyword = true;`