[ci] format

This commit is contained in:
matthewp 2022-11-09 13:35:06 +00:00 committed by fredkbot
parent dca762cf73
commit 92374c0f75
3 changed files with 33 additions and 31 deletions

View file

@ -1,11 +1,11 @@
import type * as vite from 'vite';
import type { AstroSettings } from '../@types/astro';
import * as fs from 'fs';
import { LogOptions } from '../core/logger/core.js';
import notFoundTemplate, { subpathNotUsedTemplate } from '../template/4xx.js';
import { log404 } from './common.js';
import { writeHtmlResponse } from './response.js';
import * as fs from 'fs';
export function baseMiddleware(
settings: AstroSettings,
@ -20,7 +20,6 @@ export function baseMiddleware(
const pathname = decodeURI(new URL(url, 'http://localhost').pathname);
if (pathname.startsWith(devRoot)) {
req.url = url.replace(devRoot, '/');
return next();
@ -46,7 +45,7 @@ export function baseMiddleware(
// Check to see if it's in public and if so 404
const publicPath = new URL('.' + req.url, config.publicDir);
fs.stat(publicPath, (_err, stats) => {
if(stats) {
if (stats) {
log404(logging, pathname);
const html = subpathNotUsedTemplate(devRoot, pathname);
return writeHtmlResponse(res, 404, html);

View file

@ -159,34 +159,37 @@ describe('dev container', () => {
});
it('items in public/ are not available from root when using a base', async () => {
await runInContainer({
root,
userConfig: {
base: '/sub/'
await runInContainer(
{
root,
userConfig: {
base: '/sub/',
},
},
async (container) => {
// First try the subpath
let r = createRequestAndResponse({
method: 'GET',
url: '/sub/test.txt',
});
container.handle(r.req, r.res);
await r.done;
expect(r.res.statusCode).to.equal(200);
// Next try the root path
r = createRequestAndResponse({
method: 'GET',
url: '/test.txt',
});
container.handle(r.req, r.res);
await r.done;
expect(r.res.statusCode).to.equal(404);
}
}, async (container) => {
// First try the subpath
let r = createRequestAndResponse({
method: 'GET',
url: '/sub/test.txt',
});
container.handle(r.req, r.res);
await r.done;
expect(r.res.statusCode).to.equal(200);
// Next try the root path
r = createRequestAndResponse({
method: 'GET',
url: '/test.txt',
});
container.handle(r.req, r.res);
await r.done;
expect(r.res.statusCode).to.equal(404);
});
);
});
it('items in public/ are available from root when not using a base', async () => {

View file

@ -114,6 +114,6 @@ describe('MDX syntax highlighting', () => {
await fixture.build();
const html = await fixture.readFile('/index.html');
expect(html).to.include('style="background-color:#000000"')
expect(html).to.include('style="background-color:#000000"');
});
});