Fix for loading markdown pages with spaces in the name (#3379)

* Fix for loading markdown pages with spaces in the name

* Adds a changeset
This commit is contained in:
Matthew Phillips 2022-05-16 14:44:15 -04:00 committed by GitHub
parent 9d01f93b1c
commit 0259d7658b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 50 additions and 15 deletions

View file

@ -0,0 +1,5 @@
---
'astro': patch
---
Fixes issue with loading md pages in project with a space in folder name

View file

@ -9,8 +9,8 @@ import type { Plugin } from 'vite';
import type { AstroConfig } from '../@types/astro';
import { PAGE_SSR_SCRIPT_ID } from '../vite-plugin-scripts/index.js';
import { pagesVirtualModuleId } from '../core/app/index.js';
import { appendForwardSlash } from '../core/path.js';
import { resolvePages } from '../core/util.js';
import { appendForwardSlash, prependForwardSlash } from '../core/path.js';
import { resolvePages, viteID } from '../core/util.js';
interface AstroPluginOptions {
config: AstroConfig;
@ -156,7 +156,9 @@ ${setup}`.trim();
site: config.site ? new URL(config.base, config.site).toString() : undefined,
sourcefile: id,
sourcemap: 'inline',
internalURL: `/@fs${new URL('../runtime/server/index.js', import.meta.url).pathname}`,
internalURL: `/@fs${prependForwardSlash(
viteID(new URL('../runtime/server/index.js', import.meta.url))
)}`,
});
tsResult = `\nexport const metadata = ${JSON.stringify(metadata)};

View file

@ -1,19 +1,46 @@
import { expect } from 'chai';
import * as cheerio from 'cheerio';
import { loadFixture } from './test-utils.js';
import { loadFixture, isWindows} from './test-utils.js';
describe('Pages', () => {
let fixture;
before(async () => {
fixture = await loadFixture({ root: './fixtures/astro-pages/' });
fixture = await loadFixture({ root: './fixtures/astro pages/' });
await fixture.build();
});
it('Can find page with "index" at the end file name', async () => {
const html = await fixture.readFile('/posts/name-with-index/index.html');
const $ = cheerio.load(html);
describe('Build', () => {
before(async () => {
await fixture.build();
});
expect($('h1').text()).to.equal('Name with index');
it('Can find page with "index" at the end file name', async () => {
const html = await fixture.readFile('/posts/name-with-index/index.html');
const $ = cheerio.load(html);
expect($('h1').text()).to.equal('Name with index');
});
});
if(isWindows) return;
describe('Development', () => {
let devServer;
before(async () => {
devServer = await fixture.startDevServer();
});
after(async () => {
await devServer.stop();
});
it('Is able to load md pages', async () => {
const html = await fixture.fetch('/').then((res) => res.text());
const $ = cheerio.load(html);
expect($('#testing').length).to.be.greaterThan(0);
});
});
});

View file

@ -0,0 +1 @@
# Testing

View file

@ -689,6 +689,12 @@ importers:
'@astrojs/svelte': link:../../../../integrations/svelte
astro: link:../../..
packages/astro/test/fixtures/astro pages:
specifiers:
astro: workspace:*
dependencies:
astro: link:../../..
packages/astro/test/fixtures/astro-assets:
specifiers:
astro: workspace:*
@ -925,12 +931,6 @@ importers:
dependencies:
astro: link:../../..
packages/astro/test/fixtures/astro-pages:
specifiers:
astro: workspace:*
dependencies:
astro: link:../../..
packages/astro/test/fixtures/astro-pagination:
specifiers:
astro: workspace:*