thibaud-lclr/api-client
1
0
Fork 0
Code Packages Activity Actions

chore: merge hoppscotch/main into hoppscotch/next

Browse source
This commit is contained in:
jamesgeorge007 2025-06-24 15:00:01 +05:30
commit aa5b540412
12 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/hoppscotch-backend/package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "hoppscotch-backend", "name": "hoppscotch-backend",
"version": "2025.5.3", "version": "2025.5.4",
"description": "", "description": "",
"author": "", "author": "",
"private": true, "private": true,

2
packages/hoppscotch-common/package.json
View file

@ -1,7 +1,7 @@
{ {
"name": "@hoppscotch/common", "name": "@hoppscotch/common",
"private": true, "private": true,
"version": "2025.5.3", "version": "2025.5.4",
"scripts": { "scripts": {
"dev": "pnpm exec npm-run-all -p -l dev:*", "dev": "pnpm exec npm-run-all -p -l dev:*",
"test": "vitest --run", "test": "vitest --run",

2
packages/hoppscotch-desktop/package.json
View file

@ -1,7 +1,7 @@
{ {
"name": "hoppscotch-desktop", "name": "hoppscotch-desktop",
"private": true, "private": true,
"version": "25.5.3", "version": "25.5.4",
"type": "module", "type": "module",
"scripts": { "scripts": {
"dev": "vite", "dev": "vite",

2
packages/hoppscotch-desktop/src-tauri/Cargo.lock generated
View file

@ -2054,7 +2054,7 @@ dependencies = [
[[package]] [[package]]
name = "hoppscotch-desktop" name = "hoppscotch-desktop"
version = "25.5.3" version = "25.5.4"
dependencies = [ dependencies = [
"axum", "axum",
"dirs 6.0.0", "dirs 6.0.0",

2
packages/hoppscotch-desktop/src-tauri/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "hoppscotch-desktop" name = "hoppscotch-desktop"
version = "25.5.3" version = "25.5.4"
description = "Desktop App for hoppscotch.io" description = "Desktop App for hoppscotch.io"
authors = ["CuriousCorrelation"] authors = ["CuriousCorrelation"]
edition = "2021" edition = "2021"

2
packages/hoppscotch-desktop/src-tauri/tauri.conf.json
View file

@ -1,7 +1,7 @@
{ {
"$schema": "https://schema.tauri.app/config/2", "$schema": "https://schema.tauri.app/config/2",
"productName": "Hoppscotch", "productName": "Hoppscotch",
"version": "25.5.3", "version": "25.5.4",
"identifier": "io.hoppscotch.desktop", "identifier": "io.hoppscotch.desktop",
"build": { "build": {
"beforeDevCommand": "pnpm dev", "beforeDevCommand": "pnpm dev",

2
packages/hoppscotch-desktop/src/views/Home.vue
View file

@ -299,7 +299,7 @@ const loadVendored = async () => {
const vendoredInstance: VendoredInstance = { const vendoredInstance: VendoredInstance = {
type: "vendored", type: "vendored",
displayName: "Hoppscotch", displayName: "Hoppscotch",
version: "25.5.3", version: "25.5.4",
} }
const connectionState: ConnectionState = { const connectionState: ConnectionState = {

2
packages/hoppscotch-selfhost-web/package.json
View file

@ -1,7 +1,7 @@
{ {
"name": "@hoppscotch/selfhost-web", "name": "@hoppscotch/selfhost-web",
"private": true, "private": true,
"version": "2025.5.3", "version": "2025.5.4",
"type": "module", "type": "module",
"scripts": { "scripts": {
"dev:vite": "vite", "dev:vite": "vite",

2
packages/hoppscotch-selfhost-web/src/main.ts
View file

@ -83,7 +83,7 @@ async function initApp() {
displayConfig: { displayConfig: {
displayName: "Hoppscotch", displayName: "Hoppscotch",
description: "On-Prem", description: "On-Prem",
version: "25.5.3", version: "25.5.4",
connectingMessage: "Connecting to On-prem", connectingMessage: "Connecting to On-prem",
connectedMessage: "Connected to On-prem", connectedMessage: "Connected to On-prem",
}, },

2
packages/hoppscotch-selfhost-web/webapp-server/src/bundle/model.rs
View file

@ -47,7 +47,7 @@ pub struct Bundle {
impl Bundle { impl Bundle {
pub fn new(bundle_version: Option<String>, content: Vec<u8>, signature: Signature, files: Vec<FileEntry>) -> Self { pub fn new(bundle_version: Option<String>, content: Vec<u8>, signature: Signature, files: Vec<FileEntry>) -> Self {
let metadata = BundleMetadata { let metadata = BundleMetadata {
version: "2025.5.3".to_string(), version: "2025.5.4".to_string(),
created_at: Utc::now(), created_at: Utc::now(),
signature, signature,
manifest: Manifest { files }, manifest: Manifest { files },

4
packages/hoppscotch-selfhost-web/webapp-server/src/config.rs
View file

@ -54,7 +54,7 @@ impl Default for ServerConfig {
Self { Self {
port: default_port(), port: default_port(),
max_bundle_size: default_max_bundle_size(), max_bundle_size: default_max_bundle_size(),
bundle_version: Some("2025.5.3".to_string()), bundle_version: Some("2025.5.4".to_string()),
csp_directives: None, csp_directives: None,
signing_key: None, signing_key: None,
verifying_key: None, verifying_key: None,
@ -75,7 +75,7 @@ impl ServerConfig {
Self { Self {
signing_key: Some(key_pair.signing_key), signing_key: Some(key_pair.signing_key),
verifying_key: Some(key_pair.verifying_key), verifying_key: Some(key_pair.verifying_key),
bundle_version: Some("2025.5.3".to_string()), bundle_version: Some("2025.5.4".to_string()),
frontend_path, frontend_path,
is_dev: cfg!(debug_assertions), is_dev: cfg!(debug_assertions),
..Default::default() ..Default::default()

2
packages/hoppscotch-sh-admin/package.json
View file

@ -1,7 +1,7 @@
{ {
"name": "hoppscotch-sh-admin", "name": "hoppscotch-sh-admin",
"private": true, "private": true,
"version": "2025.5.3", "version": "2025.5.4",
"type": "module", "type": "module",
"scripts": { "scripts": {
"dev": "pnpm exec npm-run-all -p -l dev:*", "dev": "pnpm exec npm-run-all -p -l dev:*",