Skip to content

feat: cache resources #5381

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Aug 25, 2025
Merged

feat: cache resources #5381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4a9c9af
feat: cache resources
TrySound Aug 24, 2025
09209f9
Add cached fetch
TrySound Aug 24, 2025
46e7938
Log cache-control
TrySound Aug 24, 2025
ba492bd
Log all headers
TrySound Aug 24, 2025
9e89e1c
Copy cache-control to response
TrySound Aug 24, 2025
f765772
Pass correct response
TrySound Aug 24, 2025
642392f
Try to override
TrySound Aug 24, 2025
d51b3cd
Cache resources
TrySound Aug 25, 2025
145f6d6
Update fixtures
TrySound Aug 25, 2025
31a82e5
Fix types
TrySound Aug 25, 2025
9d4fdb2
Update fixtures
TrySound Aug 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions fixtures/react-router-cloudflare/app/routes/[another-page]._index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import {
loadResources,
formIdFieldName,
formBotFieldName,
cachedFetch,
} from "@webstudio-is/sdk/runtime";
import {
ReactSdkContext,
Expand Down Expand Up @@ -42,7 +43,7 @@ import { sitemap } from "../__generated__/$resources.sitemap.xml";

const customFetch: typeof fetch = (input, init) => {
if (typeof input !== "string") {
return fetch(input, init);
return cachedFetch(projectId, input, init);
}

if (isLocalResource(input, "sitemap.xml")) {
Expand All @@ -52,7 +53,7 @@ const customFetch: typeof fetch = (input, init) => {
return Promise.resolve(response);
}

return fetch(input, init);
return cachedFetch(projectId, input, init);
};

export const loader = async (arg: LoaderFunctionArgs) => {
Expand Down
5 changes: 3 additions & 2 deletions fixtures/react-router-cloudflare/app/routes/_index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import {
loadResources,
formIdFieldName,
formBotFieldName,
cachedFetch,
} from "@webstudio-is/sdk/runtime";
import {
ReactSdkContext,
Expand Down Expand Up @@ -42,7 +43,7 @@ import { sitemap } from "../__generated__/$resources.sitemap.xml";

const customFetch: typeof fetch = (input, init) => {
if (typeof input !== "string") {
return fetch(input, init);
return cachedFetch(projectId, input, init);
}

if (isLocalResource(input, "sitemap.xml")) {
Expand All @@ -52,7 +53,7 @@ const customFetch: typeof fetch = (input, init) => {
return Promise.resolve(response);
}

return fetch(input, init);
return cachedFetch(projectId, input, init);
};

export const loader = async (arg: LoaderFunctionArgs) => {
Expand Down
5 changes: 3 additions & 2 deletions fixtures/react-router-docker/app/routes/[another-page]._index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import {
loadResources,
formIdFieldName,
formBotFieldName,
cachedFetch,
} from "@webstudio-is/sdk/runtime";
import {
ReactSdkContext,
Expand Down Expand Up @@ -42,7 +43,7 @@ import { sitemap } from "../__generated__/$resources.sitemap.xml";

const customFetch: typeof fetch = (input, init) => {
if (typeof input !== "string") {
return fetch(input, init);
return cachedFetch(projectId, input, init);
}

if (isLocalResource(input, "sitemap.xml")) {
Expand All @@ -52,7 +53,7 @@ const customFetch: typeof fetch = (input, init) => {
return Promise.resolve(response);
}

return fetch(input, init);
return cachedFetch(projectId, input, init);
};

export const loader = async (arg: LoaderFunctionArgs) => {
Expand Down
5 changes: 3 additions & 2 deletions fixtures/react-router-docker/app/routes/_index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import {
loadResources,
formIdFieldName,
formBotFieldName,
cachedFetch,
} from "@webstudio-is/sdk/runtime";
import {
ReactSdkContext,
Expand Down Expand Up @@ -42,7 +43,7 @@ import { sitemap } from "../__generated__/$resources.sitemap.xml";

const customFetch: typeof fetch = (input, init) => {
if (typeof input !== "string") {
return fetch(input, init);
return cachedFetch(projectId, input, init);
}

if (isLocalResource(input, "sitemap.xml")) {
Expand All @@ -52,7 +53,7 @@ const customFetch: typeof fetch = (input, init) => {
return Promise.resolve(response);
}

return fetch(input, init);
return cachedFetch(projectId, input, init);
};

export const loader = async (arg: LoaderFunctionArgs) => {
Expand Down
5 changes: 3 additions & 2 deletions fixtures/react-router-netlify/app/routes/[another-page]._index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import {
loadResources,
formIdFieldName,
formBotFieldName,
cachedFetch,
} from "@webstudio-is/sdk/runtime";
import {
ReactSdkContext,
Expand Down Expand Up @@ -42,7 +43,7 @@ import { sitemap } from "../__generated__/$resources.sitemap.xml";

const customFetch: typeof fetch = (input, init) => {
if (typeof input !== "string") {
return fetch(input, init);
return cachedFetch(projectId, input, init);
}

if (isLocalResource(input, "sitemap.xml")) {
Expand All @@ -52,7 +53,7 @@ const customFetch: typeof fetch = (input, init) => {
return Promise.resolve(response);
}

return fetch(input, init);
return cachedFetch(projectId, input, init);
};

export const loader = async (arg: LoaderFunctionArgs) => {
Expand Down
5 changes: 3 additions & 2 deletions fixtures/react-router-netlify/app/routes/_index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import {
loadResources,
formIdFieldName,
formBotFieldName,
cachedFetch,
} from "@webstudio-is/sdk/runtime";
import {
ReactSdkContext,
Expand Down Expand Up @@ -42,7 +43,7 @@ import { sitemap } from "../__generated__/$resources.sitemap.xml";

const customFetch: typeof fetch = (input, init) => {
if (typeof input !== "string") {
return fetch(input, init);
return cachedFetch(projectId, input, init);
}

if (isLocalResource(input, "sitemap.xml")) {
Expand All @@ -52,7 +53,7 @@ const customFetch: typeof fetch = (input, init) => {
return Promise.resolve(response);
}

return fetch(input, init);
return cachedFetch(projectId, input, init);
};

export const loader = async (arg: LoaderFunctionArgs) => {
Expand Down
5 changes: 3 additions & 2 deletions fixtures/react-router-vercel/app/routes/[another-page]._index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import {
loadResources,
formIdFieldName,
formBotFieldName,
cachedFetch,
} from "@webstudio-is/sdk/runtime";
import {
ReactSdkContext,
Expand Down Expand Up @@ -42,7 +43,7 @@ import { sitemap } from "../__generated__/$resources.sitemap.xml";

const customFetch: typeof fetch = (input, init) => {
if (typeof input !== "string") {
return fetch(input, init);
return cachedFetch(projectId, input, init);
}

if (isLocalResource(input, "sitemap.xml")) {
Expand All @@ -52,7 +53,7 @@ const customFetch: typeof fetch = (input, init) => {
return Promise.resolve(response);
}

return fetch(input, init);
return cachedFetch(projectId, input, init);
};

export const loader = async (arg: LoaderFunctionArgs) => {
Expand Down
5 changes: 3 additions & 2 deletions fixtures/react-router-vercel/app/routes/_index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import {
loadResources,
formIdFieldName,
formBotFieldName,
cachedFetch,
} from "@webstudio-is/sdk/runtime";
import {
ReactSdkContext,
Expand Down Expand Up @@ -42,7 +43,7 @@ import { sitemap } from "../__generated__/$resources.sitemap.xml";

const customFetch: typeof fetch = (input, init) => {
if (typeof input !== "string") {
return fetch(input, init);
return cachedFetch(projectId, input, init);
}

if (isLocalResource(input, "sitemap.xml")) {
Expand All @@ -52,7 +53,7 @@ const customFetch: typeof fetch = (input, init) => {
return Promise.resolve(response);
}

return fetch(input, init);
return cachedFetch(projectId, input, init);
};

export const loader = async (arg: LoaderFunctionArgs) => {
Expand Down
5 changes: 3 additions & 2 deletions fixtures/webstudio-cloudflare-template/app/routes/[another-page]._index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import {
isLocalResource,
loadResource,
loadResources,
cachedFetch,
formIdFieldName,
formBotFieldName,
} from "@webstudio-is/sdk/runtime";
Expand Down Expand Up @@ -43,7 +44,7 @@ import { sitemap } from "../__generated__/$resources.sitemap.xml";

const customFetch: typeof fetch = (input, init) => {
if (typeof input !== "string") {
return fetch(input, init);
return cachedFetch(projectId, input, init);
}

if (isLocalResource(input, "sitemap.xml")) {
Expand All @@ -53,7 +54,7 @@ const customFetch: typeof fetch = (input, init) => {
return Promise.resolve(response);
}

return fetch(input, init);
return cachedFetch(projectId, input, init);
};

export const loader = async (arg: LoaderFunctionArgs) => {
Expand Down
5 changes: 3 additions & 2 deletions fixtures/webstudio-cloudflare-template/app/routes/_index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import {
isLocalResource,
loadResource,
loadResources,
cachedFetch,
formIdFieldName,
formBotFieldName,
} from "@webstudio-is/sdk/runtime";
Expand Down Expand Up @@ -43,7 +44,7 @@ import { sitemap } from "../__generated__/$resources.sitemap.xml";

const customFetch: typeof fetch = (input, init) => {
if (typeof input !== "string") {
return fetch(input, init);
return cachedFetch(projectId, input, init);
}

if (isLocalResource(input, "sitemap.xml")) {
Expand All @@ -53,7 +54,7 @@ const customFetch: typeof fetch = (input, init) => {
return Promise.resolve(response);
}

return fetch(input, init);
return cachedFetch(projectId, input, init);
};

export const loader = async (arg: LoaderFunctionArgs) => {
Expand Down
5 changes: 3 additions & 2 deletions fixtures/webstudio-features/app/routes/[_route_with_symbols_]._index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import {
loadResources,
formIdFieldName,
formBotFieldName,
cachedFetch,
} from "@webstudio-is/sdk/runtime";
import {
ReactSdkContext,
Expand Down Expand Up @@ -42,7 +43,7 @@ import { sitemap } from "../__generated__/$resources.sitemap.xml";

const customFetch: typeof fetch = (input, init) => {
if (typeof input !== "string") {
return fetch(input, init);
return cachedFetch(projectId, input, init);
}

if (isLocalResource(input, "sitemap.xml")) {
Expand All @@ -52,7 +53,7 @@ const customFetch: typeof fetch = (input, init) => {
return Promise.resolve(response);
}

return fetch(input, init);
return cachedFetch(projectId, input, init);
};

export const loader = async (arg: LoaderFunctionArgs) => {
Expand Down
5 changes: 3 additions & 2 deletions fixtures/webstudio-features/app/routes/[animations]._index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import {
loadResources,
formIdFieldName,
formBotFieldName,
cachedFetch,
} from "@webstudio-is/sdk/runtime";
import {
ReactSdkContext,
Expand Down Expand Up @@ -42,7 +43,7 @@ import { sitemap } from "../__generated__/$resources.sitemap.xml";

const customFetch: typeof fetch = (input, init) => {
if (typeof input !== "string") {
return fetch(input, init);
return cachedFetch(projectId, input, init);
}

if (isLocalResource(input, "sitemap.xml")) {
Expand All @@ -52,7 +53,7 @@ const customFetch: typeof fetch = (input, init) => {
return Promise.resolve(response);
}

return fetch(input, init);
return cachedFetch(projectId, input, init);
};

export const loader = async (arg: LoaderFunctionArgs) => {
Expand Down
5 changes: 3 additions & 2 deletions fixtures/webstudio-features/app/routes/[class-names]._index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import {
loadResources,
formIdFieldName,
formBotFieldName,
cachedFetch,
} from "@webstudio-is/sdk/runtime";
import {
ReactSdkContext,
Expand Down Expand Up @@ -42,7 +43,7 @@ import { sitemap } from "../__generated__/$resources.sitemap.xml";

const customFetch: typeof fetch = (input, init) => {
if (typeof input !== "string") {
return fetch(input, init);
return cachedFetch(projectId, input, init);
}

if (isLocalResource(input, "sitemap.xml")) {
Expand All @@ -52,7 +53,7 @@ const customFetch: typeof fetch = (input, init) => {
return Promise.resolve(response);
}

return fetch(input, init);
return cachedFetch(projectId, input, init);
};

export const loader = async (arg: LoaderFunctionArgs) => {
Expand Down
5 changes: 3 additions & 2 deletions fixtures/webstudio-features/app/routes/[content-block]._index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import {
loadResources,
formIdFieldName,
formBotFieldName,
cachedFetch,
} from "@webstudio-is/sdk/runtime";
import {
ReactSdkContext,
Expand Down Expand Up @@ -42,7 +43,7 @@ import { sitemap } from "../__generated__/$resources.sitemap.xml";

const customFetch: typeof fetch = (input, init) => {
if (typeof input !== "string") {
return fetch(input, init);
return cachedFetch(projectId, input, init);
}

if (isLocalResource(input, "sitemap.xml")) {
Expand All @@ -52,7 +53,7 @@ const customFetch: typeof fetch = (input, init) => {
return Promise.resolve(response);
}

return fetch(input, init);
return cachedFetch(projectId, input, init);
};

export const loader = async (arg: LoaderFunctionArgs) => {
Expand Down
5 changes: 3 additions & 2 deletions fixtures/webstudio-features/app/routes/[duration]._index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import {
loadResources,
formIdFieldName,
formBotFieldName,
cachedFetch,
} from "@webstudio-is/sdk/runtime";
import {
ReactSdkContext,
Expand Down Expand Up @@ -42,7 +43,7 @@ import { sitemap } from "../__generated__/$resources.sitemap.xml";

const customFetch: typeof fetch = (input, init) => {
if (typeof input !== "string") {
return fetch(input, init);
return cachedFetch(projectId, input, init);
}

if (isLocalResource(input, "sitemap.xml")) {
Expand All @@ -52,7 +53,7 @@ const customFetch: typeof fetch = (input, init) => {
return Promise.resolve(response);
}

return fetch(input, init);
return cachedFetch(projectId, input, init);
};

export const loader = async (arg: LoaderFunctionArgs) => {
Expand Down
Loading
Loading