Skip to content

Commit 65ed90f

Browse files
committed
fix(cli): fix alias module resolution on Windows OS
1 parent 4969bbe commit 65ed90f

File tree

4 files changed

+16
-17
lines changed

4 files changed

+16
-17
lines changed

packages/cli/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@
7575
"@tsed/schema": ">=8.0.0",
7676
"chalk": "^5.3.0",
7777
"change-case": "^5.4.4",
78-
"esm-module-alias": "^2.2.1",
7978
"globby": "^14.0.2",
8079
"read-pkg-up": "^11.0.0",
8180
"semver": "^7.6.3",

packages/cli/src/bin/tsed.ts

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
#!/usr/bin/env node
22
import {register} from "node:module";
3+
import {join} from "node:path";
34
import {fileURLToPath, pathToFileURL} from "node:url";
45

56
const EXT = process.env.CLI_MODE === "ts" ? "ts" : "js";
67

7-
register(pathToFileURL(`${import.meta.dirname}/../loaders/alias.hook.${EXT}`), {
8+
register(pathToFileURL(join(import.meta.dirname, `../loaders/alias.hook.${EXT}`)), {
89
parentURL: import.meta.dirname,
910
data: {
10-
"@tsed/core": fileURLToPath(import.meta.resolve("@tsed/core")),
11-
"@tsed/di": fileURLToPath(import.meta.resolve("@tsed/di")),
12-
"@tsed/schema": fileURLToPath(import.meta.resolve("@tsed/schema")),
13-
"@tsed/cli-core": fileURLToPath(import.meta.resolve("@tsed/cli-core")),
14-
"@tsed/cli": fileURLToPath(import.meta.resolve("@tsed/cli"))
11+
"@tsed/core": import.meta.resolve("@tsed/core"),
12+
"@tsed/di": import.meta.resolve("@tsed/di"),
13+
"@tsed/schema": import.meta.resolve("@tsed/schema"),
14+
"@tsed/cli-core": import.meta.resolve("@tsed/cli-core"),
15+
"@tsed/cli": import.meta.resolve("@tsed/cli")
1516
},
1617
transferList: []
1718
});

packages/cli/src/loaders/alias.hook.ts

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,16 @@
1-
import generateAliasesResolver from "esm-module-alias";
1+
function generateAliasesResolver(aliases: Record<string, string>, options?: any) {
2+
return (specifier: any, parentModuleURL: any, defaultResolve: any) => {
3+
if (aliases[specifier]) {
4+
return defaultResolve(aliases[specifier], parentModuleURL);
5+
}
6+
7+
return defaultResolve(specifier, parentModuleURL);
8+
};
9+
}
210

311
let resolver: any = null;
412

513
export async function initialize(aliases: Record<string, string>) {
6-
// Receives data from `register`.
714
resolver = generateAliasesResolver(aliases);
815
}
916

yarn.lock

-8
Original file line numberDiff line numberDiff line change
@@ -2676,7 +2676,6 @@ __metadata:
26762676
chalk: "npm:^5.3.0"
26772677
change-case: "npm:^5.4.4"
26782678
cross-env: "npm:7.0.3"
2679-
esm-module-alias: "npm:^2.2.1"
26802679
globby: "npm:^14.0.2"
26812680
read-pkg-up: "npm:^11.0.0"
26822681
semver: "npm:^7.6.3"
@@ -6703,13 +6702,6 @@ __metadata:
67036702
languageName: node
67046703
linkType: hard
67056704

6706-
"esm-module-alias@npm:^2.2.1":
6707-
version: 2.2.1
6708-
resolution: "esm-module-alias@npm:2.2.1"
6709-
checksum: 10/2dda8bdde12b7b6fdfe7dd0efc4abe15c09af26f62cf5540d3df464dfe1be6a9a627105d5b6ea940f0be4d87c78c15db192fff821be7869b16cc9a1e678b8b31
6710-
languageName: node
6711-
linkType: hard
6712-
67136705
"espree@npm:^10.0.1, espree@npm:^10.1.0":
67146706
version: 10.1.0
67156707
resolution: "espree@npm:10.1.0"

0 commit comments

Comments
 (0)