Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
fix: Recover Linux screenshots and fragment captures (#6589)
Oleg Isonenbc29c51be847
diff --git a/packages/cli/src/screenshot.ts b/packages/cli/src/screenshot.tsindex 2389953fb9..ab63f709c0 100644--- a/packages/cli/src/screenshot.ts+++ b/packages/cli/src/screenshot.ts@@ -110,7 +110,6 @@ export type ScreenshotDependencies = {export const defaultScreenshotDependencies: ScreenshotDependencies = {env: process.env,- platform: process.platform,access,mkdir,which: async (command) =>diff --git a/packages/sdk-components-react/src/create-link.browser.test.tsx b/packages/sdk-components-react/src/create-link.browser.test.tsxnew file mode 100644index 0000000000..c4bb67f794--- /dev/null+++ b/packages/sdk-components-react/src/create-link.browser.test.tsx@@ -0,0 +1,86 @@+import { forwardRef, type ComponentPropsWithoutRef } from "react";+import { hydrateRoot, type Root } from "react-dom/client";+import { renderToString } from "react-dom/server";+import { act } from "react-dom/test-utils";+import { expect, test, vi } from "vitest";+import { ReactSdkContext } from "@webstudio-is/react-sdk/runtime";+import type { UrlParts } from "@webstudio-is/sdk/link-utils";+import { createLink } from "./create-link";++(+ globalThis as typeof globalThis & { IS_REACT_ACT_ENVIRONMENT: boolean }+).IS_REACT_ACT_ENVIRONMENT = true;++test("fragment links keep server classes during hydration and become active afterward", async () => {+ let hash = "";+ const RouterLink = forwardRef<+ HTMLAnchorElement,+ ComponentPropsWithoutRef<"a"> & { to: string | Partial<UrlParts> }+ >(({ to, ...props }, ref) => (+ <a+ {...props}+ href={+ typeof to === "string"+ ? to+ : `${to.pathname ?? ""}${to.search ?? ""}${to.hash ?? ""}`+ }+ ref={ref}+ />+ ));+ const Link = createLink({+ Link: RouterLink,+ useLocation: () => ({ pathname: "/path", search: "", hash }),+ useResolvedPath: (href) => {+ const url = new URL(href, "https://webstudio.local/path");+ return { pathname: url.pathname, search: url.search, hash: url.hash };+ },+ });+ const element = (+ <ReactSdkContext.Provider+ value={{+ assetBaseUrl: "/assets/",+ imageLoader: ({ src }) => src,+ videoLoader: ({ src }) => src,+ resources: {},+ breakpoints: [],+ onError: vi.fn(),+ }}+ >+ <Link href="/path#section">Route link</Link>+ <Link href="#section">Hash link</Link>+ </ReactSdkContext.Provider>+ );+ const container = document.createElement("div");+ container.innerHTML = renderToString(element);+ document.body.append(container);+ expect(+ Array.from(container.querySelectorAll("a"), (link) => link.className)+ ).toEqual(["", ""]);+ expect(+ Array.from(container.querySelectorAll("a"), (link) =>+ link.getAttribute("aria-current")+ )+ ).toEqual([null, null]);++ hash = "#section";+ const consoleError = vi.spyOn(console, "error").mockImplementation(() => {});+ let root: Root | undefined;+ try {+ await act(async () => {+ root = hydrateRoot(container, element);+ });+ expect(consoleError).not.toHaveBeenCalled();+ expect(+ Array.from(container.querySelectorAll("a"), (link) => link.className)+ ).toEqual(["active", "active"]);+ expect(+ Array.from(container.querySelectorAll("a"), (link) =>+ link.getAttribute("aria-current")+ )+ ).toEqual(["page", "page"]);+ } finally {+ await act(async () => root?.unmount());+ consoleError.mockRestore();+ container.remove();+ }+});diff --git a/packages/sdk-components-react/src/create-link.tsx b/packages/sdk-components-react/src/create-link.tsxindex 12563a8943..d2ae5602e3 100644--- a/packages/sdk-components-react/src/create-link.tsx+++ b/packages/sdk-components-react/src/create-link.tsx@@ -7,6 +7,7 @@ import {type ReactNode,forwardRef,useContext,+ useSyncExternalStore,} from "react";import { ReactSdkContext } from "@webstudio-is/react-sdk/runtime";import { BaseLink } from "./link";@@ -55,6 +56,16 @@ const getRouterHref = (href: string, location: UrlParts) => {const getCurrentHref = (location: UrlParts) =>`https://webstudio.local${location.pathname}${location.search}${location.hash}`;+const useHydrationSafeLocation = (location: UrlParts) => {+ // Fragments are not sent to the server, so defer hash-dependent link state.+ const isHydrated = useSyncExternalStore(+ () => () => {},+ () => true,+ () => false+ );+ return isHydrated ? location : { ...location, hash: "" };+};+const CurrentUrlProvider = ({children,location,@@ -89,7 +100,7 @@ export const createLink = ({HTMLAnchorElement,LinkProps & { href: string }>((props, ref) => {- const location = useLocation();+ const location = useHydrationSafeLocation(useLocation());const href = getRouterHref(props.href, location);const { linkProps, currentLinkProps } = getCurrentLinkProps(props,@@ -106,7 +117,7 @@ export const createLink = ({const HashLink = forwardRef<HTMLAnchorElement, LinkProps & { href: string }>((props, ref) => {- const location = useLocation();+ const location = useHydrationSafeLocation(useLocation());return (<CurrentUrlProvider location={location}><BaseLinkdiff --git a/packages/vision/src/screenshot-browser-cdp.test.ts b/packages/vision/src/screenshot-browser-cdp.test.tsindex 8eacf7cfa8..59e7e41cb4 100644--- a/packages/vision/src/screenshot-browser-cdp.test.ts+++ b/packages/vision/src/screenshot-browser-cdp.test.ts@@ -583,6 +583,7 @@ const createDependencies = ({: {},})) as unknown as typeof globalThis.fetch;return {+ platform: process.platform,spawnBrowser: vi.fn(() => browserProcess) as unknown as BrowserScreenshotDependencies["spawnBrowser"],@@ -1739,6 +1740,45 @@ test("keeps a browser startup signal as structured diagnostics", async () => {});});+test("retries Linux browser startup without /dev/shm after an abort", async () => {+ const dependencies = Object.assign(createDependencies(), {+ platform: "linux" as const,+ });+ vi.mocked(dependencies.spawnBrowser)+ .mockImplementationOnce(() => {+ const browserProcess = new FakeBrowserProcess();+ setTimeout(() => browserProcess.emit("exit", undefined, "SIGABRT"), 0);+ return browserProcess as never;+ })+ .mockImplementationOnce(() => new FakeBrowserProcess() as never);+ vi.mocked(dependencies.readFile)+ .mockImplementationOnce(async () => await new Promise(() => undefined))+ .mockResolvedValue("9222\n/devtools/browser/1\n");++ const session = await createBrowserScreenshotSession(+ {+ url: "https://example.com",+ output: "/tmp/current.png",+ width: 800,+ height: 600,+ browserPath: "/usr/bin/chromium",+ waitUntil: "load",+ waitForTimeout: 0,+ timeout: 1000,+ },+ dependencies+ );++ expect(dependencies.spawnBrowser).toHaveBeenCalledTimes(2);+ expect(vi.mocked(dependencies.spawnBrowser).mock.calls[0]?.[1]).not.toContain(+ "--disable-dev-shm-usage"+ );+ expect(vi.mocked(dependencies.spawnBrowser).mock.calls[1]?.[1]).toContain(+ "--disable-dev-shm-usage"+ );+ await session.close();+});+test("does not restart a browser session after cleanup", async () => {const dependencies = createDependencies();const options = {diff --git a/packages/vision/src/screenshot-browser-cdp.ts b/packages/vision/src/screenshot-browser-cdp.tsindex d9b8cd0b27..2d81eff657 100644--- a/packages/vision/src/screenshot-browser-cdp.ts+++ b/packages/vision/src/screenshot-browser-cdp.ts@@ -133,6 +133,7 @@ export type BrowserScreenshotTimings = {};export type BrowserScreenshotDependencies = {+ platform: NodeJS.Platform;spawnBrowser: (file: string, args: readonly string[]) => BrowserProcess;readFile: typeof readFile;writeFile: typeof writeFile;@@ -144,6 +145,7 @@ export type BrowserScreenshotDependencies = {export const defaultBrowserScreenshotDependencies: BrowserScreenshotDependencies ={+ platform: process.platform,spawnBrowser(file, args) {return spawn(file, [...args], { stdio: ["ignore", "ignore", "pipe"] });},@@ -699,12 +701,14 @@ const createBrowserLaunchArgs = ({height,uid,disableSandbox,+ disableDevShmUsage,}: {userDataDir: string;width: number;height: number;uid?: number;disableSandbox?: boolean;+ disableDevShmUsage?: boolean;}) => ["--headless=new","--disable-gpu",@@ -717,6 +721,7 @@ const createBrowserLaunchArgs = ({`--window-size=${width},${height}`,"--no-first-run","--no-default-browser-check",+ ...(disableDevShmUsage === true ? ["--disable-dev-shm-usage"] : []),...(uid === 0 || disableSandbox === true ? ["--no-sandbox"] : []),"about:blank",];@@ -1508,7 +1513,8 @@ const removeBrowserProfile = async (const startBrowserRuntimeOnce = async (options: BrowserScreenshotOptions,- dependencies: BrowserScreenshotDependencies+ dependencies: BrowserScreenshotDependencies,+ disableDevShmUsage = false): Promise<BrowserRuntime> => {const startupTimeout = options.startupTimeout ?? options.timeout;const userDataDir = await dependencies.mkdtemp(@@ -1524,6 +1530,7 @@ const startBrowserRuntimeOnce = async (height: options.height,uid: options.uid,disableSandbox: options.disableSandbox,+ disableDevShmUsage,}));} catch (error) {@@ -1633,7 +1640,11 @@ const startBrowserRuntime = async (}}try {- return await startBrowserRuntimeOnce(options, dependencies);+ return await startBrowserRuntimeOnce(+ options,+ dependencies,+ dependencies.platform === "linux"+ );} catch (error) {throw new BrowserStartupError(error instanceof Error ? error.message : String(error),