Update dependencies and cleanup version (#74)

* `cargo update` all dependencies

* Update Vite to v5 and fix proxy target to ipv4

* Run `npm update`

* Make test less obnoxious

* Fix Dockerfile warnings about mismatched case

Cargo.toml

@@ -1,6 +1,3 @@
 [workspace]
-
-members = [
-    "rustpad-server",
-    "rustpad-wasm",
-]
+resolver = "2"
+members = ["rustpad-server", "rustpad-wasm"]

Dockerfile

@@ -1,18 +1,18 @@
-FROM rust:alpine as backend
+FROM rust:alpine AS backend
 WORKDIR /home/rust/src
 RUN apk --no-cache add musl-dev openssl-dev
 COPY . .
 RUN cargo test --release
 RUN cargo build --release
 
-FROM amd64/rust:alpine as wasm
+FROM amd64/rust:alpine AS wasm
 WORKDIR /home/rust/src
 RUN apk --no-cache add curl musl-dev
 RUN curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
 COPY . .
 RUN wasm-pack build --target web rustpad-wasm
 
-FROM amd64/node:lts-alpine as frontend
+FROM amd64/node:lts-alpine AS frontend
 WORKDIR /usr/src/app
 COPY package.json package-lock.json ./
 COPY --from=wasm /home/rust/src/rustpad-wasm/pkg rustpad-wasm/pkg

package.json

@@ -1,5 +1,6 @@
 {
   "name": "rustpad",
+  "type": "module",
   "version": "0.1.0",
   "private": true,
   "scripts": {
@@ -28,7 +29,7 @@
     "@vitejs/plugin-react": "^1.1.3",
     "monaco-editor": "^0.31.1",
     "prettier": "2.5.1",
-    "typescript": "~4.5.4",
-    "vite": "^2.7.7"
+    "typescript": "~5.5.3",
+    "vite": "^5.3.4"
   }
 }

rustpad-server/Cargo.toml

@@ -17,7 +17,7 @@ pretty_env_logger = "0.4.0"
 rand = "0.8.3"
 serde = { version = "1.0.126", features = ["derive"] }
 serde_json = "1.0.64"
-sqlx = { version = "0.5.9", features = ["runtime-tokio-rustls", "sqlite"] }
+sqlx = { version = "0.6.3", features = ["runtime-tokio-rustls", "sqlite"] }
 tokio = { version = "1.6.1", features = ["full", "test-util"] }
 tokio-stream = "0.1.6"
 warp = "0.3.1"

rustpad-server/src/lib.rs

@@ -44,6 +44,7 @@ impl Drop for Document {
     }
 }
 
+#[allow(dead_code)]
 #[derive(Debug)]
 struct CustomReject(anyhow::Error);
 

rustpad-server/tests/persist.rs

@@ -96,16 +96,11 @@ async fn test_persist() -> Result<()> {
 
     // Give SQLite some time to actually update the database.
     time::resume();
-    time::sleep(Duration::from_millis(50)).await;
+    time::sleep(Duration::from_millis(150)).await;
     time::pause();
 
     time::advance(3 * hour).await;
     expect_text(&filter, "persist", "hello").await;
 
-    for _ in 0..50 {
-        time::advance(10000 * hour).await;
-        expect_text(&filter, "persist", "hello").await;
-    }
-
     Ok(())
 }

vite.config.js → vite.config.ts

@@ -9,7 +9,7 @@ export default defineConfig({
   server: {
     proxy: {
       "/api": {
-        target: "http://localhost:3030",
+        target: "http://127.0.0.1:3030",
         changeOrigin: true,
         secure: false,
         ws: true,