cleanup: remove import alias, use relative imports

commaai · Jan 16, 2025 · 07437e6 · 07437e6
1 parent 4bb0236
commit 07437e6
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 27 deletions.
diff --git a/index.html b/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/src/app/icon.svg" />
+    <link rel="icon" type="image/svg+xml" href="./src/app/icon.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta
       name="description"
@@ -12,7 +12,7 @@
   </head>
   <body>
     <div id="root"></div>
-    <script type="module" src="/src/main.jsx"></script>
+    <script type="module" src="./src/main.jsx"></script>
     <script
       defer
       data-domain="flash.comma.ai"

diff --git a/src/app/Flash.jsx b/src/app/Flash.jsx
@@ -1,18 +1,18 @@
 import { useCallback } from 'react'
 
-import { Step, Error, useFastboot } from '@/utils/fastboot'
-
-import bolt from '@/assets/bolt.svg'
-import cable from '@/assets/cable.svg'
-import cloud from '@/assets/cloud.svg'
-import cloudDownload from '@/assets/cloud_download.svg'
-import cloudError from '@/assets/cloud_error.svg'
-import deviceExclamation from '@/assets/device_exclamation_c3.svg'
-import deviceQuestion from '@/assets/device_question_c3.svg'
-import done from '@/assets/done.svg'
-import exclamation from '@/assets/exclamation.svg'
-import frameAlert from '@/assets/frame_alert.svg'
-import systemUpdate from '@/assets/system_update_c3.svg'
+import { Step, Error, useFastboot } from '../utils/fastboot'
+
+import bolt from '../assets/bolt.svg'
+import cable from '../assets/cable.svg'
+import cloud from '../assets/cloud.svg'
+import cloudDownload from '../assets/cloud_download.svg'
+import cloudError from '../assets/cloud_error.svg'
+import deviceExclamation from '../assets/device_exclamation_c3.svg'
+import deviceQuestion from '../assets/device_question_c3.svg'
+import done from '../assets/done.svg'
+import exclamation from '../assets/exclamation.svg'
+import frameAlert from '../assets/frame_alert.svg'
+import systemUpdate from '../assets/system_update_c3.svg'
 
 
 const steps = {

diff --git a/src/utils/fastboot.js b/src/utils/fastboot.js
@@ -3,11 +3,11 @@ import { useEffect, useRef, useState } from 'react'
 import { FastbootDevice, setDebugLevel } from 'android-fastboot'
 import * as Comlink from 'comlink'
 
-import config from '@/config'
-import { download } from '@/utils/blob'
-import { useImageWorker } from '@/utils/image'
-import { createManifest } from '@/utils/manifest'
-import { withProgress } from '@/utils/progress'
+import config from '../config'
+import { download } from '../utils/blob'
+import { useImageWorker } from '../utils/image'
+import { createManifest } from '../utils/manifest'
+import { withProgress } from '../utils/progress'
 
 /**
  * @typedef {import('./manifest.js').Image} Image

diff --git a/src/workers/image.worker.js b/src/workers/image.worker.js
@@ -4,7 +4,7 @@ import jsSHA from 'jssha'
 import { XzReadableStream } from 'xz-decompress'
 
 /**
- * @typedef {import('@/utils/manifest').Image} Image
+ * @typedef {import('../utils/manifest').Image} Image
  */
 
 /**

diff --git a/vite.config.js b/vite.config.js
@@ -1,15 +1,9 @@
-import { fileURLToPath, URL } from 'node:url';
 import { defineConfig } from 'vite'
 import react from '@vitejs/plugin-react'
 
 // https://vitejs.dev/config/
 export default defineConfig({
   plugins: [react()],
-  resolve: {
-    alias: [
-      { find: '@', replacement: fileURLToPath(new URL('./src', import.meta.url)) },
-    ],
-  },
   test: {
     globals: true,
     environment: 'jsdom',
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ import jsSHA from 'jssha' @@
     import { XzReadableStream } from 'xz-decompress'
     /**
-     * @typedef {import('@/utils/manifest').Image} Image
+     * @typedef {import('../utils/manifest').Image} Image
      */
     /**
@@ Expand Down @@