From 50965a44834268d3d4918827ad7da0d31025dd59 Mon Sep 17 00:00:00 2001 From: Jack Kavanagh Date: Wed, 5 Jun 2024 16:20:56 +0200 Subject: [PATCH] Bump/electron-30 (#7354) * bump node * bump electron * pin node v * bump libcurl * fix lock * use stable * types * latest electron --- .npmrc | 2 +- .nvmrc | 2 +- package-lock.json | 22 +++++++++---------- package.json | 2 +- packages/insomnia-send-request/package.json | 2 +- packages/insomnia/package.json | 4 ++-- .../viewers/response-multipart-viewer.tsx | 1 - shell.nix | 6 ++--- 8 files changed, 20 insertions(+), 21 deletions(-) diff --git a/.npmrc b/.npmrc index 45b6fc6397b..44fb4cd867c 100644 --- a/.npmrc +++ b/.npmrc @@ -1,5 +1,5 @@ runtime = electron -target = 29.0.0 +target = 30.0.0 disturl = https://electronjs.org/headers playwright_skip_browser_download=true engine-strict=true diff --git a/.nvmrc b/.nvmrc index f3f52b42d3d..2dbbe00e679 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -20.9.0 +20.11.1 diff --git a/package-lock.json b/package-lock.json index bf052b1e0fd..0530737f6fd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -46,7 +46,7 @@ "typescript": "^5.4.4" }, "engines": { - "node": ">=20.9 <22", + "node": ">=20.11.1 <22", "npm": ">=10" } }, @@ -1781,9 +1781,9 @@ } }, "node_modules/@getinsomnia/node-libcurl": { - "version": "2.4.29-5", - "resolved": "https://registry.npmjs.org/@getinsomnia/node-libcurl/-/node-libcurl-2.4.29-5.tgz", - "integrity": "sha512-QxyTHJsHg2klNBnCtKTMaXJlT/KzD+orKS34NfaA3G0xdEZOZvMfYL6Q232fQisaL62mt28VSL+v5ottY5Ft0w==", + "version": "2.4.30", + "resolved": "https://registry.npmjs.org/@getinsomnia/node-libcurl/-/node-libcurl-2.4.30.tgz", + "integrity": "sha512-PEXsxqzIKnF07nJpiHpfhLlHhPNhJHFumome3J/UvhtYcBbbkoE2afKwAQIRWRelU4jyBPt0i96JNgjPWyo4qg==", "hasInstallScript": true, "dependencies": { "@mapbox/node-pre-gyp": "1.0.11", @@ -1795,7 +1795,7 @@ "tslib": "2.0.1" }, "engines": { - "node": ">= 20" + "node": ">= 20.11.1" } }, "node_modules/@grpc/grpc-js": { @@ -10016,9 +10016,9 @@ } }, "node_modules/electron": { - "version": "29.3.0", - "resolved": "https://registry.npmjs.org/electron/-/electron-29.3.0.tgz", - "integrity": "sha512-ZxFKm0/v48GSoBuO3DdnMlCYXefEUKUHLMsKxyXY4nZGgzbBKpF/X8haZa2paNj23CLfsCKBOtfc2vsEQiOOsA==", + "version": "30.0.9", + "resolved": "https://registry.npmjs.org/electron/-/electron-30.0.9.tgz", + "integrity": "sha512-ArxgdGHVu3o5uaP+Tqj8cJDvU03R6vrGrOqiMs7JXLnvQHMqXJIIxmFKQAIdJW8VoT3ac3hD21tA7cPO10RLow==", "dev": true, "hasInstallScript": true, "dependencies": { @@ -22660,7 +22660,7 @@ "@bufbuild/protobuf": "^1.8.0", "@connectrpc/connect": "^1.4.0", "@connectrpc/connect-node": "^1.4.0", - "@getinsomnia/node-libcurl": "2.4.29-5", + "@getinsomnia/node-libcurl": "^2.4.30", "@grpc/grpc-js": "^1.10.6", "@grpc/proto-loader": "^0.7.12", "@jest/globals": "^29.7.0", @@ -22767,7 +22767,7 @@ "cross-env": "^7.0.3", "date-fns": "^3.6.0", "deep-equal": "^1.0.1", - "electron": "29.3.0", + "electron": "30.0.9", "electron-builder": "24.13.3", "electron-builder-squirrel-windows": "24.13.3", "electron-devtools-installer": "^3.2.0", @@ -23362,7 +23362,7 @@ "version": "9.3.0-alpha.5", "license": "Apache-2.0", "dependencies": { - "@getinsomnia/node-libcurl": "2.4.29-5", + "@getinsomnia/node-libcurl": "^2.4.30", "@seald-io/nedb": "^4.0.4", "@segment/analytics-node": "2.1.0", "@stoplight/spectral-core": "^1.18.3", diff --git a/package.json b/package.json index 2443800f176..306c2b6a6a1 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ }, "homepage": "https://github.com/kong/insomnia#readme", "engines": { - "node": ">=20.9 <22", + "node": ">=20.11.1 <22", "npm": ">=10" }, "workspaces": [ diff --git a/packages/insomnia-send-request/package.json b/packages/insomnia-send-request/package.json index 19d2e5db459..95640b44d76 100644 --- a/packages/insomnia-send-request/package.json +++ b/packages/insomnia-send-request/package.json @@ -7,7 +7,7 @@ "main": "dist/index.js", "types": "dist/send-request/index.d.ts", "dependencies": { - "@getinsomnia/node-libcurl": "2.4.29-5", + "@getinsomnia/node-libcurl": "^2.4.30", "@segment/analytics-node": "2.1.0", "@stoplight/spectral-core": "^1.18.3", "@stoplight/spectral-formats": "^1.6.0", diff --git a/packages/insomnia/package.json b/packages/insomnia/package.json index 1ab6dba11f5..7467886a332 100644 --- a/packages/insomnia/package.json +++ b/packages/insomnia/package.json @@ -39,7 +39,7 @@ "@bufbuild/protobuf": "^1.8.0", "@connectrpc/connect": "^1.4.0", "@connectrpc/connect-node": "^1.4.0", - "@getinsomnia/node-libcurl": "2.4.29-5", + "@getinsomnia/node-libcurl": "^2.4.30", "@grpc/grpc-js": "^1.10.6", "@grpc/proto-loader": "^0.7.12", "@jest/globals": "^29.7.0", @@ -143,7 +143,7 @@ "cross-env": "^7.0.3", "date-fns": "^3.6.0", "deep-equal": "^1.0.1", - "electron": "29.3.0", + "electron": "30.0.9", "electron-builder": "24.13.3", "electron-builder-squirrel-windows": "24.13.3", "electron-devtools-installer": "^3.2.0", diff --git a/packages/insomnia/src/ui/components/viewers/response-multipart-viewer.tsx b/packages/insomnia/src/ui/components/viewers/response-multipart-viewer.tsx index 14a41b09541..b351f5aa596 100644 --- a/packages/insomnia/src/ui/components/viewers/response-multipart-viewer.tsx +++ b/packages/insomnia/src/ui/components/viewers/response-multipart-viewer.tsx @@ -122,7 +122,6 @@ export const ResponseMultipartViewer: FC = ({ // Save the file try { - // @ts-expect-error -- TSCONVERSION if filePath is undefined, don't try to write anything await fs.promises.writeFile(filePath, selectedPart.value); } catch (err) { console.warn('Failed to save multipart to file', err); diff --git a/shell.nix b/shell.nix index ad7ad2b318f..5b3d2c403f7 100644 --- a/shell.nix +++ b/shell.nix @@ -2,11 +2,11 @@ with import { }; mkShell { nativeBuildInputs = [ - nodejs-20_x - electron_29 + nodejs_20 + electron_30 stdenv.cc.cc.lib ]; LD_LIBRARY_PATH = "${stdenv.cc.cc.lib}/lib64:$LD_LIBRARY_PATH"; - ELECTRON_OVERRIDE_DIST_PATH = "${electron_29}/bin/"; + ELECTRON_OVERRIDE_DIST_PATH = "${electron_30}/bin/"; ELECTRON_SKIP_BINARY_DOWNLOAD = 1; }