Skip to content

RQLY-1153 upgrade dependencies #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 16, 2023
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 .erb/scripts/notarize.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { notarize } = require("electron-notarize");
const { notarize } = require("@electron/notarize");
const { build } = require("../../package.json");

exports.default = async function notarizeMacos(context) {
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release_desktop_app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- name: Install Node.js, NPM and Yarn
uses: actions/setup-node@v2
with:
node-version: 14.18
node-version: 16.15

- name: Install desktop app dependencies
run: bash ./install.sh
Expand Down
1 change: 0 additions & 1 deletion install.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
npm i -g patch-package
npm i
7,385 changes: 3,649 additions & 3,736 deletions package-lock.json

Large diffs are not rendered by default.

32 changes: 12 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "requestly",
"productName": "Requestly",
"version": "1.4.22",
"version": "1.4.23",
"private": true,
"description": "Intercept & Modify HTTP Requests",
"scripts": {
Expand Down Expand Up @@ -37,6 +37,7 @@
"build": {
"productName": "Requestly",
"appId": "io.requestly.beta",
"electronVersion": "23.0.0",
"asar": true,
"asarUnpack": "**\\*.{node,dll}",
"files": [
Expand All @@ -53,7 +54,7 @@
"entitlementsInherit": "assets/entitlements.mac.plist",
"gatekeeperAssess": false,
"requirements": "assets/requirement.rqset",
"identity": "Sachin Jain (AFBT5Z9V94)",
"identity": "RQ LABS, INC. (B7SH28MF39)",
"target": [
{
"target": "dmg",
Expand All @@ -70,6 +71,7 @@
]
},
"dmg": {
"sign": true,
"contents": [
{
"x": 130,
Expand Down Expand Up @@ -189,11 +191,11 @@
"css-loader": "^6.4.0",
"css-minimizer-webpack-plugin": "^3.1.1",
"detect-port": "^1.3.0",
"electron": "^15.1.2",
"electron-builder": "^23.0.2",
"electron": "^23.0.0",
"electron-builder": "^24.0.0-alpha.11",
"electron-devtools-installer": "^3.2.0",
"electron-notarize": "^1.1.1",
"electron-rebuild": "^3.2.3",
"@electron/notarize": "^1.2.3",
"@electron/rebuild": "^3.2.10",
"enzyme": "^3.11.0",
"enzyme-to-json": "^3.6.2",
"eslint": "^8.0.0",
Expand Down Expand Up @@ -225,7 +227,7 @@
"webpack-merge": "^5.8.0"
},
"dependencies": {
"@electron/remote": "^2.0.1",
"@electron/remote": "^2.0.9",
"@requestly/requestly-core": "^1.0.2",
"@requestly/requestly-proxy": "^1.1.15",
"@sentry/browser": "^6.13.3",
Expand All @@ -245,7 +247,7 @@
"electron-log": "^4.4.1",
"electron-squirrel-startup": "^1.0.0",
"electron-store": "^8.0.1",
"electron-updater": "^4.3.9",
"electron-updater": "^5.3.0",
"es6-promisify": "^7.0.0",
"fs-extra": "^10.0.0",
"headless": "^1.2.0",
Expand All @@ -255,7 +257,7 @@
"lodash": "^4.17.21",
"mime-types": "^2.1.34",
"mkdirp": "^1.0.4",
"node-forge": "^0.10.0",
"node-forge": "^1.3.1",
"node-gsettings-wrapper": "^0.5.0",
"os-browserify": "^0.3.0",
"path-browserify": "^1.0.1",
Expand All @@ -269,20 +271,10 @@
"tmp": "^0.2.1",
"ua-parser-js": "^1.0.2",
"util": "^0.12.4",
"uuid": "^8.3.2",
"uuid": "^9.0.0",
"ws": "^8.2.3",
"yargs": "^17.2.1"
},
"overrides" : {
"electron-rebuild": {
"got":{
"@types/cacheable-request": {
"@types/keyv": "3.1.4"
}
}
},
"@types/keyv": "3.1.4"
},
"devEngines": {
"node": ">=14.x",
"npm": ">=7.x"
Expand Down
1 change: 1 addition & 0 deletions release/app/dont_run_npm_install_here.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
unless there is no node_modules here to work with here. If so then run npm i first and wait for it to inevitably fail!
Loading