removed conflict

atlp-rwanda · Jun 7, 2024 · 9e8ae4f · 9e8ae4f
2 parents 4f690d2 + 1d4ea43
commit 9e8ae4f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/src/main.tsx b/src/main.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import ReactDOM from 'react-dom/client';
-import App from './App.tsx';
-import './index.css';
+import App from '@/App.tsx';
+import '@/index.css';
 
 ReactDOM.createRoot(document.getElementById('root')!).render(
   <React.StrictMode>

diff --git a/tsconfig.json b/tsconfig.json
@@ -6,6 +6,11 @@
     "module": "ESNext",
     "skipLibCheck": true,
 
+     /*Configure TypeScript Paths*/
+      "paths": {
+        "@/*": ["./src/*"],
+      },
+
     /* Bundler mode */
     "moduleResolution": "bundler",
     "allowImportingTsExtensions": true,

diff --git a/vite.config.ts b/vite.config.ts
@@ -19,4 +19,14 @@ export default defineConfig({
     environment: 'jsdom',
     setupFiles: ['./src/__test__/setupTests.ts'],
   },
+  resolve: {
+    alias: {
+      '@': path.resolve(__dirname, './src'),
+    },
+  },
+  build: {
+    rollupOptions: {
+      external: ['src/App.tsx'],
+    },
+  },
 });