Skip to content

Commit 4c9eca7

Browse files
committed
refactor(@angular-devkit/build-angular): move teardown logic registration before
In some cases, this was regestered too late which caused the server never to terminate. (cherry picked from commit c0921d6)
1 parent 7cb5731 commit 4c9eca7

File tree

1 file changed

+9
-7
lines changed
  • packages/angular_devkit/build_angular/src/builders/dev-server

1 file changed

+9
-7
lines changed

packages/angular_devkit/build_angular/src/builders/dev-server/vite-server.ts

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,15 @@ export async function* serveWithVite(
129129
implicitServer: [],
130130
explicit: [],
131131
};
132+
133+
// Add cleanup logic via a builder teardown.
134+
let deferred: () => void;
135+
context.addTeardown(async () => {
136+
await server?.close();
137+
await prebundleTransformer.close();
138+
deferred?.();
139+
});
140+
132141
const build =
133142
builderName === '@angular-devkit/build-angular:application'
134143
? buildApplicationInternal
@@ -258,13 +267,6 @@ export async function* serveWithVite(
258267
} as unknown as DevServerBuilderOutput;
259268
}
260269

261-
// Add cleanup logic via a builder teardown
262-
let deferred: () => void;
263-
context.addTeardown(async () => {
264-
await server?.close();
265-
await prebundleTransformer.close();
266-
deferred?.();
267-
});
268270
await new Promise<void>((resolve) => (deferred = resolve));
269271
}
270272

0 commit comments

Comments
 (0)