RQLY-1153 upgrade dependencies (#23)

Author: nsrCodes

.erb/scripts/notarize.js

@@ -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) {

.github/workflows/release_desktop_app.yml

@@ -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

install.sh

@@ -1,2 +1 @@
-npm i -g patch-package
 npm i

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "requestly",
   "productName": "Requestly",
-  "version": "1.4.22",
+  "version": "1.4.23",
   "private": true,
   "description": "Intercept & Modify HTTP Requests",
   "scripts": {
@@ -37,6 +37,7 @@
   "build": {
     "productName": "Requestly",
     "appId": "io.requestly.beta",
+    "electronVersion": "23.0.0",
     "asar": true,
     "asarUnpack": "**\\*.{node,dll}",
     "files": [
@@ -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",
@@ -70,6 +71,7 @@
       ]
     },
     "dmg": {
+      "sign": true,
       "contents": [
         {
           "x": 130,
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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"

package.json

@@ -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!

release/app/dont_run_npm_install_here.md

@@ -1,7 +1,7 @@
 {
   "name": "requestly",
   "productName": "Requestly",
-  "version": "1.4.22",
+  "version": "1.4.23",
   "private": true,
   "description": "Intercept & Modify HTTP Requests",
   "main": "./dist/main/main.js",
@@ -14,7 +14,7 @@
     "electron-rebuild": "node -r ts-node/register ../../.erb/scripts/electron-rebuild.js",
     "link-modules": "node -r ts-node/register ../../.erb/scripts/link-modules.js",
     "preinstall": "npx npm-force-resolutions",
-    "postinstall": "patch-package && npm run electron-rebuild && npm run link-modules"
+    "postinstall": "npm run electron-rebuild && npm run link-modules"
   },
   "license": "UNLICENSED",
   "dependencies": {
@@ -25,8 +25,8 @@
     "ws": "^8.2.3"
   },
   "devDependencies": {
-    "npm-force-resolutions": "0.0.10",
-    "patch-package": "^6.4.7"
+    "electron":"23.0.0",
+    "npm-force-resolutions": "0.0.10"
   },
   "resolutions": {
     "bufferutil": "4.0.3",

release/app/package-lock.json

@@ -80,8 +80,7 @@ const createWindow = async () => {
     icon: getAssetPath("icon.png"),
     webPreferences: {
       nodeIntegration: false,
-      contextIsolation: true,
-      nativeWindowOpen: false,
+      sandbox: false,
       preload: path.join(__dirname, "preload.js"),
     },
   });
@@ -209,9 +208,10 @@ const createWindow = async () => {
   menuBuilder.buildMenu();
 
   // Open urls in the user's browser
-  webAppWindow.webContents.on("new-window", (event, url) => {
-    event.preventDefault();
-    shell.openExternal(url);
+  // webAppWindow.webContents.on("new-window", (event, url) => { // deprecated after electron v22
+  webAppWindow.webContents.setWindowOpenHandler((details) => {
+    shell.openExternal(details.url);
+    return { action: 'deny' }
   });
 
   // Remove this if your app does not use auto updates