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

* Fixes pageUrlFormat: 'file' in static build * Adds a changeset
SiriousHunter · Feb 11, 2022 · 2cceb7e · 2cceb7e
1 parent 1f288bf
commit 2cceb7e
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 2 deletions.
diff --git a/src/core/build/static-build.ts b/src/core/build/static-build.ts
@@ -395,7 +395,7 @@ function getOutFolder(astroConfig: AstroConfig, pathname: string): URL {
  case 'directory':
  return new URL('.' + appendForwardSlash(pathname), outRoot);
  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':
  return new URL('./index.html', outFolder);
  case 'file':
- return new URL('.' + pathname + '.html', outFolder);
+ return new URL('./' + npath.basename(pathname) + '.html', outFolder);
  }
 }
 

diff --git a/test/fixtures/static-build-page-url-format/src/pages/one.astro b/test/fixtures/static-build-page-url-format/src/pages/one.astro
@@ -0,0 +1,4 @@
+<html>
+<head><title>One</title></head>
+<body><h1>Testing</h1></body>
+</html>
diff --git a/test/fixtures/static-build-page-url-format/src/pages/sub/page.astro b/test/fixtures/static-build-page-url-format/src/pages/sub/page.astro
@@ -0,0 +1,4 @@
+<html>
+<head><title>Subpath</title></head>
+<body><h1>Testing</h1></body>
+</html>
diff --git a/test/static-build-page-url-format.test.js b/test/static-build-page-url-format.test.js
@@ -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:https://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');
+ });
+});