mirrors/astro
1
0
Fork 0
mirror of https://github.com/withastro/astro.git synced 2025-01-22 18:41:55 -05:00
Code Issues Projects Releases Packages Wiki Activity

fix: use publicDir & base for 'include your base in url' error message (#9841)

Browse source 
Co-authored-by: Florian Lefebvre <contact@florian-lefebvre.dev>
Co-authored-by: bluwy <bjornlu.dev@gmail.com>
This commit is contained in:
Kristian Binau 2024-02-01 16:13:58 +01:00 committed by GitHub
parent 2f448a27f2
commit 27ea080e24
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.changeset/eight-windows-kiss.md Normal file
View file

@ -0,0 +1,5 @@
---
"astro": patch
---
Makes the warning clearer when having a custom `base` and requesting a public URL without it

10
packages/astro/src/vite-plugin-astro-server/base.ts
View file

@ -3,6 +3,8 @@ import type { AstroSettings } from '../@types/astro.js';
import { bold } from 'kleur/colors'; import { bold } from 'kleur/colors';
import * as fs from 'node:fs'; import * as fs from 'node:fs';
import path from 'node:path';
import { appendForwardSlash } from '@astrojs/internal-helpers/path';
import type { Logger } from '../core/logger/core.js'; import type { Logger } from '../core/logger/core.js';
import notFoundTemplate, { subpathNotUsedTemplate } from '../template/4xx.js'; import notFoundTemplate, { subpathNotUsedTemplate } from '../template/4xx.js';
import { writeHtmlResponse } from './response.js'; import { writeHtmlResponse } from './response.js';
@ -52,11 +54,15 @@ export function baseMiddleware(
const publicPath = new URL('.' + req.url, config.publicDir); const publicPath = new URL('.' + req.url, config.publicDir);
fs.stat(publicPath, (_err, stats) => { fs.stat(publicPath, (_err, stats) => {
if (stats) { if (stats) {
const expectedLocation = new URL('.' + url, devRootURL).pathname; const publicDir = appendForwardSlash(
path.posix.relative(config.root.pathname, config.publicDir.pathname)
);
const expectedLocation = new URL(devRootURL.pathname + url, devRootURL).pathname;
logger.error( logger.error(
'router', 'router',
`Request URLs for ${bold( `Request URLs for ${bold(
'public/' publicDir
)} assets must also include your base. "${expectedLocation}" expected, but received "${url}".` )} assets must also include your base. "${expectedLocation}" expected, but received "${url}".`
); );
const html = subpathNotUsedTemplate(devRoot, pathname); const html = subpathNotUsedTemplate(devRoot, pathname);