[pull] main from hoppscotch:main

packages/hoppscotch-backend/package.json

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

packages/hoppscotch-common/package.json

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

packages/hoppscotch-common/src/components/collections/Collection.vue

@@ -82,7 +82,6 @@
             @click="emit('add-folder')"
           />
           <HoppButtonSecondary
-            v-if="!isEmpty"
             v-tippy="{ theme: 'tooltip' }"
             :icon="IconPlaySquare"
             :title="t('collection_runner.run_collection')"
@@ -145,7 +144,6 @@
                     "
                   />
                   <HoppSmartItem
-                    v-if="!isEmpty"
                     ref="runCollectionAction"
                     :icon="IconPlaySquare"
                     :label="t('collection_runner.run_collection')"
@@ -372,28 +370,6 @@ const ordering = ref(false)
 const orderingLastItem = ref(false)
 const dropItemID = ref("")
 
-/**
- * Determines if the collection/folder is empty.
- * A collection/folder is considered empty if it has no requests and no child folders.
- */
-const isEmpty = computed(() => {
-  if (!props.data) return true
-
-  if (props.collectionsType === "my-collections") {
-    const collection = props.data as HoppCollection
-    const req = collection.requests.length
-    const fol = collection.folders.length
-
-    return req === 0 && fol === 0
-  }
-
-  const teamCollection = props.data as TeamCollection
-  const req = teamCollection.requests?.length ?? 0
-  const child = teamCollection.children?.length ?? 0
-
-  return req === 0 && child === 0
-})
-
 /**
  * Determines if the collection/folder is sortable.
  * A collection/folder is sortable if it has more than one request or more than one child folder.

packages/hoppscotch-common/src/helpers/RequestRunner.ts

@@ -397,8 +397,30 @@ export function runRESTRequest$(
 
   const cookieJarEntries = getCookieJarEntries()
 
+  const { request, inheritedProperties } = tab.value.document
+
+  const requestAuth =
+    request.auth.authType === "inherit" && request.auth.authActive
+      ? inheritedProperties?.auth.inheritedAuth
+      : request.auth
+
+  const inheritedHeaders = inheritedProperties?.headers
+    ?.filter((header) => header.inheritedHeader)
+    .map((header) => header.inheritedHeader!)
+
+  const requestHeaders: HoppRESTHeaders = [
+    ...(inheritedHeaders ?? []),
+    ...request.headers,
+  ]
+
+  const resolvedRequest = {
+    ...tab.value.document.request,
+    auth: requestAuth ?? { authType: "none", authActive: false },
+    headers: requestHeaders,
+  }
+
   const res = delegatePreRequestScriptRunner(
-    tab.value.document.request,
+    resolvedRequest,
     getCombinedEnvVariables(),
     cookieJarEntries
   ).then(async (preRequestScriptResult) => {
@@ -409,31 +431,6 @@ export function runRESTRequest$(
       return E.left("script_fail" as const)
     }
 
-    const requestAuth =
-      tab.value.document.request.auth.authType === "inherit" &&
-      tab.value.document.request.auth.authActive
-        ? tab.value.document.inheritedProperties?.auth.inheritedAuth
-        : tab.value.document.request.auth
-
-    let requestHeaders
-
-    const inheritedHeaders =
-      tab.value.document.inheritedProperties?.headers.map((header) => {
-        if (header.inheritedHeader) {
-          return header.inheritedHeader
-        }
-        return []
-      })
-
-    if (inheritedHeaders) {
-      requestHeaders = [
-        ...inheritedHeaders,
-        ...tab.value.document.request.headers,
-      ]
-    } else {
-      requestHeaders = [...tab.value.document.request.headers]
-    }
-
     const finalRequestVariables =
       tab.value.document.request.requestVariables.map(
         (v: HoppRESTRequestVariable) => {
@@ -460,9 +457,7 @@ export function runRESTRequest$(
       }))
 
     const finalRequest = {
-      ...tab.value.document.request,
-      auth: requestAuth ?? { authType: "none", authActive: false },
-      headers: requestHeaders as HoppRESTHeaders,
+      ...resolvedRequest,
       ...(preRequestScriptResult.right.updatedRequest ?? {}),
     }
 

packages/hoppscotch-desktop/package.json

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

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

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

packages/hoppscotch-desktop/src-tauri/tauri.conf.json

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

packages/hoppscotch-desktop/src-tauri/tauri.portable.macos.conf.json

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

packages/hoppscotch-desktop/src-tauri/tauri.portable.windows.conf.json

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

packages/hoppscotch-desktop/src/views/Home.vue

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

packages/hoppscotch-selfhost-web/package.json

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

packages/hoppscotch-selfhost-web/src/main.ts

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

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

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

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

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

packages/hoppscotch-sh-admin/package.json

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