support newer moduleResolution kinds, update build to TS 5.x

.github/workflows/nodejs.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        node-version: [12.x, 14.x, 16.x, 18.x, 20.x]
+        node-version: [18.x, 20.x]
         os: [ubuntu-latest, windows-latest, macOS-latest]
 
     steps:

README.md

@@ -48,7 +48,7 @@ This also allows for passing in different `tsconfig` files depending on your bui
 * `inlineSourceMap`: false (see [#71](https://github.com/ezolenko/rollup-plugin-typescript2/issues/71))
 * `outDir`: `./placeholder` in cache root (see [#83](https://github.com/ezolenko/rollup-plugin-typescript2/issues/83) and [Microsoft/TypeScript#24715](https://github.com/Microsoft/TypeScript/issues/24715))
 * `declarationDir`: Rollup's `output.file` or `output.dir` (*unless `useTsconfigDeclarationDir` is true in the plugin options*)
-* `moduleResolution`: `node` (*`classic` is [deprecated](https://www.typescriptlang.org/docs/handbook/module-resolution.html). It also breaks this plugin, see [#12](https://github.com/ezolenko/rollup-plugin-typescript2/issues/12) and [#14](https://github.com/ezolenko/rollup-plugin-typescript2/issues/14)*)
+* `moduleResolution`: *`classic` is [deprecated](https://www.typescriptlang.org/docs/handbook/module-resolution.html) and changed to `node`. It also breaks this plugin, see [#12](https://github.com/ezolenko/rollup-plugin-typescript2/issues/12) and [#14](https://github.com/ezolenko/rollup-plugin-typescript2/issues/14)*). All other values are passed through. Rollup might have problems with some of them, so if in doubt, use `node`.
 * `allowNonTsExtensions`: true to let other plugins on the chain generate typescript; update plugin's `include` filter to pick them up (see [#111](https://github.com/ezolenko/rollup-plugin-typescript2/issues/111))
 
 ### Some compiler options have more than one compatible value

__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 = {

dist/rollup-plugin-typescript2.cjs.js

@@ -27834,11 +27834,22 @@ function getOptionsOverrides({ useTsconfigDeclarationDir, cacheRoot }, preParsed
         noEmitOnError: false,
         inlineSourceMap: false,
         outDir: pluginutils.normalizePath(`${cacheRoot}/placeholder`),
-        moduleResolution: tsModule.ModuleResolutionKind.NodeJs,
         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:
+        case tsModule.ModuleResolutionKind.Bundler:
+        default:
+            overrides.moduleResolution = tsModule.ModuleResolutionKind.Node10;
+    }
     if (preParsedTsconfig.options.module === undefined)
         overrides.module = tsModule.ModuleKind.ES2015;
     // only set declarationDir if useTsconfigDeclarationDir is enabled

dist/rollup-plugin-typescript2.es.js

@@ -27805,11 +27805,22 @@ function getOptionsOverrides({ useTsconfigDeclarationDir, cacheRoot }, preParsed
         noEmitOnError: false,
         inlineSourceMap: false,
         outDir: normalizePath(`${cacheRoot}/placeholder`),
-        moduleResolution: tsModule.ModuleResolutionKind.NodeJs,
         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:
+        case tsModule.ModuleResolutionKind.Bundler:
+        default:
+            overrides.moduleResolution = tsModule.ModuleResolutionKind.Node10;
+    }
     if (preParsedTsconfig.options.module === undefined)
         overrides.module = tsModule.ModuleKind.ES2015;
     // only set declarationDir if useTsconfigDeclarationDir is enabled

package.json

@@ -65,7 +65,7 @@
     "rollup-plugin-typescript2": "0.34.0",
     "ts-jest": "^28.0.0",
     "tslint": "6.1.3",
-    "typescript": "^4.6.3"
+    "typescript": "^5.1.3"
   },
   "repository": {
     "type": "git",

src/get-options-overrides.ts

@@ -16,13 +16,15 @@ export function getOptionsOverrides({ useTsconfigDeclarationDir, cacheRoot }: IO
 		noEmitOnError: false,
 		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
-		moduleResolution: tsModule.ModuleResolutionKind.NodeJs,
 		allowNonTsExtensions: true,
+		moduleResolution: tsModule.ModuleResolutionKind.Node10,
 	};
 
 	if (!preParsedTsconfig)
 		return overrides;
 
+	if (preParsedTsconfig.options.moduleResolution === tsModule.ModuleResolutionKind.Classic)
+		overrides.moduleResolution = tsModule.ModuleResolutionKind.Node10;
 	if (preParsedTsconfig.options.module === undefined)
 		overrides.module = tsModule.ModuleKind.ES2015;