chore(deps): bump Electron to 44.1.0

Electron 44 turns clipboard.writeText into a Promise and removes clipboard.writeImage in favour of clipboard.write with ClipboardItem, so the shell and preview manager follow. node-abi is pinned to a release that knows the new Electron ABI so prebuilt native modules resolve during packaging, and the release-age policy excludes this exact version.

Julius Marminge committed 2 months ago

Commit 82bc5b61 parent 0d345797 files · +93 −27Browse files

Unified · Split

7 files

apps/desktop/package.json +1 −1
apps/desktop/src/electron/ElectronShell.test.ts +22 −0
apps/desktop/src/electron/ElectronShell.ts +1 −3
apps/desktop/src/preview/Manager.test.ts +36 −7
apps/desktop/src/preview/Manager.ts +17 −3
pnpm-lock.yaml +14 −13
pnpm-workspace.yaml +2 −0

apps/desktop/package.json+1−1

@@ -22,7 +22,7 @@ · 21 unmodified lines
22	"@t3tools/ssh": "workspace:*",	22	"@t3tools/ssh": "workspace:*",
23	"@t3tools/tailscale": "workspace:*",	23	"@t3tools/tailscale": "workspace:*",
24	"effect": "catalog:",	24	"effect": "catalog:",
25	"electron": "43.4.1",	25	"electron": "44.1.0",
26	"electron-store": "^8.2.0",	26	"electron-store": "^8.2.0",
27	"electron-updater": "^6.6.2",	27	"electron-updater": "^6.6.2",
28	"playwright-core": "1.60.0",	28	"playwright-core": "1.60.0",

apps/desktop/src/electron/ElectronShell.test.ts+22−0

@@ -36,6 +36,28 @@ describe("ElectronShell", () => { · 35 unmodified lines
36	}).pipe(Effect.provide(ElectronShell.layer)),	36	}).pipe(Effect.provide(ElectronShell.layer)),
37	);	37	);
38		38
		39	it.effect("copies text to the system clipboard", () =>
		40	Effect.gen(function* () {
		41	writeTextMock.mockResolvedValue(undefined);
		42
		43	const electronShell = yield* ElectronShell.ElectronShell;
		44	yield* electronShell.copyText("https://example.com/path");
		45
		46	assert.deepEqual(writeTextMock.mock.calls, [["https://example.com/path"]]);
		47	}).pipe(Effect.provide(ElectronShell.layer)),
		48	);
		49
		50	it.effect("does not fail when the clipboard write rejects", () =>
		51	Effect.gen(function* () {
		52	writeTextMock.mockRejectedValue(new Error("write failed"));
		53
		54	const electronShell = yield* ElectronShell.ElectronShell;
		55	yield* electronShell.copyText("https://example.com/path");
		56
		57	assert.deepEqual(writeTextMock.mock.calls, [["https://example.com/path"]]);
		58	}).pipe(Effect.provide(ElectronShell.layer)),
		59	);
		60
