diff --git a/.yarnrc b/.yarnrc index c8e7a49bbe..22e66ac2fe 100644 --- a/.yarnrc +++ b/.yarnrc @@ -1,3 +1,3 @@ disturl "https://atom.io/download/electron" -target "14.2.4" +target "15.5.0" runtime "electron" diff --git a/package.json b/package.json index 216d9b1474..a180b97c05 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "sentryDsn": "" }, "engines": { - "node": ">=14 <15" + "node": ">=16 <17" }, "jest": { "collectCoverage": false, @@ -250,7 +250,7 @@ "monaco-editor": "^0.29.1", "monaco-editor-webpack-plugin": "^5.0.0", "node-fetch": "lensapp/node-fetch#2.x", - "node-pty": "^0.10.1", + "node-pty": "^0.11.0-beta19", "npm": "^6.14.17", "p-limit": "^3.1.0", "path-to-regexp": "^6.2.0", @@ -355,7 +355,7 @@ "css-loader": "^6.7.1", "deepdash": "^5.3.9", "dompurify": "^2.3.8", - "electron": "^14.2.9", + "electron": "^15.5.7", "electron-builder": "^23.0.3", "electron-notarize": "^0.3.0", "esbuild": "^0.14.38", diff --git a/src/renderer/components/test-utils/get-application-builder.tsx b/src/renderer/components/test-utils/get-application-builder.tsx index 5c8162cd2d..c1df2c5998 100644 --- a/src/renderer/components/test-utils/get-application-builder.tsx +++ b/src/renderer/components/test-utils/get-application-builder.tsx @@ -209,6 +209,7 @@ export const getApplicationBuilder = () => { { menu: null as never, commandId: 0, + userAccelerator: null, ...menuItem, } as MenuItem, undefined, diff --git a/yarn.lock b/yarn.lock index a345135f53..b3cbe8c5e7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -473,7 +473,7 @@ resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70" integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw== -"@electron/get@^1.0.1": +"@electron/get@^1.13.0": 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== @@ -4989,12 +4989,12 @@ electron-window-state@^5.0.3: jsonfile "^4.0.0" mkdirp "^0.5.1" -electron@^14.2.9: - version "14.2.9" - resolved "https://registry.yarnpkg.com/electron/-/electron-14.2.9.tgz#9e1e95643ec3847592a186e8115d1ddb2e4921ee" - integrity sha512-7LdJFmqVzO9NLKO0hwOwPA6Kv4GSybGMcej8f2q7fVT4O8mIfL9oo/v4axVjVWm0+58ROQtHv8hYnnAs3ygG0Q== +electron@^15.5.7: + version "15.5.7" + resolved "https://registry.yarnpkg.com/electron/-/electron-15.5.7.tgz#aadb0081c504f2c2d8f81ea5fd23e38881afe86a" + integrity sha512-n4mVlxoMc4eYx07wWFWGficL+iOMz5xZEf5dBtE/wwLm0fQpYVyW4AlknMFG9F8Css0MM0JSwNMOyRg5e1vDtg== dependencies: - "@electron/get" "^1.0.1" + "@electron/get" "^1.13.0" "@types/node" "^14.6.2" extract-zip "^1.0.3" @@ -9477,10 +9477,10 @@ node-notifier@^8.0.0: uuid "^8.3.0" which "^2.0.2" -node-pty@^0.10.1: - version "0.10.1" - resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-0.10.1.tgz#cd05d03a2710315ec40221232ec04186f6ac2c6d" - integrity sha512-JTdtUS0Im/yRsWJSx7yiW9rtpfmxqxolrtnyKwPLI+6XqTAPW/O2MjS8FYL4I5TsMbH2lVgDb2VMjp+9LoQGNg== +node-pty@^0.11.0-beta19: + version "0.11.0-beta9" + resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-0.11.0-beta9.tgz#38a899d62b1c5c395ca466dfac5203eff989d350" + integrity sha512-bU/2zYV6xBMVMHaMe+yr4WEw36PCA0hyZ7A0IBQFWy5l1vjsD52sZ9sGJk+dH7bw3xpuBLHMh9Eq4Di8rJz4IQ== dependencies: nan "^2.14.0"