Skip to content

[pages-shared] Remove extension name check when generating response #4051

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
1000hz merged 1 commit into from
Nov 6, 2023
Merged

[pages-shared] Remove extension name check when generating response #4051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions .changeset/cold-bugs-kick.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@cloudflare/pages-shared": minor
---

fix: remove extension name check when generating response

Current regex logic to check whether a pathname is a file (has file extension) is causing trouble for some websites, and now \${pathname}/index.html is always checked before returning notFound().
6 changes: 0 additions & 6 deletions packages/pages-shared/asset-server/handler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,8 +293,6 @@ export async function generateHandler<
);
} else if ((assetEntry = await findAssetEntryForPath(`${pathname}.html`))) {
return serveAsset(assetEntry);
} else if (hasFileExtension(pathname)) {
return notFound();
}

if ((assetEntry = await findAssetEntryForPath(`${pathname}/index.html`))) {
Expand Down Expand Up @@ -626,10 +624,6 @@ function isCacheable(request: Request) {
return !request.headers.has("authorization") && !request.headers.has("range");
}

function hasFileExtension(path: string) {
return /\/.+\.[a-z0-9]+$/i.test(path);
}

// Parses a request URL hostname to determine if the request
// is from a project served in "preview" mode.
function isPreview(url: URL): boolean {
Expand Down