#5 df: merge conflict v17

dqualizer · Aug 16, 2023 · 5a8a0b5 · 5a8a0b5
1 parent c9eb1d1
commit 5a8a0b5
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 31 deletions.
diff --git a/src/main.tsx → src/main.jsx b/src/main.tsx → src/main.jsx
diff --git a/src/pages/App.tsx → src/pages/App.jsx b/src/pages/App.tsx → src/pages/App.jsx
diff --git a/src/pages/Home.tsx → src/pages/Home.jsx b/src/pages/Home.tsx → src/pages/Home.jsx
diff --git a/src/vite-env.d.ts b/src/vite-env.d.ts
diff --git a/tsconfig.json b/tsconfig.json
diff --git a/tsconfig.node.json b/tsconfig.node.json
diff --git a/vite.config.js b/vite.config.js
@@ -0,0 +1,12 @@
+import dotenv from 'dotenv';
+dotenv.config();
+
+import { defineConfig } from 'vite';
+import react from '@vitejs/plugin-react';
+
+export default defineConfig({
+    plugins: [react()],
+    build: {
+        outDir: 'dist/app',
+    },
+});