From 2710ac6228fdf1759f35ebf0fc2ca03607400354 Mon Sep 17 00:00:00 2001 From: Baruch Odem Date: Fri, 7 Oct 2022 17:46:57 +0300 Subject: [PATCH 1/4] upgrade electron to v10 --- package.json | 4 ++-- src/background.ts | 1 + yarn.lock | 26 +++++++++++++------------- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index 1fba90c8..bc349150 100644 --- a/package.json +++ b/package.json @@ -85,7 +85,7 @@ "babel-jest": "^26.3.0", "babel-plugin-component": "^1.1.1", "conventional-changelog-eslint": "^3.0.9", - "electron": "^9.0.0", + "electron": "^10.0.0", "eslint": "^7.1.0", "eslint-config-airbnb-base": "^14.1.0", "eslint-friendly-formatter": "^4.0.1", @@ -111,7 +111,7 @@ "sass": "~1.32", "sass-loader": "^10.0.0", "semantic-release": "^19.0.5", - "spectron": "^11.0.0", + "spectron": "^12.0.0", "ts-jest": "^26.3.0", "typescript": "^3.9.7", "vue-cli-plugin-electron-builder": "^2.0.0-rc.6", diff --git a/src/background.ts b/src/background.ts index fefe7c4e..0c0c7332 100644 --- a/src/background.ts +++ b/src/background.ts @@ -22,6 +22,7 @@ function createWindow() { useContentSize: true, width: 1000, webPreferences: { + enableRemoteModule: true, nodeIntegration: (process.env.ELECTRON_NODE_INTEGRATION as unknown) as | boolean | undefined, diff --git a/yarn.lock b/yarn.lock index af93a317..07c3f25c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6548,10 +6548,10 @@ electron-builder@^22.2.0: update-notifier "^5.1.0" yargs "^16.2.0" -electron-chromedriver@^9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/electron-chromedriver/-/electron-chromedriver-9.0.0.tgz#c7629fe6b9721140f3a380144f99960c2bc3b5c1" - integrity sha512-+MuukzicyfduXO/4yQv9ygLKaScttJNbWtg77A9fs2YhbkISjObWaCF3eJNZL+edZXRfaF/6D4XuXvklQCmwQg== +electron-chromedriver@^10.0.0: + version "10.0.0" + resolved "https://registry.yarnpkg.com/electron-chromedriver/-/electron-chromedriver-10.0.0.tgz#cea6ee9f2d67f794b7439074fd70060109a7ff56" + integrity sha512-6jvMnQNHsIFTnvSn8kYQk8dRXFjqtp7E4QVIP4Cc6xR7SM8QI0/EmAqfuysd8CGJOpa8wFkEYxCT2dbHGp3bDw== dependencies: "@electron/get" "^1.12.2" extract-zip "^2.0.0" @@ -6604,10 +6604,10 @@ electron-updater@^4.3.9: lodash.isequal "^4.5.0" semver "^7.3.5" -electron@^9.0.0: - version "9.4.4" - resolved "https://registry.yarnpkg.com/electron/-/electron-9.4.4.tgz#2a74a0655a74bd326216672c5ae6ed3a44451446" - integrity sha512-dcPlTrMWQu5xuSm6sYV42KK/BRIqh3erM8v/WtZqaDmG7pkCeJpvw26Dgbqhdt78XmqqGiN96giEe6A3S9vpAQ== +electron@^10.0.0: + version "10.4.7" + resolved "https://registry.yarnpkg.com/electron/-/electron-10.4.7.tgz#3ec7d46d02c0a6b4955f5fbf19a84d0e0c711184" + integrity sha512-je+AokZfKldI5GItXOx5pwBEAnbEqTrEPhaRUm2RN0OFBPXO+7wjJ3X+HvvlOHvKtfZrlU+57Dmkg1DseSFOPA== dependencies: "@electron/get" "^1.0.1" "@types/node" "^12.0.12" @@ -15125,13 +15125,13 @@ spdy@^4.0.2: select-hose "^2.0.0" spdy-transport "^3.0.0" -spectron@^11.0.0: - version "11.1.0" - resolved "https://registry.yarnpkg.com/spectron/-/spectron-11.1.0.tgz#ee4f11c9057f6d79094f2d444eba555ccbe63965" - integrity sha512-gL5mQZrh2Afv5vfUX7Llf61NI9zzS139BP0vivNU9kbl92O1AoGk7KwOEg+Cf6Pb2/G/s/81wYWqo/WOhYi6jQ== +spectron@^12.0.0: + version "12.0.0" + resolved "https://registry.yarnpkg.com/spectron/-/spectron-12.0.0.tgz#8a3454a1366cdb82fbb6be75be0104915b607340" + integrity sha512-ZyDFS7I+4dWa/YXSQ/trbC4s1Rd0Ks5oi4MQ6XSJHULPasJhx5q2bM93Ae7BNUvwrGrbhjk7O6f14JwqJimLyA== dependencies: dev-null "^0.1.1" - electron-chromedriver "^9.0.0" + electron-chromedriver "^10.0.0" request "^2.87.0" split "^1.0.0" webdriverio "^6.1.20" From d76f4ead05b59fd10f8aca4b35491322be76294b Mon Sep 17 00:00:00 2001 From: Baruch Odem Date: Sat, 8 Oct 2022 23:11:25 +0300 Subject: [PATCH 2/4] upgrade electron to v11 --- package.json | 4 ++-- yarn.lock | 36 ++++++++++++++++++------------------ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/package.json b/package.json index bc349150..505d8956 100644 --- a/package.json +++ b/package.json @@ -85,7 +85,7 @@ "babel-jest": "^26.3.0", "babel-plugin-component": "^1.1.1", "conventional-changelog-eslint": "^3.0.9", - "electron": "^10.0.0", + "electron": "^11.0.0", "eslint": "^7.1.0", "eslint-config-airbnb-base": "^14.1.0", "eslint-friendly-formatter": "^4.0.1", @@ -111,7 +111,7 @@ "sass": "~1.32", "sass-loader": "^10.0.0", "semantic-release": "^19.0.5", - "spectron": "^12.0.0", + "spectron": "^13.0.0", "ts-jest": "^26.3.0", "typescript": "^3.9.7", "vue-cli-plugin-electron-builder": "^2.0.0-rc.6", diff --git a/yarn.lock b/yarn.lock index 07c3f25c..d58e4b19 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6548,10 +6548,10 @@ electron-builder@^22.2.0: update-notifier "^5.1.0" yargs "^16.2.0" -electron-chromedriver@^10.0.0: - version "10.0.0" - resolved "https://registry.yarnpkg.com/electron-chromedriver/-/electron-chromedriver-10.0.0.tgz#cea6ee9f2d67f794b7439074fd70060109a7ff56" - integrity sha512-6jvMnQNHsIFTnvSn8kYQk8dRXFjqtp7E4QVIP4Cc6xR7SM8QI0/EmAqfuysd8CGJOpa8wFkEYxCT2dbHGp3bDw== +electron-chromedriver@^11.0.0: + version "11.0.0" + resolved "https://registry.yarnpkg.com/electron-chromedriver/-/electron-chromedriver-11.0.0.tgz#49b034ed0ad12c12e3522862c7bb46875a0d85e1" + integrity sha512-ayMJPBbB4puU0SqYbcD9XvF3/7GWIhqKE1n5lG2/GQPRnrZkNoPIilsrS0rQcD50Xhl69KowatDqLhUznZWtbA== dependencies: "@electron/get" "^1.12.2" extract-zip "^2.0.0" @@ -6604,10 +6604,10 @@ electron-updater@^4.3.9: lodash.isequal "^4.5.0" semver "^7.3.5" -electron@^10.0.0: - version "10.4.7" - resolved "https://registry.yarnpkg.com/electron/-/electron-10.4.7.tgz#3ec7d46d02c0a6b4955f5fbf19a84d0e0c711184" - integrity sha512-je+AokZfKldI5GItXOx5pwBEAnbEqTrEPhaRUm2RN0OFBPXO+7wjJ3X+HvvlOHvKtfZrlU+57Dmkg1DseSFOPA== +electron@^11.0.0: + version "11.5.0" + resolved "https://registry.yarnpkg.com/electron/-/electron-11.5.0.tgz#f1650543b9d8f2047d3807755bdb120153ed210f" + integrity sha512-WjNDd6lGpxyiNjE3LhnFCAk/D9GIj1rU3GSDealVShhkkkPR3Vh4q8ErXGDl1OAO/faomVa10KoFPUN/pLbNxg== dependencies: "@electron/get" "^1.0.1" "@types/node" "^12.0.12" @@ -15125,16 +15125,16 @@ spdy@^4.0.2: select-hose "^2.0.0" spdy-transport "^3.0.0" -spectron@^12.0.0: - version "12.0.0" - resolved "https://registry.yarnpkg.com/spectron/-/spectron-12.0.0.tgz#8a3454a1366cdb82fbb6be75be0104915b607340" - integrity sha512-ZyDFS7I+4dWa/YXSQ/trbC4s1Rd0Ks5oi4MQ6XSJHULPasJhx5q2bM93Ae7BNUvwrGrbhjk7O6f14JwqJimLyA== +spectron@^13.0.0: + version "13.0.0" + resolved "https://registry.yarnpkg.com/spectron/-/spectron-13.0.0.tgz#16bdfcf9a2b26cb5ee6c3e29b4f08101e339aa4d" + integrity sha512-7RPa6Fp8gqL4V0DubobnqIRFHIijkpjg6MFHcJlxoerWyvLJd+cQvOh756XpB1Z/U3DyA9jPcS+HE2PvYRP5+A== dependencies: dev-null "^0.1.1" - electron-chromedriver "^10.0.0" - request "^2.87.0" - split "^1.0.0" - webdriverio "^6.1.20" + electron-chromedriver "^11.0.0" + request "^2.88.2" + split "^1.0.1" + webdriverio "^6.9.1" split-string@^3.0.1, split-string@^3.0.2: version "3.1.0" @@ -15157,7 +15157,7 @@ split2@~1.0.0: dependencies: through2 "~2.0.0" -split@^1.0.0: +split@^1.0.0, split@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/split/-/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9" integrity sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg== @@ -16871,7 +16871,7 @@ webdriverio@*: serialize-error "^8.0.0" webdriver "7.7.3" -webdriverio@^6.1.20: +webdriverio@^6.9.1: version "6.12.1" resolved "https://registry.yarnpkg.com/webdriverio/-/webdriverio-6.12.1.tgz#5b6f1167373bd7a154419d8a930ef1ffda9d0537" integrity sha512-Nx7ge0vTWHVIRUbZCT+IuMwB5Q0Q5nLlYdgnmmJviUKLuc3XtaEBkYPTbhHWHgSBXsPZMIc023vZKNkn+6iyeQ== From aba2c5acc9693577ae020fa8e9a64dc1ce6222bd Mon Sep 17 00:00:00 2001 From: Baruch Odem Date: Sun, 9 Oct 2022 12:39:32 +0300 Subject: [PATCH 3/4] upgrade electron to v12 --- jest.config.js | 3 +- package.json | 6 +- src/app-globals.ts | 4 +- src/background.ts | 3 + src/electron.ts | 5 ++ src/ui/components/app/Updater.vue | 2 +- tsconfig.json | 5 +- yarn.lock | 132 +++++++++++++++++++++++++----- 8 files changed, 134 insertions(+), 26 deletions(-) create mode 100644 src/electron.ts diff --git a/jest.config.js b/jest.config.js index bcf1a92f..626e5077 100644 --- a/jest.config.js +++ b/jest.config.js @@ -12,7 +12,8 @@ module.exports = { ], moduleNameMapper: { '\\.css$': 'identity-obj-proxy', - electron: '/test/unit/mock/electron.ts', + '^@electron/remote$': '/test/unit/mock/electron.ts', + '^electron$': '/test/unit/mock/electron.ts', '^keytar$': '/test/unit/mock/keytar.ts', }, transform: { diff --git a/package.json b/package.json index 505d8956..2a15fd73 100644 --- a/package.json +++ b/package.json @@ -28,6 +28,7 @@ } }, "dependencies": { + "@electron/remote": "^2.0.8", "@getstation/electron-google-oauth2": "2.1.0", "@sentry/electron": "^2.5.0", "@vue/composition-api": "^1.0.0-rc.6", @@ -78,6 +79,7 @@ "@vue/cli-plugin-unit-jest": "^4.5.4", "@vue/cli-plugin-vuex": "^4.3.1", "@vue/cli-service": "^4.3.1", + "@vue/compiler-dom": "^3.2.40", "@vue/eslint-config-typescript": "^7.0.0", "@vue/test-utils": "^1.0.3", "babel-core": "^7.0.0-bridge.0", @@ -85,7 +87,7 @@ "babel-jest": "^26.3.0", "babel-plugin-component": "^1.1.1", "conventional-changelog-eslint": "^3.0.9", - "electron": "^11.0.0", + "electron": "^12.0.0", "eslint": "^7.1.0", "eslint-config-airbnb-base": "^14.1.0", "eslint-friendly-formatter": "^4.0.1", @@ -111,7 +113,7 @@ "sass": "~1.32", "sass-loader": "^10.0.0", "semantic-release": "^19.0.5", - "spectron": "^13.0.0", + "spectron": "^14.0.0", "ts-jest": "^26.3.0", "typescript": "^3.9.7", "vue-cli-plugin-electron-builder": "^2.0.0-rc.6", diff --git a/src/app-globals.ts b/src/app-globals.ts index fb1d7aef..8836f50a 100644 --- a/src/app-globals.ts +++ b/src/app-globals.ts @@ -1,8 +1,8 @@ -import { app, remote } from 'electron'; import { mkdirSync } from 'fs'; import path from 'path'; +import electron from './electron'; -export const App = app || remote.app; +export const App: Electron.App = electron.app; if (process.env.NODE_ENV !== 'production') { const localUserData = path.resolve('userData'); diff --git a/src/background.ts b/src/background.ts index 0c0c7332..ac95ebf8 100644 --- a/src/background.ts +++ b/src/background.ts @@ -7,6 +7,8 @@ import Sentry from './logging/sentry'; import { registerHandlers } from './handlers'; // import './store'; +require('@electron/remote/main').initialize(); + Sentry.initializeReporter(); const isDevelopment = process.env.NODE_ENV !== 'production'; @@ -23,6 +25,7 @@ function createWindow() { width: 1000, webPreferences: { enableRemoteModule: true, + contextIsolation: false, nodeIntegration: (process.env.ELECTRON_NODE_INTEGRATION as unknown) as | boolean | undefined, diff --git a/src/electron.ts b/src/electron.ts new file mode 100644 index 00000000..4a3d0e7f --- /dev/null +++ b/src/electron.ts @@ -0,0 +1,5 @@ +const electron = process.type === 'browser' + ? require('electron') + : require('@electron/remote'); + +export default electron; diff --git a/src/ui/components/app/Updater.vue b/src/ui/components/app/Updater.vue index e9d554d3..1f28c5d4 100644 --- a/src/ui/components/app/Updater.vue +++ b/src/ui/components/app/Updater.vue @@ -63,7 +63,7 @@ import { defineComponent, ref } from '@vue/composition-api'; import { ipcHandlers } from '@/handlers'; import { UpdateInfo } from '@/handlers/updater'; import { App } from '@/app-globals'; -import { shell } from 'electron'; +import { shell } from '@electron/remote'; import { repository } from '../../../../package.json'; enum STATES { diff --git a/tsconfig.json b/tsconfig.json index 006d8d71..ec027e46 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -45,5 +45,8 @@ "files": [ "./src/types/shims-vue.d.ts", "./src/types/shims-tsx.d.ts" - ] + ], + "vueCompilerOptions": { + "target": 2 + } } diff --git a/yarn.lock b/yarn.lock index d58e4b19..23eb2545 100644 --- a/yarn.lock +++ b/yarn.lock @@ -276,6 +276,11 @@ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.5.tgz#4cd2f346261061b2518873ffecdf1612cb032829" integrity sha512-TM8C+xtH/9n1qzX+JNHi7AN2zHMTiPUtspO0ZdHflW8KaskkALhMmuMHb4bCmNdv9VAPzJX3/bXqkVLnAvsPfg== +"@babel/parser@^7.16.4": + version "7.19.3" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.19.3.tgz#8dd36d17c53ff347f9e55c328710321b49479a9a" + integrity sha512-pJ9xOlNWHiy9+FuFP09DEAFbAn4JskgRsVcc169w2xRBC3FRGuQEwjeIMMND9L2zc0iEhO/tGv4Zq+km+hxNpQ== + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.14.5": version "7.14.5" resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5.tgz#4b467302e1548ed3b1be43beae2cc9cf45e0bb7e" @@ -1016,7 +1021,7 @@ ajv "^6.12.0" ajv-keywords "^3.4.1" -"@electron/get@^1.0.1", "@electron/get@^1.12.2": +"@electron/get@^1.0.1": version "1.12.4" resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.12.4.tgz#a5971113fc1bf8fa12a8789dc20152a7359f06ab" integrity sha512-6nr9DbJPUR9Xujw6zD3y+rS95TyItEVM0NVjt1EehY2vUWfIgPiIPVHxCvaTS0xr2B+DRxovYVKbuOWqC35kjg== @@ -1032,6 +1037,32 @@ global-agent "^2.0.2" global-tunnel-ng "^2.7.1" +"@electron/get@^1.12.4": + version "1.14.1" + resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.14.1.tgz#16ba75f02dffb74c23965e72d617adc721d27f40" + integrity sha512-BrZYyL/6m0ZXz/lDxy/nlVhQz+WF+iPS6qXolEU8atw7h6v1aYkjwJZ63m+bJMBTxDE66X+r2tPS4a/8C82sZw== + dependencies: + debug "^4.1.1" + env-paths "^2.2.0" + fs-extra "^8.1.0" + got "^9.6.0" + progress "^2.0.3" + semver "^6.2.0" + sumchecker "^3.0.1" + optionalDependencies: + global-agent "^3.0.0" + global-tunnel-ng "^2.7.1" + +"@electron/remote@^1.0.4": + version "1.2.2" + resolved "https://registry.yarnpkg.com/@electron/remote/-/remote-1.2.2.tgz#4c390a2e669df47af973c09eec106162a296c323" + integrity sha512-PfnXpQGWh4vpX866NNucJRnNOzDRZcsLcLaT32fUth9k0hccsohfxprqEDYLzRg+ZK2xRrtyUN5wYYoHimMCJg== + +"@electron/remote@^2.0.8": + version "2.0.8" + resolved "https://registry.yarnpkg.com/@electron/remote/-/remote-2.0.8.tgz#85ff321f0490222993207106e2f720273bb1a5c3" + integrity sha512-P10v3+iFCIvEPeYzTWWGwwHmqWnjoh8RYnbtZAb3RlQefy4guagzIwcWtfftABIfm6JJTNQf4WPSKWZOpLmHXw== + "@electron/universal@1.0.4": version "1.0.4" resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-1.0.4.tgz#231ac246c39d45b80e159bd21c3f9027dcaa10f5" @@ -2268,7 +2299,7 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.4.tgz#fec0ce0526abb6062fd206d72a642811b887a111" integrity sha512-6xwbrW4JJiJLgF+zNypN5wr2ykM9/jHcL7rQ8fZe2vuftggjzZeRSM4OwRc6Xk8qWjwJ99qVHo/JgOGmomWRog== -"@types/node@12", "@types/node@^12.0.12": +"@types/node@12": version "12.20.15" resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.15.tgz#10ee6a6a3f971966fddfa3f6e89ef7a73ec622df" integrity sha512-F6S4Chv4JicJmyrwlDkxUdGNSplsQdGwp1A0AJloEVDirWdZOAiRHhovDlsFkKUrquUXhz1imJhXHsf59auyAg== @@ -2278,6 +2309,11 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.3.tgz#6d327abaa4be34a74e421ed6409a0ae2f47f4c3d" integrity sha512-e6ZowgGJmTuXa3GyaPbTGxX17tnThl2aSSizrFthQ7m9uLGZBXiGhgE55cjRZTF5kjZvYn9EOPOMljdjwbflxw== +"@types/node@^14.6.2": + version "14.18.31" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.31.tgz#4b873dea3122e71af4f77e65ec5841397ff254d3" + integrity sha512-vQAnaReSQkEDa8uwAyQby8bYGKu84R/deEc6mg5T8fX6gzCn8QW6rziSgsti1fNvsrswKUKPnVTi7uoB+u62Mw== + "@types/normalize-package-data@^2.4.0": version "2.4.0" resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e" @@ -2839,6 +2875,24 @@ semver "^6.1.0" strip-ansi "^6.0.0" +"@vue/compiler-core@3.2.40": + version "3.2.40" + resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.40.tgz#c785501f09536748121e937fb87605bbb1ada8e5" + integrity sha512-2Dc3Stk0J/VyQ4OUr2yEC53kU28614lZS+bnrCbFSAIftBJ40g/2yQzf4mPBiFuqguMB7hyHaujdgZAQ67kZYA== + dependencies: + "@babel/parser" "^7.16.4" + "@vue/shared" "3.2.40" + estree-walker "^2.0.2" + source-map "^0.6.1" + +"@vue/compiler-dom@^3.2.40": + version "3.2.40" + resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.40.tgz#c225418773774db536174d30d3f25ba42a33e7e4" + integrity sha512-OZCNyYVC2LQJy4H7h0o28rtk+4v+HMQygRTpmibGoG9wZyomQiS5otU7qo3Wlq5UfHDw2RFwxb9BJgKjVpjrQw== + dependencies: + "@vue/compiler-core" "3.2.40" + "@vue/shared" "3.2.40" + "@vue/component-compiler-utils@^3.1.0", "@vue/component-compiler-utils@^3.1.2": version "3.2.1" resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-3.2.1.tgz#c3e3cb85ea80cc157eeaffe128a25dfe77e2f326" @@ -2873,6 +2927,11 @@ resolved "https://registry.yarnpkg.com/@vue/preload-webpack-plugin/-/preload-webpack-plugin-1.1.2.tgz#ceb924b4ecb3b9c43871c7a429a02f8423e621ab" integrity sha512-LIZMuJk38pk9U9Ur4YzHjlIyMuxPlACdBIHH9/nGYVTsaGKOSnSuELiE8vS9wa+dJpIYspYUOqk+L1Q4pgHQHQ== +"@vue/shared@3.2.40": + version "3.2.40" + resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.40.tgz#e57799da2a930b975321981fcee3d1e90ed257ae" + integrity sha512-0PLQ6RUtZM0vO3teRfzGi4ltLUO5aO+kLgwh4Um3THSR03rpQWLTuRCkuO5A41ITzwdWeKdPHtSARuPkoo5pCQ== + "@vue/test-utils@^1.0.3": version "1.2.0" resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-1.2.0.tgz#3bc8c17ed549157275f0aec6b95da40887f7297f" @@ -4576,7 +4635,7 @@ cacheable-request@^6.0.0: normalize-url "^4.1.0" responselike "^1.0.2" -cacheable-request@^7.0.1: +cacheable-request@^7.0.1, cacheable-request@^7.0.2: version "7.0.2" resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.2.tgz#ea0d0b889364a25854757301ca12b2da77f91d27" integrity sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew== @@ -6548,12 +6607,12 @@ electron-builder@^22.2.0: update-notifier "^5.1.0" yargs "^16.2.0" -electron-chromedriver@^11.0.0: - version "11.0.0" - resolved "https://registry.yarnpkg.com/electron-chromedriver/-/electron-chromedriver-11.0.0.tgz#49b034ed0ad12c12e3522862c7bb46875a0d85e1" - integrity sha512-ayMJPBbB4puU0SqYbcD9XvF3/7GWIhqKE1n5lG2/GQPRnrZkNoPIilsrS0rQcD50Xhl69KowatDqLhUznZWtbA== +electron-chromedriver@^12.0.0: + version "12.0.0" + resolved "https://registry.yarnpkg.com/electron-chromedriver/-/electron-chromedriver-12.0.0.tgz#55bdc451b938b384642d613a05eadacb1fe476ee" + integrity sha512-zOs98o9+20Er8Q44z06h90VldwrJaoRCieW3Q8WkdDjA3cMRU5mlmm1kGDhPLMeYNuhq6e39aGMVH/IBFD97HQ== dependencies: - "@electron/get" "^1.12.2" + "@electron/get" "^1.12.4" extract-zip "^2.0.0" electron-devtools-installer@^3.1.1: @@ -6604,13 +6663,13 @@ electron-updater@^4.3.9: lodash.isequal "^4.5.0" semver "^7.3.5" -electron@^11.0.0: - version "11.5.0" - resolved "https://registry.yarnpkg.com/electron/-/electron-11.5.0.tgz#f1650543b9d8f2047d3807755bdb120153ed210f" - integrity sha512-WjNDd6lGpxyiNjE3LhnFCAk/D9GIj1rU3GSDealVShhkkkPR3Vh4q8ErXGDl1OAO/faomVa10KoFPUN/pLbNxg== +electron@^12.0.0: + version "12.2.3" + resolved "https://registry.yarnpkg.com/electron/-/electron-12.2.3.tgz#d426a7861e3c722f92c32153f11f7bbedf65b000" + integrity sha512-B27c7eqx1bC5kea6An8oVhk1pShNC4VGqWarHMhD47MDtmg54KepHO5AbAvmKKZK/jWN7NTC7wyCYTDElJNtQA== dependencies: "@electron/get" "^1.0.1" - "@types/node" "^12.0.12" + "@types/node" "^14.6.2" extract-zip "^1.0.3" elliptic@^6.5.3: @@ -7095,6 +7154,11 @@ estraverse@^5.1.0, estraverse@^5.2.0: resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880" integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ== +estree-walker@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac" + integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w== + esutils@^2.0.2: version "2.0.3" resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" @@ -8068,6 +8132,18 @@ global-agent@^2.0.2: semver "^7.3.2" serialize-error "^7.0.1" +global-agent@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz#ae7cd31bd3583b93c5a16437a1afe27cc33a1ab6" + integrity sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q== + dependencies: + boolean "^3.0.1" + es6-error "^4.1.1" + matcher "^3.0.0" + roarr "^2.15.3" + semver "^7.3.2" + serialize-error "^7.0.1" + global-dirs@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.0.tgz#70a76fe84ea315ab37b1f5576cbde7d48ef72686" @@ -8239,6 +8315,23 @@ got@^11.0.2, got@^11.8.1: p-cancelable "^2.0.0" responselike "^2.0.0" +got@^11.8.0: + version "11.8.5" + resolved "https://registry.yarnpkg.com/got/-/got-11.8.5.tgz#ce77d045136de56e8f024bebb82ea349bc730046" + integrity sha512-o0Je4NvQObAuZPHLFoRSkdG2lTgtcynqymzg2Vupdx6PorhaT5MCbIyXG6d4D94kk8ZG57QeosgdiqfJWhEhlQ== + dependencies: + "@sindresorhus/is" "^4.0.0" + "@szmarczak/http-timer" "^4.0.5" + "@types/cacheable-request" "^6.0.1" + "@types/responselike" "^1.0.0" + cacheable-lookup "^5.0.3" + cacheable-request "^7.0.2" + decompress-response "^6.0.0" + http2-wrapper "^1.0.0-beta.5.2" + lowercase-keys "^2.0.0" + p-cancelable "^2.0.0" + responselike "^2.0.0" + got@^9.6.0: version "9.6.0" resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85" @@ -15125,14 +15218,15 @@ spdy@^4.0.2: select-hose "^2.0.0" spdy-transport "^3.0.0" -spectron@^13.0.0: - version "13.0.0" - resolved "https://registry.yarnpkg.com/spectron/-/spectron-13.0.0.tgz#16bdfcf9a2b26cb5ee6c3e29b4f08101e339aa4d" - integrity sha512-7RPa6Fp8gqL4V0DubobnqIRFHIijkpjg6MFHcJlxoerWyvLJd+cQvOh756XpB1Z/U3DyA9jPcS+HE2PvYRP5+A== +spectron@^14.0.0: + version "14.0.0" + resolved "https://registry.yarnpkg.com/spectron/-/spectron-14.0.0.tgz#c8160e38c30dcda39734f3e8e809162dc0805d14" + integrity sha512-88GM7D1eLiTxjByjtY7lxU7CJcQ92kX1x0WfnADaIXqqYRLbI1KlIWxXz1Xm5UxuMJh5N847K0NONG49mvZtuw== dependencies: + "@electron/remote" "^1.0.4" dev-null "^0.1.1" - electron-chromedriver "^11.0.0" - request "^2.88.2" + electron-chromedriver "^12.0.0" + got "^11.8.0" split "^1.0.1" webdriverio "^6.9.1" From 0324e0d33233ae7a3b1e459eeaafcadec703ce0d Mon Sep 17 00:00:00 2001 From: Baruch Odem Date: Sun, 9 Oct 2022 12:45:58 +0300 Subject: [PATCH 4/4] upgrade electron to v13 --- package.json | 4 ++-- yarn.lock | 30 +++++++++++++++--------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index 2a15fd73..e58919d9 100644 --- a/package.json +++ b/package.json @@ -87,7 +87,7 @@ "babel-jest": "^26.3.0", "babel-plugin-component": "^1.1.1", "conventional-changelog-eslint": "^3.0.9", - "electron": "^12.0.0", + "electron": "^13.0.0", "eslint": "^7.1.0", "eslint-config-airbnb-base": "^14.1.0", "eslint-friendly-formatter": "^4.0.1", @@ -113,7 +113,7 @@ "sass": "~1.32", "sass-loader": "^10.0.0", "semantic-release": "^19.0.5", - "spectron": "^14.0.0", + "spectron": "^15.0.0", "ts-jest": "^26.3.0", "typescript": "^3.9.7", "vue-cli-plugin-electron-builder": "^2.0.0-rc.6", diff --git a/yarn.lock b/yarn.lock index 23eb2545..a22e9b56 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1053,7 +1053,7 @@ global-agent "^3.0.0" global-tunnel-ng "^2.7.1" -"@electron/remote@^1.0.4": +"@electron/remote@^1.1.0": version "1.2.2" resolved "https://registry.yarnpkg.com/@electron/remote/-/remote-1.2.2.tgz#4c390a2e669df47af973c09eec106162a296c323" integrity sha512-PfnXpQGWh4vpX866NNucJRnNOzDRZcsLcLaT32fUth9k0hccsohfxprqEDYLzRg+ZK2xRrtyUN5wYYoHimMCJg== @@ -6607,10 +6607,10 @@ electron-builder@^22.2.0: update-notifier "^5.1.0" yargs "^16.2.0" -electron-chromedriver@^12.0.0: - version "12.0.0" - resolved "https://registry.yarnpkg.com/electron-chromedriver/-/electron-chromedriver-12.0.0.tgz#55bdc451b938b384642d613a05eadacb1fe476ee" - integrity sha512-zOs98o9+20Er8Q44z06h90VldwrJaoRCieW3Q8WkdDjA3cMRU5mlmm1kGDhPLMeYNuhq6e39aGMVH/IBFD97HQ== +electron-chromedriver@^13.0.0: + version "13.0.0" + resolved "https://registry.yarnpkg.com/electron-chromedriver/-/electron-chromedriver-13.0.0.tgz#a553af7743215ac463e1e40e0db14d4a542ef762" + integrity sha512-fID1ms8wT7qNfoKkXHNpH0ZE8/Nclb5YmkF3O0w57OxsR8S9PxgE9CJAgaSGroxBgZ+ge1i2OU0Aq/WE/e/Neg== dependencies: "@electron/get" "^1.12.4" extract-zip "^2.0.0" @@ -6663,10 +6663,10 @@ electron-updater@^4.3.9: lodash.isequal "^4.5.0" semver "^7.3.5" -electron@^12.0.0: - version "12.2.3" - resolved "https://registry.yarnpkg.com/electron/-/electron-12.2.3.tgz#d426a7861e3c722f92c32153f11f7bbedf65b000" - integrity sha512-B27c7eqx1bC5kea6An8oVhk1pShNC4VGqWarHMhD47MDtmg54KepHO5AbAvmKKZK/jWN7NTC7wyCYTDElJNtQA== +electron@^13.0.0: + version "13.6.9" + resolved "https://registry.yarnpkg.com/electron/-/electron-13.6.9.tgz#7bd83cc1662ceaaa09dcd132a7b507cec888b028" + integrity sha512-Es/sBy85NIuqsO9MW41PUCpwIkeinlTQ7g0ainfnmRAM2rmog3GBxVCaoV5dzEjwTF7TKG1Yr/E7Z3qHmlfWAg== dependencies: "@electron/get" "^1.0.1" "@types/node" "^14.6.2" @@ -15218,14 +15218,14 @@ spdy@^4.0.2: select-hose "^2.0.0" spdy-transport "^3.0.0" -spectron@^14.0.0: - version "14.0.0" - resolved "https://registry.yarnpkg.com/spectron/-/spectron-14.0.0.tgz#c8160e38c30dcda39734f3e8e809162dc0805d14" - integrity sha512-88GM7D1eLiTxjByjtY7lxU7CJcQ92kX1x0WfnADaIXqqYRLbI1KlIWxXz1Xm5UxuMJh5N847K0NONG49mvZtuw== +spectron@^15.0.0: + version "15.0.0" + resolved "https://registry.yarnpkg.com/spectron/-/spectron-15.0.0.tgz#9c0e254b2be3f0725a81b8343092b9d0108439c7" + integrity sha512-eErHqymkEVb6H+LPZQoDYvWEv93o3nhxL7HXXdmC61ncV0jBckh8x3Qt6j+As2c1n0C/hKG9A2H1NnwGwD6agg== dependencies: - "@electron/remote" "^1.0.4" + "@electron/remote" "^1.1.0" dev-null "^0.1.1" - electron-chromedriver "^12.0.0" + electron-chromedriver "^13.0.0" got "^11.8.0" split "^1.0.1" webdriverio "^6.9.1"