Take "target" from base tsconfig when present

isaacs · Mar 22, 2024 · 79ae570 · 79ae570
1 parent 8fda22e
commit 79ae570
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 20 deletions.
diff --git a/.tshy/build.json b/.tshy/build.json
@@ -2,7 +2,6 @@
   "extends": "../tsconfig.json",
   "compilerOptions": {
     "rootDir": "../src",
-    "target": "es2022",
     "module": "nodenext",
     "moduleResolution": "nodenext"
   }

diff --git a/README.md b/README.md
@@ -701,7 +701,7 @@ following caveats:
   - `outDir` - will be overridden based on build, best omitted
   - `rootDir` - will be set to `./src` in the build, can only
     cause annoying errors otherwise.
-  - `target` - will be set to `es2022`
+  - `target` - will be set to `es2022` if not specified
   - `module` - will be set to `NodeNext`
   - `moduleResolution` - will be set to `NodeNext`
 

diff --git a/src/tsconfig.ts b/src/tsconfig.ts
@@ -14,6 +14,7 @@ import * as console from './console.js'
 import config from './config.js'
 import polyfills from './polyfills.js'
 import preventVerbatimModuleSyntax from './prevent-verbatim-module-syntax.js'
+import readTypescriptConfig from './read-typescript-config.js'
 
 const {
   dialects = ['esm', 'commonjs'],
@@ -43,17 +44,22 @@ const recommended: Record<string, any> = {
   },
 }
 
-const build: Record<string, any> = {
-  extends:
-    config.project === undefined
-      ? '../tsconfig.json'
-      : join('..', config.project),
-  compilerOptions: {
-    rootDir: '../src',
-    target: 'es2022',
-    module: 'nodenext',
-    moduleResolution: 'nodenext',
-  },
+const build = (): Record<string, any> => {
+  const targetSetInConfig =
+    readTypescriptConfig().options.target !== undefined
+
+  return {
+    extends:
+      config.project === undefined
+        ? '../tsconfig.json'
+        : join('..', config.project),
+    compilerOptions: {
+      target: targetSetInConfig ? undefined : 'es2022',
+      rootDir: '../src',
+      module: 'nodenext',
+      moduleResolution: 'nodenext',
+    },
+  }
 }
 
 const commonjs = (dialect: string): Record<string, any> => {
@@ -112,7 +118,7 @@ if (config.project === undefined && !existsSync('tsconfig.json')) {
 for (const f of readdirSync('.tshy')) {
   unlinkSync(resolve('.tshy', f))
 }
-writeConfig('build', build)
+writeConfig('build', build())
 if (dialects.includes('commonjs')) {
   writeConfig('commonjs', commonjs('cjs'))
   for (const d of commonjsDialects) {

diff --git a/tap-snapshots/test/tsconfig.ts.test.cjs b/tap-snapshots/test/tsconfig.ts.test.cjs
@@ -116,7 +116,6 @@ Object {
     "module": "nodenext",
     "moduleResolution": "nodenext",
     "rootDir": "../src",
-    "target": "es2022",
   },
   "extends": "../tsconfig.json",
 }

diff --git a/test/fixtures/basic-custom-project/.tshy/build.json b/test/fixtures/basic-custom-project/.tshy/build.json
@@ -2,7 +2,6 @@
   "extends": "../tsconfig.custom.json",
   "compilerOptions": {
     "rootDir": "../src",
-    "target": "es2022",
     "module": "nodenext",
     "moduleResolution": "nodenext"
   }

diff --git a/test/fixtures/basic-imports-only-deps/.tshy/build.json b/test/fixtures/basic-imports-only-deps/.tshy/build.json
@@ -2,7 +2,6 @@
   "extends": "../tsconfig.json",
   "compilerOptions": {
     "rootDir": "../src",
-    "target": "es2022",
     "module": "nodenext",
     "moduleResolution": "nodenext"
   }

diff --git a/test/fixtures/basic/.tshy/build.json b/test/fixtures/basic/.tshy/build.json
@@ -2,7 +2,6 @@
   "extends": "../tsconfig.json",
   "compilerOptions": {
     "rootDir": "../src",
-    "target": "es2022",
     "module": "nodenext",
     "moduleResolution": "nodenext"
   }

diff --git a/test/fixtures/imports-with-star/.tshy/build.json b/test/fixtures/imports-with-star/.tshy/build.json
@@ -2,7 +2,6 @@
   "extends": "../tsconfig.json",
   "compilerOptions": {
     "rootDir": "../src",
-    "target": "es2022",
     "module": "nodenext",
     "moduleResolution": "nodenext"
   }

diff --git a/test/fixtures/imports/.tshy/build.json b/test/fixtures/imports/.tshy/build.json
@@ -2,7 +2,6 @@
   "extends": "../tsconfig.json",
   "compilerOptions": {
     "rootDir": "../src",
-    "target": "es2022",
     "module": "nodenext",
     "moduleResolution": "nodenext"
   }