From 741cf7fe1e6ec678a76e8f7212acb813a4d46df2 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 25 Jun 2024 12:02:32 -0400
Subject: [PATCH] test: enable `@typescript-eslint/await-thenable` lint rule

The `@typescript-eslint/await-thenable` rule is now enabled and all failures
have been addressed within the code.
---
 .eslintrc.json                                                  | 1 -
 packages/angular/build/src/builders/dev-server/vite-server.ts   | 2 +-
 .../cli/src/command-builder/architect-base-command-module.ts    | 2 +-
 packages/angular/cli/src/commands/new/cli.ts                    | 2 +-
 .../src/builders/browser/specs/build-optimizer_spec.ts          | 2 +-
 .../angular_devkit/build_angular/src/utils/process-bundle.ts    | 2 +-
 packages/angular_devkit/core/src/json/schema/registry.ts        | 1 +
 7 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index f917322cc5..4b18926cb8 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -103,7 +103,6 @@
     "no-case-declarations": "off",
     "no-fallthrough": "off",
     "no-underscore-dangle": "off",
-    "@typescript-eslint/await-thenable": "off",
     "@typescript-eslint/ban-types": "off",
     "@typescript-eslint/no-empty-function": "off",
     "@typescript-eslint/explicit-module-boundary-types": "off",
diff --git a/packages/angular/build/src/builders/dev-server/vite-server.ts b/packages/angular/build/src/builders/dev-server/vite-server.ts
index dc76cbda3a..89ae2151e2 100644
--- a/packages/angular/build/src/builders/dev-server/vite-server.ts
+++ b/packages/angular/build/src/builders/dev-server/vite-server.ts
@@ -245,7 +245,7 @@ export async function* serveWithVite(
         ...new Set([...server.config.server.fs.allow, ...assetFiles.values()]),
       ];
 
-      await handleUpdate(normalizePath, generatedFiles, server, serverOptions, context.logger);
+      handleUpdate(normalizePath, generatedFiles, server, serverOptions, context.logger);
 
       if (requiresServerRestart) {
         // Restart the server to force SSR dep re-optimization when a dependency has been added.
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
index d2339fedbd..5835a14101 100644
--- a/packages/angular/cli/src/command-builder/architect-base-command-module.ts
+++ b/packages/angular/cli/src/command-builder/architect-base-command-module.ts
@@ -41,7 +41,7 @@ export abstract class ArchitectBaseCommandModule<T extends object>
   protected readonly missingTargetChoices: MissingTargetChoice[] | undefined;
 
   protected async runSingleTarget(target: Target, options: OtherOptions): Promise<number> {
-    const architectHost = await this.getArchitectHost();
+    const architectHost = this.getArchitectHost();
 
     let builderName: string;
     try {
diff --git a/packages/angular/cli/src/commands/new/cli.ts b/packages/angular/cli/src/commands/new/cli.ts
index 8cfd28335c..9163708726 100644
--- a/packages/angular/cli/src/commands/new/cli.ts
+++ b/packages/angular/cli/src/commands/new/cli.ts
@@ -55,7 +55,7 @@ export default class NewCommandModule
         ? collectionNameFromArgs
         : await this.getCollectionFromConfig();
 
-    const workflow = await this.getOrCreateWorkflowForBuilder(collectionName);
+    const workflow = this.getOrCreateWorkflowForBuilder(collectionName);
     const collection = workflow.engine.createCollection(collectionName);
     const options = await this.getSchematicOptions(collection, this.schematicName, workflow);
 
diff --git a/packages/angular_devkit/build_angular/src/builders/browser/specs/build-optimizer_spec.ts b/packages/angular_devkit/build_angular/src/builders/browser/specs/build-optimizer_spec.ts
index dd93140c94..42608031b7 100644
--- a/packages/angular_devkit/build_angular/src/builders/browser/specs/build-optimizer_spec.ts
+++ b/packages/angular_devkit/build_angular/src/builders/browser/specs/build-optimizer_spec.ts
@@ -57,7 +57,7 @@ describe('Browser Builder build optimizer', () => {
     const boOutput = (await run.result) as BrowserBuilderOutput;
     expect(boOutput.success).toBe(true);
 
-    const boStats = await await lastValueFrom(
+    const boStats = await lastValueFrom(
       host.stat(join(normalize(output.outputs[0].path), 'main.js')),
     );
     if (!boStats) {
diff --git a/packages/angular_devkit/build_angular/src/utils/process-bundle.ts b/packages/angular_devkit/build_angular/src/utils/process-bundle.ts
index 3873e47522..94116622b5 100644
--- a/packages/angular_devkit/build_angular/src/utils/process-bundle.ts
+++ b/packages/angular_devkit/build_angular/src/utils/process-bundle.ts
@@ -174,7 +174,7 @@ export async function inlineLocales(options: InlineOptions) {
       true,
       localeDataContent,
     );
-    const transformResult = await transformFromAstSync(ast, options.code, {
+    const transformResult = transformFromAstSync(ast, options.code, {
       filename: options.filename,
       // using false ensures that babel will NOT search and process sourcemap comments (large memory usage)
       // The types do not include the false option even though it is valid
diff --git a/packages/angular_devkit/core/src/json/schema/registry.ts b/packages/angular_devkit/core/src/json/schema/registry.ts
index 85ec30a0ab..2e6f3245f5 100644
--- a/packages/angular_devkit/core/src/json/schema/registry.ts
+++ b/packages/angular_devkit/core/src/json/schema/registry.ts
@@ -355,6 +355,7 @@ export class CoreSchemaRegistry implements SchemaRegistry {
 
       // Validate using ajv
       try {
+        // eslint-disable-next-line @typescript-eslint/await-thenable
         const success = await validator.call(validationContext, data);
 
         if (!success) {