Infrastructure/astro
0
Fork 0
mirror of https://github.com/withastro/astro.git synced 2024-12-16 21:46:22 -05:00
Code Issues Activity

Fix cssesc from breaking browser code (#10194)

Browse source 
* Fix cssesc from breaking browser code

* Include specific thing instead

* Update .changeset/quick-bottles-march.md

Co-authored-by: Florian Lefebvre <contact@florian-lefebvre.dev>

* Fix ISR

* Remove query stripping altogether

* Warn on client usage

* Fix build

* oops

---------

Co-authored-by: Florian Lefebvre <contact@florian-lefebvre.dev>
This commit is contained in:
Matthew Phillips 2024-02-22 11:11:41 -05:00 committed by GitHub
parent c856c72940
commit 3cc2010927
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 27 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.changeset/cuddly-ads-fail.md Normal file
View file

@ -0,0 +1,5 @@
---
"@astrojs/vercel": patch
---
Fix loading client-scripts in dev with ISR

5
.changeset/quick-bottles-march.md Normal file
View file

@ -0,0 +1,5 @@
---
"astro": patch
---
Fixes an issue related to content collections usage in browser context caused by `csssec`

13
packages/astro/src/content/vite-plugin-content-virtual-mod.ts
View file

@ -61,13 +61,14 @@ export function astroContentVirtualModPlugin({
}
}
},
async load(id) {
async load(id, args) {
if (id === RESOLVED_VIRTUAL_MODULE_ID) {
const lookupMap = await generateLookupMap({
settings,
fs,
});
const code = await generateContentEntryFile({ settings, fs, lookupMap, IS_DEV, IS_SERVER });
const isClient = !args?.ssr;
const code = await generateContentEntryFile({ settings, fs, lookupMap, IS_DEV, IS_SERVER, isClient });
return {
code,
@ -102,12 +103,14 @@ export async function generateContentEntryFile({
lookupMap,
IS_DEV,
IS_SERVER,
isClient
}: {
settings: AstroSettings;
fs: typeof nodeFs;
lookupMap: ContentLookupMap;
IS_DEV: boolean;
IS_SERVER: boolean;
isClient: boolean;
}) {
const contentPaths = getContentPaths(settings.config);
const relContentDir = rootRelativePath(settings.config.root, contentPaths.contentDir);
@ -143,13 +146,15 @@ export async function generateContentEntryFile({
renderEntryGlobResult = getStringifiedCollectionFromLookup('render', relContentDir, lookupMap);
}
const virtualModContents = nodeFs
let virtualModContents = nodeFs
.readFileSync(contentPaths.virtualModTemplate, 'utf-8')
.replace('@@CONTENT_DIR@@', relContentDir)
.replace("'@@CONTENT_ENTRY_GLOB_PATH@@'", contentEntryGlobResult)
.replace("'@@DATA_ENTRY_GLOB_PATH@@'", dataEntryGlobResult)
.replace("'@@RENDER_ENTRY_GLOB_PATH@@'", renderEntryGlobResult)
.replace('/* @@LOOKUP_MAP_ASSIGNMENT@@ */', `lookupMap = ${JSON.stringify(lookupMap)};`);
.replace('/* @@LOOKUP_MAP_ASSIGNMENT@@ */', `lookupMap = ${JSON.stringify(lookupMap)};`) +
(isClient ? `
console.warn('astro:content is only supported running server-side. Using it in the browser will lead to bloated bundles and slow down page load. In the future it will not be supported.');` : '');
return virtualModContents;
}

1
packages/astro/src/core/build/plugins/plugin-content.ts
View file

@ -164,6 +164,7 @@ function vitePluginContent(
lookupMap,
IS_DEV: false,
IS_SERVER: false,
isClient: false,
});
this.emitFile({
type: 'prebuilt-chunk',

7
packages/astro/src/transitions/vite-plugin-transitions.ts
View file

@ -10,6 +10,13 @@ const resolvedVirtualClientModuleId = '\0' + virtualClientModuleId;
export default function astroTransitions({ settings }: { settings: AstroSettings }): vite.Plugin {
return {
name: 'astro:transitions',
config() {
return {
optimizeDeps: {
include: ['astro > cssesc'],
},
};
},
async resolveId(id) {
if (id === virtualModuleId) {
return resolvedVirtualModuleId;

14
packages/integrations/vercel/src/serverless/adapter.ts
View file

@ -287,20 +287,6 @@ export default function vercelServerless({
);
}
},
'astro:server:setup'({ server }) {
// isr functions do not have access to search params, this middleware removes them for the dev mode
if (isr) {
const exclude_ = typeof isr === 'object' ? isr.exclude ?? [] : [];
// we create a regex to emulate vercel's production behavior
const exclude = exclude_.concat('/_image').map((ex) => new RegExp(escapeRegex(ex)));
server.middlewares.use(function removeIsrParams(req, _, next) {
const { pathname } = new URL(`https://example.com${req.url}`);
if (exclude.some((ex) => ex.test(pathname))) return next();
req.url = pathname;
return next();
});
}
},
'astro:build:ssr': async ({ entryPoints, middlewareEntryPoint }) => {
_entryPoints = entryPoints;
_middlewareEntryPoint = middlewareEntryPoint;