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: use local URLs for expression assets in exports (#5945)
Sviat Barbutsa9a087c573ae0
diff --git a/packages/cli/src/prebuild.test.ts b/packages/cli/src/prebuild.test.tsindex 1d7a5c2caf..85cd831614 100644--- a/packages/cli/src/prebuild.test.ts+++ b/packages/cli/src/prebuild.test.ts@@ -12,6 +12,7 @@ import { join } from "node:path";import { pathToFileURL } from "node:url";import { tmpdir } from "node:os";import { bundleVersion } from "@webstudio-is/protocol";+import type { Asset } from "@webstudio-is/sdk";import { generateRedirectsModule, prebuild } from "./prebuild";const originalCwd = process.cwd();@@ -68,6 +69,7 @@ const getFilePaths = async (dir: string): Promise<string[]> => {const createSiteData = (overrides: {+ assets?: Asset[];pages?: Array<{id: string;name: string;@@ -114,7 +116,7 @@ const createSiteData = (},page: pages[0],pages,- assets: [+ assets: overrides.assets ?? [{id: "asset-image",projectId: "project-id",@@ -378,6 +380,38 @@ describe("prebuild", () => {).resolves.not.toContain('"path": "/draft"');});+ test("uses the local asset base in generated asset resources", async () => {+ await writeSiteData(+ createSiteData({+ assets: [+ {+ id: "asset-audio",+ projectId: "project-id",+ name: "audio.mp3",+ type: "file",+ format: "mp3",+ size: 1,+ meta: {},+ description: "",+ createdAt: "2024-01-01T00:00:00.000Z",+ },+ ],+ })+ );++ await prebuild({+ assets: false,+ template: ["defaults"],+ });++ const assetsModule = await readFile(+ "app/__generated__/$resources.assets.ts",+ "utf8"+ );+ expect(assetsModule).toContain('"url": "/assets/audio.mp3"');+ expect(assetsModule).not.toContain("/cgi/");+ });+test("scaffolds generated files and stores redirects as data", async () => {await mkdir("app/__generated__", { recursive: true });await mkdir("app/routes", { recursive: true });diff --git a/packages/cli/src/prebuild.ts b/packages/cli/src/prebuild.tsindex 9d83bafd69..d45e00a504 100644--- a/packages/cli/src/prebuild.ts+++ b/packages/cli/src/prebuild.ts@@ -792,13 +792,18 @@ export const prebuild = async (options: {`);- // Generate assets resource file- // Assets use /cgi/ endpoints on both builder and published sites- // Use a placeholder origin for URL construction, result will be relative paths+ // Generate assets resource file.+ // Use a placeholder origin to preserve runtime metadata before overriding the+ // builder-only URL with the generated project's local asset URL.const assetsById = Object.fromEntries(siteData.assets.map((asset) => [asset.id,- toRuntimeAsset(asset, "https://placeholder.local"),+ {+ ...toRuntimeAsset(asset, "https://placeholder.local"),+ // Generated projects serve materialized assets from the template's+ // asset base; the /cgi routes only exist in the live builder.+ url: `${assetBaseUrl}${asset.name}`,+ },]));