michael/astro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixes pageUrlFormat: 'file' in static build (#2569)

Browse source 
* Fixes pageUrlFormat: 'file' in static build

* Adds a changeset
This commit is contained in:
Matthew Phillips 2022-02-11 09:43:42 -05:00 • committed by GitHub
parent 176b77329e
commit 82544e4134
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 49 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.changeset/gold-kangaroos-notice.md Normal file
View file

@ -0,0 +1,5 @@
---
'astro': patch
---
Fixes pageUrlFormat: 'file' in the static build

4
packages/astro/src/core/build/static-build.ts
View file

@ -395,7 +395,7 @@ function getOutFolder(astroConfig: AstroConfig, pathname: string): URL {
case 'directory': case 'directory':
return new URL('.' + appendForwardSlash(pathname), outRoot); return new URL('.' + appendForwardSlash(pathname), outRoot);
case 'file': case 'file':
return outRoot; return new URL('.' + appendForwardSlash(npath.dirname(pathname)), outRoot);
} }
} }
@ -404,7 +404,7 @@ function getOutFile(astroConfig: AstroConfig, outFolder: URL, pathname: string):
case 'directory': case 'directory':
return new URL('./index.html', outFolder); return new URL('./index.html', outFolder);
case 'file': case 'file':
return new URL('.' + pathname + '.html', outFolder); return new URL('./' + npath.basename(pathname) + '.html', outFolder);
} }
} }

4
packages/astro/test/fixtures/static-build-page-url-format/src/pages/one.astro vendored Normal file
View file

@ -0,0 +1,4 @@
<html>
<head><title>One</title></head>
<body><h1>Testing</h1></body>
</html>

4
packages/astro/test/fixtures/static-build-page-url-format/src/pages/sub/page.astro vendored Normal file
View file

@ -0,0 +1,4 @@
<html>
<head><title>Subpath</title></head>
<body><h1>Testing</h1></body>
</html>

34
packages/astro/test/static-build-page-url-format.test.js Normal file
View file

@ -0,0 +1,34 @@
import { expect } from 'chai';
import cheerio from 'cheerio';
import { loadFixture } from './test-utils.js';
function addLeadingSlash(path) {
return path.startsWith('/') ? path : '/' + path;
}
describe('Static build - pageUrlFormat: \'file\'', () => {
let fixture;
before(async () => {
fixture = await loadFixture({
projectRoot: './fixtures/static-build-page-url-format/',
renderers: [],
buildOptions: {
experimentalStaticBuild: true,
site: 'http://example.com/subpath/',
pageUrlFormat: 'file'
},
});
await fixture.build();
});
it('Builds pages in root', async () => {
const html = await fixture.readFile('/subpath/one.html');
expect(html).to.be.a('string');
});
it('Builds pages in subfolders', async () => {
const html = await fixture.readFile('/subpath/sub/page.html');
expect(html).to.be.a('string');
});
});