#5 df: merge conflict v13

dqualizer · Aug 16, 2023 · 2937d7b · 2937d7b
1 parent affff4a
commit 2937d7b
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 0 deletions.
diff --git a/src/main.jsx → src/main.tsx b/src/main.jsx → src/main.tsx
diff --git a/src/pages/App.jsx → src/pages/App.tsx b/src/pages/App.jsx → src/pages/App.tsx
diff --git a/src/pages/Home.jsx → src/pages/Home.tsx b/src/pages/Home.jsx → src/pages/Home.tsx
diff --git a/src/pages/Testing.jsx → src/pages/Testing.tsx b/src/pages/Testing.jsx → src/pages/Testing.tsx
diff --git a/src/vite-env.d.ts b/src/vite-env.d.ts
@@ -0,0 +1 @@
+/// <reference types="vite/client" />
diff --git a/tsconfig.json b/tsconfig.json
@@ -0,0 +1,21 @@
+{
+    "compilerOptions": {
+      "target": "ESNext",
+      "useDefineForClassFields": true,
+      "lib": ["DOM", "DOM.Iterable", "ESNext"],
+      "allowJs": false,
+      "skipLibCheck": true,
+      "esModuleInterop": false,
+      "allowSyntheticDefaultImports": true,
+      "strict": true,
+      "forceConsistentCasingInFileNames": true,
+      "module": "ESNext",
+      "moduleResolution": "Node",
+      "resolveJsonModule": true,
+      "isolatedModules": true,
+      "noEmit": true,
+      "jsx": "react-jsx"
+    },
+    "include": ["src"],
+    "references": [{ "path": "./tsconfig.node.json" }]
+  }
diff --git a/tsconfig.node.json b/tsconfig.node.json
@@ -0,0 +1,9 @@
+{
+    "compilerOptions": {
+      "composite": true,
+      "module": "ESNext",
+      "moduleResolution": "Node",
+      "allowSyntheticDefaultImports": true
+    },
+    "include": ["vite.config.ts"]
+  }
diff --git a/vite.config.js → vite.config.ts b/vite.config.js → vite.config.ts