- fix for unittest

ezolenko · Jun 23, 2023 · 4d30a25 · 4d30a25
1 parent e7c02dc
commit 4d30a25
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/__tests__/get-options-overrides.spec.ts b/__tests__/get-options-overrides.spec.ts
@@ -22,12 +22,12 @@ const forcedOptions: ts.CompilerOptions = {
 	allowNonTsExtensions: true,
 	importHelpers: true,
 	inlineSourceMap: false,
-	moduleResolution: ts.ModuleResolutionKind.NodeJs,
 	noEmit: false,
 	noEmitOnError: false,
 	noEmitHelpers: false,
 	noResolve: false,
 	outDir: `${cacheDir}/placeholder`,
+	moduleResolution: ts.ModuleResolutionKind.Node10,
 };
 
 const defaultPreParsedTsConfig: ts.ParsedCommandLine = {

diff --git a/dist/rollup-plugin-typescript2.cjs.js b/dist/rollup-plugin-typescript2.cjs.js
@@ -27835,20 +27835,20 @@ function getOptionsOverrides({ useTsconfigDeclarationDir, cacheRoot }, preParsed
         inlineSourceMap: false,
         outDir: pluginutils.normalizePath(`${cacheRoot}/placeholder`),
         allowNonTsExtensions: true,
+        moduleResolution: tsModule.ModuleResolutionKind.Node10,
     };
     if (!preParsedTsconfig)
         return overrides;
     switch (preParsedTsconfig.options.moduleResolution) {
         case tsModule.ModuleResolutionKind.Node10:
         case tsModule.ModuleResolutionKind.Node16:
         case tsModule.ModuleResolutionKind.NodeNext:
+            overrides.moduleResolution = preParsedTsconfig.options.moduleResolution;
             break;
         case tsModule.ModuleResolutionKind.Classic:
-            overrides.moduleResolution = tsModule.ModuleResolutionKind.Node10;
-            break;
         case tsModule.ModuleResolutionKind.Bundler:
         default:
-            overrides.moduleResolution = tsModule.ModuleResolutionKind.Node16;
+            overrides.moduleResolution = tsModule.ModuleResolutionKind.Node10;
     }
     if (preParsedTsconfig.options.module === undefined)
         overrides.module = tsModule.ModuleKind.ES2015;

diff --git a/dist/rollup-plugin-typescript2.cjs.js.map b/dist/rollup-plugin-typescript2.cjs.js.map
diff --git a/dist/rollup-plugin-typescript2.es.js b/dist/rollup-plugin-typescript2.es.js
@@ -27806,20 +27806,20 @@ function getOptionsOverrides({ useTsconfigDeclarationDir, cacheRoot }, preParsed
         inlineSourceMap: false,
         outDir: normalizePath(`${cacheRoot}/placeholder`),
         allowNonTsExtensions: true,
+        moduleResolution: tsModule.ModuleResolutionKind.Node10,
     };
     if (!preParsedTsconfig)
         return overrides;
     switch (preParsedTsconfig.options.moduleResolution) {
         case tsModule.ModuleResolutionKind.Node10:
         case tsModule.ModuleResolutionKind.Node16:
         case tsModule.ModuleResolutionKind.NodeNext:
+            overrides.moduleResolution = preParsedTsconfig.options.moduleResolution;
             break;
         case tsModule.ModuleResolutionKind.Classic:
-            overrides.moduleResolution = tsModule.ModuleResolutionKind.Node10;
-            break;
         case tsModule.ModuleResolutionKind.Bundler:
         default:
-            overrides.moduleResolution = tsModule.ModuleResolutionKind.Node16;
+            overrides.moduleResolution = tsModule.ModuleResolutionKind.Node10;
     }
     if (preParsedTsconfig.options.module === undefined)
         overrides.module = tsModule.ModuleKind.ES2015;

diff --git a/dist/rollup-plugin-typescript2.es.js.map b/dist/rollup-plugin-typescript2.es.js.map
diff --git a/src/get-options-overrides.ts b/src/get-options-overrides.ts
@@ -17,6 +17,7 @@ export function getOptionsOverrides({ useTsconfigDeclarationDir, cacheRoot }: IO
 		inlineSourceMap: false,
 		outDir: normalize(`${cacheRoot}/placeholder`), // need an outdir that is different from source or tsconfig parsing trips up. https://github.com/Microsoft/TypeScript/issues/24715
 		allowNonTsExtensions: true,
+		moduleResolution: tsModule.ModuleResolutionKind.Node10,
 	};
 
 	if (!preParsedTsconfig)
@@ -27,13 +28,12 @@ export function getOptionsOverrides({ useTsconfigDeclarationDir, cacheRoot }: IO
 		case tsModule.ModuleResolutionKind.Node10:
 		case tsModule.ModuleResolutionKind.Node16:
 		case tsModule.ModuleResolutionKind.NodeNext:
+			overrides.moduleResolution = preParsedTsconfig.options.moduleResolution;
 			break;
 		case tsModule.ModuleResolutionKind.Classic:
-			overrides.moduleResolution = tsModule.ModuleResolutionKind.Node10;
-			break;
 		case tsModule.ModuleResolutionKind.Bundler:
 		default:
-			overrides.moduleResolution = tsModule.ModuleResolutionKind.Node16;
+			overrides.moduleResolution = tsModule.ModuleResolutionKind.Node10;
 	}
 
 	if (preParsedTsconfig.options.module === undefined)