Skip to content

Commit e48f2e9

Browse files
authored
Fix pnpm build for angular (#187)
* fix pnpm * reuse existing cwd
1 parent 5ae5fd8 commit e48f2e9

File tree

1 file changed

+7
-4
lines changed
  • packages/@apphosting/adapter-angular/src

1 file changed

+7
-4
lines changed

packages/@apphosting/adapter-angular/src/utils.ts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,17 @@ export const REQUIRED_BUILDER = "@angular-devkit/build-angular:application";
3232
*/
3333
export async function checkStandaloneBuildConditions(cwd: string): Promise<void> {
3434
// dynamically load Angular so this can be used in an NPX context
35+
const angularCorePath = require.resolve("@angular/core", { paths: [cwd] });
3536
const { NodeJsAsyncHost }: typeof import("@angular-devkit/core/node") = await import(
36-
// TODO (sijinli): resolve paths under cwd to be safer later
37-
require.resolve("@angular-devkit/core/node/index.js", { paths: [cwd] })
37+
require.resolve("@angular-devkit/core/node", {
38+
paths: [cwd, angularCorePath],
39+
})
3840
);
3941
const { workspaces }: typeof import("@angular-devkit/core") = await import(
40-
require.resolve("@angular-devkit/core/src/index.js", { paths: [cwd] })
42+
require.resolve("@angular-devkit/core", {
43+
paths: [cwd, angularCorePath],
44+
})
4145
);
42-
4346
const host = workspaces.createWorkspaceHost(new NodeJsAsyncHost());
4447
const { workspace } = await workspaces.readWorkspace(cwd, host);
4548

0 commit comments

Comments
 (0)