Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
4bfd1c4
fix: resolve collection variable referencing issues (#5584)
nivedin Nov 24, 2025
b438e1d
fix: prevent duplicate requests from showing active indicator simulta…
chhaviG22 Nov 24, 2025
904a1b0
chore: security patch for the dependency chain v2025.11.0 (#5590)
mirarifhasan Nov 24, 2025
92031c8
fix: filter undefined values in config and update build files (#5610)
mirarifhasan Nov 24, 2025
f624050
chore(agent): bump agent and dependency chain (#5607)
CuriousCorrelation Nov 24, 2025
ce026d5
chore(desktop): bump desktop shell dependencies (#5612)
CuriousCorrelation Nov 24, 2025
e63bfe3
feat: API Documentation (#5499)
nivedin Nov 25, 2025
0173419
fix(common): agent interceptor dependency compat (#5613)
CuriousCorrelation Nov 25, 2025
f834cc8
feat(desktop): portable phase-3: instance manager (#5421)
CuriousCorrelation Nov 25, 2025
77af577
feat: mock server feature enhancements (#5609)
anwarulislam Nov 25, 2025
0321238
feat: add platform-specific import support for personal collections (…
anwarulislam Nov 25, 2025
a5fb7cb
fix: API documentation UI flow improvements (#5618)
nivedin Nov 25, 2025
16f08e2
feat(common): add better ux to profile page by enabling routing for e…
anwarulislam Nov 25, 2025
f2f015c
feat(scripting-revamp): add support for sending requests in scripting…
jamesgeorge007 Nov 26, 2025
7bcd268
chore: bump version to `2025.11.0`
jamesgeorge007 Nov 26, 2025
62aa444
chore: bump CLI version
jamesgeorge007 Nov 26, 2025
0bf8e08
chore: formatting updates
jamesgeorge007 Nov 26, 2025
c50076e
chore: bump dependencies
jamesgeorge007 Nov 26, 2025
7deaa13
ci: remove stale workflow
jamesgeorge007 Nov 26, 2025
fdbec04
fix: guard tauri calls with kernel check (#5619)
CuriousCorrelation Nov 26, 2025
4c1911c
feat(common): add erase response functionality with keybindings (#5435)
12fahed Nov 26, 2025
9f703c9
fix(common): GraphQL argument addition and click event propagation (#…
notKvS Nov 26, 2025
c6c86e8
fix(cli): prevent false test skips for intentional error scenarios
jamesgeorge007 Nov 26, 2025
1e8edd2
docs(cli): add workspace dependency build requirements to README (#5440)
iw4p Nov 26, 2025
ab52efc
feat: improve documentation UI and add published docs indicators (#5620)
nivedin Nov 27, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
17 changes: 11 additions & 6 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@ jobs:

strategy:
matrix:
# Pinned to Node.js 22 to maintain compatibility with isolated-vm v5.x
# Node.js 24 requires isolated-vm v6+ due to V8 API changes
# TODO: Upgrade to isolated-vm v6 and support Node.js 24 in future dependency update cycle
node-version: ["22"]
# Pinned to Node.js 22 due to known test failures on Node.js 24.
# Future TODO: Investigate test failures and move to Node.js 24 (Active LTS).
node-version: [22]

steps:
- name: Checkout
Expand All @@ -33,8 +32,14 @@ jobs:
- name: Setup pnpm
uses: pnpm/action-setup@v3
with:
version: 8
run_install: true
version: 10
run_install: false

- name: Install dependencies
run: pnpm install
env:
DATABASE_URL: postgresql://postgres:testpass@localhost:5432/hoppscotch
DATA_ENCRYPTION_KEY: "12345678901234567890123456789012"

- name: Run tests
run: pnpm test
42 changes: 0 additions & 42 deletions .github/workflows/ui.yml

This file was deleted.

2 changes: 1 addition & 1 deletion aio_run.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ fs.rmSync("build.env")

const caddyFileName = process.env.ENABLE_SUBPATH_BASED_ACCESS === 'true' ? 'aio-subpath-access.Caddyfile' : 'aio-multiport-setup.Caddyfile'
const caddyProcess = runChildProcessWithPrefix("caddy", ["run", "--config", `/etc/caddy/${caddyFileName}`, "--adapter", "caddyfile"], "App/Admin Dashboard Caddy")
const backendProcess = runChildProcessWithPrefix("node", ["/dist/backend/dist/main.js"], "Backend Server")
const backendProcess = runChildProcessWithPrefix("node", ["/dist/backend/dist/src/main.js"], "Backend Server")
const webappProcess = runChildProcessWithPrefix("webapp-server", [], "Webapp Server")

caddyProcess.on("exit", (code) => {
Expand Down
46 changes: 33 additions & 13 deletions devenv.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
"devenv": {
"locked": {
"dir": "src/modules",
"lastModified": 1738772960,
"lastModified": 1761922975,
"owner": "cachix",
"repo": "devenv",
"rev": "7f756cdf3fbb01cab243dcec4de0ca94e6aaa2af",
"rev": "c9f0b47815a4895fadac87812de8a4de27e0ace1",
"type": "github"
},
"original": {
Expand All @@ -24,10 +24,10 @@
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1738737274,
"lastModified": 1762238689,
"owner": "nix-community",
"repo": "fenix",
"rev": "f82de9980822f3b1efcf54944939b1d514386827",
"rev": "0f94d1e67ea9ef983a9b5caf9c14bc52ae2eac44",
"type": "github"
},
"original": {
Expand All @@ -39,10 +39,10 @@
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1733328505,
"lastModified": 1761588595,
"owner": "edolstra",
"repo": "flake-compat",
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
"rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
"type": "github"
},
"original": {
Expand All @@ -60,10 +60,10 @@
]
},
"locked": {
"lastModified": 1737465171,
"lastModified": 1760663237,
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17",
"rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37",
"type": "github"
},
"original": {
Expand Down Expand Up @@ -94,10 +94,10 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1738734093,
"lastModified": 1762156382,
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5b2753b0356d1c951d7a3ef1d086ba5a71fff43c",
"rev": "7241bcbb4f099a66aafca120d37c65e8dda32717",
"type": "github"
},
"original": {
Expand All @@ -115,16 +115,17 @@
"nixpkgs": "nixpkgs",
"pre-commit-hooks": [
"git-hooks"
]
],
"rust-overlay": "rust-overlay"
}
},
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1738754241,
"lastModified": 1762201112,
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "ca47cddc31ae76a05e8709ed4aec805c5ef741d3",
"rev": "132d3338f4526b5c71046e5dc7ddf800e279daf4",
"type": "github"
},
"original": {
Expand All @@ -133,6 +134,25 @@
"repo": "rust-analyzer",
"type": "github"
}
},
"rust-overlay": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1762223900,
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "cfe1598d69a42a5edb204770e71b8df77efef2c3",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
}
},
"root": "root",
Expand Down
15 changes: 7 additions & 8 deletions devenv.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,7 @@ let
else pkgs;

darwinPackages = with pkgs; [
darwin.apple_sdk.frameworks.Security
darwin.apple_sdk.frameworks.CoreServices
darwin.apple_sdk.frameworks.CoreFoundation
darwin.apple_sdk.frameworks.Foundation
darwin.apple_sdk.frameworks.AppKit
darwin.apple_sdk.frameworks.WebKit
apple-sdk
];

linuxPackages = with pkgs; [
Expand All @@ -33,7 +28,7 @@ in {
# NOTE: In case there's `Cannot find module: ... bcrypt ...` error, try `npm rebuild bcrypt`
# See: https://github.com/kelektiv/node.bcrypt.js/issues/800
# See: https://github.com/kelektiv/node.bcrypt.js/issues/1055
nodejs_20
nodejs_22
nodePackages.typescript-language-server
nodePackages."@volar/vue-language-server"
nodePackages.prisma
Expand Down Expand Up @@ -167,11 +162,15 @@ in {
enable = true;
};
javascript = {
package = pkgs.nodejs_20;
package = pkgs.nodejs_22;
enable = true;
npm.enable = true;
pnpm.enable = true;
};
go = {
enable = true;
package = pkgs.go_1_24;
};
rust = {
enable = true;
channel = "nightly";
Expand Down
23 changes: 7 additions & 16 deletions devenv.yaml
Original file line number Diff line number Diff line change
@@ -1,23 +1,14 @@
# yaml-language-server: $schema=https://devenv.sh/devenv.schema.json
inputs:
# For NodeJS-22 and above
nixpkgs:
url: github:NixOS/nixpkgs/nixpkgs-unstable
# nixpkgs:
# url: github:cachix/devenv-nixpkgs/rolling
fenix:
url: github:nix-community/fenix
inputs:
nixpkgs:
follows: nixpkgs

# If you're using non-OSS software, you can set allowUnfree to true.
nixpkgs:
url: github:NixOS/nixpkgs/nixpkgs-unstable
rust-overlay:
url: github:oxalica/rust-overlay
inputs:
nixpkgs:
follows: nixpkgs
allowUnfree: true

# If you're willing to use a package that's vulnerable
# permittedInsecurePackages:
# - "openssl-1.1.1w"

# If you have more than one devenv you can merge them
#imports:
# - ./backend
10 changes: 6 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"author": "Hoppscotch (support@hoppscotch.io)",
"private": true,
"license": "MIT",
"packageManager": "pnpm@10.18.3",
"packageManager": "pnpm@10.23.0",
"scripts": {
"preinstall": "npx only-allow pnpm",
"prepare": "husky",
Expand All @@ -27,22 +27,24 @@
"@commitlint/cli": "20.1.0",
"@commitlint/config-conventional": "20.0.0",
"@hoppscotch/ui": "0.2.5",
"@types/node": "24.9.1",
"@types/node": "24.10.1",
"cross-env": "10.1.0",
"http-server": "14.1.1",
"husky": "9.1.7",
"lint-staged": "16.2.5"
"lint-staged": "16.2.7"
},
"pnpm": {
"overrides": {
"@nestjs-modules/mailer>mjml": "5.0.0-alpha.4",
"apiconnect-wsdl": "2.0.36",
"cross-spawn": "7.0.6",
"execa@0.10.0": "2.0.0",
"glob@<11.1.0": "11.1.0",
"hono@<4.10.3": "4.10.3",
"nodemailer@<7.0.7": "7.0.7",
"sha.js@2.4.11": "2.4.12",
"subscriptions-transport-ws>ws": "7.5.10",
"vue": "3.5.22",
"vue": "3.5.25",
"form-data": "4.0.4",
"ws": "8.17.1"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/codemirror-lang-graphql/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
"devDependencies": {
"@lezer/generator": "1.8.0",
"@rollup/plugin-typescript": "12.1.4",
"mocha": "11.7.4",
"rollup": "4.52.5",
"mocha": "11.7.5",
"rollup": "4.53.3",
"typescript": "5.9.3"
}
}
24 changes: 12 additions & 12 deletions 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.15",
"version": "0.1.16",
"type": "module",
"scripts": {
"dev": "vite",
Expand All @@ -12,26 +12,26 @@
"dependencies": {
"@hoppscotch/ui": "0.2.5",
"@tauri-apps/api": "2.1.1",
"@tauri-apps/plugin-shell": "^2.2.1",
"@vueuse/core": "13.7.0",
"axios": "1.12.2",
"@tauri-apps/plugin-shell": "2.3.3",
"@vueuse/core": "14.0.0",
"axios": "1.13.2",
"fp-ts": "2.16.11",
"lodash-es": "4.17.21",
"vue": "3.5.22"
"vue": "3.5.25"
},
"devDependencies": {
"@iconify-json/lucide": "1.2.68",
"@tauri-apps/cli": "^2.0.3",
"@iconify-json/lucide": "1.2.73",
"@tauri-apps/cli": "2.9.3",
"@types/lodash-es": "4.17.12",
"@types/node": "24.9.1",
"@vitejs/plugin-vue": "5.1.4",
"@types/node": "24.10.1",
"@vitejs/plugin-vue": "6.0.2",
"autoprefixer": "10.4.21",
"postcss": "8.5.6",
"tailwindcss": "3.4.16",
"typescript": "5.9.3",
"unplugin-icons": "22.2.0",
"unplugin-vue-components": "29.0.0",
"vite": "6.3.6",
"unplugin-icons": "22.5.0",
"unplugin-vue-components": "30.0.0",
"vite": "7.2.4",
"vue-tsc": "2.2.0"
}
}
Loading
Loading