fix(typescript): Allow for using compilerOptions.moduleResolution (#…

…1453) * fix(typescript): Add test for setting moduleResolution This adds a test case for resolving types with node ESM `exports` feature and `compilerOptions.moduleResolution` option configured. Signed-off-by: Ferdinand Thiessen <rpm@fthiessen.de> * fix(typescript): Allow for using `compilerOptions.moduleResolution` Signed-off-by: Ferdinand Thiessen <rpm@fthiessen.de> --------- Signed-off-by: Ferdinand Thiessen <rpm@fthiessen.de>
rollup · May 12, 2023 · eb0cfe0 · eb0cfe0
1 parent 089a51e
commit eb0cfe0
Show file tree

Hide file tree

Showing 14 changed files with 55 additions and 7 deletions.
diff --git a/packages/typescript/src/options/tsconfig.ts b/packages/typescript/src/options/tsconfig.ts
@@ -105,6 +105,7 @@ function containsEnumOptions(
  */
 function setModuleResolutionKind(parsedConfig: ParsedCommandLine): ParsedCommandLine {
   const moduleKind = parsedConfig.options.module;
+  // Fallback if `parsedConfig.options.moduleResolution` is not set
   const moduleResolution =
     moduleKind === ModuleKind.Node16
       ? ModuleResolutionKind.Node16
@@ -115,8 +116,8 @@ function setModuleResolutionKind(parsedConfig: ParsedCommandLine): ParsedCommand
   return {
     ...parsedConfig,
     options: {
-      ...parsedConfig.options,
-      moduleResolution
+      moduleResolution,
+      ...parsedConfig.options
     }
   };
 }

diff --git a/packages/typescript/test/fixtures/nodenext-module/index.ts b/packages/typescript/test/fixtures/nodenext-module/index.ts
@@ -0,0 +1,4 @@
+import foo from 'foo';
+
+const bar: string = foo;
+console.log(bar);
diff --git a/...t-resolution/node_modules/foo/index.d.cts → ...enext-module/node_modules/foo/index.d.cts b/...t-resolution/node_modules/foo/index.d.cts → ...enext-module/node_modules/foo/index.d.cts
diff --git a/...xt-resolution/node_modules/foo/index.d.ts → ...denext-module/node_modules/foo/index.d.ts b/...xt-resolution/node_modules/foo/index.d.ts → ...denext-module/node_modules/foo/index.d.ts
diff --git a/...next-resolution/node_modules/foo/index.js → ...nodenext-module/node_modules/foo/index.js b/...next-resolution/node_modules/foo/index.js → ...nodenext-module/node_modules/foo/index.js
diff --git a/packages/typescript/test/fixtures/nodenext-module/node_modules/foo/package.json b/packages/typescript/test/fixtures/nodenext-module/node_modules/foo/package.json
diff --git a/packages/typescript/test/fixtures/nodenext-module/package.json b/packages/typescript/test/fixtures/nodenext-module/package.json
@@ -0,0 +1,3 @@
+{
+  "type": "module"
+}
diff --git a/packages/typescript/test/fixtures/nodenext-module/tsconfig.json b/packages/typescript/test/fixtures/nodenext-module/tsconfig.json
@@ -0,0 +1,5 @@
+{
+  "compilerOptions": {
+    "module": "nodenext"
+  }
+}
diff --git a/packages/typescript/test/fixtures/nodenext-resolution/node_modules/foo/dist/index.js b/packages/typescript/test/fixtures/nodenext-resolution/node_modules/foo/dist/index.js
diff --git a/packages/typescript/test/fixtures/nodenext-resolution/node_modules/foo/package.json b/packages/typescript/test/fixtures/nodenext-resolution/node_modules/foo/package.json
diff --git a/packages/typescript/test/fixtures/nodenext-resolution/node_modules/foo/types/index.d.cts b/packages/typescript/test/fixtures/nodenext-resolution/node_modules/foo/types/index.d.cts
diff --git a/packages/typescript/test/fixtures/nodenext-resolution/node_modules/foo/types/index.d.ts b/packages/typescript/test/fixtures/nodenext-resolution/node_modules/foo/types/index.d.ts
diff --git a/packages/typescript/test/fixtures/nodenext-resolution/tsconfig.json b/packages/typescript/test/fixtures/nodenext-resolution/tsconfig.json
@@ -1,5 +1,5 @@
 {
   "compilerOptions": {
-    "module": "nodenext"
+    "moduleResolution": "nodenext"
   }
 }
diff --git a/packages/typescript/test/test.js b/packages/typescript/test/test.js
@@ -1292,6 +1292,26 @@ test.serial('works when code is in src directory', async (t) => {
 });
 
 test.serial('correctly resolves types in a nodenext module', async (t) => {
+  const warnings = [];
+  const bundle = await rollup({
+    input: 'fixtures/nodenext-module/index.ts',
+    plugins: [
+      typescript({
+        tsconfig: 'fixtures/nodenext-module/tsconfig.json'
+      })
+    ],
+    onwarn({ toString, ...warning }) {
+      warnings.push(warning);
+    }
+  });
+  const code = await getCode(bundle, outputOptions);
+
+  t.true(code.includes('const bar = foo'), code);
+  t.is(warnings.length, 1);
+  t.is(warnings[0].code, 'UNRESOLVED_IMPORT');
+});
+
+test.serial('correctly resolves types with nodenext moduleResolution', async (t) => {
   const warnings = [];
   const bundle = await rollup({
     input: 'fixtures/nodenext-resolution/index.ts',
@@ -1306,7 +1326,7 @@ test.serial('correctly resolves types in a nodenext module', async (t) => {
   });
   const code = await getCode(bundle, outputOptions);
 
-  t.true(code.includes('const bar = foo'), code);
+  t.true(code.includes('var bar = foo'), code);
   t.is(warnings.length, 1);
   t.is(warnings[0].code, 'UNRESOLVED_IMPORT');
 });