39	it.effect("opens the Full Disk Access settings anchor", () =>	61	it.effect("opens the Full Disk Access settings anchor", () =>
40	Effect.gen(function* () {	62	Effect.gen(function* () {
41	openExternalMock.mockResolvedValue(undefined);	63	openExternalMock.mockResolvedValue(undefined);

apps/desktop/src/electron/ElectronShell.ts+1−3

       ),
     ),
   copyText: (text) =>
-    Effect.sync(() => {
+    Effect.promise(() => Electron.clipboard.writeText(text).catch(() => undefined)),
-      Electron.clipboard.writeText(text);
-    }),
 });
 export const layer = Layer.succeed(ElectronShell, make);

apps/desktop/src/preview/Manager.test.ts+36−7

 const {
   browserWindowConstructor,
+  clipboardItemConstructor,
   createFromPath,
   fromId,
   getFocusedWebContents,
   showItemInFolder,
   webviewSend,
   writeFile,
-  writeImage,
+  writeClipboard,
 } = vi.hoisted(() => ({
   browserWindowConstructor: vi.fn(),
-  createFromPath: vi.fn((): { readonly isEmpty: () => boolean } => ({ isEmpty: () => false })),
+  clipboardItemConstructor: vi.fn(),
+  createFromPath: vi.fn((): { readonly isEmpty: () => boolean; readonly toPNG: () => Buffer } => ({
+    isEmpty: () => false,
+    toPNG: () => Buffer.from("png"),
+  })),
   fromId: vi.fn<(_id?: number) => Electron.WebContents | null>((_id?: number) => null),
   getFocusedWebContents: vi.fn(() => null),
   mkdir: vi.fn((_path: string) => undefined),
   showItemInFolder: vi.fn(),
   webviewSend: vi.fn(),
   writeFile: vi.fn((_path: string, _data: Uint8Array) => undefined),
-  writeImage: vi.fn(),
+  writeClipboard: vi.fn(async () => undefined),
 }));
 vi.mock("electron", () => ({
   BrowserWindow: browserWindowConstructor,
+  ClipboardItem: class {
+    constructor(data: Record<string, unknown>) {
+      clipboardItemConstructor(data);
+    }
+  },
   clipboard: {
-    writeImage,
+    write: writeClipboard,
   },
   nativeImage: {
     createFromPath,
     mkdir.mockClear();
     writeFile.mockClear();
     showItemInFolder.mockClear();
-    writeImage.mockClear();
+    clipboardItemConstructor.mockClear();
+    writeClipboard.mockClear();
     createFromPath.mockClear();
     webviewSend.mockClear();
   });
         yield* manager.copyArtifactToClipboard(artifactPath);
         expect(createFromPath).toHaveBeenCalledWith(artifactPath);
-        expect(writeImage).toHaveBeenCalledOnce();
+        expect(clipboardItemConstructor).toHaveBeenCalledWith({
+          "image/png": expect.any(Blob),
+        });
+        expect(writeClipboard).toHaveBeenCalledOnce();
         const exit = yield* Effect.exit(
           manager.copyArtifactToClipboard("/tmp/t3/dev/settings.json"),
         );
         });
         expect("cause" in error).toBe(false);
-        createFromPath.mockReturnValueOnce({ isEmpty: () => true });
+        createFromPath.mockReturnValueOnce({
+          isEmpty: () => true,
+          toPNG: () => Buffer.from("invalid"),
+        });
         const invalidImageExit = yield* Effect.exit(manager.copyArtifactToClipboard(artifactPath));
         expect(Exit.isFailure(invalidImageExit)).toBe(true);
         if (Exit.isSuccess(invalidImageExit)) return;
           _tag: "PreviewArtifactImageLoadError",
           artifactPath,
         });
+        const writeCause = new Error("clipboard write failed");
+        writeClipboard.mockRejectedValueOnce(writeCause);
+        const writeExit = yield* Effect.exit(manager.copyArtifactToClipboard(artifactPath));
+        expect(Exit.isFailure(writeExit)).toBe(true);
+        if (Exit.isSuccess(writeExit)) return;
+        expect(Option.getOrThrow(Cause.findErrorOption(writeExit.cause))).toMatchObject({
+          _tag: "PreviewOperationError",
+          operation: "copyArtifactToClipboard.write",
+          artifactPath,
+          cause: writeCause,
+        });
       }),
     ),
   );

apps/desktop/src/preview/Manager.ts+17−3

 } from "@t3tools/contracts";
 import { HostProcessPlatform } from "@t3tools/shared/hostProcess";
 import { normalizePreviewUrl } from "@t3tools/shared/preview";
-import { BrowserWindow, type Session, clipboard, nativeImage, shell, webContents } from "electron";
+import {
+  BrowserWindow,
+  ClipboardItem,
+  type Session,
+  clipboard,
+  nativeImage,
+  shell,
+  webContents,
+} from "electron";
 import * as Cause from "effect/Cause";
 import * as Clock from "effect/Clock";
 import * as Context from "effect/Context";
     if (image.isEmpty()) {
       return yield* new PreviewArtifactImageLoadError({ artifactPath: resolvedPath });
     }
-    yield* attempt({ operation: "copyArtifactToClipboard.write", artifactPath: resolvedPath }, () =>
+    yield* attemptPromise(
-      clipboard.writeImage(image),
+      { operation: "copyArtifactToClipboard.write", artifactPath: resolvedPath },
+      () =>
+        clipboard.write([
+          new ClipboardItem({
+            "image/png": new Blob([Uint8Array.from(image.toPNG())], { type: "image/png" }),
+          }),
+        ]),
     );
   });

pnpm-lock.yaml+14−13

   expo-router: 57.0.17
   expo-sharing>@expo/config-plugins: 57.0.9
   expo-sharing>@expo/config-types: 57.0.2
+  node-abi: 4.33.0
   lightningcss: 1.33.0
   tailwindcss: 4.3.3
   vite: npm:@voidzero-dev/vite-plus-core@0.3.0
     dependencies:
       '@clerk/electron':
         specifier: 0.0.37
