Skip to content

Commit 4870d69

Browse files
authored
fix(rollup): resolve aliases using pathe utils (#483)
1 parent c77c677 commit 4870d69

File tree

2 files changed

+2
-19
lines changed

2 files changed

+2
-19
lines changed

src/builders/rollup/config.ts

+2-6
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,15 @@ import { nodeResolve } from "@rollup/plugin-node-resolve";
44
import alias from "@rollup/plugin-alias";
55
import replace from "@rollup/plugin-replace";
66
import { resolve, isAbsolute } from "pathe";
7+
import { resolveAlias } from "pathe/utils";
78
import { arrayIncludes, getpkg, warn } from "../../utils";
89
import type { BuildContext, RollupOptions } from "../../types";
910
import { esbuild } from "./plugins/esbuild";
1011
import { JSONPlugin } from "./plugins/json";
1112
import { rawPlugin } from "./plugins/raw";
1213
import { cjsPlugin } from "./plugins/cjs";
1314
import { shebangPlugin } from "./plugins/shebang";
14-
import {
15-
DEFAULT_EXTENSIONS,
16-
getChunkFilename,
17-
resolveAlias,
18-
resolveAliases,
19-
} from "./utils";
15+
import { DEFAULT_EXTENSIONS, getChunkFilename, resolveAliases } from "./utils";
2016

2117
export function getRollupOptions(ctx: BuildContext): RollupOptions {
2218
const _aliases = resolveAliases(ctx);

src/builders/rollup/utils.ts

-13
Original file line numberDiff line numberDiff line change
@@ -40,19 +40,6 @@ export function resolveAliases(ctx: BuildContext): Record<string, string> {
4040
return aliases;
4141
}
4242

43-
// TODO: use pathe utils to handle nested aliases
44-
export function resolveAlias(
45-
id: string,
46-
aliases: Record<string, string>,
47-
): string {
48-
for (const [find, replacement] of Object.entries(aliases)) {
49-
if (id.startsWith(find)) {
50-
return id.replace(find, replacement);
51-
}
52-
}
53-
return id;
54-
}
55-
5643
export function getChunkFilename(
5744
ctx: BuildContext,
5845
chunk: PreRenderedChunk,

0 commit comments

Comments
 (0)