authorgravatar for maria@kuuro.netmaria <maria@kuuro.net> 2026-10-06 14:12:08-03:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2026-10-06 17:12:08+00:00
logfd1c3386c4d60f3477ab3f13c87537848de099f5
tree26c4c56851961a2ab441df8eba83b057933866c8
parentdff412c3411f34b3150983f00686a98b600526e3
signature Signed by PGP key B5690EEEBB952194

fix(release): unblock nightly browser tests and cli builds (#16515)

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>

3 files changed, 15 insertions(+), 7 deletions(-)

.github/workflows/release.yml+3
...@@ -330,6 +330,9 @@ jobs:...@@ -330,6 +330,9 @@ jobs:
330 # No Electron setup here: `t3` (apps/server) has no Electron dependency330 # No Electron setup here: `t3` (apps/server) has no Electron dependency
331 # and none of its tests touch the runtime. Only the non-server `test`331 # and none of its tests touch the runtime. Only the non-server `test`
332 # job, which covers @t3tools/desktop, needs the download.332 # job, which covers @t3tools/desktop, needs the download.
333 - name: Install Chromium for server browser integration tests
334 run: node apps/server/node_modules/playwright-core/cli.js install --with-deps --only-shell chromium
335
333 - name: Test336 - name: Test
334 run: vp run --filter t3 test --shard ${{ matrix.shard }}/${{ strategy.job-total }}337 run: vp run --filter t3 test --shard ${{ matrix.shard }}/${{ strategy.job-total }}
335338
apps/server/src/preview/ServerBrowserContexts.test.ts+3-4
...@@ -1,7 +1,7 @@...@@ -1,7 +1,7 @@
1import * as NodeEvents from "node:events";1import * as NodeEvents from "node:events";
22
3import { INCOGNITO_BROWSER_PROFILE_ID } from "@t3tools/contracts";3import { INCOGNITO_BROWSER_PROFILE_ID } from "@t3tools/contracts";
4import type { Browser, BrowserContext, BrowserType } from "playwright-core";4import { chromium, type Browser, type BrowserContext, type BrowserType } from "playwright-core";
5import { beforeEach, describe, expect, it, vi } from "vite-plus/test";5import { beforeEach, describe, expect, it, vi } from "vite-plus/test";
66
7import { ServerBrowserContexts } from "./ServerBrowserContexts.ts";7import { ServerBrowserContexts } from "./ServerBrowserContexts.ts";
...@@ -12,9 +12,8 @@ const launches = vi.hoisted(() => ({...@@ -12,9 +12,8 @@ const launches = vi.hoisted(() => ({
12 mkdir: vi.fn().mockResolvedValue(undefined),12 mkdir: vi.fn().mockResolvedValue(undefined),
13 rm: vi.fn().mockResolvedValue(undefined),13 rm: vi.fn().mockResolvedValue(undefined),
14}));14}));
15vi.mock("playwright-core", () => ({15vi.spyOn(chromium, "launch").mockImplementation(launches.launch);
16 chromium: { launch: launches.launch, launchPersistentContext: launches.persistent },16vi.spyOn(chromium, "launchPersistentContext").mockImplementation(launches.persistent);
17}));
18vi.mock("node:fs/promises", () => ({ mkdir: launches.mkdir, rm: launches.rm }));17vi.mock("node:fs/promises", () => ({ mkdir: launches.mkdir, rm: launches.rm }));
1918
20const makeContext = () => {19const makeContext = () => {
apps/server/src/preview/ServerBrowserContexts.ts+9-3
...@@ -2,11 +2,17 @@...@@ -2,11 +2,17 @@
2import { INCOGNITO_BROWSER_PROFILE_ID } from "@t3tools/contracts";2import { INCOGNITO_BROWSER_PROFILE_ID } from "@t3tools/contracts";
3import { constVoid } from "effect/Function";3import { constVoid } from "effect/Function";
4import * as NodeFSP from "node:fs/promises";4import * as NodeFSP from "node:fs/promises";
5import * as NodeModule from "node:module";
5import * as NodePath from "node:path";6import * as NodePath from "node:path";
6import type { Browser, BrowserContext } from "playwright-core";7import type { Browser, BrowserContext } from "playwright-core";
78
8import { sandboxDisabled } from "./PreviewBrowserHost.ts";9import { sandboxDisabled } from "./PreviewBrowserHost.ts";
910
11// Playwright needs its files on disk. createRequire also resolves it from a Node SEA executable.
12const requirePlaywright = NodeModule.createRequire(import.meta.url);
13const loadPlaywright = () =>
14 requirePlaywright("playwright-core") as typeof import("playwright-core");
15
10interface Options {16interface Options {
11 readonly profilesDir: string;17 readonly profilesDir: string;
12 /** The shared headless browser's executable, installing it on first use. */18 /** The shared headless browser's executable, installing it on first use. */
...@@ -54,7 +60,7 @@ export class ServerBrowserContexts {...@@ -54,7 +60,7 @@ export class ServerBrowserContexts {
54 private sharedBrowser() {60 private sharedBrowser() {
55 if (!this.browser) {61 if (!this.browser) {
56 const launched = this.launchOptions().then(async (options) => {62 const launched = this.launchOptions().then(async (options) => {
57 const { chromium } = await import("playwright-core");63 const { chromium } = loadPlaywright();
58 const browser = await this.launch(options, () => chromium.launch(options));64 const browser = await this.launch(options, () => chromium.launch(options));
59 browser.on("disconnected", () => {65 browser.on("disconnected", () => {
60 if (this.browser === launched) this.browser = undefined;66 if (this.browser === launched) this.browser = undefined;
...@@ -104,7 +110,7 @@ export class ServerBrowserContexts {...@@ -104,7 +110,7 @@ export class ServerBrowserContexts {
104 }110 }
105 const directory = this.profileDirectory(profileId);111 const directory = this.profileDirectory(profileId);
106 const options = await this.launchOptions();112 const options = await this.launchOptions();
107 const { chromium } = await import("playwright-core");113 const { chromium } = loadPlaywright();
108 await NodeFSP.mkdir(directory, { recursive: true });114 await NodeFSP.mkdir(directory, { recursive: true });
109 return this.launch(options, () =>115 return this.launch(options, () =>
110 chromium.launchPersistentContext(directory, { ...options, ...contextOptions }),116 chromium.launchPersistentContext(directory, { ...options, ...contextOptions }),
...@@ -133,7 +139,7 @@ export class ServerBrowserContexts {...@@ -133,7 +139,7 @@ export class ServerBrowserContexts {
133 * serves. The page keeps the desktop's storage, size, and window.139 * serves. The page keeps the desktop's storage, size, and window.
134 */140 */
135 async connectDesktopPage(endpoint: string) {141 async connectDesktopPage(endpoint: string) {
136 const { chromium } = await import("playwright-core");142 const { chromium } = loadPlaywright();
137 const browser = await chromium.connectOverCDP(endpoint, { timeout: 15_000 });143 const browser = await chromium.connectOverCDP(endpoint, { timeout: 15_000 });
138 const page = browser.contexts().flatMap((context) => context.pages())[0];144 const page = browser.contexts().flatMap((context) => context.pages())[0];
139 if (!page) {145 if (!page) {