-
-
Notifications
You must be signed in to change notification settings - Fork 10.6k
fix(dev): handle critical CSS with absolute base
and Vite Env API
#13598
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.
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
base: dev
Are you sure you want to change the base?
Conversation
🦋 Changeset detectedLatest commit: 7cea871 The changes in this PR will be included in the next version bump. This PR includes changesets to release 11 packages
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
Hi @chr33s, Welcome, and thank you for contributing to React Router! Before we consider your pull request, we ask that you sign our Contributor License Agreement (CLA). We require this only once. You may review the CLA and sign it by adding your name to contributors.yml. Once the CLA is signed, the If you have already signed the CLA and received this response in error, or if you have any questions, please contact us at [email protected]. Thanks! - The Remix team |
Thank you for signing the Contributor License Agreement. Let's get this merged! 🥳 |
Any chance we could add a test for this? |
@timdorr as requested, refactored the change to a helper function and included tests to cover both relative and absolute vite base paths. |
@@ -1576,7 +1576,7 @@ export const reactRouterVitePlugin: ReactRouterVitePlugin = () => { | |||
if (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi) { | |||
viteDevServer.middlewares.use(async (req, res, next) => { | |||
let [reqPathname, reqSearch] = (req.url ?? "").split("?"); | |||
if (reqPathname === `${ctx.publicPath}@react-router/critical.css`) { | |||
if (reqPathname === getRelativePathName(`${ctx.publicPath}@react-router/critical.css`)) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since this is only used during development, I'm happy to simplify this by simply checking that reqPathname.endsWith("/@react-router/critical.css")
and not worrying about the rest of the path.
The /@react-router/
prefix is sufficient for me to treat this as private implementation detail and not worry about clashing with other URLs.
Also, simplifying in this way makes me feel like additional tests are unnecessary.
base
and Vite Env API
@markdalgleish updated as per your comment. |
As above, using
new URL
may not be the best solution, but was the easiest.