DEVPROD-5149: Combine TSConfig (#5)

evergreen-ci · Mar 27, 2024 · b284d4d · b284d4d
1 parent c8332c7
commit b284d4d
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 70 deletions.
diff --git a/.evergreen/shared.yml b/.evergreen/shared.yml
@@ -405,4 +405,3 @@ tasks:
     commands:
       - func: symlink
       - func: yarn-tsc
-
diff --git a/apps/parsley/package.json b/apps/parsley/package.json
@@ -107,7 +107,7 @@
     "@types/js-cookie": "3.0.4",
     "@types/lodash.debounce": "4.0.7",
     "@types/new-relic-browser": "1.230.2",
-    "@types/node": "16.11.47",
+    "@types/node": "^20.11.30",
     "@types/pluralize": "0.0.31",
     "@types/prompts": "2.4.4",
     "@types/react": "18.0.15",

diff --git a/apps/parsley/tsconfig.json b/apps/parsley/tsconfig.json
@@ -1,31 +1,11 @@
 {
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "target": "ESNext",
-    "useDefineForClassFields": true,
-    "lib": [
-      "DOM",
-      "DOM.Iterable",
-      "ESNext"
-    ],
-    "allowJs": true,
-    "skipLibCheck": true,
-    "esModuleInterop": true,
-    "allowSyntheticDefaultImports": true,
-    "strict": true,
-    "forceConsistentCasingInFileNames": true,
-    "module": "CommonJS",
-    "moduleResolution": "Node",
-    "resolveJsonModule": true,
-    "isolatedModules": true,
-    "noEmit": true,
-    "jsx": "react-jsx",
-    "jsxImportSource": "@emotion/react", // enables css prop on JSX
-    "baseUrl": "src",
-    "noFallthroughCasesInSwitch": true,
+    "baseUrl": "src"
   },
   "include": [
     "src",
-    "config/jest/setup.ts",
+    "config/jest/setup.ts"
   ],
   "exclude": [
     "node_modules",
@@ -37,4 +17,4 @@
       "path": "./tsconfig.node.json"
     }
   ]
-}
+}
diff --git a/apps/parsley/tsconfig.node.json b/apps/parsley/tsconfig.node.json
@@ -9,4 +9,4 @@
     "vite.config.ts",
     "config/injectVariablesInHTML.ts"
   ]
-}
+}
diff --git a/apps/spruce/package.json b/apps/spruce/package.json
@@ -156,7 +156,7 @@
     "@types/lodash.debounce": "4.0.7",
     "@types/lodash.throttle": "^4.1.9",
     "@types/new-relic-browser": "0.1212.2",
-    "@types/node": "^16.11.47",
+    "@types/node": "^20.11.30",
     "@types/pluralize": "0.0.33",
     "@types/prompts": "2.4.9",
     "@types/react": "18.2.0",

diff --git a/apps/spruce/tsconfig.json b/apps/spruce/tsconfig.json
@@ -1,38 +1,8 @@
 {
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "target": "esnext",
-    "lib": [
-      "dom",
-      "dom.iterable",
-      "esnext"
-    ],
-    "plugins": [
-      {
-        "name": "@styled/typescript-styled-plugin"
-      }
-    ],
-    "allowJs": true,
-    "skipLibCheck": true,
-    "esModuleInterop": true,
-    "allowSyntheticDefaultImports": true,
-    "strict": false,
-    "forceConsistentCasingInFileNames": true,
-    "strictNullChecks": false,
-    "module": "CommonJS",
-    "moduleResolution": "node",
-    "resolveJsonModule": true,
-    "isolatedModules": true,
-    "noEmit": true,
-    "jsx": "react-jsx",
-    "jsxImportSource": "@emotion/react",
-    "types": [
-      "node",
-      "jest",
-      "@testing-library/jest-dom",
-      "new-relic-browser"
-    ],
     "baseUrl": "src",
-    "noFallthroughCasesInSwitch": true,
+    "strict": false
   },
   "exclude": [
     "node_modules",
@@ -41,8 +11,8 @@
   "include": [
     "src",
     "test_utils/index.tsx",
-    "test_utils/custom-queries.ts", 
-    "config/jest/setupTests.ts",
+    "test_utils/custom-queries.ts",
+    "config/jest/setupTests.ts"
   ],
   "references": [
     {

diff --git a/apps/spruce/tsconfig.node.json b/apps/spruce/tsconfig.node.json
@@ -10,4 +10,4 @@
         "vite.config.ts",
         "config/injectVariablesInHTML.ts"
     ]
-}
+}
diff --git a/tsconfig.base.json b/tsconfig.base.json
@@ -0,0 +1,24 @@
+{
+  "compilerOptions": {
+    "target": "ESNext",
+    "lib": [
+      "DOM",
+      "DOM.Iterable",
+      "ESNext"
+    ],
+    "allowJs": true,
+    "skipLibCheck": true,
+    "esModuleInterop": true,
+    "allowSyntheticDefaultImports": true,
+    "forceConsistentCasingInFileNames": true,
+    "module": "CommonJS",
+    "moduleResolution": "Node",
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "noEmit": true,
+    "jsx": "react-jsx",
+    "jsxImportSource": "@emotion/react",
+    "noFallthroughCasesInSwitch": true,
+    "strict": true
+  }
+}
diff --git a/yarn.lock b/yarn.lock
@@ -6539,24 +6539,19 @@
     "@types/node" "*"
     form-data "^4.0.0"
 
-"@types/node@*":
+"@types/node@*", "@types/node@^20.11.30":
   version "20.11.30"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.30.tgz#9c33467fc23167a347e73834f788f4b9f399d66f"
   integrity sha512-dHM6ZxwlmuZaRmUPfv1p+KrdD1Dci04FbdEm/9wEMouFqxYoFl5aMkt0VMAUtYRQDyYvD41WJLukhq/ha3YuTw==
   dependencies:
     undici-types "~5.26.4"
 
-"@types/[email protected]":
-  version "16.11.47"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.47.tgz#efa9e3e0f72e7aa6a138055dace7437a83d9f91c"
-  integrity sha512-fpP+jk2zJ4VW66+wAMFoBJlx1bxmBKx4DUFf68UHgdGCOuyUTDlLWqsaNPJh7xhNDykyJ9eIzAygilP/4WoN8g==
-
 "@types/node@^14.14.31":
   version "14.18.63"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.63.tgz#1788fa8da838dbb5f9ea994b834278205db6ca2b"
   integrity sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ==
 
-"@types/node@^16.0.0", "@types/node@^16.11.47":
+"@types/node@^16.0.0":
   version "16.18.91"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.91.tgz#3e7b3b3d28f740e3e2d4ceb7ad9d16e6b9277c91"
   integrity sha512-h8Q4klc8xzc9kJKr7UYNtJde5TU2qEePVyH3WyzJaUC+3ptyc5kPQbWOIUcn8ZsG5+KSkq+P0py0kC0VqxgAXw==
Original file line number	Diff line number	Diff line change
Expand Up		@@ -405,4 +405,3 @@ tasks:
		commands:
		- func: symlink
		- func: yarn-tsc
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,4 +9,4 @@ @@
         "vite.config.ts",
         "config/injectVariablesInHTML.ts"
       ]
-    }
+    }