ci: fix builds with tsconfig dancing

tablecheck · Oct 3, 2023 · a64df8f · a64df8f
1 parent a55e105
commit a64df8f
Show file tree

Hide file tree

Showing 15 changed files with 36 additions and 21 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -7,7 +7,7 @@ module.exports = {
     node: true,
   },
   parserOptions: {
-    project: './tsconfig.base.json',
+    project: './tsconfig.eslint.json',
   },
   overrides: [
     {

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -26,4 +26,4 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.RELEASE_BOT_TOKEN }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
           SLACK_TOKEN: ${{ secrets.SLACK_TOKEN }}
-        run: npx auto shipit
+        run: npx auto shipit --verbose
diff --git a/.gitignore b/.gitignore
@@ -22,8 +22,6 @@ junit
 .env.test.local
 .env.production.local
 .@tablecheck
-tsconfig.compound.json
 /packages/quality/build.config.ts
 /packages/utils/build.config.ts
-/tsconfig.eslint.json
 /packages/utils/config
diff --git a/packages/audit/tsconfig.build.json b/packages/audit/tsconfig.build.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "./tsconfig.json",
   "include": [
     "src/**/*.ts",
     "src/**/*.tsx",
@@ -13,7 +13,9 @@
     "rootDir": "src",
     "outDir": "dist",
     "paths": {},
-    "module": "NodeNext"
+    "module": "NodeNext",
+
+    "resolveJsonModule": true
   },
   "exclude": ["node_modules"],
   "files": []

diff --git a/packages/audit/tsconfig.json b/packages/audit/tsconfig.json
@@ -11,7 +11,9 @@
   "compilerOptions": {
     "baseUrl": ".",
     "rootDir": "src",
-    "outDir": "dist"
+    "outDir": "dist",
+    "module": "NodeNext",
+    "resolveJsonModule": true
   },
   "exclude": ["node_modules"],
   "files": []

diff --git a/packages/eslint-config/tsconfig.build.json b/packages/eslint-config/tsconfig.build.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "./tsconfig.json",
   "include": [
     "src/**/*.ts",
     "src/**/*.tsx",

diff --git a/packages/eslint-config/tsconfig.json b/packages/eslint-config/tsconfig.json
@@ -12,7 +12,9 @@
     "rootDir": "src",
     "outDir": "dist",
     "paths": {},
-    "types": ["vitest"]
+    "types": ["vitest"],
+    "module": "NodeNext",
+    "resolveJsonModule": true
   },
   "exclude": ["node_modules"],
   "files": []

diff --git a/packages/eslint-plugin/tsconfig.build.json b/packages/eslint-plugin/tsconfig.build.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "./tsconfig.json",
   "include": [
     "src/**/*.ts",
     "src/**/*.tsx",

diff --git a/packages/eslint-plugin/tsconfig.json b/packages/eslint-plugin/tsconfig.json
@@ -12,7 +12,9 @@
     "rootDir": "src",
     "outDir": "dist",
     "paths": {},
-    "types": ["vitest"]
+    "types": ["vitest"],
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext"
   },
   "exclude": ["node_modules"],
   "files": []

diff --git a/packages/nx/tsconfig.json b/packages/nx/tsconfig.json
@@ -12,7 +12,9 @@
   "compilerOptions": {
     "baseUrl": ".",
     "rootDir": "src",
-    "outDir": "dist"
+    "outDir": "dist",
+    "module": "NodeNext",
+    "resolveJsonModule": true
   },
   "exclude": [
     "node_modules",

diff --git a/packages/semantic-release-config/tsconfig.json b/packages/semantic-release-config/tsconfig.json
@@ -11,7 +11,9 @@
   "compilerOptions": {
     "rootDir": "src",
     "outDir": "dist",
-    "paths": {}
+    "paths": {},
+    "module": "NodeNext",
+    "resolveJsonModule": true
   },
   "exclude": ["node_modules"],
   "files": []

diff --git a/packages/utils/tsconfig.json b/packages/utils/tsconfig.json
@@ -11,7 +11,9 @@
   "compilerOptions": {
     "rootDir": "src",
     "outDir": "dist",
-    "paths": {}
+    "paths": {},
+    "module": "NodeNext",
+    "resolveJsonModule": true
   },
   "exclude": ["node_modules"],
   "files": []

diff --git a/tsconfig.base.json b/tsconfig.base.json
@@ -5,13 +5,11 @@
     "sourceMap": true,
     "declaration": true,
     "allowSyntheticDefaultImports": true,
-    "resolveJsonModule": true,
     "emitDecoratorMetadata": true,
     "esModuleInterop": true,
     "experimentalDecorators": true,
     "importHelpers": true,
     "target": "ES2022",
-    "module": "NodeNext",
     "lib": ["es2020", "dom"],
     "skipLibCheck": true,
     "skipDefaultLibCheck": true,

diff --git a/tsconfig.eslint.json b/tsconfig.eslint.json
@@ -0,0 +1,8 @@
+{
+  "extends": "./tsconfig.base.json",
+  "compilerOptions": {
+    "resolveJsonModule": true,
+    "module": "NodeNext"
+  },
+  "exclude": ["node_modules", "tmp"]
+}
diff --git a/tsconfig.json b/tsconfig.json
@@ -1,7 +1,4 @@
 {
-  "extends": "./tsconfig.base.json",
-  "compilerOptions": {
-    "module": "CommonJS"
-  },
-  "exclude": ["node_modules", "tmp"]
+  "include": ["this file is just for auto-rc to work correctly..."],
+  "exclude": ["**/*"]
 }