Skip to content

Commit

Permalink
[@astrojs/image] Handle missing trailing slash in processStaticImage (#…
Browse files Browse the repository at this point in the history
…6421)

The code path changed by this commit isn't only taken when running using Vite. If the site is configured with a base url which is different from `/` but does **not** end with `/` (for example, because `trailingSlash` is set to `never`), the `- 1` results in an off-by-one error when truncating the URL.

By checking if the base url ends with `/`, we can determine the right length for the prefix to truncate.
  • Loading branch information
vtavernier authored Mar 7, 2023
1 parent fbab73c commit e58a925
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
5 changes: 5 additions & 0 deletions .changeset/eleven-mugs-flash.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@astrojs/image': patch
---

Handle missing trailing slash in processStaticImage
2 changes: 1 addition & 1 deletion packages/integrations/image/src/build/ssg.ts
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ export async function ssgBuild({
// Vite will prefix a hashed image with the base path, we need to strip this
// off to find the actual file relative to /dist
if (config.base && src.startsWith(config.base)) {
src = src.substring(config.base.length - 1);
src = src.substring(config.base.length - +config.base.endsWith('/'));
}

if (isRemoteImage(src)) {
Expand Down

0 comments on commit e58a925

Please sign in to comment.