From 484a5d94b311c52817ac3f6c0854de7a16692027 Mon Sep 17 00:00:00 2001
From: Yaacov Rydzinski <yaacovCR@gmail.com>
Date: Wed, 13 Aug 2025 04:37:35 +0300
Subject: [PATCH] chore: update module/moduleResolution settings

---
 resources/build-npm.ts | 19 ++++++++-----------
 tsconfig.json          |  4 ++--
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/resources/build-npm.ts b/resources/build-npm.ts
index 01121a668b..1196a35477 100644
--- a/resources/build-npm.ts
+++ b/resources/build-npm.ts
@@ -86,11 +86,7 @@ async function buildPackage(outDir: string, isESMOnly: boolean): Promise<void> {
   if (isESMOnly) {
     packageJSON.exports = {};
 
-    const { emittedTSFiles } = emitTSFiles({
-      outDir,
-      module: 'es2020',
-      extension: '.js',
-    });
+    const { emittedTSFiles } = emitTSFiles({ outDir, extension: '.js' });
 
     for (const filepath of emittedTSFiles) {
       if (path.basename(filepath) === 'index.js') {
@@ -113,9 +109,10 @@ async function buildPackage(outDir: string, isESMOnly: boolean): Promise<void> {
     const { emittedTSFiles } = emitTSFiles({
       outDir,
       module: 'commonjs',
+      moduleResolution: 'node10',
       extension: '.js',
     });
-    emitTSFiles({ outDir, module: 'es2020', extension: '.mjs' });
+    emitTSFiles({ outDir, extension: '.mjs' });
 
     packageJSON.exports = {};
     for (const filepath of emittedTSFiles) {
@@ -142,18 +139,18 @@ async function buildPackage(outDir: string, isESMOnly: boolean): Promise<void> {
 // Based on https://github.com/Microsoft/TypeScript/wiki/Using-the-Compiler-API#getting-the-dts-from-a-javascript-file
 function emitTSFiles(options: {
   outDir: string;
-  module: string;
+  module?: string;
+  moduleResolution?: string;
   extension: string;
 }): {
   emittedTSFiles: ReadonlyArray<string>;
 } {
-  const { outDir, module, extension } = options;
+  const { extension, ...rest } = options;
   const tsOptions = readTSConfig({
-    module,
+    ...rest,
     noEmit: false,
     declaration: true,
-    declarationDir: outDir,
-    outDir,
+    declarationDir: rest.outDir,
     listEmittedFiles: true,
   });
 
diff --git a/tsconfig.json b/tsconfig.json
index 059166da98..9d220dc2d3 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -10,8 +10,8 @@
     "target": "es2021",
     "sourceMap": true,
     "inlineSources": true,
-    "module": "es2022",
-    "moduleResolution": "node",
+    "module": "node16",
+    "moduleResolution": "node16",
     "noEmit": true,
     "isolatedModules": true,
     "verbatimModuleSyntax": true,