support newer moduleResolution kinds

* moduleResolution classic is overridden to node10, all other values are passed through from tsconfig
* updating dev typescript to 5.1.3

.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,13 +48,15 @@ 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)*)
 * `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
 
 * `module`: defaults to `ES2015`. Other valid values are `ES2020`, `ES2022` and `ESNext` (required for dynamic imports, see [#54](https://github.com/ezolenko/rollup-plugin-typescript2/issues/54)).
 
+* `moduleResolution`: defaults to `node10` (same as `node`), but value from tsconfig is used if specified. Other valid (but mostly untested) values are `node16`, `nodenext` and `bundler`. If in doubt, use `node10`.
+	* `classic` is [deprecated](https://www.typescriptlang.org/docs/handbook/module-resolution.html) and changed to `node10`. 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).
+
 ### Some options need additional configuration on plugin side
 
 * `allowJs`: lets TypeScript process JS files as well. If you use it, modify this plugin's `include` option to add `"*.js+(|x)", "**/*.js+(|x)"` (might also want to `exclude` `"**/node_modules/**/*"`, as it can slow down the build significantly).

__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,

dist/get-options-overrides.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-options-overrides.d.ts","sourceRoot":"","sources":["../src/get-options-overrides.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,OAAO,MAAM,YAAY,CAAC;AAItC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAE1C,wBAAgB,mBAAmB,CAAC,EAAE,yBAAyB,EAAE,SAAS,EAAE,EAAE,QAAQ,EAAE,iBAAiB,CAAC,EAAE,OAAO,CAAC,iBAAiB,GAAG,OAAO,CAAC,eAAe,CA8B9J;AAeD,wBAAgB,YAAY,CAAC,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,QAAQ,EAAE,YAAY,EAAE,OAAO,CAAC,iBAAiB,4BAoBpH"}
+{"version":3,"file":"get-options-overrides.d.ts","sourceRoot":"","sources":["../src/get-options-overrides.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,OAAO,MAAM,YAAY,CAAC;AAItC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAE1C,wBAAgB,mBAAmB,CAAC,EAAE,yBAAyB,EAAE,SAAS,EAAE,EAAE,QAAQ,EAAE,iBAAiB,CAAC,EAAE,OAAO,CAAC,iBAAiB,GAAG,OAAO,CAAC,eAAe,CA+B9J;AAeD,wBAAgB,YAAY,CAAC,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,QAAQ,EAAE,YAAY,EAAE,OAAO,CAAC,iBAAiB,4BAoBpH"}

dist/rollup-plugin-typescript2.cjs.js

@@ -27834,11 +27834,12 @@ function getOptionsOverrides({ useTsconfigDeclarationDir, cacheRoot }, preParsed
         noEmitOnError: false,
         inlineSourceMap: false,
         outDir: pluginutils.normalizePath(`${cacheRoot}/placeholder`),
-        moduleResolution: tsModule.ModuleResolutionKind.NodeJs,
         allowNonTsExtensions: true,
     };
     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;
     // only set declarationDir if useTsconfigDeclarationDir is enabled

dist/rollup-plugin-typescript2.es.js

@@ -27805,11 +27805,12 @@ function getOptionsOverrides({ useTsconfigDeclarationDir, cacheRoot }, preParsed
         noEmitOnError: false,
         inlineSourceMap: false,
         outDir: normalizePath(`${cacheRoot}/placeholder`),
-        moduleResolution: tsModule.ModuleResolutionKind.NodeJs,
         allowNonTsExtensions: true,
     };
     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;
     // only set declarationDir if useTsconfigDeclarationDir is enabled

package-lock.json

@@ -38,7 +38,7 @@
         "rollup-plugin-typescript2": "0.34.0",
         "ts-jest": "^28.0.0",
         "tslint": "6.1.3",
-        "typescript": "^4.6.3"
+        "typescript": "^5.1.3"
       },
       "peerDependencies": {
         "rollup": ">=1.26.3",
@@ -5611,15 +5611,16 @@
       }
     },
     "node_modules/typescript": {
-      "version": "4.6.3",
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.3.tgz",
+      "integrity": "sha512-XH627E9vkeqhlZFQuL+UsyAXEnibT0kWR2FWONlr4sTjvxyJYnyefgrkyECLzM5NenmKzRAy2rR/OlYLA1HkZw==",
       "dev": true,
-      "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
       },
       "engines": {
-        "node": ">=4.2.0"
+        "node": ">=14.17"
       }
     },
     "node_modules/universalify": {
@@ -9925,7 +9926,9 @@
       "dev": true
     },
     "typescript": {
-      "version": "4.6.3",
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.3.tgz",
+      "integrity": "sha512-XH627E9vkeqhlZFQuL+UsyAXEnibT0kWR2FWONlr4sTjvxyJYnyefgrkyECLzM5NenmKzRAy2rR/OlYLA1HkZw==",
       "dev": true
     },
     "universalify": {

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,14 @@ 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,
 	};
 
 	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;