From 16a45167da6bb7da9641158fc668ec1aa24eed2a Mon Sep 17 00:00:00 2001 From: Vianney MORAIN Date: Wed, 17 Jun 2026 15:32:21 +0200 Subject: [PATCH 1/2] fix(e2e): support standard Vite build output in serve-built-remix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit serve-built-remix.ts expected the Vercel preset build format (build/server//index.js). Since vite.config.ts skips vercelPreset() for non-Vercel builds, the output is now build/server/index.js directly, with build/server/assets/ as a subdirectory — causing the script to try to import assets/index.js (ERR_MODULE_NOT_FOUND). Check for index.js at the root of build/server/ first; fall back to the hash-subdirectory format for Vercel preset builds. Co-Authored-By: Claude Sonnet 4.6 --- apps/builder/e2e/serve-built-remix.ts | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/apps/builder/e2e/serve-built-remix.ts b/apps/builder/e2e/serve-built-remix.ts index b239d6818c1b..84ac84be21d6 100644 --- a/apps/builder/e2e/serve-built-remix.ts +++ b/apps/builder/e2e/serve-built-remix.ts @@ -2,7 +2,7 @@ import { installGlobals } from "@remix-run/node"; import { createRequestHandler as createExpressRequestHandler } from "@remix-run/express"; import type { ServerBuild } from "@remix-run/server-runtime"; import express from "express"; -import { readdirSync, readFileSync } from "node:fs"; +import { existsSync, readdirSync, readFileSync } from "node:fs"; import https from "node:https"; import path from "node:path"; import { pathToFileURL } from "node:url"; @@ -11,6 +11,14 @@ installGlobals({ nativeFetch: true }); const resolveServerBuildPath = () => { const serverDirectory = path.resolve("build/server"); + + // Standard Vite build (no vercelPreset): index.js is at the root of build/server/ + const directEntry = path.join(serverDirectory, "index.js"); + if (existsSync(directEntry)) { + return directEntry; + } + + // Vercel preset build: index.js lives inside a hash-named subdirectory const serverBuild = readdirSync(serverDirectory, { withFileTypes: true, }).find((entry) => entry.isDirectory()); From 8f17ad7a83f278d5083e60c300ab0e45ca0582c5 Mon Sep 17 00:00:00 2001 From: Vianney MORAIN Date: Wed, 17 Jun 2026 15:34:07 +0200 Subject: [PATCH 2/2] fix(storybook): update color import after Figma token pipeline removal Upstream removed the Figma token sync pipeline (db78ae4dc), deleting packages/design-system/src/__generated__/figma-design-tokens. The same color values are exported directly from design-tokens.ts. Co-Authored-By: Claude Sonnet 4.6 --- .storybook/preview.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.storybook/preview.tsx b/.storybook/preview.tsx index cb6ab55aad5b..77e6f9d5e507 100644 --- a/.storybook/preview.tsx +++ b/.storybook/preview.tsx @@ -4,7 +4,7 @@ import { useEffect } from "react"; import { TooltipProvider } from "@radix-ui/react-tooltip"; import { setEnv } from "../packages/feature-flags/src/index"; import { theme, globalCss } from "../packages/design-system/src/index"; -import { color } from "../packages/design-system/src/__generated__/figma-design-tokens"; +import { color } from "../packages/design-system/src/design-tokens"; // this adds