-        version: 0.0.37(@clerk/electron-passkeys@0.0.3)(electron-store@8.2.0)(electron@43.4.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+        version: 0.0.37(@clerk/electron-passkeys@0.0.3)(electron-store@8.2.0)(electron@44.1.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       '@clerk/electron-passkeys':
         specifier: 0.0.3
         version: 0.0.3
         specifier: 4.0.0-beta.103
         version: 4.0.0-beta.103(patch_hash=af36b7948b6f9c56623074662b51dade5699880c1a7c71245de73e13c3185fb6)
       electron:
-        specifier: 43.4.1
+        specifier: 44.1.0
-        version: 43.4.1
+        version: 44.1.0
       electron-store:
         specifier: ^8.2.0
         version: 8.2.0
         version: 1.5.0(@types/react@19.2.16)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       '@clerk/electron':
         specifier: 0.0.37
-        version: 0.0.37(@clerk/electron-passkeys@0.0.3)(electron-store@8.2.0)(electron@43.4.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+        version: 0.0.37(@clerk/electron-passkeys@0.0.3)(electron-store@8.2.0)(electron@44.1.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       '@clerk/react':
         specifier: 6.14.7
         version: 6.14.7(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
     resolution: {integrity: sha512-bO3y10YikuUwUuDUQRM4KfwNkKhnpVO7IPdbsrejwN9/AABJzzTQ4GeHwyzNSrVO+tEH3/Np255a3sVZpZDjvg==}
     engines: {node: '>=8.0.0'}
-  electron@43.4.1:
+  electron@44.1.0:
-    resolution: {integrity: sha512-5b+EuiwkgG5iRcsEL34rimgRpkYp15SsfZOa0pC5kXs0Tb82TH4n95rpQzTZa7yRCbA7tm0WoEbuBL6NaAhAcA==}
+    resolution: {integrity: sha512-kmLg8axOg22DC3fXx5NCwBYW8fx0rK2zzJ3Tf67GjNCkxfoxEcd+yo0QfDjlBtHJs3xeA8fTg64b6iVzFTVErg==}
     engines: {node: '>= 22.12.0'}
     hasBin: true
   nlcst-to-string@4.0.0:
     resolution: {integrity: sha512-YKLBCcUYKAg0FNlOBT6aI91qFmSiFKiluk655WzPF+DDMA02qIyy8uiRqI8QXtcFpEvll12LpL5MXqEmAZ+dcA==}
-  node-abi@4.31.0:
+  node-abi@4.33.0:
-    resolution: {integrity: sha512-Erq5w/t3syw3s4sDsUaX4QttIdBPsGKTT1DTRsCkTonGggczhlDKm/wDX3o+HPJpQ41EjXCbcmXf0tgr5YZJXw==}
+    resolution: {integrity: sha512-vLBWCKb+7LWsX+TbfzWOkw0W81m377tyx3hOweBTjO43CXZnRGS1/JPWs20fr0PgZyDXk6ROYrylsEycK8raDA==}
     engines: {node: '>=22.12.0'}
   node-addon-api@7.1.1:
       '@clerk/electron-passkeys-win32-arm64-msvc': 0.0.3
       '@clerk/electron-passkeys-win32-x64-msvc': 0.0.3
-  '@clerk/electron@0.0.37(@clerk/electron-passkeys@0.0.3)(electron-store@8.2.0)(electron@43.4.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
+  '@clerk/electron@0.0.37(@clerk/electron-passkeys@0.0.3)(electron-store@8.2.0)(electron@44.1.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
     dependencies:
       '@clerk/clerk-js': 6.30.1(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       '@clerk/react': 6.14.7(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       '@clerk/shared': 4.30.1(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
-      electron: 43.4.1
+      electron: 44.1.0
       react: 19.2.6
       tslib: 2.8.1
     optionalDependencies:
     dependencies:
       '@malept/cross-spawn-promise': 2.0.0
       debug: 4.4.3
-      node-abi: 4.31.0
+      node-abi: 4.33.0
       node-api-version: 0.2.1
       node-gyp: 12.3.0
       read-binary-file-arch: 1.0.6
     transitivePeerDependencies:
       - supports-color
-  electron@43.4.1:
+  electron@44.1.0:
     dependencies:
       '@electron-internal/extract-zip': 1.0.5
       '@electron/get': 5.1.0
     dependencies:
       '@types/nlcst': 2.0.3
-  node-abi@4.31.0:
+  node-abi@4.33.0:
     dependencies:
       semver: 7.8.5

pnpm-workspace.yaml+2−0

   - expo-updates@57.0.19
   - expo@57.0.18
   - expo-widgets@57.0.15
+  - electron@44.1.0
   - "@anthropic-ai/claude-agent-sdk@0.3.260"
 overrides:
   expo-router: 57.0.17
   "expo-sharing>@expo/config-plugins": 57.0.9
   "expo-sharing>@expo/config-types": 57.0.2
+  node-abi: 4.33.0
   lightningcss: "catalog:"
   tailwindcss: "catalog:"
   vite: "catalog:"

chore(deps): bump Electron to 44.1.0

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code