Skip to content
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

Jump to bottom

fix: cloudflare routing 404 #870

Merged
merged 1 commit into from
Sep 12, 2024
Merged

fix: cloudflare routing 404 #870

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
58 changes: 44 additions & 14 deletions packages/waku/src/lib/plugins/vite-plugin-deploy-cloudflare.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,30 @@ const srcServeFile = decodeFilePathFromAbsolute(
),
);

const getFiles = (dir: string, files: string[] = []): string[] => {
const entries = readdirSync(dir, { withFileTypes: true });
for (const entry of entries) {
const fullPath = path.join(dir, entry.name);
if (entry.isDirectory()) {
getFiles(fullPath, files);
} else {
files.push(fullPath);
}
}
return files;
};

const WORKER_JS_NAME = '_worker.js';
const ROUTES_JSON_NAME = '_routes.json';
const HEADERS_NAME = '_headers';

type StaticRoutes = { version: number; include: string[]; exclude: string[] };

export function deployCloudflarePlugin(opts: {
srcDir: string;
distDir: string;
rscPath: string;
privateDir: string;
}): Plugin {
const platformObject = unstable_getPlatformObject();
let rootDir: string;
Expand Down Expand Up @@ -120,23 +136,37 @@ export default {
const routesFile = path.join(outDir, ROUTES_JSON_NAME);
const publicDir = path.join(outDir, WORKER_JS_NAME, DIST_PUBLIC);
if (!existsSync(path.join(publicDir, ROUTES_JSON_NAME))) {
const staticPaths: string[] = [];
const paths = readdirSync(publicDir, {
withFileTypes: true,
});
// exclude strategy
const staticPaths: string[] = ['/assets/*'];
const paths = getFiles(publicDir);
for (const p of paths) {
if (p.isDirectory()) {
const entry = `/${p.name}/*`;
if (!staticPaths.includes(entry)) {
staticPaths.push(entry);
}
} else {
if (p.name === WORKER_JS_NAME) {
return;
}
staticPaths.push(`/${p.name}`);
const basePath = path.dirname(p.replace(publicDir, '')) || '/';
const name = path.basename(p);
const entry =
name === 'index.html'
? basePath + (basePath !== '/' ? '/' : '')
: path.join(basePath, name.replace(/\.html$/, ''));
if (
entry.startsWith('/assets/') ||
entry.startsWith('/' + WORKER_JS_NAME + '/') ||
entry === '/' + WORKER_JS_NAME ||
entry === '/' + ROUTES_JSON_NAME ||
entry === '/' + HEADERS_NAME
) {
continue;
}
if (!staticPaths.includes(entry)) {
staticPaths.push(entry);
}
}
const MAX_CLOUDFLARE_RULES = 100;
if (staticPaths.length + 1 > MAX_CLOUDFLARE_RULES) {
throw new Error(
`The number of static paths exceeds the limit of ${MAX_CLOUDFLARE_RULES}. ` +
`You need to create a custom ${ROUTES_JSON_NAME} file in the public folder. ` +
`See https://developers.cloudflare.com/pages/functions/routing/#functions-invocation-routes`,
);
}
const staticRoutes: StaticRoutes = {
version: 1,
include: ['/*'],
Expand Down
Loading