From b2cb722c01b37bef1cfb958459008a3bbe40a1e9 Mon Sep 17 00:00:00 2001 From: Scott Nonnenberg Date: Mon, 7 Aug 2023 17:39:57 -0700 Subject: [PATCH] Move windows-dummy-keystroke fork to signalapp organization --- ACKNOWLEDGMENTS.md | 44 ++++++++++++++++++------------------- app/WindowsNotifications.ts | 2 +- app/main.ts | 2 +- package.json | 4 ++-- yarn.lock | 15 +++++++------ 5 files changed, 34 insertions(+), 33 deletions(-) diff --git a/ACKNOWLEDGMENTS.md b/ACKNOWLEDGMENTS.md index 352049c2c1a7..6e91dd01b611 100644 --- a/ACKNOWLEDGMENTS.md +++ b/ACKNOWLEDGMENTS.md @@ -505,6 +505,28 @@ Signal Desktop makes use of the following open source projects. OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +## @signalapp/windows-dummy-keystroke + + Copyright (c) 2022 David Rickard + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ## @types/fabric MIT License @@ -3028,28 +3050,6 @@ Signal Desktop makes use of the following open source projects. END OF TERMS AND CONDITIONS -## windows-dummy-keystroke - - Copyright (c) 2022 David Rickard - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - ## zod MIT License diff --git a/app/WindowsNotifications.ts b/app/WindowsNotifications.ts index 224e51e56e58..d025250f7a35 100644 --- a/app/WindowsNotifications.ts +++ b/app/WindowsNotifications.ts @@ -22,7 +22,7 @@ import { AUMID } from './startup_config'; import type { WindowsNotificationData } from '../ts/services/notifications'; import { renderWindowsToast } from './renderWindowsToast'; -export { sendDummyKeystroke } from 'windows-dummy-keystroke'; +export { sendDummyKeystroke } from '@signalapp/windows-dummy-keystroke'; const NOTIFICATION_GROUP = 'group'; const NOTIFICATION_TAG = 'tag'; diff --git a/app/main.ts b/app/main.ts index 458c8858ce72..b6925ca23769 100644 --- a/app/main.ts +++ b/app/main.ts @@ -247,7 +247,7 @@ if (!process.mas) { } else { app.on('second-instance', (_e: Electron.Event, argv: Array) => { // Workaround to let AllowSetForegroundWindow succeed. - // See https://www.npmjs.com/package/windows-dummy-keystroke for a full explanation of why this is needed. + // See https://www.npmjs.com/package/@signalapp/windows-dummy-keystroke for a full explanation of why this is needed. sendDummyKeystroke?.(); // Someone tried to run a second instance, we should focus our window diff --git a/package.json b/package.json index 11783a036e69..3c3b4ee53fe3 100644 --- a/package.json +++ b/package.json @@ -177,7 +177,7 @@ "uuid": "3.3.2", "uuid-browser": "3.1.0", "websocket": "1.0.34", - "windows-dummy-keystroke": "git+https://git@github.com/scottnonnenberg-signal/windows-dummy-keystroke.git#2227c50613020d0bb5d8d1921c96d2b9b4476291", + "@signalapp/windows-dummy-keystroke": "1.0.0", "zod": "3.5.1" }, "devDependencies": { @@ -507,7 +507,7 @@ "node_modules/fs-xattr/build/Release/*.node", "node_modules/@nodert-win10-rs4/windows.data.xml.dom/build/Release/*.node", "node_modules/@nodert-win10-rs4/windows.ui.notifications/build/Release/*.node", - "node_modules/windows-dummy-keystroke/build/Release/*.node", + "node_modules/@signalapp/windows-dummy-keystroke/build/Release/*.node", "!**/node_modules/react-dom/*/*.development.js", "!node_modules/mp4box/**", "node_modules/mp4box/package.json", diff --git a/yarn.lock b/yarn.lock index b4175c509a34..72fc1ad24c42 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2329,6 +2329,14 @@ dependencies: tar "^6.1.0" +"@signalapp/windows-dummy-keystroke@1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@signalapp/windows-dummy-keystroke/-/windows-dummy-keystroke-1.0.0.tgz#4c7a216a71ccdd87e7628656af8e3f7938af2f7d" + integrity sha512-52C8p5sitWYGUIQ5iDt8uGls60JNc2xiYpx48Z4x70KnuIdHPjIe8KkXjXfvhK1bRoKde/hvq/Oa8H+nDGHd6Q== + dependencies: + bindings "^1.5.0" + nan "^2.17.0" + "@sindresorhus/is@^0.14.0": version "0.14.0" resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" @@ -19046,13 +19054,6 @@ wildcard@^2.0.0: resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec" integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw== -"windows-dummy-keystroke@git+https://git@github.com/scottnonnenberg-signal/windows-dummy-keystroke.git#2227c50613020d0bb5d8d1921c96d2b9b4476291": - version "1.0.0" - resolved "git+https://git@github.com/scottnonnenberg-signal/windows-dummy-keystroke.git#2227c50613020d0bb5d8d1921c96d2b9b4476291" - dependencies: - bindings "^1.5.0" - nan "^2.17.0" - word-wrap@^1.2.3: version "1.2.4" resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.4.tgz#cb4b50ec9aca570abd1f52f33cd45b6c61739a9f"