Merge branch 'develop'

gom-3 · Sep 21, 2024 · bb66da2 · bb66da2
2 parents ad8fbc7 + ed274cc
commit bb66da2
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 39 deletions.
diff --git a/tsconfig.app.json b/tsconfig.app.json
@@ -0,0 +1,45 @@
+{
+  "compilerOptions": {
+    "composite": true,
+    "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
+    "target": "ES2020",
+    "useDefineForClassFields": true,
+    "lib": ["ES2020", "DOM", "DOM.Iterable"],
+    "module": "ESNext",
+    "skipLibCheck": true,
+
+    /* Bundler mode */
+    "moduleResolution": "bundler",
+    "allowImportingTsExtensions": true,
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "moduleDetection": "force",
+    "noEmit": true,
+    "jsx": "react-jsx",
+
+    /* Linting */
+    "strict": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "noFallthroughCasesInSwitch": true,
+
+    "baseUrl": "src",
+    "paths": {
+      "@assets/*": ["assets/*"],
+      "@assets": ["assets"],
+      "@components/*": ["components/*"],
+      "@components": ["components"],
+      "@constants/*": ["constants/*"],
+      "@constants": ["constants"],
+      "@libs/*": ["libs/*"],
+      "@libs": ["libs"],
+      "@hooks/*": ["hooks/*"],
+      "@hooks": ["hooks"],
+      "@types/*": ["types/*"],
+      "@types": ["types"],
+      "@pages/*": ["pages/*"],
+      "@pages": ["pages"]
+    }
+  },
+  "include": ["src"]
+}
diff --git a/tsconfig.json b/tsconfig.json
@@ -1,43 +1,9 @@
 {
-  "compilerOptions": {
-    "target": "ES2020",
-    "useDefineForClassFields": true,
-    "lib": ["ES2020", "DOM", "DOM.Iterable"],
-    "types": ["cypress", "@testing-library/cypress"],
-    "module": "ESNext",
-    "skipLibCheck": true,
-    /* Bundler mode */
-    "moduleResolution": "bundler",
-    "allowImportingTsExtensions": true,
-    "resolveJsonModule": true,
-    "isolatedModules": true,
-    "noEmit": true,
-    "jsx": "react-jsx",
-    /* Linting */
-    "strict": true,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "noFallthroughCasesInSwitch": true,
-    "baseUrl": "src",
-    "paths": {
-      "@assets/*": ["assets/*"],
-      "@assets": ["assets"],
-      "@components/*": ["components/*"],
-      "@components": ["components"],
-      "@constants/*": ["constants/*"],
-      "@constants": ["constants"],
-      "@libs/*": ["libs/*"],
-      "@libs": ["libs"],
-      "@hooks/*": ["hooks/*"],
-      "@hooks": ["hooks"],
-      "@types/*": ["types/*"],
-      "@types": ["types"],
-      "@pages/*": ["pages/*"],
-      "@pages": ["pages"]
-    }
-  },
-  "include": ["src", "**/*.ts"],
+  "files": [],
   "references": [
+    {
+      "path": "./tsconfig.app.json"
+    },
     {
       "path": "./tsconfig.node.json"
     }

diff --git a/tsconfig.node.json b/tsconfig.node.json
@@ -1,10 +1,13 @@
 {
   "compilerOptions": {
     "composite": true,
+    "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo",
     "skipLibCheck": true,
     "module": "ESNext",
     "moduleResolution": "bundler",
-    "allowSyntheticDefaultImports": true
+    "allowSyntheticDefaultImports": true,
+    "strict": true,
+    "noEmit": true
   },
   "include": ["vite.config.ts"]
 }