Skip to content

fix(nextjs): Check if public dir exists #3602

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
AbhiPrasad merged 1 commit into from
May 26, 2021
Merged

fix(nextjs): Check if public dir exists #3602

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
28 changes: 18 additions & 10 deletions packages/nextjs/src/utils/instrumentServer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,23 +161,31 @@ function makeWrappedErrorLogger(origErrorLogger: ErrorLogger): WrappedErrorLogge
};
}

// inspired by next's public file routing; see
// https://github.com/vercel/next.js/blob/4443d6f3d36b107e833376c2720c1e206eee720d/packages/next/next-server/server/next-server.ts#L1166
function getPublicDirFiles(): Set<string> {
try {
// we need the paths here to match the format of a request url, which means they must:
// - start with a slash
// - use forward slashes rather than backslashes
// - be URL-encoded
const dirContents = deepReadDirSync(liveServer.publicDir).map(filepath =>
encodeURI(`/${filepath.replace(/\\/g, '/')}`),
);
return new Set(dirContents);
} catch (_) {
return new Set();
}
}

/**
* Wrap the server's request handler to be able to create request transactions.
*
* @param origReqHandler The original request handler from the `Server` class
* @returns A wrapped version of that handler
*/
function makeWrappedReqHandler(origReqHandler: ReqHandler): WrappedReqHandler {
// inspired by next's public file routing; see
// https://github.com/vercel/next.js/blob/4443d6f3d36b107e833376c2720c1e206eee720d/packages/next/next-server/server/next-server.ts#L1166
const publicDirFiles = new Set(
// we need the paths here to match the format of a request url, which means they must:
// - start with a slash
// - use forward slashes rather than backslashes
// - be URL-encoded
deepReadDirSync(liveServer.publicDir).map(filepath => encodeURI(`/${filepath.replace(/\\/g, '/')}`)),
);

const publicDirFiles = getPublicDirFiles();
// add transaction start and stop to the normal request handling
const wrappedReqHandler = async function(
this: Server,
Expand Down