e10 merge

keybase · Jun 23, 2021 · 763227b · 763227b
1 parent e3826b7
commit 763227b
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 18 deletions.
diff --git a/go/libkb/version.go b/go/libkb/version.go
@@ -4,4 +4,4 @@
 package libkb
 
 // Version is the current version (should be MAJOR.MINOR.PATCH)
-const Version = "5.7.0"
+const Version = "5.7.1"
diff --git a/shared/actions/fs/platform-specific.desktop.tsx b/shared/actions/fs/platform-specific.desktop.tsx
@@ -90,11 +90,13 @@ const _openPathInSystemFileManagerPromise = (openPath: string, isFolder: boolean
   new Promise((resolve, reject) => {
     if (isFolder) {
       if (isWindows) {
-        if (Electron.remote.shell.openItem(openPath)) {
-          resolve()
-        } else {
-          reject(new Error('unable to open item'))
-        }
+        Electron.remote.shell.openPath(openPath).then(error => {
+          if (error) {
+            reject(new Error('unable to open item'))
+          } else {
+            resolve()
+          }
+        })
       } else {
         openInDefaultDirectory(openPath).then(resolve, reject)
       }

diff --git a/shared/android/app/build.gradle b/shared/android/app/build.gradle
@@ -6,7 +6,7 @@ apply from: '../../node_modules/react-native-unimodules/gradle.groovy'
 import com.android.build.OutputFile
 
 // KB: app version
-def VERSION_NAME = "5.7.0"
+def VERSION_NAME = "5.7.1"
 
 /**
  * The react.gradle file registers a task for each build variant (e.g. bundleDebugJsAndAssets

diff --git a/shared/desktop/app/main-window.desktop.tsx b/shared/desktop/app/main-window.desktop.tsx
@@ -277,6 +277,7 @@ export default () => {
     webPreferences: {
       backgroundThrottling: false,
       devTools: showDevTools,
+      enableRemoteModule: true,
       nodeIntegration: true,
       nodeIntegrationInWorker: false,
       preload: resolveRoot('dist', `preload-main${__DEV__ ? '.dev' : ''}.bundle.js`),

diff --git a/shared/desktop/app/menu-bar.desktop.tsx b/shared/desktop/app/menu-bar.desktop.tsx
@@ -40,6 +40,7 @@ export default (menubarWindowIDCallback: (id: number) => void) => {
       resizable: false,
       transparent: true,
       webPreferences: {
+        enableRemoteModule: true,
         nodeIntegration: true,
         nodeIntegrationInWorker: false,
         preload: resolveRoot('dist', `preload-main${__DEV__ ? '.dev' : ''}.bundle.js`),

diff --git a/shared/desktop/app/menu-helper.desktop.tsx b/shared/desktop/app/menu-helper.desktop.tsx
@@ -161,15 +161,19 @@ function setupContextMenu(window: Electron.BrowserWindow) {
                 s =>
                   new Electron.MenuItem({
                     click(_, w) {
-                      w.webContents.replaceMisspelling(s)
+                      if (w) {
+                        w.webContents.replaceMisspelling(s)
+                      }
                     },
                     label: s,
                   })
               ),
               ...(dictionarySuggestions.length ? [new Electron.MenuItem({type: 'separator'})] : []),
               new Electron.MenuItem({
                 click(_, w) {
-                  w.webContents.session.addWordToSpellCheckerDictionary(props.misspelledWord)
+                  if (w) {
+                    w.webContents.session.addWordToSpellCheckerDictionary(props.misspelledWord)
+                  }
                 },
                 label: 'Add to dictionary',
               }),

diff --git a/shared/desktop/app/node.desktop.tsx b/shared/desktop/app/node.desktop.tsx
@@ -34,9 +34,9 @@ Electron.app.commandLine.appendSwitch('disk-cache-size', '1')
 const installCrashReporter = () => {
   if (env.KEYBASE_CRASH_REPORT) {
     console.log(`Adding crash reporting (local). Crash files located in ${Electron.app.getPath('temp')}`)
+    Electron.app.setPath('crashDumps', cacheRoot)
     Electron.crashReporter.start({
       companyName: 'Keybase',
-      crashesDirectory: cacheRoot,
       productName: 'Keybase',
       submitURL: '',
       uploadToServer: false,
@@ -365,6 +365,7 @@ const plumbEvents = () => {
           show: false, // Start hidden and show when we actually get props
           titleBarStyle: 'customButtonsOnHover' as const,
           webPreferences: {
+            enableRemoteModule: true,
             nodeIntegration: true,
             nodeIntegrationInWorker: false,
             preload: resolveRoot('dist', `preload-main${__DEV__ ? '.dev' : ''}.bundle.js`),

diff --git a/shared/desktop/webpack.config.babel.js b/shared/desktop/webpack.config.babel.js
@@ -28,7 +28,7 @@ const config = (_, {mode}) => {
         ignore: [/\.(native|ios|android)\.(ts|js)x?$/],
         plugins: [...(isHot && !nodeThread ? ['react-hot-loader/babel'] : [])],
         presets: [
-          ['@babel/preset-env', {debug: false, modules: false, targets: {electron: '8.0.2'}}],
+          ['@babel/preset-env', {debug: false, modules: false, targets: {electron: '10.1.1'}}],
           '@babel/preset-typescript',
         ],
       },

diff --git a/shared/ios/Keybase/Info.plist b/shared/ios/Keybase/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.7.0</string>
+	<string>5.7.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>

diff --git a/shared/ios/KeybaseShare/Info.plist b/shared/ios/KeybaseShare/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.7.0</string>
+	<string>5.7.1</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>NSExtension</key>

diff --git a/shared/package.json b/shared/package.json
@@ -201,7 +201,7 @@
     "cross-env": "7.0.2",
     "css-loader": "3.2.0",
     "del": "3.0.0",
-    "electron": "8.0.2",
+    "electron": "10.1.1",
     "electron-packager": "14.0.6",
     "eslint": "6.4.0",
     "eslint-plugin-filenames": "1.3.2",

diff --git a/shared/yarn.lock b/shared/yarn.lock
@@ -5249,10 +5249,10 @@ electron-to-chromium@^1.3.247:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.266.tgz#a33fb529c75f8d133e75ea7cbedb73a62f2158d2"
   integrity sha512-UTuTZ4v8T0gLPHI7U75PXLQePWI65MTS3mckRrnLCkNljHvsutbYs+hn2Ua/RFul3Jt/L3Ht2rLP+dU/AlBfrQ==
 
-electron@8.0.2:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-8.0.2.tgz#8dfd62fd42529fed94040b643660f2a82b4f8e95"
-  integrity sha512-hiQaFtFhd9X2Vjs01l3GXb8hPWSCa31o/kXydo+RC7vwcx9AGuzG7jWIq8vidzAWsF/YPM0LFVjFRZrfkqi03Q==
+electron@10.1.1:
+  version "10.1.1"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-10.1.1.tgz#44ff9207afc9df253d3b5ea40c7e6513c5dc08d8"
+  integrity sha512-ZJtZHMr17AvvBosuA6XUmpehwAlGM4/n46Mw9BcyD8tpgdI6IQd0X5OU9meE3X3M8Y6Ja2Kr2udTMgtjvot2hA==
   dependencies:
     "@electron/get" "^1.0.1"
     "@types/node" "^12.0.12"