frontend: housekeeping - Updating tsconfigs for intellisense (#3045)

lyft · Jul 16, 2024 · e16326b · e16326b
1 parent 9b86dc5
commit e16326b
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 10 deletions.
diff --git a/frontend/api/tsconfig.json b/frontend/api/tsconfig.json
@@ -1,7 +1,6 @@
 {
   "extends": "../tsconfig.base.json",
   "compilerOptions": {
-    "composite": true,
     "outDir": "./src",
     "rootDir": "./src"
   },

diff --git a/frontend/packages/core/src/AppProvider/index.tsx b/frontend/packages/core/src/AppProvider/index.tsx
@@ -76,7 +76,7 @@ interface ClutchAppProps {
     [key: string]: () => WorkflowConfiguration;
   };
   configuration: UserConfiguration;
-  appConfiguration: AppConfiguration;
+  appConfiguration?: AppConfiguration;
   children?: ClutchAppChild | ClutchAppChild[];
 }
 

diff --git a/frontend/packages/tools/devBuild.js b/frontend/packages/tools/devBuild.js
@@ -30,7 +30,8 @@ const tscAliasPlugin = {
   name: "tscAlias",
   setup(build) {
     build.onEnd(() => {
-      replaceTscAliasPaths({ configFile: `${process.argv[2]}/tsconfig.json` });
+      fs.existsSync(`${process.argv[2]}/tsconfig.paths.json`) &&
+        replaceTscAliasPaths({ configFile: `${process.argv[2]}/tsconfig.paths.json` });
     });
   },
 };

diff --git a/frontend/packages/tools/package.json b/frontend/packages/tools/package.json
@@ -14,7 +14,7 @@
     "node_modules:find": "find $PROJECT_CWD -name 'node_modules' -type d -prune -print",
     "node_modules:nuke": "echo \"Deleting below 'node_modules' folders...\" && npm run --silent node_modules:find | xargs du -chs && echo '' && npm run --silent node_modules:find -- -exec rm -rf '{}' \\;",
     "package:clean": "cd $INIT_CWD && rm -rf dist tsconfig.tsbuildinfo",
-    "package:compile": "cd $INIT_CWD && run -T tsc -b && run -T tsc-alias",
+    "package:compile": "cd $INIT_CWD && run -T tsc -b && find $INIT_CWD -name \"tsconfig.paths.json\" -exec yarn run -T tsc-alias -p \"tsconfig.paths.json\" \\;",
     "package:compile:dev": "yarn node devBuild.js $INIT_CWD",
     "package:compile:watch": "yarn node devBuild.js $INIT_CWD -w",
     "package:lint": "eslint --ext .js,.jsx,.ts,.tsx $INIT_CWD",

diff --git a/frontend/tsconfig.base.json b/frontend/tsconfig.base.json
@@ -1,20 +1,27 @@
 {
   "compilerOptions": {
+    "allowSyntheticDefaultImports": true,
     "baseUrl": "./",
     "composite": true,
     "declaration": true,
+    "declarationMap": true,
     "esModuleInterop": true,
     "forceConsistentCasingInFileNames": true,
     "importsNotUsedAsValues": "error",
     "incremental": true,
     "isolatedModules": true,
     "jsx": "react",
     "lib": ["DOM", "ESNext"],
+    "module": "esnext",
     "moduleResolution": "node",
     "noImplicitAny": false,
     "noImplicitReturns": true,
+    "paths": {
+      "@clutch-sh/*": ["api/*", "packages/*/src", "workflows/*/src"]
+    },
     "preserveConstEnums": true,
     "preserveSymlinks": true,
+    "resolveJsonModule": true,
     "skipLibCheck": true,
     "strict": false,
     "target": "ES2018",

diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json
@@ -1,9 +1,7 @@
 {
   "extends": "./tsconfig.base.json",
   "compilerOptions": {
-    "outDir": "dist",
-    "paths": {
-      "@clutch-sh/*": ["api/*", "packages/*/src", "workflows/*/src"]
-    }
+    "composite": false,
+    "outDir": "dist"
   }
 }
diff --git a/tools/setup-git-hooks.sh b/tools/setup-git-hooks.sh
@@ -13,5 +13,7 @@ fi
 GITHUB_ROOT="${SCRIPT_ROOT}/.github"
 GIT_REPO_ROOT="${REPO_ROOT}/.git"
 
-echo "Setting up git pre-commit hooks for ${REPO_ROOT}"
-ln -s -f "${GITHUB_ROOT}/hooks/pre-commit" "${GIT_REPO_ROOT}/hooks/pre-commit"
+if [[ -f "${GITHUB_ROOT}/hooks/pre-commit" && -f "${GIT_REPO_ROOT}/hooks/pre-commit" ]]; then
+  echo "Setting up git pre-commit hooks for ${REPO_ROOT}"
+  ln -s -f "${GITHUB_ROOT}/hooks/pre-commit" "${GIT_REPO_ROOT}/hooks/pre-commit"
+fi