Skip to content

Commit e9cb63b

Browse files
Merge pull request #220 from crabnebula-dev/fix/app-url
fix: app URL no longer has the app/ prefix, closes #218
2 parents 517049d + f231404 commit e9cb63b

3 files changed

Lines changed: 10 additions & 10 deletions

File tree

clients/web/src/lib/tauri/tests/get-root-path-by-url-segment.test.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,27 @@ describe("getRootPathByUrlSegment", () => {
44
it("Should be able to find base path if we are on it", () => {
55
expect(
66
getRootPathByUrlSegment(
7-
"http://localhost:5173/app/dash/127.0.0.1/3000/calls",
7+
"http://localhost:5173/dash/127.0.0.1/3000/calls",
88
"calls"
99
)
10-
).toBe("http://localhost:5173/app/dash/127.0.0.1/3000/calls");
10+
).toBe("http://localhost:5173/dash/127.0.0.1/3000/calls");
1111
});
1212

1313
it("Should be able to find base path if we are on it, even if it has search params", () => {
1414
expect(
1515
getRootPathByUrlSegment(
16-
"http://localhost:5173/app/dash/127.0.0.1/3000/calls?span=9007199254740996",
16+
"http://localhost:5173/dash/127.0.0.1/3000/calls?span=9007199254740996",
1717
"calls"
1818
)
19-
).toBe("http://localhost:5173/app/dash/127.0.0.1/3000/calls");
19+
).toBe("http://localhost:5173/dash/127.0.0.1/3000/calls");
2020
});
2121

2222
it("Should be abe to find base path even if the key exists twice", () => {
2323
expect(
2424
getRootPathByUrlSegment(
25-
"http://localhost:5173/app/dash/127.0.0.1/3000/tauri/tauri.conf.json/tauri?size=0",
25+
"http://localhost:5173/dash/127.0.0.1/3000/tauri/tauri.conf.json/tauri?size=0",
2626
"tauri"
2727
)
28-
).toBe("http://localhost:5173/app/dash/127.0.0.1/3000/tauri");
28+
).toBe("http://localhost:5173/dash/127.0.0.1/3000/tauri");
2929
});
3030
});

crates/devtools-v1/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,9 +260,9 @@ fn port_is_available(port: u16) -> bool {
260260
// This is pretty ugly code I know, but it looks nice in the terminal soo ¯\_(ツ)_/¯
261261
fn print_link(addr: &SocketAddr) {
262262
let url = if option_env!("__DEVTOOLS_LOCAL_DEVELOPMENT").is_some() {
263-
"http://localhost:5173/app/dash/"
263+
"http://localhost:5173/dash/"
264264
} else {
265-
"https://devtools.crabnebula.dev/app/dash/"
265+
"https://devtools.crabnebula.dev/dash/"
266266
};
267267

268268
let url = format!("{url}{}/{}", addr.ip(), addr.port());

crates/devtools/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,9 +302,9 @@ fn port_is_available(host: &IpAddr, port: u16) -> bool {
302302

303303
fn print_link(addr: &SocketAddr) {
304304
let url = if option_env!("__DEVTOOLS_LOCAL_DEVELOPMENT").is_some() {
305-
"http://localhost:5173/app/dash/"
305+
"http://localhost:5173/dash/"
306306
} else {
307-
"https://devtools.crabnebula.dev/app/dash/"
307+
"https://devtools.crabnebula.dev/dash/"
308308
};
309309

310310
let url = format!(

0 commit comments

Comments
 (0)