Merge pull request #14 from kellnr/update-to-vite

replace vue-cli with vite
kellnr · Sep 24, 2023 · e31ee12 · e31ee12
2 parents 3302fc3 + b94ec9d
commit e31ee12
Show file tree

Hide file tree

Showing 16 changed files with 2,381 additions and 11,257 deletions.
diff --git a/crates/kellnr/build.rs b/crates/kellnr/build.rs
@@ -4,6 +4,7 @@ static UI_DIR: &str = "../../ui";
 static UI_DIR_SRC: &str = "../../ui/src";
 static UI_DIST_DIR: &str = "../../ui/dist";
 static STATIC_DIR: &str = "../../static";
+static INDEX_HTML: &str = "../../ui/index.html";
 
 #[cfg(windows)]
 static NPM_CMD: &str = "npm.cmd";
@@ -14,6 +15,7 @@ fn main() {
     println!("Build Kellnr - build.rs!");
 
     println!("cargo:rerun-if-changed={}", UI_DIR_SRC);
+    println!("cargo:rerun-if-changed={}", INDEX_HTML);
 
     install_ui_deps();
     build_ui();

diff --git a/ui/.env.development b/ui/.env.development
diff --git a/ui/.env.production b/ui/.env.production
diff --git a/ui/babel.config.js b/ui/babel.config.js
diff --git a/ui/babel.config.ts b/ui/babel.config.ts
diff --git a/ui/public/index.html → ui/index.html b/ui/public/index.html → ui/index.html
@@ -5,20 +5,21 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta content="width=device-width, initial-scale=1" name="viewport" />
-  <link rel="icon" href="<%= BASE_URL %>img/kellnr-logo-small-light.png" type="image/png">
+  <link rel="icon" href="/img/kellnr-logo-small-light.png" type="image/png">
   <title>
-    <%= htmlWebpackPlugin.options.title %>
+      Kellnr
   </title>
 
 </head>
 
 <body color-theme="" id="body">
   <noscript>
-    <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled.
+    <strong>We're sorry but <i>Kellnr</i> doesn't work properly without JavaScript enabled.
         Please enable it to continue.</strong>
   </noscript>
+  <script type="module" src="/src/main.ts"></script>
   <div id="app"></div>
   <!-- built files will be auto injected -->
 </body>
 
-</html>
+</html>
diff --git a/ui/jsconfig.json b/ui/jsconfig.json