From 5a8a0b54fb9beaa479061c42c508d4ed1ec1fc66 Mon Sep 17 00:00:00 2001 From: Daniel Date: Wed, 16 Aug 2023 14:31:14 +0200 Subject: [PATCH] #5 df: merge conflict v17 --- src/{main.tsx => main.jsx} | 0 src/pages/{App.tsx => App.jsx} | 0 src/pages/{Home.tsx => Home.jsx} | 0 src/vite-env.d.ts | 1 - tsconfig.json | 21 --------------------- tsconfig.node.json | 9 --------- vite.config.js | 12 ++++++++++++ 7 files changed, 12 insertions(+), 31 deletions(-) rename src/{main.tsx => main.jsx} (100%) rename src/pages/{App.tsx => App.jsx} (100%) rename src/pages/{Home.tsx => Home.jsx} (100%) delete mode 100644 src/vite-env.d.ts delete mode 100644 tsconfig.json delete mode 100644 tsconfig.node.json create mode 100644 vite.config.js diff --git a/src/main.tsx b/src/main.jsx similarity index 100% rename from src/main.tsx rename to src/main.jsx diff --git a/src/pages/App.tsx b/src/pages/App.jsx similarity index 100% rename from src/pages/App.tsx rename to src/pages/App.jsx diff --git a/src/pages/Home.tsx b/src/pages/Home.jsx similarity index 100% rename from src/pages/Home.tsx rename to src/pages/Home.jsx diff --git a/src/vite-env.d.ts b/src/vite-env.d.ts deleted file mode 100644 index 11f02fe..0000000 --- a/src/vite-env.d.ts +++ /dev/null @@ -1 +0,0 @@ -/// diff --git a/tsconfig.json b/tsconfig.json deleted file mode 100644 index 829a8fe..0000000 --- a/tsconfig.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "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" }] - } \ No newline at end of file diff --git a/tsconfig.node.json b/tsconfig.node.json deleted file mode 100644 index eedc67d..0000000 --- a/tsconfig.node.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "compilerOptions": { - "composite": true, - "module": "ESNext", - "moduleResolution": "Node", - "allowSyntheticDefaultImports": true - }, - "include": ["vite.config.ts"] - } \ No newline at end of file diff --git a/vite.config.js b/vite.config.js new file mode 100644 index 0000000..1696969 --- /dev/null +++ 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', + }, +});