From 3d655f614795aeca09b1fcf8406f19d4505b8291 Mon Sep 17 00:00:00 2001 From: ezolenko Date: Fri, 19 May 2023 18:01:34 -0600 Subject: [PATCH] - fix for unittests --- __tests__/get-options-overrides.spec.ts | 5 ++++- src/get-options-overrides.ts | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/__tests__/get-options-overrides.spec.ts b/__tests__/get-options-overrides.spec.ts index 51314e9..4018428 100644 --- a/__tests__/get-options-overrides.spec.ts +++ b/__tests__/get-options-overrides.spec.ts @@ -22,7 +22,6 @@ const forcedOptions: ts.CompilerOptions = { allowNonTsExtensions: true, importHelpers: true, inlineSourceMap: false, - moduleResolution: ts.ModuleResolutionKind.NodeJs, noEmit: false, noEmitOnError: false, noEmitHelpers: false, @@ -51,6 +50,7 @@ test("getOptionsOverrides - preParsedTsConfig", () => { declarationDir: undefined, module: ts.ModuleKind.ES2015, sourceRoot: undefined, + moduleResolution: ts.ModuleResolutionKind.Node10, }); }); @@ -67,6 +67,7 @@ test("getOptionsOverrides - preParsedTsConfig with options.module", () => { ...forcedOptions, declarationDir: undefined, sourceRoot: undefined, + moduleResolution: ts.ModuleResolutionKind.Node10, }); }); @@ -78,6 +79,7 @@ test("getOptionsOverrides - with declaration", () => { ...forcedOptions, module: ts.ModuleKind.ES2015, sourceRoot: undefined, + moduleResolution: ts.ModuleResolutionKind.Node10, }); }); @@ -94,6 +96,7 @@ test("getOptionsOverrides - with sourceMap", () => { ...forcedOptions, declarationDir: undefined, module: ts.ModuleKind.ES2015, + moduleResolution: ts.ModuleResolutionKind.Node10, }); }); diff --git a/src/get-options-overrides.ts b/src/get-options-overrides.ts index a95c073..a29570a 100644 --- a/src/get-options-overrides.ts +++ b/src/get-options-overrides.ts @@ -27,8 +27,10 @@ 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: + case undefined: overrides.moduleResolution = tsModule.ModuleResolutionKind.Node10; break; case tsModule.ModuleResolutionKind.Bundler: