Skip to content

Commit eb8487f

Browse files
fix(desktop): rebase with appload mirror and hash (hoppscotch#5351)
The rebases and updates desktop's `@hoppscotch/plugin-appload` dependency from branch-based ref to specific commit hash to resolve Docker build failures. Branch-based GitHub dependencies require `git` in the build environment. Our Dockerfile stages didn't install `git`, which caused `pnpm install` to fail with `spawn git ENOENT`. Using a commit hash allows `pnpm` to fetch the tarball directly without requiring `git`.
1 parent f234e66 commit eb8487f

File tree

10 files changed

+32
-63
lines changed

10 files changed

+32
-63
lines changed

packages/hoppscotch-desktop/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"@fontsource-variable/roboto-mono": "5.2.6",
2525
"@hoppscotch/common": "workspace:^",
2626
"@hoppscotch/kernel": "workspace:^",
27-
"@hoppscotch/plugin-appload": "github:CuriousCorrelation/tauri-plugin-appload#feat-desktop-appload-top-level-config",
27+
"@hoppscotch/plugin-appload": "github:CuriousCorrelation/tauri-plugin-appload#e05861959938b57479a1a81fa796735ebbd08c7c",
2828
"@hoppscotch/ui": "0.2.5",
2929
"@tauri-apps/api": "2.1.1",
3030
"@tauri-apps/plugin-fs": "2.0.2",

packages/hoppscotch-desktop/plugin-workspace/tauri-plugin-appload/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
},
2727
"devDependencies": {
2828
"@rollup/plugin-typescript": "^11.1.6",
29-
"rollup": "^4.48.1",
30-
"tslib": "^2.6.2",
31-
"typescript": "5.9.2"
29+
"rollup": "^4.9.6",
30+
"typescript": "5.9.2",
31+
"tslib": "^2.6.2"
3232
}
3333
}

packages/hoppscotch-desktop/plugin-workspace/tauri-plugin-appload/permissions/autogenerated/reference.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Default permissions for AppLoad plugin
77
- `allow-load`
88
- `allow-download`
99
- `allow-clear`
10+
- `allow-close`
1011
- `allow-remove`
1112

1213
## Permission Table

packages/hoppscotch-desktop/plugin-workspace/tauri-plugin-appload/permissions/schemas/schema.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -309,12 +309,14 @@
309309
{
310310
"description": "Enables the close command without any pre-configured scope.",
311311
"type": "string",
312-
"const": "allow-close"
312+
"const": "allow-close",
313+
"markdownDescription": "Enables the close command without any pre-configured scope."
313314
},
314315
{
315316
"description": "Denies the close command without any pre-configured scope.",
316317
"type": "string",
317-
"const": "deny-close"
318+
"const": "deny-close",
319+
"markdownDescription": "Denies the close command without any pre-configured scope."
318320
},
319321
{
320322
"description": "Enables the download command without any pre-configured scope.",
@@ -365,10 +367,10 @@
365367
"markdownDescription": "Denies the remove command without any pre-configured scope."
366368
},
367369
{
368-
"description": "Default permissions for AppLoad plugin\n#### This default permission set includes:\n\n- `allow-load`\n- `allow-download`\n- `allow-clear`\n- `allow-remove`",
370+
"description": "Default permissions for AppLoad plugin\n#### This default permission set includes:\n\n- `allow-load`\n- `allow-download`\n- `allow-clear`\n- `allow-close`\n- `allow-remove`",
369371
"type": "string",
370372
"const": "default",
371-
"markdownDescription": "Default permissions for AppLoad plugin\n#### This default permission set includes:\n\n- `allow-load`\n- `allow-download`\n- `allow-clear`\n- `allow-remove`"
373+
"markdownDescription": "Default permissions for AppLoad plugin\n#### This default permission set includes:\n\n- `allow-load`\n- `allow-download`\n- `allow-clear`\n- `allow-close`\n- `allow-remove`"
372374
}
373375
]
374376
}

packages/hoppscotch-desktop/plugin-workspace/tauri-plugin-appload/src/vendor/builder.rs

Lines changed: 0 additions & 34 deletions
This file was deleted.

packages/hoppscotch-desktop/plugin-workspace/tauri-plugin-relay/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
},
2727
"devDependencies": {
2828
"@rollup/plugin-typescript": "^11.1.6",
29-
"rollup": "^4.48.1",
30-
"tslib": "^2.6.2",
31-
"typescript": "5.9.2"
29+
"rollup": "^4.9.6",
30+
"typescript": "5.9.2",
31+
"tslib": "^2.6.2"
3232
}
3333
}

packages/hoppscotch-desktop/plugin-workspace/tauri-plugin-relay/pnpm-lock.yaml

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/hoppscotch-desktop/src-tauri/Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/hoppscotch-desktop/src-tauri/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ tauri-plugin-store = "2.2.0"
2929
tauri-plugin-dialog = "2.2.0"
3030
tauri-plugin-fs = "2.2.0"
3131
tauri-plugin-deep-link = "2.2.0"
32-
tauri-plugin-appload = { git = "https://github.com/CuriousCorrelation/tauri-plugin-appload", branch = "feat-desktop-appload-top-level-config" }
32+
tauri-plugin-appload = { git = "https://github.com/CuriousCorrelation/tauri-plugin-appload", rev = "e05861959938b57479a1a81fa796735ebbd08c7c" }
3333
tauri-plugin-relay = { git = "https://github.com/CuriousCorrelation/tauri-plugin-relay", rev = "ff18f776ddeb53dbbdeaf97e1fabc30bdc57c158" }
3434
axum = "0.8.1"
3535
tower-http = { version = "0.6.2", features = ["cors"] }

pnpm-lock.yaml

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)