fix: handle trailing slash on the image endpoint

[Princesseuh]

Changes

Add a trailing slash to the image endpoint based on the trailing slash config, like we do for base

Fixes #11568

Testing

Added tests

Docs

N/A

[changeset-bot]

🦋 Changeset detected

Latest commit: 8579d22

The changes in this PR will be included in the next version bump.

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

[bluwy]

Instead of adding import.meta.env.*. Maybe we can add the trailing slash to endpoint.route directly here?

astro/packages/astro/src/core/config/schema.ts

Lines 648 to 670 in b082702

	.transform((config) => {
	// If the user changed `outDir`, we need to also update `build.client` and `build.server`
	// the be based on the correct `outDir`
	if (
	config.outDir.toString() !==
	resolveDirAsUrl(ASTRO_CONFIG_DEFAULTS.outDir, fileProtocolRoot).toString()
	) {
	const outDirPath = fileURLToPath(config.outDir);
	config.build.client = resolveDirAsUrl(originalBuildClient, outDirPath);
	config.build.server = resolveDirAsUrl(originalBuildServer, outDirPath);
	}
	// Handle `base` trailing slash based on `trailingSlash` config
	if (config.trailingSlash === 'never') {
	config.base = prependForwardSlash(removeTrailingForwardSlash(config.base));
	} else if (config.trailingSlash === 'always') {
	config.base = prependForwardSlash(appendForwardSlash(config.base));
	} else {
	config.base = prependForwardSlash(config.base);
	}
	return config;
	})

[Princesseuh]

Instead of adding import.meta.env.*. Maybe we can add the trailing slash to endpoint.route directly here?

astro/packages/astro/src/core/config/schema.ts

Lines 648 to 670 in b082702

	.transform((config) => {
	// If the user changed `outDir`, we need to also update `build.client` and `build.server`
	// the be based on the correct `outDir`
	if (
	config.outDir.toString() !==
	resolveDirAsUrl(ASTRO_CONFIG_DEFAULTS.outDir, fileProtocolRoot).toString()
	) {
	const outDirPath = fileURLToPath(config.outDir);
	config.build.client = resolveDirAsUrl(originalBuildClient, outDirPath);
	config.build.server = resolveDirAsUrl(originalBuildServer, outDirPath);
	}
	// Handle `base` trailing slash based on `trailingSlash` config
	if (config.trailingSlash === 'never') {
	config.base = prependForwardSlash(removeTrailingForwardSlash(config.base));
	} else if (config.trailingSlash === 'always') {
	config.base = prependForwardSlash(appendForwardSlash(config.base));
	} else {
	config.base = prependForwardSlash(config.base);
	}
	return config;
	})

I thought about it, but I figured that this value is generally useful to users when building URLs (much like BASE_URL or ASSET_PREFIX is) so we might as well expose it, what do you think?

[bluwy]

I think there's value in it too, but for now it might collide with my plan to make the trailingSlash config an object (which isn't set in stone, but if it goes through, this feature would make it a little bumpy).

So I personally would hold off for a bit, but even if this goes through is not a very big deal 😅

[Princesseuh]

Okay, I'll adjust and we can kick the can of "how to access config values in Astro" even further down the road 🫡

[ematipico]

Why does the PR point next and not main?

[Princesseuh]

Why does the PR point next and not main?

you can't customize the endpoint route in main, so this is not relevant. You'd have to fix the issue completely differently, but the issue on main is more niche than it is now on next