Skip to content

Commit 4afae20

Browse files
authored
fix: resolve tsconfig-path errors when using destructuring aliases (#7577)
1 parent 96a1235 commit 4afae20

File tree

2 files changed

+20
-16
lines changed

2 files changed

+20
-16
lines changed

packages/solutions/app-tools/src/commands/build.ts

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,10 @@ export const build = async (
5858
const appContext = api.getAppContext();
5959
const hooks = api.getHooks();
6060

61+
const combinedAlias = ([] as unknown[])
62+
.concat(resolvedConfig?.resolve?.alias ?? [])
63+
.concat(resolvedConfig?.source?.alias ?? []) as ConfigChain<Alias>;
64+
6165
// we need load server plugin to appContext for ssg & deploy commands.
6266
await loadServerPlugins(api, appContext.appDirectory, appContext.metaName);
6367

@@ -66,17 +70,15 @@ export const build = async (
6670
await registerEsm({
6771
appDir: appContext.appDirectory,
6872
distDir: appContext.distDirectory,
69-
alias: {
70-
...resolvedConfig.resolve?.alias,
71-
...resolvedConfig.source?.alias,
72-
},
73+
alias: combinedAlias,
7374
});
7475
}
7576

76-
await registerCompiler(appContext.appDirectory, appContext.distDirectory, {
77-
...resolvedConfig?.resolve?.alias,
78-
...resolvedConfig?.source?.alias,
79-
} as ConfigChain<Alias>);
77+
await registerCompiler(
78+
appContext.appDirectory,
79+
appContext.distDirectory,
80+
combinedAlias,
81+
);
8082

8183
const { apiOnly } = appContext;
8284

packages/solutions/app-tools/src/commands/dev.ts

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,22 +40,24 @@ export const dev = async (
4040
const appContext = api.getAppContext();
4141
const hooks = api.getHooks();
4242

43+
const combinedAlias = ([] as unknown[])
44+
.concat(normalizedConfig?.resolve?.alias ?? [])
45+
.concat(normalizedConfig?.source?.alias ?? []) as ConfigChain<Alias>;
46+
4347
if (appContext.moduleType && appContext.moduleType === 'module') {
4448
const { registerEsm } = await import('../esm/register-esm.mjs');
4549
await registerEsm({
4650
appDir: appContext.appDirectory,
4751
distDir: appContext.distDirectory,
48-
alias: {
49-
...normalizedConfig.resolve?.alias,
50-
...normalizedConfig.source?.alias,
51-
},
52+
alias: combinedAlias,
5253
});
5354
}
5455

55-
await registerCompiler(appContext.appDirectory, appContext.distDirectory, {
56-
...normalizedConfig?.source?.alias,
57-
...normalizedConfig?.resolve?.alias,
58-
} as ConfigChain<Alias>);
56+
await registerCompiler(
57+
appContext.appDirectory,
58+
appContext.distDirectory,
59+
combinedAlias,
60+
);
5961

6062
const { appDirectory, port, apiOnly, metaName, serverRoutes } = appContext;
6163

0 commit comments

Comments
 (0)