Merge branch 'release-1.11'

Gruntfile.js

@@ -6,6 +6,7 @@ const path = require('path');
 const webpackConfig = require('./build/webpack.config');
 const pkg = require('./package.json');
 const hookRcedit = require('./build/util/hook-rcedit');
+const codeSignConfig = require('../keys/codesign');
 
 hookRcedit.setup();
 
@@ -276,7 +277,19 @@ module.exports = function(grunt) {
                     icon: 'graphics/icon.icns',
                     appBundleId: 'net.antelle.keeweb',
                     appCategoryType: 'public.app-category.productivity',
-                    extendInfo: 'package/osx/extend.plist'
+                    extendInfo: 'package/osx/extend.plist',
+                    osxSign: {
+                        identity: codeSignConfig.identities.app,
+                        hardenedRuntime: true,
+                        entitlements: 'package/osx/entitlements.mac.plist',
+                        'entitlements-inherit': 'package/osx/entitlements.mac.plist',
+                        'gatekeeper-assess': false
+                    },
+                    osxNotarize: {
+                        appleId: codeSignConfig.appleId,
+                        appleIdPassword: '@keychain:AC_PASSWORD',
+                        ascProvider: codeSignConfig.teamId
+                    }
                 }
             },
             win32: {
@@ -296,13 +309,6 @@ module.exports = function(grunt) {
             }
         },
         codesign: {
-            app: {
-                options: {
-                    identity: 'app',
-                    deep: true
-                },
-                src: ['tmp/desktop/KeeWeb-darwin-x64/KeeWeb.app']
-            },
             dmg: {
                 options: {
                     identity: 'app'

app/scripts/comp/browser/key-handler.js

@@ -63,7 +63,7 @@ class KeyHandler {
         const keyShortcuts = this.shortcuts[code];
         if (keyShortcuts && keyShortcuts.length) {
             for (const sh of keyShortcuts) {
-                if (this.modal && (sh.modal !== this.modal || sh.modal === '*')) {
+                if (this.modal && (sh.modal !== this.modal && sh.modal !== '*')) {
                     e.stopPropagation();
                     continue;
                 }

app/scripts/plugins/theme-vars.js

@@ -1,8 +1,7 @@
 import { Color } from 'util/data/color';
 
-const ThemeVarsScss = require('raw-loader!../../styles/base/_theme-vars.scss').default;
-// eslint-disable-next-line import/no-commonjs
-const ThemeDefaults = require('../../styles/themes/_theme-defaults.scss');
+import ThemeVarsScss from '!!raw-loader!../../styles/base/_theme-vars.scss';
+import ThemeDefaults from '!!raw-loader!../../styles/themes/_theme-defaults.scss';
 
 const ThemeVars = {
     themeDefaults: null,

app/scripts/views/open-view.js

@@ -70,7 +70,10 @@ class OpenView extends View {
         KeyHandler.setModal('open');
         this.once('remove', () => {
             this.passwordInput.reset();
-            KeyHandler.setModal(null);
+            if (KeyHandler.modal !== 'auto-type') {
+                // TODO: refactor this
+                KeyHandler.setModal(null);
+            }
         });
     }
 

build/util/hook-rcedit.js

@@ -4,7 +4,7 @@ const childProcess = require('child_process');
 
 const childProcessSpawn = childProcess.spawn;
 
-function hookedSpawn(command, options) {
+function hookedSpawn(command, options, ...args) {
     if (command === 'wine') {
         options = options.map(option => {
             if (option.includes(' ')) {
@@ -13,7 +13,7 @@ function hookedSpawn(command, options) {
             return option;
         });
     }
-    return childProcessSpawn.call(childProcess, command, options);
+    return childProcessSpawn.call(childProcess, command, options, ...args);
 }
 
 module.exports.setup = function() {

grunt.tasks.js

@@ -40,8 +40,7 @@ module.exports = function(grunt) {
         'copy:desktop-darwin-installer',
         'copy:desktop-windows-helper-ia32',
         'copy:desktop-windows-helper-x64',
-        'chmod:linux-desktop-x64',
-        'codesign:app'
+        'chmod:linux-desktop-x64'
     ]);
 
     grunt.registerTask('build-desktop-archives', [

package/osx/entitlements.mac.plist

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>com.apple.security.cs.allow-jit</key>
+    <true/>
+    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+    <true/>
+    <key>com.apple.security.cs.allow-dyld-environment-variables</key>
+    <true/>
+  </dict>
+</plist>

release-notes.md

@@ -1,5 +1,10 @@
 Release notes
 -------------
+##### v1.11.8 (2019-10-11)
+`-` fix #1292: macOS app notarization  
+`-` fix #1296: search in auto-type  
+`-` fixed issues with some theme plugins  
+
 ##### v1.11.7 (2019-10-08)
 `-` fix #1289: crash on Auto sorting mode  
 `-` fix #1288: issues when opening a file during in auto-type mode