Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/hoppscotch-agent/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "hoppscotch-agent",
"private": true,
"version": "0.1.11",
"version": "0.1.12",
"type": "module",
"scripts": {
"dev": "vite",
Expand Down
4 changes: 2 additions & 2 deletions packages/hoppscotch-agent/src-tauri/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/hoppscotch-agent/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "hoppscotch-agent"
version = "0.1.11"
version = "0.1.12"
description = "A cross-platform HTTP request agent for Hoppscotch for advanced request handling including custom headers, certificates, proxies, and local system integration."
authors = ["AndrewBastin", "CuriousCorrelation"]
edition = "2021"
Expand Down
2 changes: 1 addition & 1 deletion packages/hoppscotch-agent/src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "https://schema.tauri.app/config/2.0.0-rc",
"productName": "Hoppscotch Agent",
"version": "0.1.11",
"version": "0.1.12",
"identifier": "io.hoppscotch.agent",
"build": {
"beforeDevCommand": "pnpm dev",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "https://schema.tauri.app/config/2.0.0-rc",
"productName": "Hoppscotch Agent Portable",
"version": "0.1.11",
"version": "0.1.12",
"identifier": "io.hoppscotch.agent",
"build": {
"beforeDevCommand": "pnpm dev",
Expand Down
2 changes: 1 addition & 1 deletion packages/hoppscotch-backend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "hoppscotch-backend",
"version": "2025.7.0",
"version": "2025.7.1",
"description": "",
"author": "",
"private": true,
Expand Down
2 changes: 1 addition & 1 deletion packages/hoppscotch-common/locales/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -993,7 +993,7 @@
"invited_to_team": "{owner} te ha invitado al espacio de trabajo {team}",
"join": "Invitación aceptada",
"join_team": "Entrar al espacio de trabajo {team}",
"joined_team": "Haz entrado al espacio de trabajo {team}",
"joined_team": "Has entrado al espacio de trabajo {team}",
"joined_team_description": "Ahora eres miembro de este espacio de trabajo",
"left": "Saliste del espacio de trabajo",
"login_to_continue": "Iniciar sesión para continuar",
Expand Down
44 changes: 30 additions & 14 deletions packages/hoppscotch-common/locales/tw.json
Original file line number Diff line number Diff line change
@@ -1,51 +1,63 @@
{
"action": {
"add": "Add",
"add": "新增",
"autoscroll": "自動捲動",
"cancel": "取消",
"choose_file": "選擇一個檔案",
"choose_workspace": "選擇工作區",
"choose_collection": "選擇集合",
"select_workspace": "選擇工作區",
"clear": "清除",
"clear_all": "全部清除",
"clear_cache": "清除快取",
"clear_history": "清除所有歷史記錄",
"clear_unpinned": "清除未釘選",
"close": "關閉",
"confirm": "確認",
"connect": "連線",
"connecting": "正在連接",
"connecting": "連線中",
"copy": "複製",
"create": "建立",
"delete": "刪除",
"disconnect": "斷開連線",
"disconnect": "中斷連線",
"dismiss": "忽略",
"done": "完成",
"dont_save": "不要儲存",
"download_file": "下載檔案",
"download_test_report": "下載測試報告",
"drag_to_reorder": "拖曳以重新排序",
"duplicate": "複製",
"edit": "編輯",
"filter": "篩選回應",
"filter": "篩選",
"go_back": "返回",
"go_forward": "向前",
"group_by": "分組方式",
"go_forward": "前進",
"group_by": "分組",
"hide_secret": "Hide secret",
"label": "標籤",
"learn_more": "瞭解更多",
"download_here": "Download here",
"download_here": "下載到這裡",
"less": "更少",
"more": "更多",
"new": "新增",
"no": "否",
"open_workspace": "開啟工作區",
"paste": "貼上",
"prettify": "美化",
"properties": "Properties",
"prettify": "格式化",
"properties": "屬性",
"register": "註冊",
"remove": "移除",
"rename": "Rename",
"remove_instance": "移除實例",
"rename": "重新命名",
"restore": "還原",
"retry": "重試",
"save": "儲存",
"save_as_example": "儲存為範本",
"scroll_to_bottom": "捲動至底部",
"scroll_to_top": "捲動至頂部",
"search": "搜尋",
"send": "傳送",
"share": "Share",
"show_secret": "Show secret",
"send": "送出",
"share": "分享",
"show_secret": "顯示祕密",
"start": "開始",
"starting": "正在開始",
"stop": "停止",
Expand All @@ -55,7 +67,11 @@
"turn_off": "關閉",
"turn_on": "開啟",
"undo": "復原",
"yes": "是"
"yes": "是",
"verify": "驗證",
"enable": "啟用",
"disable": "停用",
"assign": "指派"
},
"add": {
"new": "新增",
Expand Down
2 changes: 1 addition & 1 deletion packages/hoppscotch-common/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@hoppscotch/common",
"private": true,
"version": "2025.7.0",
"version": "2025.7.1",
"scripts": {
"dev": "pnpm exec npm-run-all -p -l dev:*",
"test": "vitest --run",
Expand Down
3 changes: 1 addition & 2 deletions packages/hoppscotch-common/src/components.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -211,9 +211,7 @@ declare module 'vue' {
IconLucideArrowUpRight: typeof import('~icons/lucide/arrow-up-right')['default']
IconLucideBrush: typeof import('~icons/lucide/brush')['default']
IconLucideCheckCircle: typeof import('~icons/lucide/check-circle')['default']
IconLucideChevronDown: typeof import('~icons/lucide/chevron-down')['default']
IconLucideChevronRight: typeof import('~icons/lucide/chevron-right')['default']
IconLucideChevronUp: typeof import('~icons/lucide/chevron-up')['default']
IconLucideCircleCheck: typeof import('~icons/lucide/circle-check')['default']
IconLucideGlobe: typeof import('~icons/lucide/globe')['default']
IconLucideHelpCircle: typeof import('~icons/lucide/help-circle')['default']
Expand All @@ -223,6 +221,7 @@ declare module 'vue' {
IconLucideListEnd: typeof import('~icons/lucide/list-end')['default']
IconLucideMinus: typeof import('~icons/lucide/minus')['default']
IconLucidePlusCircle: typeof import('~icons/lucide/plus-circle')['default']
IconLucideRss: typeof import('~icons/lucide/rss')['default']
IconLucideSearch: typeof import('~icons/lucide/search')['default']
IconLucideTriangleAlert: typeof import('~icons/lucide/triangle-alert')['default']
IconLucideUsers: typeof import('~icons/lucide/users')['default']
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<HttpRequest v-model="tab" />
<HttpRequestOptions
v-model="tab.document.request"
v-model:option-tab="tab.document.optionTabPreference"
v-model:option-tab="tab.document.optionTabPreference!"
v-model:inherited-properties="tab.document.inheritedProperties"
/>
</template>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
<template>
<div class="flex flex-col">
<div
class="flex flex-col"
:class="{
'space-y-2': !hasTeamWriteAccess,
}"
>
<div class="flex flex-col space-y-2">
<HoppSmartItem
v-for="importer in importers"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ const aggregateEnvs = useReadonlyStream(
const tabs = useService(RESTTabService)

const envVars = computed(() => {
if (props.envs) {
if (props.envs?.length) {
return props.envs.map((x) => {
const { key, secret } = x
const currentValue = secret ? "********" : x.currentValue
Expand Down
13 changes: 12 additions & 1 deletion packages/hoppscotch-common/src/helpers/RequestRunner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -587,6 +587,17 @@ export function runTestRunnerRequest(
return E.left("script_fail" as const)
}

const finalRequestVariables = pipe(
request.requestVariables,
A.filter(({ active }) => active),
A.map(({ key, value }) => ({
key,
initialValue: value,
currentValue: value,
secret: false,
}))
)

const effectiveRequest = await getEffectiveRESTRequest(request, {
id: "env-id",
v: 2,
Expand All @@ -597,7 +608,7 @@ export function runTestRunnerRequest(
...preRequestScriptResult.right.envs,
temp: !persistEnv ? getTemporaryVariables() : [],
},
requestVariables: [],
requestVariables: finalRequestVariables,
})
),
})
Expand Down
2 changes: 1 addition & 1 deletion packages/hoppscotch-desktop/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "hoppscotch-desktop",
"private": true,
"version": "25.7.0",
"version": "25.7.1",
"type": "module",
"scripts": {
"dev": "vite",
Expand Down
86 changes: 83 additions & 3 deletions packages/hoppscotch-desktop/plugin-workspace/relay/src/interop.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ use time::OffsetDateTime;

#[derive(Debug, Serialize, Deserialize, Clone, Copy, PartialEq, Display, EnumString)]
pub enum MediaType {
// Text
#[serde(rename = "text/plain")]
#[strum(to_string = "text/plain")]
TextPlain,
Expand All @@ -20,6 +21,11 @@ pub enum MediaType {
#[serde(rename = "text/csv")]
#[strum(to_string = "text/csv")]
TextCsv,
#[serde(rename = "text/xml")]
#[strum(to_string = "text/xml")]
TextXml,

// Application
#[serde(rename = "application/json")]
#[strum(to_string = "application/json")]
Json,
Expand All @@ -29,9 +35,6 @@ pub enum MediaType {
#[serde(rename = "application/xml")]
#[strum(to_string = "application/xml")]
Xml,
#[serde(rename = "text/xml")]
#[strum(to_string = "text/xml")]
TextXml,
#[serde(rename = "application/x-www-form-urlencoded")]
#[strum(to_string = "application/x-www-form-urlencoded")]
FormUrlEncoded,
Expand All @@ -41,6 +44,83 @@ pub enum MediaType {
#[serde(rename = "application/octet-stream")]
#[strum(to_string = "application/octet-stream")]
OctetStream,
#[serde(rename = "application/pdf")]
#[strum(to_string = "application/pdf")]
ApplicationPdf,
#[serde(rename = "application/zip")]
#[strum(to_string = "application/zip")]
ApplicationZip,
#[serde(rename = "application/javascript")]
#[strum(to_string = "application/javascript")]
ApplicationJavascript,

// Audio
#[serde(rename = "audio/mpeg")]
#[strum(to_string = "audio/mpeg")]
AudioMpeg,
#[serde(rename = "audio/mp4")]
#[strum(to_string = "audio/mp4")]
AudioMp4,
#[serde(rename = "audio/x-m4a")]
#[strum(to_string = "audio/x-m4a")]
AudioXM4a,
#[serde(rename = "audio/wav")]
#[strum(to_string = "audio/wav")]
AudioWav,
#[serde(rename = "audio/ogg")]
#[strum(to_string = "audio/ogg")]
AudioOgg,
#[serde(rename = "audio/aac")]
#[strum(to_string = "audio/aac")]
AudioAac,
#[serde(rename = "audio/flac")]
#[strum(to_string = "audio/flac")]
AudioFlac,

// Video
#[serde(rename = "video/mp4")]
#[strum(to_string = "video/mp4")]
VideoMp4,
#[serde(rename = "video/avi")]
#[strum(to_string = "video/avi")]
VideoAvi,
#[serde(rename = "video/quicktime")]
#[strum(to_string = "video/quicktime")]
VideoQuicktime,
#[serde(rename = "video/x-msvideo")]
#[strum(to_string = "video/x-msvideo")]
VideoXMsvideo,
#[serde(rename = "video/webm")]
#[strum(to_string = "video/webm")]
VideoWebm,
#[serde(rename = "video/x-flv")]
#[strum(to_string = "video/x-flv")]
VideoXFlv,

// Image
#[serde(rename = "image/png")]
#[strum(to_string = "image/png")]
ImagePng,
#[serde(rename = "image/jpeg")]
#[strum(to_string = "image/jpeg")]
ImageJpeg,
#[serde(rename = "image/gif")]
#[strum(to_string = "image/gif")]
ImageGif,
#[serde(rename = "image/svg+xml")]
#[strum(to_string = "image/svg+xml")]
ImageSvgXml,
#[serde(rename = "image/webp")]
#[strum(to_string = "image/webp")]
ImageWebp,
#[serde(rename = "image/bmp")]
#[strum(to_string = "image/bmp")]
ImageBmp,
#[serde(rename = "image/x-icon")]
#[strum(to_string = "image/x-icon")]
ImageXIcon,

// Fallback for unknown
#[serde(other)]
Other,
}
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading