Skip to content

Commit ec58004

Browse files
authored
chore: update module/moduleResolution settings (#4471)
1 parent 7200723 commit ec58004

File tree

2 files changed

+10
-13
lines changed

2 files changed

+10
-13
lines changed

resources/build-npm.ts

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,7 @@ async function buildPackage(outDir: string, isESMOnly: boolean): Promise<void> {
8686
if (isESMOnly) {
8787
packageJSON.exports = {};
8888

89-
const { emittedTSFiles } = emitTSFiles({
90-
outDir,
91-
module: 'es2020',
92-
extension: '.js',
93-
});
89+
const { emittedTSFiles } = emitTSFiles({ outDir, extension: '.js' });
9490

9591
for (const filepath of emittedTSFiles) {
9692
if (path.basename(filepath) === 'index.js') {
@@ -113,9 +109,10 @@ async function buildPackage(outDir: string, isESMOnly: boolean): Promise<void> {
113109
const { emittedTSFiles } = emitTSFiles({
114110
outDir,
115111
module: 'commonjs',
112+
moduleResolution: 'node10',
116113
extension: '.js',
117114
});
118-
emitTSFiles({ outDir, module: 'es2020', extension: '.mjs' });
115+
emitTSFiles({ outDir, extension: '.mjs' });
119116

120117
packageJSON.exports = {};
121118
for (const filepath of emittedTSFiles) {
@@ -142,18 +139,18 @@ async function buildPackage(outDir: string, isESMOnly: boolean): Promise<void> {
142139
// Based on https://github.com/Microsoft/TypeScript/wiki/Using-the-Compiler-API#getting-the-dts-from-a-javascript-file
143140
function emitTSFiles(options: {
144141
outDir: string;
145-
module: string;
142+
module?: string;
143+
moduleResolution?: string;
146144
extension: string;
147145
}): {
148146
emittedTSFiles: ReadonlyArray<string>;
149147
} {
150-
const { outDir, module, extension } = options;
148+
const { extension, ...rest } = options;
151149
const tsOptions = readTSConfig({
152-
module,
150+
...rest,
153151
noEmit: false,
154152
declaration: true,
155-
declarationDir: outDir,
156-
outDir,
153+
declarationDir: rest.outDir,
157154
listEmittedFiles: true,
158155
});
159156

tsconfig.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
"target": "es2021",
1111
"sourceMap": true,
1212
"inlineSources": true,
13-
"module": "es2022",
14-
"moduleResolution": "node",
13+
"module": "node16",
14+
"moduleResolution": "node16",
1515
"noEmit": true,
1616
"isolatedModules": true,
1717
"verbatimModuleSyntax": true,

0 commit comments

Comments
 (0)