Infrastructure/astro
0
Fork 0
mirror of https://github.com/withastro/astro.git synced 2025-03-31 23:31:30 -05:00
Code Issues Activity

fix(astro): prerendering issue when path contains underscore (#11243)

Browse source 
* fix(astro): prerendering issue when path contains underscore

* chore: add missing files

* Update .changeset/honest-ravens-double.md

Co-authored-by: Emanuele Stoppa <my.burning@gmail.com>

---------

Co-authored-by: Matthew Phillips <matthew@matthewphillips.info>
Co-authored-by: Emanuele Stoppa <my.burning@gmail.com>
This commit is contained in:
Szymon Chmal 2024-06-14 22:21:11 +02:00 • committed by GitHub
parent 6582811398
commit ba2b14cc28
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 95 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.changeset/honest-ravens-double.md Normal file
View file

@ -0,0 +1,5 @@
---
"astro": patch
---
Fixes a prerendering issue for libraries in `node_modules` when a folder with an underscore is in the path.

16
packages/astro/src/core/util.ts
View file

@ -120,11 +120,23 @@ function isInjectedRoute(file: URL, settings: AstroSettings) {
}
function isPublicRoute(file: URL, config: AstroConfig): boolean {
const pagesDir = resolvePages(config);
const parts = file.toString().replace(pagesDir.toString(), '').split('/').slice(1);
const rootDir = config.root.toString();
const pagesDir = resolvePages(config).toString();
const fileDir = file.toString();
// Normalize the file directory path by removing the pagesDir prefix if it exists,
// otherwise remove the rootDir prefix.
const normalizedDir = fileDir.startsWith(pagesDir) ? fileDir.slice(pagesDir.length) : fileDir.slice(rootDir.length);
const parts = normalizedDir
.replace(pagesDir.toString(), '')
.split('/')
.slice(1);
for (const part of parts) {
if (part.startsWith('_')) return false;
}
return true;
}

8
packages/astro/test/fixtures/_underscore in folder name/astro.config.mjs vendored Normal file
View file

@ -0,0 +1,8 @@
import { defineConfig } from 'astro/config';
import fakeIntegration from 'fake-astro-library';
export default defineConfig({
integrations: [
fakeIntegration(),
],
});

4
packages/astro/test/fixtures/_underscore in folder name/node_modules/fake-astro-library/404.astro generated vendored Normal file
View file

@ -0,0 +1,4 @@
---
export const prerender = true;
---
<div>Test 404</div>

16
packages/astro/test/fixtures/_underscore in folder name/node_modules/fake-astro-library/index.ts generated vendored Normal file
View file

@ -0,0 +1,16 @@
export default function FakeIntegration() {
return {
name: 'fake-astro-library',
hooks: {
'astro:config:setup': async ({
injectRoute,
}) => {
injectRoute({
pattern: '404',
entrypoint: 'fake-astro-library/404.astro',
prerender: true,
});
},
},
};
}

12
packages/astro/test/fixtures/_underscore in folder name/node_modules/fake-astro-library/package.json generated vendored Normal file
View file

@ -0,0 +1,12 @@
{
"name": "fake-astro-library",
"version": "0.0.0",
"private": true,
"exports": {
".": "./index.ts",
"./404.astro": "./404.astro"
},
"dependencies": {
"astro": "workspace:*"
}
}

11
packages/astro/test/fixtures/_underscore in folder name/src/pages/index.astro vendored Normal file
View file

@ -0,0 +1,11 @@
<html>
<head>
<title>Project with underscore in the folder name</title>
</head>
<body>
<h1>Testing</h1>
<script>
console.log('hi');
</script>
</body>
</html>

25
packages/astro/test/underscore-in-folder-name.test.js Normal file
View file

@ -0,0 +1,25 @@
import assert from 'node:assert/strict';
import { before, describe, it } from 'node:test';
import { loadFixture } from './test-utils.js';
import testAdapter from './test-adapter.js';
describe('Projects with a underscore in the folder name', () => {
let fixture;
before(async () => {
fixture = await loadFixture({
root: './fixtures/_underscore in folder name/',
output: 'hybrid',
adapter: testAdapter(),
});
await fixture.build();
});
it('includes page from node_modules/fake-astro-library', async () => {
const app = await fixture.loadTestAdapterApp();
/** @type {Set<string>} */
const assets = app.manifest.assets;
assert.equal(assets.has('/index.html'), true);
assert.equal(assets.has('/404.html'), true);
});
});