diff --git a/Gruntfile.js b/Gruntfile.js index f4321dbb..68f59f63 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -227,6 +227,44 @@ module.exports = function (grunt) { src: 'graphics/icon.icns', dest: 'tmp/desktop/KeeWeb Installer.app/Contents/Resources/applet.icns', nonull: true + }, + 'native-messaging-host-darwin-x64': { + src: + 'node_modules/@keeweb/keeweb-native-messaging-host/darwin-x64/keeweb-native-messaging-host', + dest: + 'tmp/desktop/KeeWeb-darwin-x64/KeeWeb.app/Contents/MacOS/util/keeweb-native-messaging-host', + nonull: true + }, + 'native-messaging-host-darwin-arm64': { + src: + 'node_modules/@keeweb/keeweb-native-messaging-host/darwin-arm64/keeweb-native-messaging-host', + dest: + 'tmp/desktop/KeeWeb-darwin-arm64/KeeWeb.app/Contents/MacOS/util/keeweb-native-messaging-host', + nonull: true + }, + 'native-messaging-host-linux-x64': { + src: + 'node_modules/@keeweb/keeweb-native-messaging-host/linux-x64/keeweb-native-messaging-host', + dest: 'tmp/desktop/keeweb-linux-x64/keeweb-native-messaging-host', + nonull: true + }, + 'native-messaging-host-win32-x64': { + src: + 'node_modules/@keeweb/keeweb-native-messaging-host/win32-x64/keeweb-native-messaging-host.exe', + dest: 'tmp/desktop/KeeWeb-win32-x64/keeweb-native-messaging-host.exe', + nonull: true + }, + 'native-messaging-host-win32-ia32': { + src: + 'node_modules/@keeweb/keeweb-native-messaging-host/win32-ia32/keeweb-native-messaging-host.exe', + dest: 'tmp/desktop/KeeWeb-win32-ia32/keeweb-native-messaging-host.exe', + nonull: true + }, + 'native-messaging-host-win32-arm64': { + src: + 'node_modules/@keeweb/keeweb-native-messaging-host/win32-arm64/keeweb-native-messaging-host.exe', + dest: 'tmp/desktop/KeeWeb-win32-arm64/keeweb-native-messaging-host.exe', + nonull: true } }, eslint: { @@ -748,67 +786,6 @@ module.exports = function (grunt) { } }, html: 'dist/index.html' - }, - cmake: { - 'native-messaging-host-darwin-x64': { - options: { - outputName: 'keeweb-native-messaging-host', - cmakeConfigure: ['-DCMAKE_OSX_ARCHITECTURES=x86_64'] - }, - files: { - 'tmp/desktop/KeeWeb-darwin-x64/KeeWeb.app/Contents/MacOS/util/keeweb-native-messaging-host': - 'extension/native-messaging-host' - } - }, - 'native-messaging-host-darwin-arm64': { - options: { - outputName: 'keeweb-native-messaging-host', - cmakeConfigure: ['-DCMAKE_OSX_ARCHITECTURES=arm64'] - }, - files: { - 'tmp/desktop/KeeWeb-darwin-arm64/KeeWeb.app/Contents/MacOS/util/keeweb-native-messaging-host': - 'extension/native-messaging-host' - } - }, - 'native-messaging-host-linux-x64': { - options: { - outputName: 'keeweb-native-messaging-host' - }, - files: { - 'tmp/desktop/keeweb-linux-x64/keeweb-native-messaging-host': - 'extension/native-messaging-host' - } - }, - 'native-messaging-host-win32-x64': { - options: { - outputName: 'keeweb-native-messaging-host.exe', - cmakeConfigure: ['-A', 'x64'] - }, - files: { - 'tmp/desktop/KeeWeb-win32-x64/keeweb-native-messaging-host.exe': - 'extension/native-messaging-host' - } - }, - 'native-messaging-host-win32-ia32': { - options: { - outputName: 'keeweb-native-messaging-host.exe', - cmakeConfigure: ['-A', 'win32'] - }, - files: { - 'tmp/desktop/KeeWeb-win32-ia32/keeweb-native-messaging-host.exe': - 'extension/native-messaging-host' - } - }, - 'native-messaging-host-win32-arm64': { - options: { - outputName: 'keeweb-native-messaging-host.exe', - cmakeConfigure: ['-A', 'arm64'] - }, - files: { - 'tmp/desktop/KeeWeb-win32-arm64/keeweb-native-messaging-host.exe': - 'extension/native-messaging-host' - } - } } }); }; diff --git a/package-lock.json b/package-lock.json index 1e6b077c..3e153062 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { "name": "keeweb", - "version": "1.17.5", + "version": "1.17.6", "lockfileVersion": 2, "requires": true, "packages": { "": { - "version": "1.17.5", + "version": "1.17.6", "license": "MIT", "dependencies": { "@babel/core": "^7.13.8", @@ -14,6 +14,7 @@ "@babel/plugin-proposal-optional-chaining": "^7.13.8", "@babel/preset-env": "^7.13.9", "@fortawesome/fontawesome-free": "^5.15.2", + "@keeweb/keeweb-native-messaging-host": "https://github.com/keeweb/keeweb-connect/releases/download/0.0.3/keeweb-native-messaging-host.tgz", "@keeweb/keeweb-native-modules": "https://github.com/keeweb/keeweb-native-modules/releases/download/0.10.4/keeweb-native-modules.tgz", "adm-zip": "^0.5.3", "argon2-browser": "1.15.3", @@ -1468,6 +1469,12 @@ "node": ">=10" } }, + "node_modules/@keeweb/keeweb-native-messaging-host": { + "version": "0.0.3", + "resolved": "https://github.com/keeweb/keeweb-connect/releases/download/0.0.3/keeweb-native-messaging-host.tgz", + "integrity": "sha512-ofKt+qaqsODgYzzm4AyJPt08N97TS5Vz96M77ARisjGSQxQyz4shYbPGk+ax1tPBSMN7aXZf4bLAxlgDdPbjXQ==", + "license": "MIT" + }, "node_modules/@keeweb/keeweb-native-modules": { "version": "0.10.4", "resolved": "https://github.com/keeweb/keeweb-native-modules/releases/download/0.10.4/keeweb-native-modules.tgz", @@ -22476,6 +22483,10 @@ } } }, + "@keeweb/keeweb-native-messaging-host": { + "version": "https://github.com/keeweb/keeweb-connect/releases/download/0.0.3/keeweb-native-messaging-host.tgz", + "integrity": "sha512-ofKt+qaqsODgYzzm4AyJPt08N97TS5Vz96M77ARisjGSQxQyz4shYbPGk+ax1tPBSMN7aXZf4bLAxlgDdPbjXQ==" + }, "@keeweb/keeweb-native-modules": { "version": "https://github.com/keeweb/keeweb-native-modules/releases/download/0.10.4/keeweb-native-modules.tgz", "integrity": "sha512-tquZZIBLci2Yz+CKYoylFC8wUDuCrjRBuhVvstaesN0I8F0jY9IW7a9k7i5v8Dzrzhde7ELPwanXGtVQMt398Q==" diff --git a/package.json b/package.json index d62bc68d..8b3e86a8 100644 --- a/package.json +++ b/package.json @@ -16,6 +16,7 @@ "@babel/plugin-proposal-optional-chaining": "^7.13.8", "@babel/preset-env": "^7.13.9", "@fortawesome/fontawesome-free": "^5.15.2", + "@keeweb/keeweb-native-messaging-host": "https://github.com/keeweb/keeweb-connect/releases/download/0.0.3/keeweb-native-messaging-host.tgz", "@keeweb/keeweb-native-modules": "https://github.com/keeweb/keeweb-native-modules/releases/download/0.10.4/keeweb-native-modules.tgz", "adm-zip": "^0.5.3", "argon2-browser": "1.15.3",