From fa3454a6d832cf1933c81c5c354802d4723395b7 Mon Sep 17 00:00:00 2001
From: peng <414326615@qq.com>
Date: Wed, 21 Feb 2024 10:41:37 +0800
Subject: [PATCH 01/29] feat: add multiple cdn

---
 packages/astro/src/@types/astro.ts            |  6 ++--
 .../astro/src/assets/utils/transformToPath.ts | 11 +++++++
 .../astro/src/assets/vite-plugin-assets.ts    | 31 ++++++++++++++-----
 .../src/content/vite-plugin-content-assets.ts | 11 +++++--
 packages/astro/src/core/app/types.ts          |  4 ++-
 .../src/core/build/plugins/plugin-manifest.ts | 10 ++++--
 packages/astro/src/core/config/schema.ts      |  4 +--
 packages/astro/src/core/create-vite.ts        | 10 ++++--
 packages/astro/src/core/render/ssr-element.ts | 25 +++++++++------
 packages/internal-helpers/src/path.ts         |  5 +++
 10 files changed, 89 insertions(+), 28 deletions(-)

diff --git a/packages/astro/src/@types/astro.ts b/packages/astro/src/@types/astro.ts
index 8a26ebaba6cd..254d32b473a2 100644
--- a/packages/astro/src/@types/astro.ts
+++ b/packages/astro/src/@types/astro.ts
@@ -13,7 +13,7 @@ import type { AddressInfo } from 'node:net';
 import type * as rollup from 'rollup';
 import type * as vite from 'vite';
 import type { RemotePattern } from '../assets/utils/remotePattern.js';
-import type { SerializedSSRManifest } from '../core/app/types.js';
+import type { SerializedSSRManifest, AssetsPrefix } from '../core/app/types.js';
 import type { PageBuildData } from '../core/build/types.js';
 import type { AstroConfigType } from '../core/config/index.js';
 import type { AstroTimer } from '../core/config/timer.js';
@@ -63,7 +63,7 @@ export type {
 	UnresolvedImageTransform,
 } from '../assets/types.js';
 export type { RemotePattern } from '../assets/utils/remotePattern.js';
-export type { SSRManifest } from '../core/app/types.js';
+export type { SSRManifest, AssetsPrefix } from '../core/app/types.js';
 export type {
 	AstroCookieGetOptions,
 	AstroCookieSetOptions,
@@ -838,7 +838,7 @@ export interface AstroUserConfig {
 		 * }
 		 * ```
 		 */
-		assetsPrefix?: string;
+		assetsPrefix?: AssetsPrefix;
 		/**
 		 * @docs
 		 * @name build.serverEntry
diff --git a/packages/astro/src/assets/utils/transformToPath.ts b/packages/astro/src/assets/utils/transformToPath.ts
index dd8d17fbeaf3..c6d3bd65fad7 100644
--- a/packages/astro/src/assets/utils/transformToPath.ts
+++ b/packages/astro/src/assets/utils/transformToPath.ts
@@ -4,6 +4,7 @@ import { removeQueryString } from '../../core/path.js';
 import { shorthash } from '../../runtime/server/shorthash.js';
 import type { ImageTransform } from '../types.js';
 import { isESMImportedImage } from './imageKind.js';
+import type { AssetsPrefix } from '../../@types/astro.js';
 
 export function propsToFilename(transform: ImageTransform, hash: string) {
 	let filename = removeQueryString(
@@ -33,3 +34,13 @@ export function hashTransform(
 	);
 	return shorthash(deterministicString(hashFields));
 }
+
+export function getAssetsPrefix(fileType: string, assetsPrefix: AssetsPrefix):string {
+	if (typeof assetsPrefix === 'string') return assetsPrefix
+	if (assetsPrefix[fileType]) {
+		return assetsPrefix[fileType]
+	} else if (assetsPrefix.defaultAssetsPrefix) {
+		return assetsPrefix.defaultAssetsPrefix
+	}
+	return ''
+}
\ No newline at end of file
diff --git a/packages/astro/src/assets/vite-plugin-assets.ts b/packages/astro/src/assets/vite-plugin-assets.ts
index 5a56e76a6838..c249ff4961be 100644
--- a/packages/astro/src/assets/vite-plugin-assets.ts
+++ b/packages/astro/src/assets/vite-plugin-assets.ts
@@ -1,6 +1,7 @@
 import MagicString from 'magic-string';
 import type * as vite from 'vite';
 import { normalizePath } from 'vite';
+import { getFileExtension } from '@astrojs/internal-helpers/path';
 import type { AstroPluginOptions, ImageTransform } from '../@types/astro.js';
 import { extendManualChunks } from '../core/build/plugins/util.js';
 import { AstroError, AstroErrorData } from '../core/errors/index.js';
@@ -15,7 +16,8 @@ import { VALID_INPUT_FORMATS, VIRTUAL_MODULE_ID, VIRTUAL_SERVICE_ID } from './co
 import { emitESMImage } from './utils/emitAsset.js';
 import { isESMImportedImage } from './utils/imageKind.js';
 import { getProxyCode } from './utils/proxy.js';
-import { hashTransform, propsToFilename } from './utils/transformToPath.js';
+import { getAssetsPrefix, hashTransform, propsToFilename } from './utils/transformToPath.js';
+import { isObject } from '../core/util.js';
 
 const resolvedVirtualModuleId = '\0' + VIRTUAL_MODULE_ID;
 
@@ -94,9 +96,15 @@ export default function assets({
 					}
 
 					// Rollup will copy the file to the output directory, this refer to this final path, not to the original path
-					const finalOriginalImagePath = (
-						isESMImportedImage(options.src) ? options.src.src : options.src
-					).replace(settings.config.build.assetsPrefix || '', '');
+					const ESMImportedImageSrc = isESMImportedImage(options.src) ? options.src.src : options.src;
+					let pf = ''
+					const fileExtension = getFileExtension(ESMImportedImageSrc)
+					if (settings.config.build.assetsPrefix && typeof settings.config.build.assetsPrefix === 'string')  {
+						pf = settings.config.build.assetsPrefix
+					} else if (isObject(settings.config.build.assetsPrefix)) {
+						pf = getAssetsPrefix(fileExtension, settings.config.build.assetsPrefix)
+					}
+					const finalOriginalImagePath = ESMImportedImageSrc.replace(pf, '');
 
 					const hash = hashTransform(
 						options,
@@ -130,8 +138,10 @@ export default function assets({
 
 					// The paths here are used for URLs, so we need to make sure they have the proper format for an URL
 					// (leading slash, prefixed with the base / assets prefix, encoded, etc)
-					if (settings.config.build.assetsPrefix) {
+					if (settings.config.build.assetsPrefix && typeof settings.config.build.assetsPrefix === 'string') {
 						return encodeURI(joinPaths(settings.config.build.assetsPrefix, finalFilePath));
+					} else if (isObject(settings.config.build.assetsPrefix)) {
+						return encodeURI(joinPaths(pf, finalFilePath));
 					} else {
 						return encodeURI(prependForwardSlash(joinPaths(settings.config.base, finalFilePath)));
 					}
@@ -148,8 +158,15 @@ export default function assets({
 					const [full, hash, postfix = ''] = match;
 
 					const file = this.getFileName(hash);
-					const prefix = settings.config.build.assetsPrefix
-						? appendForwardSlash(settings.config.build.assetsPrefix)
+					let pf
+					if (settings.config.build.assetsPrefix && typeof settings.config.build.assetsPrefix === 'string') {
+						pf = settings.config.build.assetsPrefix
+					} else if (isObject(settings.config.build.assetsPrefix)) {
+						const fileExtension = getFileExtension(file)
+						pf = getAssetsPrefix(fileExtension, settings.config.build.assetsPrefix)
+					}
+					const prefix = pf
+						? appendForwardSlash(pf)
 						: resolvedConfig.base;
 					const outputFilepath = prefix + normalizePath(file + postfix);
 
diff --git a/packages/astro/src/content/vite-plugin-content-assets.ts b/packages/astro/src/content/vite-plugin-content-assets.ts
index 6eeef1c40640..c5f4662bdd76 100644
--- a/packages/astro/src/content/vite-plugin-content-assets.ts
+++ b/packages/astro/src/content/vite-plugin-content-assets.ts
@@ -1,6 +1,7 @@
 import { extname } from 'node:path';
 import { pathToFileURL } from 'node:url';
 import type { Plugin, Rollup } from 'vite';
+import { getFileExtension } from '@astrojs/internal-helpers/path';
 import type { AstroSettings } from '../@types/astro.js';
 import { moduleIsTopLevelPage, walkParentInfos } from '../core/build/graph.js';
 import { getPageDataByViteID, type BuildInternals } from '../core/build/internal.js';
@@ -19,6 +20,8 @@ import {
 	STYLES_PLACEHOLDER,
 } from './consts.js';
 import { hasContentFlag } from './utils.js';
+import { isObject } from '../core/util.js';
+import { getAssetsPrefix } from '../assets/utils/transformToPath.js';
 
 export function astroContentAssetPropagationPlugin({
 	mode,
@@ -125,8 +128,12 @@ export function astroConfigBuildPlugin(
 			'build:post': ({ ssrOutputs, clientOutputs, mutate }) => {
 				const outputs = ssrOutputs.flatMap((o) => o.output);
 				const prependBase = (src: string) => {
-					if (options.settings.config.build.assetsPrefix) {
-						return joinPaths(options.settings.config.build.assetsPrefix, src);
+					const { assetsPrefix } = options.settings.config.build
+					if (assetsPrefix && typeof assetsPrefix === "string") {
+						return joinPaths(assetsPrefix, src);
+					} else if (isObject(assetsPrefix)) {
+						const pf = getAssetsPrefix(getFileExtension(src), assetsPrefix)
+						return joinPaths(pf, src);
 					} else {
 						return prependForwardSlash(joinPaths(options.settings.config.base, src));
 					}
diff --git a/packages/astro/src/core/app/types.ts b/packages/astro/src/core/app/types.ts
index b38f51d64f72..ef448827f4e4 100644
--- a/packages/astro/src/core/app/types.ts
+++ b/packages/astro/src/core/app/types.ts
@@ -34,6 +34,8 @@ export type SerializedRouteInfo = Omit<RouteInfo, 'routeData'> & {
 
 export type ImportComponentInstance = () => Promise<SinglePageBuiltModule>;
 
+export type AssetsPrefix = string | Record<string, string>
+
 export type SSRManifest = {
 	adapterName: string;
 	routes: RouteInfo[];
@@ -42,7 +44,7 @@ export type SSRManifest = {
 	trailingSlash: 'always' | 'never' | 'ignore';
 	buildFormat: 'file' | 'directory';
 	compressHTML: boolean;
-	assetsPrefix?: string;
+	assetsPrefix?: AssetsPrefix;
 	renderers: SSRLoadedRenderer[];
 	/**
 	 * Map of directive name (e.g. `load`) to the directive script code
diff --git a/packages/astro/src/core/build/plugins/plugin-manifest.ts b/packages/astro/src/core/build/plugins/plugin-manifest.ts
index 09408e23af36..6935ba57e592 100644
--- a/packages/astro/src/core/build/plugins/plugin-manifest.ts
+++ b/packages/astro/src/core/build/plugins/plugin-manifest.ts
@@ -9,13 +9,15 @@ import type {
 	SerializedRouteInfo,
 	SerializedSSRManifest,
 } from '../../app/types.js';
-import { joinPaths, prependForwardSlash } from '../../path.js';
+import { getFileExtension, joinPaths, prependForwardSlash } from '../../path.js';
 import { serializeRouteData } from '../../routing/index.js';
 import { addRollupInput } from '../add-rollup-input.js';
 import { getOutFile, getOutFolder } from '../common.js';
 import { cssOrder, mergeInlineCss, type BuildInternals } from '../internal.js';
 import type { AstroBuildPlugin } from '../plugin.js';
 import type { StaticBuildOptions } from '../types.js';
+import { isObject } from '../../util.js';
+import { getAssetsPrefix } from '../../../assets/utils/transformToPath.js';
 
 const manifestReplace = '@@ASTRO_MANIFEST_REPLACE@@';
 const replaceExp = new RegExp(`['"](${manifestReplace})['"]`, 'g');
@@ -165,8 +167,12 @@ function buildManifest(
 	}
 
 	const prefixAssetPath = (pth: string) => {
-		if (settings.config.build.assetsPrefix) {
+		if (typeof settings.config.build.assetsPrefix === "string") {
 			return joinPaths(settings.config.build.assetsPrefix, pth);
+		} else if (isObject(settings.config.build.assetsPrefix)) {
+			const fileType = getFileExtension(pth)
+			const pf = getAssetsPrefix(fileType, settings.config.build.assetsPrefix)
+			return joinPaths(pf, pth);
 		} else {
 			return prependForwardSlash(joinPaths(settings.config.base, pth));
 		}
diff --git a/packages/astro/src/core/config/schema.ts b/packages/astro/src/core/config/schema.ts
index 29c817bce052..c79222d4d614 100644
--- a/packages/astro/src/core/config/schema.ts
+++ b/packages/astro/src/core/config/schema.ts
@@ -138,7 +138,7 @@ export const AstroConfigSchema = z.object({
 				.default(ASTRO_CONFIG_DEFAULTS.build.server)
 				.transform((val) => new URL(val)),
 			assets: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.build.assets),
-			assetsPrefix: z.string().optional(),
+			assetsPrefix: z.string().optional().or(z.record(z.string()).optional()),
 			serverEntry: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.build.serverEntry),
 			redirects: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.build.redirects),
 			inlineStylesheets: z
@@ -479,7 +479,7 @@ export function createRelativeSchema(cmd: string, fileProtocolRoot: string) {
 					.default(ASTRO_CONFIG_DEFAULTS.build.server)
 					.transform((val) => resolveDirAsUrl(val, fileProtocolRoot)),
 				assets: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.build.assets),
-				assetsPrefix: z.string().optional(),
+				assetsPrefix: z.string().optional().or(z.record(z.string()).optional()),
 				serverEntry: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.build.serverEntry),
 				redirects: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.build.redirects),
 				inlineStylesheets: z
diff --git a/packages/astro/src/core/create-vite.ts b/packages/astro/src/core/create-vite.ts
index 99082b830419..e3f7b350a0af 100644
--- a/packages/astro/src/core/create-vite.ts
+++ b/packages/astro/src/core/create-vite.ts
@@ -34,6 +34,8 @@ import type { Logger } from './logger/core.js';
 import { createViteLogger } from './logger/vite.js';
 import { vitePluginMiddleware } from './middleware/vite-plugin.js';
 import { joinPaths } from './path.js';
+import { isObject } from './util.js';
+import { getAssetsPrefix } from '../assets/utils/transformToPath.js';
 
 interface CreateViteOptions {
 	settings: AstroSettings;
@@ -205,8 +207,12 @@ export async function createVite(
 	const assetsPrefix = settings.config.build.assetsPrefix;
 	if (assetsPrefix) {
 		commonConfig.experimental = {
-			renderBuiltUrl(filename, { type }) {
+			renderBuiltUrl(filename, { type, hostType }) {
 				if (type === 'asset') {
+					if (isObject(assetsPrefix)) {
+						const pf = getAssetsPrefix(hostType, assetsPrefix)
+						return joinPaths(pf, filename);
+					}
 					return joinPaths(assetsPrefix, filename);
 				}
 			},
@@ -309,6 +315,6 @@ function isCommonNotAstro(dep: string): boolean {
 	);
 }
 
-function stringifyForDefine(value: string | undefined): string {
+function stringifyForDefine(value: string | undefined | object): string {
 	return typeof value === 'string' ? JSON.stringify(value) : 'undefined';
 }
diff --git a/packages/astro/src/core/render/ssr-element.ts b/packages/astro/src/core/render/ssr-element.ts
index 8593dc0bfcc8..a476912bf4e7 100644
--- a/packages/astro/src/core/render/ssr-element.ts
+++ b/packages/astro/src/core/render/ssr-element.ts
@@ -1,10 +1,17 @@
-import type { SSRElement } from '../../@types/astro.js';
+import type { SSRElement, AssetsPrefix } from '../../@types/astro.js';
 import { joinPaths, prependForwardSlash, slash } from '../../core/path.js';
 import type { StylesheetAsset } from '../app/types.js';
+import { getFileExtension } from '@astrojs/internal-helpers/path';
+import { isObject } from '../util.js';
+import { getAssetsPrefix } from '../../assets/utils/transformToPath.js';
 
-export function createAssetLink(href: string, base?: string, assetsPrefix?: string): string {
-	if (assetsPrefix) {
+export function createAssetLink(href: string, base?: string, assetsPrefix?: AssetsPrefix): string {
+	if (typeof assetsPrefix === "string") {
 		return joinPaths(assetsPrefix, slash(href));
+	} else if (isObject(assetsPrefix)) {
+		const fileType = getFileExtension(href)
+		const pf = getAssetsPrefix(fileType, assetsPrefix)
+		return joinPaths(pf, slash(href));
 	} else if (base) {
 		return prependForwardSlash(joinPaths(base, slash(href)));
 	} else {
@@ -15,7 +22,7 @@ export function createAssetLink(href: string, base?: string, assetsPrefix?: stri
 export function createStylesheetElement(
 	stylesheet: StylesheetAsset,
 	base?: string,
-	assetsPrefix?: string
+	assetsPrefix?: AssetsPrefix
 ): SSRElement {
 	if (stylesheet.type === 'inline') {
 		return {
@@ -36,7 +43,7 @@ export function createStylesheetElement(
 export function createStylesheetElementSet(
 	stylesheets: StylesheetAsset[],
 	base?: string,
-	assetsPrefix?: string
+	assetsPrefix?: AssetsPrefix
 ): Set<SSRElement> {
 	return new Set(stylesheets.map((s) => createStylesheetElement(s, base, assetsPrefix)));
 }
@@ -44,7 +51,7 @@ export function createStylesheetElementSet(
 export function createModuleScriptElement(
 	script: { type: 'inline' | 'external'; value: string },
 	base?: string,
-	assetsPrefix?: string
+	assetsPrefix?: AssetsPrefix
 ): SSRElement {
 	if (script.type === 'external') {
 		return createModuleScriptElementWithSrc(script.value, base, assetsPrefix);
@@ -61,7 +68,7 @@ export function createModuleScriptElement(
 export function createModuleScriptElementWithSrc(
 	src: string,
 	base?: string,
-	assetsPrefix?: string
+	assetsPrefix?: AssetsPrefix
 ): SSRElement {
 	return {
 		props: {
@@ -75,7 +82,7 @@ export function createModuleScriptElementWithSrc(
 export function createModuleScriptElementWithSrcSet(
 	srces: string[],
 	site?: string,
-	assetsPrefix?: string
+	assetsPrefix?: AssetsPrefix
 ): Set<SSRElement> {
 	return new Set<SSRElement>(
 		srces.map((src) => createModuleScriptElementWithSrc(src, site, assetsPrefix))
@@ -85,7 +92,7 @@ export function createModuleScriptElementWithSrcSet(
 export function createModuleScriptsSet(
 	scripts: { type: 'inline' | 'external'; value: string }[],
 	base?: string,
-	assetsPrefix?: string
+	assetsPrefix?: AssetsPrefix
 ): Set<SSRElement> {
 	return new Set<SSRElement>(
 		scripts.map((script) => createModuleScriptElement(script, base, assetsPrefix))
diff --git a/packages/internal-helpers/src/path.ts b/packages/internal-helpers/src/path.ts
index cc9954ef2c04..ef71a0c4f9f1 100644
--- a/packages/internal-helpers/src/path.ts
+++ b/packages/internal-helpers/src/path.ts
@@ -80,6 +80,11 @@ export function removeFileExtension(path: string) {
 	return idx === -1 ? path : path.slice(0, idx);
 }
 
+export function getFileExtension(path: string) {
+	let idx = path.lastIndexOf('.');
+	return idx === -1 ? '' : path.slice(idx+1);
+}
+
 export function removeQueryString(path: string) {
 	const index = path.lastIndexOf('?');
 	return index > 0 ? path.substring(0, index) : path;

From 12ed2dcc3fcc4a973be25a7f2623b61b58d1933f Mon Sep 17 00:00:00 2001
From: peng <414326615@qq.com>
Date: Wed, 21 Feb 2024 15:23:01 +0800
Subject: [PATCH 02/29] add multiple cdn test

---
 .../test/astro-assets-prefix-mult-cdn.test.js | 137 ++++++++++++++++++
 1 file changed, 137 insertions(+)
 create mode 100644 packages/astro/test/astro-assets-prefix-mult-cdn.test.js

diff --git a/packages/astro/test/astro-assets-prefix-mult-cdn.test.js b/packages/astro/test/astro-assets-prefix-mult-cdn.test.js
new file mode 100644
index 000000000000..14ef1d7e34bd
--- /dev/null
+++ b/packages/astro/test/astro-assets-prefix-mult-cdn.test.js
@@ -0,0 +1,137 @@
+import { expect } from 'chai';
+import * as cheerio from 'cheerio';
+import testAdapter from './test-adapter.js';
+import { loadFixture } from './test-utils.js';
+
+const defaultAssetsPrefixRegex = /^https:\/\/example.com\/_astro\/.*/;
+
+const jsAssetsPrefixRegex = /^https:\/\/js\.example\.com\/_astro\/.*/;
+
+const cssAssetsPrefixRegex = /^https:\/\/css\.example\.com\/_astro\/.*/;
+
+const assetsPrefix = {
+	'js': 'https://js.example.com',
+	'css': 'https://css.example.com',
+	'defaultAssetsPrefix': 'https://example.com'
+}
+
+// Asset prefix for CDN support
+describe('Assets Prefix Multiple CDN - Static', () => {
+	let fixture;
+
+	before(async () => {
+		fixture = await loadFixture({
+			root: './fixtures/astro-assets-prefix',
+			build: {
+				assetsPrefix,
+			}
+		});
+		await fixture.build();
+	});
+
+	it('all stylesheets should start with  cssAssetPrefix', async () => {
+		const html = await fixture.readFile('/index.html');
+		const $ = cheerio.load(html);
+		const stylesheets = $('link[rel="stylesheet"]');
+		stylesheets.each((i, el) => {
+			expect(el.attribs.href).to.match(cssAssetsPrefixRegex);
+		});
+	});
+
+	it('image src start with defaultAssetsPrefix', async () => {
+		const html = await fixture.readFile('/index.html');
+		const $ = cheerio.load(html);
+		const imgAsset = $('#image-asset');
+		expect(imgAsset.attr('src')).to.match(defaultAssetsPrefixRegex);
+	});
+
+	it('react component astro-island should import from jsAssetsPrefix', async () => {
+		const html = await fixture.readFile('/index.html');
+		const $ = cheerio.load(html);
+		const island = $('astro-island');
+		expect(island.attr('component-url')).to.match(jsAssetsPrefixRegex);
+		expect(island.attr('renderer-url')).to.match(jsAssetsPrefixRegex);
+	});
+
+	it('import.meta.env.ASSETS_PREFIX works', async () => {
+		const html = await fixture.readFile('/index.html');
+		const $ = cheerio.load(html);
+		const env = $('#assets-prefix-env');
+		expect(env.text()).to.equal(JSON.stringify(assetsPrefix));
+	});
+
+	it('markdown image src start with assetsPrefix', async () => {
+		const html = await fixture.readFile('/markdown/index.html');
+		const $ = cheerio.load(html);
+		const imgAsset = $('img');
+		expect(imgAsset.attr('src')).to.match(defaultAssetsPrefixRegex);
+	});
+
+	it('content collections image src start with assetsPrefix', async () => {
+		const html = await fixture.readFile('/blog/index.html');
+		const $ = cheerio.load(html);
+		const imgAsset = $('img');
+		expect(imgAsset.attr('src')).to.match(defaultAssetsPrefixRegex);
+	});
+});
+
+
+describe('Assets Prefix Multiple CDN, server', () => {
+	let app;
+
+	before(async () => {
+		const fixture = await loadFixture({
+			root: './fixtures/astro-assets-prefix',
+			output: 'server',
+			adapter: testAdapter(),
+			build: {
+				assetsPrefix,
+			}
+		});
+		await fixture.build();
+		app = await fixture.loadTestAdapterApp();
+	});
+
+	it('all stylesheets should start with assetPrefix', async () => {
+		const request = new Request('http://example.com/custom-base/');
+		const response = await app.render(request);
+		expect(response.status).to.equal(200);
+		const html = await response.text();
+		const $ = cheerio.load(html);
+		const stylesheets = $('link[rel="stylesheet"]');
+		stylesheets.each((i, el) => {
+			expect(el.attribs.href).to.match(cssAssetsPrefixRegex);
+		});
+	});
+
+	it('image src start with assetsPrefix', async () => {
+		const request = new Request('http://example.com/custom-base/');
+		const response = await app.render(request);
+		expect(response.status).to.equal(200);
+		const html = await response.text();
+		const $ = cheerio.load(html);
+		const imgAsset = $('#image-asset');
+		expect(imgAsset.attr('src')).to.match(defaultAssetsPrefixRegex);
+	});
+
+	it('react component astro-island should import from assetsPrefix', async () => {
+		const request = new Request('http://example.com/custom-base/');
+		const response = await app.render(request);
+		expect(response.status).to.equal(200);
+		const html = await response.text();
+		const $ = cheerio.load(html);
+		const island = $('astro-island');
+		expect(island.attr('component-url')).to.match(jsAssetsPrefixRegex);
+		expect(island.attr('renderer-url')).to.match(jsAssetsPrefixRegex);
+	});
+
+	it('markdown optimized image src does not start with assetsPrefix in SSR', async () => {
+		const request = new Request('http://example.com/custom-base/markdown/');
+		const response = await app.render(request);
+		expect(response.status).to.equal(200);
+		const html = await response.text();
+		const $ = cheerio.load(html);
+		const imgAsset = $('img');
+		expect(imgAsset.attr('src')).to.not.match(defaultAssetsPrefixRegex);
+	});
+});

From 327d8c2fbedb8bd52247673ca119f2806085e687 Mon Sep 17 00:00:00 2001
From: peng <414326615@qq.com>
Date: Thu, 22 Feb 2024 14:12:21 +0800
Subject: [PATCH 03/29] assetsPrefix not empty string

---
 packages/astro/src/core/render/ssr-element.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/astro/src/core/render/ssr-element.ts b/packages/astro/src/core/render/ssr-element.ts
index a476912bf4e7..4cf2122873fd 100644
--- a/packages/astro/src/core/render/ssr-element.ts
+++ b/packages/astro/src/core/render/ssr-element.ts
@@ -6,7 +6,7 @@ import { isObject } from '../util.js';
 import { getAssetsPrefix } from '../../assets/utils/transformToPath.js';
 
 export function createAssetLink(href: string, base?: string, assetsPrefix?: AssetsPrefix): string {
-	if (typeof assetsPrefix === "string") {
+	if (assetsPrefix && typeof assetsPrefix === "string") {
 		return joinPaths(assetsPrefix, slash(href));
 	} else if (isObject(assetsPrefix)) {
 		const fileType = getFileExtension(href)

From 3c0092559055223a3864c52e209f7b4853fa1c3b Mon Sep 17 00:00:00 2001
From: peng <414326615@qq.com>
Date: Thu, 22 Feb 2024 14:53:41 +0800
Subject: [PATCH 04/29] add changeset

---
 .changeset/fluffy-readers-add.md | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 .changeset/fluffy-readers-add.md

diff --git a/.changeset/fluffy-readers-add.md b/.changeset/fluffy-readers-add.md
new file mode 100644
index 000000000000..c4d156e634ef
--- /dev/null
+++ b/.changeset/fluffy-readers-add.md
@@ -0,0 +1,6 @@
+---
+"@astrojs/internal-helpers": minor
+"astro": minor
+---
+
+Add multiple CDN option, `build.assetsPrefix` also add object type for can config multiple CDN assets prefix.

From 0ef27ca24ed5a5198cb136bf0e14fcc2a3da99f5 Mon Sep 17 00:00:00 2001
From: peng <414326615@qq.com>
Date: Fri, 23 Feb 2024 14:30:24 +0800
Subject: [PATCH 05/29] simplify code

---
 .../astro/src/assets/utils/transformToPath.ts |  3 ++-
 .../astro/src/assets/vite-plugin-assets.ts    | 21 ++++---------------
 .../src/content/vite-plugin-content-assets.ts |  8 +++----
 .../src/core/build/plugins/plugin-manifest.ts |  5 +----
 packages/astro/src/core/create-vite.ts        |  7 +------
 packages/astro/src/core/render/ssr-element.ts |  5 +----
 6 files changed, 12 insertions(+), 37 deletions(-)

diff --git a/packages/astro/src/assets/utils/transformToPath.ts b/packages/astro/src/assets/utils/transformToPath.ts
index c6d3bd65fad7..41f33aed8536 100644
--- a/packages/astro/src/assets/utils/transformToPath.ts
+++ b/packages/astro/src/assets/utils/transformToPath.ts
@@ -35,7 +35,8 @@ export function hashTransform(
 	return shorthash(deterministicString(hashFields));
 }
 
-export function getAssetsPrefix(fileType: string, assetsPrefix: AssetsPrefix):string {
+export function getAssetsPrefix(fileType: string, assetsPrefix?: AssetsPrefix):string {
+	if (!assetsPrefix) return ''
 	if (typeof assetsPrefix === 'string') return assetsPrefix
 	if (assetsPrefix[fileType]) {
 		return assetsPrefix[fileType]
diff --git a/packages/astro/src/assets/vite-plugin-assets.ts b/packages/astro/src/assets/vite-plugin-assets.ts
index c249ff4961be..8482042faccd 100644
--- a/packages/astro/src/assets/vite-plugin-assets.ts
+++ b/packages/astro/src/assets/vite-plugin-assets.ts
@@ -17,7 +17,6 @@ import { emitESMImage } from './utils/emitAsset.js';
 import { isESMImportedImage } from './utils/imageKind.js';
 import { getProxyCode } from './utils/proxy.js';
 import { getAssetsPrefix, hashTransform, propsToFilename } from './utils/transformToPath.js';
-import { isObject } from '../core/util.js';
 
 const resolvedVirtualModuleId = '\0' + VIRTUAL_MODULE_ID;
 
@@ -97,13 +96,8 @@ export default function assets({
 
 					// Rollup will copy the file to the output directory, this refer to this final path, not to the original path
 					const ESMImportedImageSrc = isESMImportedImage(options.src) ? options.src.src : options.src;
-					let pf = ''
 					const fileExtension = getFileExtension(ESMImportedImageSrc)
-					if (settings.config.build.assetsPrefix && typeof settings.config.build.assetsPrefix === 'string')  {
-						pf = settings.config.build.assetsPrefix
-					} else if (isObject(settings.config.build.assetsPrefix)) {
-						pf = getAssetsPrefix(fileExtension, settings.config.build.assetsPrefix)
-					}
+					const pf = getAssetsPrefix(fileExtension, settings.config.build.assetsPrefix)
 					const finalOriginalImagePath = ESMImportedImageSrc.replace(pf, '');
 
 					const hash = hashTransform(
@@ -138,9 +132,7 @@ export default function assets({
 
 					// The paths here are used for URLs, so we need to make sure they have the proper format for an URL
 					// (leading slash, prefixed with the base / assets prefix, encoded, etc)
-					if (settings.config.build.assetsPrefix && typeof settings.config.build.assetsPrefix === 'string') {
-						return encodeURI(joinPaths(settings.config.build.assetsPrefix, finalFilePath));
-					} else if (isObject(settings.config.build.assetsPrefix)) {
+					if (settings.config.build.assetsPrefix) {
 						return encodeURI(joinPaths(pf, finalFilePath));
 					} else {
 						return encodeURI(prependForwardSlash(joinPaths(settings.config.base, finalFilePath)));
@@ -158,13 +150,8 @@ export default function assets({
 					const [full, hash, postfix = ''] = match;
 
 					const file = this.getFileName(hash);
-					let pf
-					if (settings.config.build.assetsPrefix && typeof settings.config.build.assetsPrefix === 'string') {
-						pf = settings.config.build.assetsPrefix
-					} else if (isObject(settings.config.build.assetsPrefix)) {
-						const fileExtension = getFileExtension(file)
-						pf = getAssetsPrefix(fileExtension, settings.config.build.assetsPrefix)
-					}
+					const fileExtension = getFileExtension(file)
+					const pf = getAssetsPrefix(fileExtension, settings.config.build.assetsPrefix)
 					const prefix = pf
 						? appendForwardSlash(pf)
 						: resolvedConfig.base;
diff --git a/packages/astro/src/content/vite-plugin-content-assets.ts b/packages/astro/src/content/vite-plugin-content-assets.ts
index c5f4662bdd76..2f256b17f7f0 100644
--- a/packages/astro/src/content/vite-plugin-content-assets.ts
+++ b/packages/astro/src/content/vite-plugin-content-assets.ts
@@ -20,7 +20,6 @@ import {
 	STYLES_PLACEHOLDER,
 } from './consts.js';
 import { hasContentFlag } from './utils.js';
-import { isObject } from '../core/util.js';
 import { getAssetsPrefix } from '../assets/utils/transformToPath.js';
 
 export function astroContentAssetPropagationPlugin({
@@ -129,10 +128,9 @@ export function astroConfigBuildPlugin(
 				const outputs = ssrOutputs.flatMap((o) => o.output);
 				const prependBase = (src: string) => {
 					const { assetsPrefix } = options.settings.config.build
-					if (assetsPrefix && typeof assetsPrefix === "string") {
-						return joinPaths(assetsPrefix, src);
-					} else if (isObject(assetsPrefix)) {
-						const pf = getAssetsPrefix(getFileExtension(src), assetsPrefix)
+					if (assetsPrefix) {
+						const fileExtension = getFileExtension(src)
+						const pf = getAssetsPrefix(fileExtension, assetsPrefix)
 						return joinPaths(pf, src);
 					} else {
 						return prependForwardSlash(joinPaths(options.settings.config.base, src));
diff --git a/packages/astro/src/core/build/plugins/plugin-manifest.ts b/packages/astro/src/core/build/plugins/plugin-manifest.ts
index 6935ba57e592..7109aed16d5b 100644
--- a/packages/astro/src/core/build/plugins/plugin-manifest.ts
+++ b/packages/astro/src/core/build/plugins/plugin-manifest.ts
@@ -16,7 +16,6 @@ import { getOutFile, getOutFolder } from '../common.js';
 import { cssOrder, mergeInlineCss, type BuildInternals } from '../internal.js';
 import type { AstroBuildPlugin } from '../plugin.js';
 import type { StaticBuildOptions } from '../types.js';
-import { isObject } from '../../util.js';
 import { getAssetsPrefix } from '../../../assets/utils/transformToPath.js';
 
 const manifestReplace = '@@ASTRO_MANIFEST_REPLACE@@';
@@ -167,9 +166,7 @@ function buildManifest(
 	}
 
 	const prefixAssetPath = (pth: string) => {
-		if (typeof settings.config.build.assetsPrefix === "string") {
-			return joinPaths(settings.config.build.assetsPrefix, pth);
-		} else if (isObject(settings.config.build.assetsPrefix)) {
+		if (settings.config.build.assetsPrefix) {
 			const fileType = getFileExtension(pth)
 			const pf = getAssetsPrefix(fileType, settings.config.build.assetsPrefix)
 			return joinPaths(pf, pth);
diff --git a/packages/astro/src/core/create-vite.ts b/packages/astro/src/core/create-vite.ts
index e3f7b350a0af..275cb09cc573 100644
--- a/packages/astro/src/core/create-vite.ts
+++ b/packages/astro/src/core/create-vite.ts
@@ -34,7 +34,6 @@ import type { Logger } from './logger/core.js';
 import { createViteLogger } from './logger/vite.js';
 import { vitePluginMiddleware } from './middleware/vite-plugin.js';
 import { joinPaths } from './path.js';
-import { isObject } from './util.js';
 import { getAssetsPrefix } from '../assets/utils/transformToPath.js';
 
 interface CreateViteOptions {
@@ -209,11 +208,7 @@ export async function createVite(
 		commonConfig.experimental = {
 			renderBuiltUrl(filename, { type, hostType }) {
 				if (type === 'asset') {
-					if (isObject(assetsPrefix)) {
-						const pf = getAssetsPrefix(hostType, assetsPrefix)
-						return joinPaths(pf, filename);
-					}
-					return joinPaths(assetsPrefix, filename);
+					return joinPaths(getAssetsPrefix(hostType, assetsPrefix), filename);
 				}
 			},
 		};
diff --git a/packages/astro/src/core/render/ssr-element.ts b/packages/astro/src/core/render/ssr-element.ts
index 4cf2122873fd..69e88b2a370b 100644
--- a/packages/astro/src/core/render/ssr-element.ts
+++ b/packages/astro/src/core/render/ssr-element.ts
@@ -2,13 +2,10 @@ import type { SSRElement, AssetsPrefix } from '../../@types/astro.js';
 import { joinPaths, prependForwardSlash, slash } from '../../core/path.js';
 import type { StylesheetAsset } from '../app/types.js';
 import { getFileExtension } from '@astrojs/internal-helpers/path';
-import { isObject } from '../util.js';
 import { getAssetsPrefix } from '../../assets/utils/transformToPath.js';
 
 export function createAssetLink(href: string, base?: string, assetsPrefix?: AssetsPrefix): string {
-	if (assetsPrefix && typeof assetsPrefix === "string") {
-		return joinPaths(assetsPrefix, slash(href));
-	} else if (isObject(assetsPrefix)) {
+	if (assetsPrefix) {
 		const fileType = getFileExtension(href)
 		const pf = getAssetsPrefix(fileType, assetsPrefix)
 		return joinPaths(pf, slash(href));

From 47b3d5f7d1cf14eea21b3856242986c349ff2b38 Mon Sep 17 00:00:00 2001
From: peng <414326615@qq.com>
Date: Thu, 29 Feb 2024 16:31:30 +0800
Subject: [PATCH 06/29] change docs

---
 .changeset/fluffy-readers-add.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/fluffy-readers-add.md b/.changeset/fluffy-readers-add.md
index c4d156e634ef..499105cfaf2b 100644
--- a/.changeset/fluffy-readers-add.md
+++ b/.changeset/fluffy-readers-add.md
@@ -3,4 +3,4 @@
 "astro": minor
 ---
 
-Add multiple CDN option, `build.assetsPrefix` also add object type for can config multiple CDN assets prefix.
+Adds the option to pass an object to `build.assetsPrefix`. This allows for the use of multiple CDN prefixes based on the target filetype.

From 3a1dcdb3793caba0dc1682ff3cd46366976fb54e Mon Sep 17 00:00:00 2001
From: peng <414326615@qq.com>
Date: Thu, 29 Feb 2024 16:35:09 +0800
Subject: [PATCH 07/29] replace getFileExtension with node path.extname

---
 packages/astro/src/assets/vite-plugin-assets.ts          | 8 ++++----
 packages/astro/src/content/vite-plugin-content-assets.ts | 3 +--
 packages/astro/src/core/build/plugins/plugin-manifest.ts | 5 +++--
 packages/astro/src/core/render/ssr-element.ts            | 4 ++--
 packages/internal-helpers/src/path.ts                    | 5 -----
 5 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/packages/astro/src/assets/vite-plugin-assets.ts b/packages/astro/src/assets/vite-plugin-assets.ts
index 8482042faccd..f531270e3b73 100644
--- a/packages/astro/src/assets/vite-plugin-assets.ts
+++ b/packages/astro/src/assets/vite-plugin-assets.ts
@@ -1,7 +1,7 @@
 import MagicString from 'magic-string';
 import type * as vite from 'vite';
 import { normalizePath } from 'vite';
-import { getFileExtension } from '@astrojs/internal-helpers/path';
+import { extname } from 'node:path';
 import type { AstroPluginOptions, ImageTransform } from '../@types/astro.js';
 import { extendManualChunks } from '../core/build/plugins/util.js';
 import { AstroError, AstroErrorData } from '../core/errors/index.js';
@@ -96,8 +96,8 @@ export default function assets({
 
 					// Rollup will copy the file to the output directory, this refer to this final path, not to the original path
 					const ESMImportedImageSrc = isESMImportedImage(options.src) ? options.src.src : options.src;
-					const fileExtension = getFileExtension(ESMImportedImageSrc)
-					const pf = getAssetsPrefix(fileExtension, settings.config.build.assetsPrefix)
+					const fileExtension = extname(ESMImportedImageSrc);
+					const pf = getAssetsPrefix(fileExtension, settings.config.build.assetsPrefix);
 					const finalOriginalImagePath = ESMImportedImageSrc.replace(pf, '');
 
 					const hash = hashTransform(
@@ -150,7 +150,7 @@ export default function assets({
 					const [full, hash, postfix = ''] = match;
 
 					const file = this.getFileName(hash);
-					const fileExtension = getFileExtension(file)
+					const fileExtension = extname(file)
 					const pf = getAssetsPrefix(fileExtension, settings.config.build.assetsPrefix)
 					const prefix = pf
 						? appendForwardSlash(pf)
diff --git a/packages/astro/src/content/vite-plugin-content-assets.ts b/packages/astro/src/content/vite-plugin-content-assets.ts
index 2f256b17f7f0..250af4540f4c 100644
--- a/packages/astro/src/content/vite-plugin-content-assets.ts
+++ b/packages/astro/src/content/vite-plugin-content-assets.ts
@@ -1,7 +1,6 @@
 import { extname } from 'node:path';
 import { pathToFileURL } from 'node:url';
 import type { Plugin, Rollup } from 'vite';
-import { getFileExtension } from '@astrojs/internal-helpers/path';
 import type { AstroSettings } from '../@types/astro.js';
 import { moduleIsTopLevelPage, walkParentInfos } from '../core/build/graph.js';
 import { getPageDataByViteID, type BuildInternals } from '../core/build/internal.js';
@@ -129,7 +128,7 @@ export function astroConfigBuildPlugin(
 				const prependBase = (src: string) => {
 					const { assetsPrefix } = options.settings.config.build
 					if (assetsPrefix) {
-						const fileExtension = getFileExtension(src)
+						const fileExtension = extname(src)
 						const pf = getAssetsPrefix(fileExtension, assetsPrefix)
 						return joinPaths(pf, src);
 					} else {
diff --git a/packages/astro/src/core/build/plugins/plugin-manifest.ts b/packages/astro/src/core/build/plugins/plugin-manifest.ts
index 7109aed16d5b..3192e0839aab 100644
--- a/packages/astro/src/core/build/plugins/plugin-manifest.ts
+++ b/packages/astro/src/core/build/plugins/plugin-manifest.ts
@@ -1,5 +1,6 @@
 import glob from 'fast-glob';
 import { fileURLToPath } from 'node:url';
+import { extname } from 'node:path';
 import type { OutputChunk } from 'rollup';
 import { type Plugin as VitePlugin } from 'vite';
 import { runHookBuildSsr } from '../../../integrations/index.js';
@@ -9,7 +10,7 @@ import type {
 	SerializedRouteInfo,
 	SerializedSSRManifest,
 } from '../../app/types.js';
-import { getFileExtension, joinPaths, prependForwardSlash } from '../../path.js';
+import { joinPaths, prependForwardSlash } from '../../path.js';
 import { serializeRouteData } from '../../routing/index.js';
 import { addRollupInput } from '../add-rollup-input.js';
 import { getOutFile, getOutFolder } from '../common.js';
@@ -167,7 +168,7 @@ function buildManifest(
 
 	const prefixAssetPath = (pth: string) => {
 		if (settings.config.build.assetsPrefix) {
-			const fileType = getFileExtension(pth)
+			const fileType = extname(pth)
 			const pf = getAssetsPrefix(fileType, settings.config.build.assetsPrefix)
 			return joinPaths(pf, pth);
 		} else {
diff --git a/packages/astro/src/core/render/ssr-element.ts b/packages/astro/src/core/render/ssr-element.ts
index 69e88b2a370b..ffba433c972b 100644
--- a/packages/astro/src/core/render/ssr-element.ts
+++ b/packages/astro/src/core/render/ssr-element.ts
@@ -1,12 +1,12 @@
+import { extname } from 'node:path';
 import type { SSRElement, AssetsPrefix } from '../../@types/astro.js';
 import { joinPaths, prependForwardSlash, slash } from '../../core/path.js';
 import type { StylesheetAsset } from '../app/types.js';
-import { getFileExtension } from '@astrojs/internal-helpers/path';
 import { getAssetsPrefix } from '../../assets/utils/transformToPath.js';
 
 export function createAssetLink(href: string, base?: string, assetsPrefix?: AssetsPrefix): string {
 	if (assetsPrefix) {
-		const fileType = getFileExtension(href)
+		const fileType = extname(href)
 		const pf = getAssetsPrefix(fileType, assetsPrefix)
 		return joinPaths(pf, slash(href));
 	} else if (base) {
diff --git a/packages/internal-helpers/src/path.ts b/packages/internal-helpers/src/path.ts
index ef71a0c4f9f1..cc9954ef2c04 100644
--- a/packages/internal-helpers/src/path.ts
+++ b/packages/internal-helpers/src/path.ts
@@ -80,11 +80,6 @@ export function removeFileExtension(path: string) {
 	return idx === -1 ? path : path.slice(0, idx);
 }
 
-export function getFileExtension(path: string) {
-	let idx = path.lastIndexOf('.');
-	return idx === -1 ? '' : path.slice(idx+1);
-}
-
 export function removeQueryString(path: string) {
 	const index = path.lastIndexOf('?');
 	return index > 0 ? path.substring(0, index) : path;

From acd1ec950e328e506df1f6fe08c2655bdabbf02a Mon Sep 17 00:00:00 2001
From: peng <414326615@qq.com>
Date: Fri, 1 Mar 2024 16:35:29 +0800
Subject: [PATCH 08/29] Adapt node extname

---
 .../astro/src/assets/utils/transformToPath.ts | 11 +++---
 packages/astro/src/core/create-vite.ts        |  3 +-
 .../test/astro-assets-prefix-mult-cdn.test.js | 38 +++++++++----------
 .../astro-assets-prefix/src/pages/index.astro |  2 +-
 4 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/packages/astro/src/assets/utils/transformToPath.ts b/packages/astro/src/assets/utils/transformToPath.ts
index 41f33aed8536..54872a73460a 100644
--- a/packages/astro/src/assets/utils/transformToPath.ts
+++ b/packages/astro/src/assets/utils/transformToPath.ts
@@ -36,12 +36,13 @@ export function hashTransform(
 }
 
 export function getAssetsPrefix(fileType: string, assetsPrefix?: AssetsPrefix):string {
-	if (!assetsPrefix) return ''
-	if (typeof assetsPrefix === 'string') return assetsPrefix
+	if (!assetsPrefix) return '';
+	if (typeof assetsPrefix === 'string') return assetsPrefix;
+	fileType = fileType[0] === '.' ? fileType.slice(1) : fileType;
 	if (assetsPrefix[fileType]) {
-		return assetsPrefix[fileType]
+		return assetsPrefix[fileType];
 	} else if (assetsPrefix.defaultAssetsPrefix) {
-		return assetsPrefix.defaultAssetsPrefix
+		return assetsPrefix.defaultAssetsPrefix;
 	}
-	return ''
+	return '';
 }
\ No newline at end of file
diff --git a/packages/astro/src/core/create-vite.ts b/packages/astro/src/core/create-vite.ts
index 275cb09cc573..56c2711f7a42 100644
--- a/packages/astro/src/core/create-vite.ts
+++ b/packages/astro/src/core/create-vite.ts
@@ -35,6 +35,7 @@ import { createViteLogger } from './logger/vite.js';
 import { vitePluginMiddleware } from './middleware/vite-plugin.js';
 import { joinPaths } from './path.js';
 import { getAssetsPrefix } from '../assets/utils/transformToPath.js';
+import { isObject } from './util.js';
 
 interface CreateViteOptions {
 	settings: AstroSettings;
@@ -311,5 +312,5 @@ function isCommonNotAstro(dep: string): boolean {
 }
 
 function stringifyForDefine(value: string | undefined | object): string {
-	return typeof value === 'string' ? JSON.stringify(value) : 'undefined';
+	return (typeof value === "string" || isObject(value)) ? JSON.stringify(value) : "undefined";
 }
diff --git a/packages/astro/test/astro-assets-prefix-mult-cdn.test.js b/packages/astro/test/astro-assets-prefix-mult-cdn.test.js
index 14ef1d7e34bd..dd412deba0cc 100644
--- a/packages/astro/test/astro-assets-prefix-mult-cdn.test.js
+++ b/packages/astro/test/astro-assets-prefix-mult-cdn.test.js
@@ -1,4 +1,5 @@
-import { expect } from 'chai';
+import assert from 'node:assert/strict';
+import { before, describe, it } from 'node:test';
 import * as cheerio from 'cheerio';
 import testAdapter from './test-adapter.js';
 import { loadFixture } from './test-utils.js';
@@ -34,7 +35,7 @@ describe('Assets Prefix Multiple CDN - Static', () => {
 		const $ = cheerio.load(html);
 		const stylesheets = $('link[rel="stylesheet"]');
 		stylesheets.each((i, el) => {
-			expect(el.attribs.href).to.match(cssAssetsPrefixRegex);
+			assert.match(el.attribs.href, cssAssetsPrefixRegex)
 		});
 	});
 
@@ -42,40 +43,39 @@ describe('Assets Prefix Multiple CDN - Static', () => {
 		const html = await fixture.readFile('/index.html');
 		const $ = cheerio.load(html);
 		const imgAsset = $('#image-asset');
-		expect(imgAsset.attr('src')).to.match(defaultAssetsPrefixRegex);
+		assert.match(imgAsset.attr('src'), defaultAssetsPrefixRegex);
 	});
 
 	it('react component astro-island should import from jsAssetsPrefix', async () => {
 		const html = await fixture.readFile('/index.html');
 		const $ = cheerio.load(html);
 		const island = $('astro-island');
-		expect(island.attr('component-url')).to.match(jsAssetsPrefixRegex);
-		expect(island.attr('renderer-url')).to.match(jsAssetsPrefixRegex);
+		assert.match(island.attr('component-url'), jsAssetsPrefixRegex);
+		assert.match(island.attr('renderer-url'), jsAssetsPrefixRegex);
 	});
 
 	it('import.meta.env.ASSETS_PREFIX works', async () => {
 		const html = await fixture.readFile('/index.html');
 		const $ = cheerio.load(html);
 		const env = $('#assets-prefix-env');
-		expect(env.text()).to.equal(JSON.stringify(assetsPrefix));
+		assert.equal(env.text(), JSON.stringify(assetsPrefix));
 	});
 
 	it('markdown image src start with assetsPrefix', async () => {
 		const html = await fixture.readFile('/markdown/index.html');
 		const $ = cheerio.load(html);
-		const imgAsset = $('img');
-		expect(imgAsset.attr('src')).to.match(defaultAssetsPrefixRegex);
+		const imgAssets = $('img');
+		assert.match(imgAssets.attr('src'), defaultAssetsPrefixRegex);
 	});
 
 	it('content collections image src start with assetsPrefix', async () => {
 		const html = await fixture.readFile('/blog/index.html');
 		const $ = cheerio.load(html);
 		const imgAsset = $('img');
-		expect(imgAsset.attr('src')).to.match(defaultAssetsPrefixRegex);
+		assert.match(imgAsset.attr('src'), defaultAssetsPrefixRegex);
 	});
 });
 
-
 describe('Assets Prefix Multiple CDN, server', () => {
 	let app;
 
@@ -95,43 +95,43 @@ describe('Assets Prefix Multiple CDN, server', () => {
 	it('all stylesheets should start with assetPrefix', async () => {
 		const request = new Request('http://example.com/custom-base/');
 		const response = await app.render(request);
-		expect(response.status).to.equal(200);
+		assert.equal(response.status, 200);
 		const html = await response.text();
 		const $ = cheerio.load(html);
 		const stylesheets = $('link[rel="stylesheet"]');
 		stylesheets.each((i, el) => {
-			expect(el.attribs.href).to.match(cssAssetsPrefixRegex);
+			assert.match(el.attribs.href, cssAssetsPrefixRegex);
 		});
 	});
 
 	it('image src start with assetsPrefix', async () => {
 		const request = new Request('http://example.com/custom-base/');
 		const response = await app.render(request);
-		expect(response.status).to.equal(200);
+		assert.equal(response.status, 200);
 		const html = await response.text();
 		const $ = cheerio.load(html);
 		const imgAsset = $('#image-asset');
-		expect(imgAsset.attr('src')).to.match(defaultAssetsPrefixRegex);
+		assert.match(imgAsset.attr('src'), defaultAssetsPrefixRegex);
 	});
 
 	it('react component astro-island should import from assetsPrefix', async () => {
 		const request = new Request('http://example.com/custom-base/');
 		const response = await app.render(request);
-		expect(response.status).to.equal(200);
+		assert.equal(response.status, 200);
 		const html = await response.text();
 		const $ = cheerio.load(html);
 		const island = $('astro-island');
-		expect(island.attr('component-url')).to.match(jsAssetsPrefixRegex);
-		expect(island.attr('renderer-url')).to.match(jsAssetsPrefixRegex);
+		assert.match(island.attr('component-url'), jsAssetsPrefixRegex);
+		assert.match(island.attr('renderer-url'), jsAssetsPrefixRegex);
 	});
 
 	it('markdown optimized image src does not start with assetsPrefix in SSR', async () => {
 		const request = new Request('http://example.com/custom-base/markdown/');
 		const response = await app.render(request);
-		expect(response.status).to.equal(200);
+		assert.equal(response.status, 200);
 		const html = await response.text();
 		const $ = cheerio.load(html);
 		const imgAsset = $('img');
-		expect(imgAsset.attr('src')).to.not.match(defaultAssetsPrefixRegex);
+		assert.doesNotMatch(imgAsset.attr('src'), defaultAssetsPrefixRegex);
 	});
 });
diff --git a/packages/astro/test/fixtures/astro-assets-prefix/src/pages/index.astro b/packages/astro/test/fixtures/astro-assets-prefix/src/pages/index.astro
index 67f6e97fa56c..4158153205f4 100644
--- a/packages/astro/test/fixtures/astro-assets-prefix/src/pages/index.astro
+++ b/packages/astro/test/fixtures/astro-assets-prefix/src/pages/index.astro
@@ -13,7 +13,7 @@ import Counter from '../components/Counter.jsx';
     <img id="image-asset" src={p1Image.src} width={p1Image.width} height={p1Image.height} alt="penguin" />
     <Image src={p1Image} alt="penguin" />
     <Counter client:load />
-    <p id="assets-prefix-env">{import.meta.env.ASSETS_PREFIX}</p>
+    <p id="assets-prefix-env">{typeof import.meta.env.ASSETS_PREFIX === 'string' ? import.meta.env.ASSETS_PREFIX : JSON.stringify(import.meta.env.ASSETS_PREFIX)}</p>
     <style>
       h1 {
         color: red;

From 99f53f7678dbc948d1ef04b7ae5d2f5449ce70f2 Mon Sep 17 00:00:00 2001
From: peng <414326615@qq.com>
Date: Fri, 1 Mar 2024 17:39:54 +0800
Subject: [PATCH 09/29] multiple image test

---
 packages/astro/test/astro-assets-prefix-mult-cdn.test.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/astro/test/astro-assets-prefix-mult-cdn.test.js b/packages/astro/test/astro-assets-prefix-mult-cdn.test.js
index dd412deba0cc..8116f21b80e0 100644
--- a/packages/astro/test/astro-assets-prefix-mult-cdn.test.js
+++ b/packages/astro/test/astro-assets-prefix-mult-cdn.test.js
@@ -65,7 +65,9 @@ describe('Assets Prefix Multiple CDN - Static', () => {
 		const html = await fixture.readFile('/markdown/index.html');
 		const $ = cheerio.load(html);
 		const imgAssets = $('img');
-		assert.match(imgAssets.attr('src'), defaultAssetsPrefixRegex);
+		imgAssets.each((i, el) => {
+			assert.match(el.attribs.src, defaultAssetsPrefixRegex);
+		});
 	});
 
 	it('content collections image src start with assetsPrefix', async () => {

From 7e6467dded09a83cbc49134748a48640af37749e Mon Sep 17 00:00:00 2001
From: peng <414326615@qq.com>
Date: Mon, 4 Mar 2024 10:49:11 +0800
Subject: [PATCH 10/29] wip space

---
 packages/astro/test/astro-assets-prefix-mult-cdn.test.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/astro/test/astro-assets-prefix-mult-cdn.test.js b/packages/astro/test/astro-assets-prefix-mult-cdn.test.js
index 8116f21b80e0..f88afe52ed31 100644
--- a/packages/astro/test/astro-assets-prefix-mult-cdn.test.js
+++ b/packages/astro/test/astro-assets-prefix-mult-cdn.test.js
@@ -5,11 +5,8 @@ import testAdapter from './test-adapter.js';
 import { loadFixture } from './test-utils.js';
 
 const defaultAssetsPrefixRegex = /^https:\/\/example.com\/_astro\/.*/;
-
 const jsAssetsPrefixRegex = /^https:\/\/js\.example\.com\/_astro\/.*/;
-
 const cssAssetsPrefixRegex = /^https:\/\/css\.example\.com\/_astro\/.*/;
-
 const assetsPrefix = {
 	'js': 'https://js.example.com',
 	'css': 'https://css.example.com',

From 30b2cd720ae9c2cf0ad6e1ebfbc0ed42f62b63fd Mon Sep 17 00:00:00 2001
From: peng <414326615@qq.com>
Date: Mon, 4 Mar 2024 15:32:34 +0800
Subject: [PATCH 11/29] update docs

---
 packages/astro/src/@types/astro.ts | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/packages/astro/src/@types/astro.ts b/packages/astro/src/@types/astro.ts
index 61ce21636560..fe58ebd25ea8 100644
--- a/packages/astro/src/@types/astro.ts
+++ b/packages/astro/src/@types/astro.ts
@@ -881,11 +881,13 @@ export interface AstroUserConfig {
 		/**
 		 * @docs
 		 * @name build.assetsPrefix
-		 * @type {string}
+		 * @type {AssetsPrefix}
 		 * @default `undefined`
 		 * @version 2.2.0
 		 * @description
 		 * Specifies the prefix for Astro-generated asset links. This can be used if assets are served from a different domain than the current site.
+		 * 
+		 * If use `string`
 		 *
 		 * For example, if this is set to `https://cdn.example.com`, assets will be fetched from `https://cdn.example.com/_astro/...` (regardless of the `base` option).
 		 * You would need to upload the files in `./dist/_astro/` to `https://cdn.example.com/_astro/` to serve the assets.
@@ -899,6 +901,27 @@ export interface AstroUserConfig {
 		 *   }
 		 * }
 		 * ```
+		 * 
+		 * If this value is a `Record<string, string>`,
+		 * 
+		 * Applicable to multiple CDN scenarios. If you static file use different CDN, you can configure it like the example below.
+		 * 
+		 * For example, if static file is js file, assets prefix use `https://js.cdn.example.com`. If static file is css file, assets prefix use `https://css.cdn.example.com`. Other assets prefix use `https://cdn.example.com`.
+		 * 
+		 * ```js
+		 * {
+		 *   build: {
+		 *     assetsPrefix: {
+		 *       'js': 'https://js.cdn.example.com',
+		 *       'css': 'https://js.cdn.example.com',
+		 *       'defaultAssetsPrefix': 'https://cdn.example.com'
+		 *     }
+		 *   }
+		 * }
+		 * ```
+		 * 
+		 * Object key is file extension, value is CDN assets prefix path. `defaultAssetsPrefix` is default assets prefix cdn value set. You can set the default values of other files by setting the value of `defaultAssetsPrefix`. If `defaultAssetsPrefix` is not set, when the file extension is not found in the `assetsPrefix` object, it will be set to the empty string `''` by default.
+		 * 
 		 */
 		assetsPrefix?: AssetsPrefix;
 		/**

From 3f769fa8a5a6d1b515e0f3e045c229f9fd8bb242 Mon Sep 17 00:00:00 2001
From: peng <414326615@qq.com>
Date: Mon, 4 Mar 2024 15:54:31 +0800
Subject: [PATCH 12/29] update docs, assetsPrefix type

---
 packages/astro/src/@types/astro.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/astro/src/@types/astro.ts b/packages/astro/src/@types/astro.ts
index fe58ebd25ea8..f2c1531497e2 100644
--- a/packages/astro/src/@types/astro.ts
+++ b/packages/astro/src/@types/astro.ts
@@ -881,7 +881,7 @@ export interface AstroUserConfig {
 		/**
 		 * @docs
 		 * @name build.assetsPrefix
-		 * @type {AssetsPrefix}
+		 * @type {string | Record<string, string>}
 		 * @default `undefined`
 		 * @version 2.2.0
 		 * @description

From 91ea28e225375e387417a4fa142b8dfa61949472 Mon Sep 17 00:00:00 2001
From: peng <414326615@qq.com>
Date: Mon, 4 Mar 2024 15:58:45 +0800
Subject: [PATCH 13/29] update docs

---
 packages/astro/src/@types/astro.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/astro/src/@types/astro.ts b/packages/astro/src/@types/astro.ts
index f2c1531497e2..f4c637ebaea4 100644
--- a/packages/astro/src/@types/astro.ts
+++ b/packages/astro/src/@types/astro.ts
@@ -887,7 +887,7 @@ export interface AstroUserConfig {
 		 * @description
 		 * Specifies the prefix for Astro-generated asset links. This can be used if assets are served from a different domain than the current site.
 		 * 
-		 * If use `string`
+		 * If this value is a `string`
 		 *
 		 * For example, if this is set to `https://cdn.example.com`, assets will be fetched from `https://cdn.example.com/_astro/...` (regardless of the `base` option).
 		 * You would need to upload the files in `./dist/_astro/` to `https://cdn.example.com/_astro/` to serve the assets.

From de65e0a03335f40958c5adaa1519e545e5c14886 Mon Sep 17 00:00:00 2001
From: peng <414326615@qq.com>
Date: Mon, 4 Mar 2024 16:01:02 +0800
Subject: [PATCH 14/29] update docs

---
 packages/astro/src/@types/astro.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/astro/src/@types/astro.ts b/packages/astro/src/@types/astro.ts
index f4c637ebaea4..84d3e15b354f 100644
--- a/packages/astro/src/@types/astro.ts
+++ b/packages/astro/src/@types/astro.ts
@@ -887,7 +887,7 @@ export interface AstroUserConfig {
 		 * @description
 		 * Specifies the prefix for Astro-generated asset links. This can be used if assets are served from a different domain than the current site.
 		 * 
-		 * If this value is a `string`
+		 * If this value is a `string`,
 		 *
 		 * For example, if this is set to `https://cdn.example.com`, assets will be fetched from `https://cdn.example.com/_astro/...` (regardless of the `base` option).
 		 * You would need to upload the files in `./dist/_astro/` to `https://cdn.example.com/_astro/` to serve the assets.

From eef88df49874cd24b6f4da014ed932cf1e3fc60e Mon Sep 17 00:00:00 2001
From: Emanuele Stoppa <my.burning@gmail.com>
Date: Tue, 5 Mar 2024 11:04:14 +0000
Subject: [PATCH 15/29] chore: update types and rename to `fallback`

---
 packages/astro/src/@types/astro.ts            | 16 ++++----
 .../astro/src/assets/utils/transformToPath.ts |  8 ++--
 packages/astro/src/core/app/types.ts          |  7 +++-
 packages/astro/src/core/config/schema.ts      | 38 +++++++++++++++++--
 .../test/astro-assets-prefix-mult-cdn.test.js | 14 +++----
 5 files changed, 60 insertions(+), 23 deletions(-)

diff --git a/packages/astro/src/@types/astro.ts b/packages/astro/src/@types/astro.ts
index 84d3e15b354f..73e7c0b7b6e0 100644
--- a/packages/astro/src/@types/astro.ts
+++ b/packages/astro/src/@types/astro.ts
@@ -886,7 +886,7 @@ export interface AstroUserConfig {
 		 * @version 2.2.0
 		 * @description
 		 * Specifies the prefix for Astro-generated asset links. This can be used if assets are served from a different domain than the current site.
-		 * 
+		 *
 		 * If this value is a `string`,
 		 *
 		 * For example, if this is set to `https://cdn.example.com`, assets will be fetched from `https://cdn.example.com/_astro/...` (regardless of the `base` option).
@@ -901,27 +901,27 @@ export interface AstroUserConfig {
 		 *   }
 		 * }
 		 * ```
-		 * 
+		 *
 		 * If this value is a `Record<string, string>`,
-		 * 
+		 *
 		 * Applicable to multiple CDN scenarios. If you static file use different CDN, you can configure it like the example below.
-		 * 
+		 *
 		 * For example, if static file is js file, assets prefix use `https://js.cdn.example.com`. If static file is css file, assets prefix use `https://css.cdn.example.com`. Other assets prefix use `https://cdn.example.com`.
-		 * 
+		 *
 		 * ```js
 		 * {
 		 *   build: {
 		 *     assetsPrefix: {
 		 *       'js': 'https://js.cdn.example.com',
 		 *       'css': 'https://js.cdn.example.com',
-		 *       'defaultAssetsPrefix': 'https://cdn.example.com'
+		 *       'fallabck': 'https://cdn.example.com'
 		 *     }
 		 *   }
 		 * }
 		 * ```
-		 * 
+		 *
 		 * Object key is file extension, value is CDN assets prefix path. `defaultAssetsPrefix` is default assets prefix cdn value set. You can set the default values of other files by setting the value of `defaultAssetsPrefix`. If `defaultAssetsPrefix` is not set, when the file extension is not found in the `assetsPrefix` object, it will be set to the empty string `''` by default.
-		 * 
+		 *
 		 */
 		assetsPrefix?: AssetsPrefix;
 		/**
diff --git a/packages/astro/src/assets/utils/transformToPath.ts b/packages/astro/src/assets/utils/transformToPath.ts
index 886e4c92924e..07f7c77dcf49 100644
--- a/packages/astro/src/assets/utils/transformToPath.ts
+++ b/packages/astro/src/assets/utils/transformToPath.ts
@@ -35,14 +35,14 @@ export function hashTransform(
 	return shorthash(deterministicString(hashFields));
 }
 
-export function getAssetsPrefix(fileType: string, assetsPrefix?: AssetsPrefix):string {
+export function getAssetsPrefix(fileType: string, assetsPrefix?: AssetsPrefix): string {
 	if (!assetsPrefix) return '';
 	if (typeof assetsPrefix === 'string') return assetsPrefix;
 	fileType = fileType[0] === '.' ? fileType.slice(1) : fileType;
 	if (assetsPrefix[fileType]) {
 		return assetsPrefix[fileType];
-	} else if (assetsPrefix.defaultAssetsPrefix) {
-		return assetsPrefix.defaultAssetsPrefix;
+	} else if (assetsPrefix.fallback) {
+		return assetsPrefix.fallback;
 	}
 	return '';
-}
\ No newline at end of file
+}
diff --git a/packages/astro/src/core/app/types.ts b/packages/astro/src/core/app/types.ts
index ff5165f7bb43..75adab2f9cf5 100644
--- a/packages/astro/src/core/app/types.ts
+++ b/packages/astro/src/core/app/types.ts
@@ -35,7 +35,12 @@ export type SerializedRouteInfo = Omit<RouteInfo, 'routeData'> & {
 
 export type ImportComponentInstance = () => Promise<SinglePageBuiltModule>;
 
-export type AssetsPrefix = string | Record<string, string>
+export type AssetsPrefix =
+	| string
+	| ({
+			fallback: string;
+	  } & Record<string, string>)
+	| undefined;
 
 export type SSRManifest = {
 	adapterName: string;
diff --git a/packages/astro/src/core/config/schema.ts b/packages/astro/src/core/config/schema.ts
index 344318f4e15e..60378fa4f368 100644
--- a/packages/astro/src/core/config/schema.ts
+++ b/packages/astro/src/core/config/schema.ts
@@ -11,7 +11,7 @@ import type { AstroUserConfig, ViteUserConfig } from '../../@types/astro.js';
 import type { OutgoingHttpHeaders } from 'node:http';
 import path from 'node:path';
 import { pathToFileURL } from 'node:url';
-import { z } from 'zod';
+import { type TypeOf, z } from 'zod';
 import { appendForwardSlash, prependForwardSlash, removeTrailingForwardSlash } from '../path.js';
 
 // This import is required to appease TypeScript!
@@ -133,7 +133,23 @@ export const AstroConfigSchema = z.object({
 				.default(ASTRO_CONFIG_DEFAULTS.build.server)
 				.transform((val) => new URL(val)),
 			assets: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.build.assets),
-			assetsPrefix: z.string().optional().or(z.record(z.string()).optional()),
+			assetsPrefix: z
+				.string()
+				.optional()
+				.or(z.object({ fallback: z.string() }).and(z.record(z.string())).optional())
+				.refine(
+					(value) => {
+						if (value && typeof value !== 'string') {
+							if (!value.fallback) {
+								return false;
+							}
+						}
+						return true;
+					},
+					{
+						message: 'The `fallback` is mandatory when defining the option as an object.',
+					}
+				),
 			serverEntry: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.build.serverEntry),
 			redirects: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.build.redirects),
 			inlineStylesheets: z
@@ -508,7 +524,23 @@ export function createRelativeSchema(cmd: string, fileProtocolRoot: string) {
 					.default(ASTRO_CONFIG_DEFAULTS.build.server)
 					.transform((val) => resolveDirAsUrl(val, fileProtocolRoot)),
 				assets: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.build.assets),
-				assetsPrefix: z.string().optional().or(z.record(z.string()).optional()),
+				assetsPrefix: z
+					.string()
+					.optional()
+					.or(z.object({ fallback: z.string() }).and(z.record(z.string())).optional())
+					.refine(
+						(value) => {
+							if (value && typeof value !== 'string') {
+								if (!value.fallback) {
+									return false;
+								}
+							}
+							return true;
+						},
+						{
+							message: 'The `fallback` is mandatory when defining the option as an object.',
+						}
+					),
 				serverEntry: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.build.serverEntry),
 				redirects: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.build.redirects),
 				inlineStylesheets: z
diff --git a/packages/astro/test/astro-assets-prefix-mult-cdn.test.js b/packages/astro/test/astro-assets-prefix-mult-cdn.test.js
index f88afe52ed31..7f34594f82a5 100644
--- a/packages/astro/test/astro-assets-prefix-mult-cdn.test.js
+++ b/packages/astro/test/astro-assets-prefix-mult-cdn.test.js
@@ -8,10 +8,10 @@ const defaultAssetsPrefixRegex = /^https:\/\/example.com\/_astro\/.*/;
 const jsAssetsPrefixRegex = /^https:\/\/js\.example\.com\/_astro\/.*/;
 const cssAssetsPrefixRegex = /^https:\/\/css\.example\.com\/_astro\/.*/;
 const assetsPrefix = {
-	'js': 'https://js.example.com',
-	'css': 'https://css.example.com',
-	'defaultAssetsPrefix': 'https://example.com'
-}
+	js: 'https://js.example.com',
+	css: 'https://css.example.com',
+	fallback: 'https://example.com',
+};
 
 // Asset prefix for CDN support
 describe('Assets Prefix Multiple CDN - Static', () => {
@@ -22,7 +22,7 @@ describe('Assets Prefix Multiple CDN - Static', () => {
 			root: './fixtures/astro-assets-prefix',
 			build: {
 				assetsPrefix,
-			}
+			},
 		});
 		await fixture.build();
 	});
@@ -32,7 +32,7 @@ describe('Assets Prefix Multiple CDN - Static', () => {
 		const $ = cheerio.load(html);
 		const stylesheets = $('link[rel="stylesheet"]');
 		stylesheets.each((i, el) => {
-			assert.match(el.attribs.href, cssAssetsPrefixRegex)
+			assert.match(el.attribs.href, cssAssetsPrefixRegex);
 		});
 	});
 
@@ -85,7 +85,7 @@ describe('Assets Prefix Multiple CDN, server', () => {
 			adapter: testAdapter(),
 			build: {
 				assetsPrefix,
-			}
+			},
 		});
 		await fixture.build();
 		app = await fixture.loadTestAdapterApp();

From 17cebd00e020980c74b1e131fcce907158a8b3e8 Mon Sep 17 00:00:00 2001
From: Emanuele Stoppa <my.burning@gmail.com>
Date: Tue, 5 Mar 2024 11:11:53 +0000
Subject: [PATCH 16/29] enhance changelog

---
 .changeset/fluffy-readers-add.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/.changeset/fluffy-readers-add.md b/.changeset/fluffy-readers-add.md
index 499105cfaf2b..cc874c705e10 100644
--- a/.changeset/fluffy-readers-add.md
+++ b/.changeset/fluffy-readers-add.md
@@ -4,3 +4,23 @@
 ---
 
 Adds the option to pass an object to `build.assetsPrefix`. This allows for the use of multiple CDN prefixes based on the target filetype.
+
+When defining `build.assetsPrefix` as a object, the object must accept a key named `fallback`, which is used when as asset doesn't match an extension.
+
+Each key of the object must match the extension of the file. 
+
+```js
+// astro.config.mjs
+import { defineConfig } from "astro/config"
+
+export default defineConfig({
+    build: {
+        assetsPrefix: {
+            'js': "https://js.cdn.example.com",
+            'mjs': "https://js.cdn.example.com", // if you have .mjs files, you must add a new entry like this
+            "png": "https://images.cdn.example.com",
+            'fallback': "https://generic.cdn.example.com"
+        }
+    }
+})
+```

From 2b4cd7dd20ce5534776e04ffcfc5ee56f0d0a22d Mon Sep 17 00:00:00 2001
From: peng <414326615@qq.com>
Date: Tue, 5 Mar 2024 21:12:59 +0800
Subject: [PATCH 17/29] change docs

---
 packages/astro/src/@types/astro.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/astro/src/@types/astro.ts b/packages/astro/src/@types/astro.ts
index 73e7c0b7b6e0..317f1b6d6a34 100644
--- a/packages/astro/src/@types/astro.ts
+++ b/packages/astro/src/@types/astro.ts
@@ -920,7 +920,7 @@ export interface AstroUserConfig {
 		 * }
 		 * ```
 		 *
-		 * Object key is file extension, value is CDN assets prefix path. `defaultAssetsPrefix` is default assets prefix cdn value set. You can set the default values of other files by setting the value of `defaultAssetsPrefix`. If `defaultAssetsPrefix` is not set, when the file extension is not found in the `assetsPrefix` object, it will be set to the empty string `''` by default.
+		 * Object key is file extension, value is CDN assets prefix path. `fallabck` is default assets prefix cdn value set and it is a mandatory key. You can set the default values of other files by setting the value of `fallabck`.
 		 *
 		 */
 		assetsPrefix?: AssetsPrefix;

From d3e755e849b7afc2abc4a065ef202fc7670542c3 Mon Sep 17 00:00:00 2001
From: peng <414326615@qq.com>
Date: Tue, 5 Mar 2024 21:30:15 +0800
Subject: [PATCH 18/29] update change defaultAeestsPrefix to fallback key test

---
 packages/astro/test/astro-assets-prefix-mult-cdn.test.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/astro/test/astro-assets-prefix-mult-cdn.test.js b/packages/astro/test/astro-assets-prefix-mult-cdn.test.js
index 7f34594f82a5..9dbf259b2d96 100644
--- a/packages/astro/test/astro-assets-prefix-mult-cdn.test.js
+++ b/packages/astro/test/astro-assets-prefix-mult-cdn.test.js
@@ -36,7 +36,7 @@ describe('Assets Prefix Multiple CDN - Static', () => {
 		});
 	});
 
-	it('image src start with defaultAssetsPrefix', async () => {
+	it('image src start with fallback', async () => {
 		const html = await fixture.readFile('/index.html');
 		const $ = cheerio.load(html);
 		const imgAsset = $('#image-asset');
@@ -55,7 +55,7 @@ describe('Assets Prefix Multiple CDN - Static', () => {
 		const html = await fixture.readFile('/index.html');
 		const $ = cheerio.load(html);
 		const env = $('#assets-prefix-env');
-		assert.equal(env.text(), JSON.stringify(assetsPrefix));
+		assert.deepEqual(JSON.parse(env.text()), assetsPrefix);
 	});
 
 	it('markdown image src start with assetsPrefix', async () => {

From b95b782265a50f4df2e99a60fc46c861044bf9fb Mon Sep 17 00:00:00 2001
From: Emanuele Stoppa <my.burning@gmail.com>
Date: Wed, 6 Mar 2024 14:19:47 +0000
Subject: [PATCH 19/29] move utility to a new to avoid importing `node:path`
 inside vite plugins

---
 .../astro/src/assets/utils/getAssetsPrefix.ts     | 13 +++++++++++++
 .../astro/src/assets/utils/transformToPath.ts     | 13 -------------
 packages/astro/src/assets/vite-plugin-assets.ts   | 15 ++++++++-------
 .../src/content/vite-plugin-content-assets.ts     |  8 ++++----
 .../src/core/build/plugins/plugin-manifest.ts     |  9 ++++-----
 packages/astro/src/core/create-vite.ts            |  4 ++--
 packages/astro/src/core/render/ssr-element.ts     |  9 ++++-----
 packages/internal-helpers/src/path.ts             |  4 ++++
 8 files changed, 39 insertions(+), 36 deletions(-)
 create mode 100644 packages/astro/src/assets/utils/getAssetsPrefix.ts

diff --git a/packages/astro/src/assets/utils/getAssetsPrefix.ts b/packages/astro/src/assets/utils/getAssetsPrefix.ts
new file mode 100644
index 000000000000..38c0b5e9c497
--- /dev/null
+++ b/packages/astro/src/assets/utils/getAssetsPrefix.ts
@@ -0,0 +1,13 @@
+import type { AssetsPrefix } from '../../core/app/types.js';
+
+export function getAssetsPrefix(fileType: string, assetsPrefix?: AssetsPrefix): string {
+	if (!assetsPrefix) return '';
+	if (typeof assetsPrefix === 'string') return assetsPrefix;
+	fileType = fileType[0] === '.' ? fileType.slice(1) : fileType;
+	if (assetsPrefix[fileType]) {
+		return assetsPrefix[fileType];
+	} else if (assetsPrefix.fallback) {
+		return assetsPrefix.fallback;
+	}
+	return '';
+}
diff --git a/packages/astro/src/assets/utils/transformToPath.ts b/packages/astro/src/assets/utils/transformToPath.ts
index 07f7c77dcf49..0cac1a67151c 100644
--- a/packages/astro/src/assets/utils/transformToPath.ts
+++ b/packages/astro/src/assets/utils/transformToPath.ts
@@ -4,7 +4,6 @@ import { removeQueryString } from '../../core/path.js';
 import { shorthash } from '../../runtime/server/shorthash.js';
 import type { ImageTransform } from '../types.js';
 import { isESMImportedImage } from './imageKind.js';
-import type { AssetsPrefix } from '../../@types/astro.js';
 
 export function propsToFilename(transform: ImageTransform, hash: string) {
 	let filename = removeQueryString(
@@ -34,15 +33,3 @@ export function hashTransform(
 	);
 	return shorthash(deterministicString(hashFields));
 }
-
-export function getAssetsPrefix(fileType: string, assetsPrefix?: AssetsPrefix): string {
-	if (!assetsPrefix) return '';
-	if (typeof assetsPrefix === 'string') return assetsPrefix;
-	fileType = fileType[0] === '.' ? fileType.slice(1) : fileType;
-	if (assetsPrefix[fileType]) {
-		return assetsPrefix[fileType];
-	} else if (assetsPrefix.fallback) {
-		return assetsPrefix.fallback;
-	}
-	return '';
-}
diff --git a/packages/astro/src/assets/vite-plugin-assets.ts b/packages/astro/src/assets/vite-plugin-assets.ts
index 28fcbef39a10..8ca2f122a8de 100644
--- a/packages/astro/src/assets/vite-plugin-assets.ts
+++ b/packages/astro/src/assets/vite-plugin-assets.ts
@@ -16,7 +16,8 @@ import { VALID_INPUT_FORMATS, VIRTUAL_MODULE_ID, VIRTUAL_SERVICE_ID } from './co
 import { emitESMImage } from './utils/emitAsset.js';
 import { isESMImportedImage } from './utils/imageKind.js';
 import { getProxyCode } from './utils/proxy.js';
-import { getAssetsPrefix, hashTransform, propsToFilename } from './utils/transformToPath.js';
+import { hashTransform, propsToFilename } from './utils/transformToPath.js';
+import { getAssetsPrefix } from './utils/getAssetsPrefix.js';
 
 const resolvedVirtualModuleId = '\0' + VIRTUAL_MODULE_ID;
 
@@ -96,7 +97,9 @@ export default function assets({
 					}
 
 					// Rollup will copy the file to the output directory, this refer to this final path, not to the original path
-					const ESMImportedImageSrc = isESMImportedImage(options.src) ? options.src.src : options.src;
+					const ESMImportedImageSrc = isESMImportedImage(options.src)
+						? options.src.src
+						: options.src;
 					const fileExtension = extname(ESMImportedImageSrc);
 					const pf = getAssetsPrefix(fileExtension, settings.config.build.assetsPrefix);
 					const finalOriginalImagePath = ESMImportedImageSrc.replace(pf, '');
@@ -151,11 +154,9 @@ export default function assets({
 					const [full, hash, postfix = ''] = match;
 
 					const file = this.getFileName(hash);
-					const fileExtension = extname(file)
-					const pf = getAssetsPrefix(fileExtension, settings.config.build.assetsPrefix)
-					const prefix = pf
-						? appendForwardSlash(pf)
-						: resolvedConfig.base;
+					const fileExtension = extname(file);
+					const pf = getAssetsPrefix(fileExtension, settings.config.build.assetsPrefix);
+					const prefix = pf ? appendForwardSlash(pf) : resolvedConfig.base;
 					const outputFilepath = prefix + normalizePath(file + postfix);
 
 					s.overwrite(match.index, match.index + full.length, outputFilepath);
diff --git a/packages/astro/src/content/vite-plugin-content-assets.ts b/packages/astro/src/content/vite-plugin-content-assets.ts
index acb2251f0379..14e3c076044d 100644
--- a/packages/astro/src/content/vite-plugin-content-assets.ts
+++ b/packages/astro/src/content/vite-plugin-content-assets.ts
@@ -19,7 +19,7 @@ import {
 	STYLES_PLACEHOLDER,
 } from './consts.js';
 import { hasContentFlag } from './utils.js';
-import { getAssetsPrefix } from '../assets/utils/transformToPath.js';
+import { getAssetsPrefix } from '../assets/utils/getAssetsPrefix.js';
 
 export function astroContentAssetPropagationPlugin({
 	mode,
@@ -142,10 +142,10 @@ export function astroConfigBuildPlugin(
 			'build:post': ({ ssrOutputs, clientOutputs, mutate }) => {
 				const outputs = ssrOutputs.flatMap((o) => o.output);
 				const prependBase = (src: string) => {
-					const { assetsPrefix } = options.settings.config.build
+					const { assetsPrefix } = options.settings.config.build;
 					if (assetsPrefix) {
-						const fileExtension = extname(src)
-						const pf = getAssetsPrefix(fileExtension, assetsPrefix)
+						const fileExtension = extname(src);
+						const pf = getAssetsPrefix(fileExtension, assetsPrefix);
 						return joinPaths(pf, src);
 					} else {
 						return prependForwardSlash(joinPaths(options.settings.config.base, src));
diff --git a/packages/astro/src/core/build/plugins/plugin-manifest.ts b/packages/astro/src/core/build/plugins/plugin-manifest.ts
index 3ee575a95e8e..6833a3352e69 100644
--- a/packages/astro/src/core/build/plugins/plugin-manifest.ts
+++ b/packages/astro/src/core/build/plugins/plugin-manifest.ts
@@ -1,5 +1,4 @@
 import { fileURLToPath } from 'node:url';
-import { extname } from 'node:path';
 import glob from 'fast-glob';
 import type { OutputChunk } from 'rollup';
 import { type Plugin as VitePlugin } from 'vite';
@@ -12,14 +11,14 @@ import type {
 	SerializedRouteInfo,
 	SerializedSSRManifest,
 } from '../../app/types.js';
-import { joinPaths, prependForwardSlash } from '../../path.js';
+import { joinPaths, prependForwardSlash, fileExtension } from '../../path.js';
 import { serializeRouteData } from '../../routing/index.js';
 import { addRollupInput } from '../add-rollup-input.js';
 import { getOutFile, getOutFolder } from '../common.js';
 import { type BuildInternals, cssOrder, mergeInlineCss } from '../internal.js';
 import type { AstroBuildPlugin } from '../plugin.js';
 import type { StaticBuildOptions } from '../types.js';
-import { getAssetsPrefix } from '../../../assets/utils/transformToPath.js';
+import { getAssetsPrefix } from '../../../assets/utils/getAssetsPrefix.js';
 
 const manifestReplace = '@@ASTRO_MANIFEST_REPLACE@@';
 const replaceExp = new RegExp(`['"]${manifestReplace}['"]`, 'g');
@@ -165,8 +164,8 @@ function buildManifest(
 
 	const prefixAssetPath = (pth: string) => {
 		if (settings.config.build.assetsPrefix) {
-			const fileType = extname(pth)
-			const pf = getAssetsPrefix(fileType, settings.config.build.assetsPrefix)
+			const fileType = fileExtension(pth);
+			const pf = getAssetsPrefix(fileType, settings.config.build.assetsPrefix);
 			return joinPaths(pf, pth);
 		} else {
 			return prependForwardSlash(joinPaths(settings.config.base, pth));
diff --git a/packages/astro/src/core/create-vite.ts b/packages/astro/src/core/create-vite.ts
index e63a65f41f56..27790a1632ac 100644
--- a/packages/astro/src/core/create-vite.ts
+++ b/packages/astro/src/core/create-vite.ts
@@ -35,8 +35,8 @@ import type { Logger } from './logger/core.js';
 import { createViteLogger } from './logger/vite.js';
 import { vitePluginMiddleware } from './middleware/vite-plugin.js';
 import { joinPaths } from './path.js';
-import { getAssetsPrefix } from '../assets/utils/transformToPath.js';
 import { isObject } from './util.js';
+import { getAssetsPrefix } from '../assets/utils/getAssetsPrefix.js';
 
 interface CreateViteOptions {
 	settings: AstroSettings;
@@ -321,5 +321,5 @@ function isCommonNotAstro(dep: string): boolean {
 }
 
 function stringifyForDefine(value: string | undefined | object): string {
-	return (typeof value === "string" || isObject(value)) ? JSON.stringify(value) : "undefined";
+	return typeof value === 'string' || isObject(value) ? JSON.stringify(value) : 'undefined';
 }
diff --git a/packages/astro/src/core/render/ssr-element.ts b/packages/astro/src/core/render/ssr-element.ts
index ffba433c972b..284ef545cfb8 100644
--- a/packages/astro/src/core/render/ssr-element.ts
+++ b/packages/astro/src/core/render/ssr-element.ts
@@ -1,13 +1,12 @@
-import { extname } from 'node:path';
 import type { SSRElement, AssetsPrefix } from '../../@types/astro.js';
-import { joinPaths, prependForwardSlash, slash } from '../../core/path.js';
+import { fileExtension, joinPaths, prependForwardSlash, slash } from '../../core/path.js';
 import type { StylesheetAsset } from '../app/types.js';
-import { getAssetsPrefix } from '../../assets/utils/transformToPath.js';
+import { getAssetsPrefix } from '../../assets/utils/getAssetsPrefix.js';
 
 export function createAssetLink(href: string, base?: string, assetsPrefix?: AssetsPrefix): string {
 	if (assetsPrefix) {
-		const fileType = extname(href)
-		const pf = getAssetsPrefix(fileType, assetsPrefix)
+		const fileType = fileExtension(href);
+		const pf = getAssetsPrefix(fileType, assetsPrefix);
 		return joinPaths(pf, slash(href));
 	} else if (base) {
 		return prependForwardSlash(joinPaths(base, slash(href)));
diff --git a/packages/internal-helpers/src/path.ts b/packages/internal-helpers/src/path.ts
index fbbebc7c9b4a..5ae8a84a4569 100644
--- a/packages/internal-helpers/src/path.ts
+++ b/packages/internal-helpers/src/path.ts
@@ -92,3 +92,7 @@ export function isRemotePath(src: string) {
 export function slash(path: string) {
 	return path.replace(/\\/g, '/');
 }
+
+export function fileExtension(path: string) {
+	return path.split('.').pop() ?? '';
+}

From eb5eec94fdd6a47bb5f12799345bcd583a648261 Mon Sep 17 00:00:00 2001
From: Emanuele Stoppa <my.burning@gmail.com>
Date: Thu, 7 Mar 2024 09:51:44 +0000
Subject: [PATCH 20/29] Update packages/astro/src/@types/astro.ts

Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca>
---
 packages/astro/src/@types/astro.ts | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/packages/astro/src/@types/astro.ts b/packages/astro/src/@types/astro.ts
index 317f1b6d6a34..07ffa8f464f4 100644
--- a/packages/astro/src/@types/astro.ts
+++ b/packages/astro/src/@types/astro.ts
@@ -902,26 +902,24 @@ export interface AstroUserConfig {
 		 * }
 		 * ```
 		 *
-		 * If this value is a `Record<string, string>`,
+		 * **Added in 4.5.0**
 		 *
-		 * Applicable to multiple CDN scenarios. If you static file use different CDN, you can configure it like the example below.
-		 *
-		 * For example, if static file is js file, assets prefix use `https://js.cdn.example.com`. If static file is css file, assets prefix use `https://css.cdn.example.com`. Other assets prefix use `https://cdn.example.com`.
+		 * You can also pass an object to `assetsPrefix` to specify a different domain for each file type.
+		 * In this case, a `fallback` property is required and will be used by default for any other files.
 		 *
 		 * ```js
 		 * {
 		 *   build: {
 		 *     assetsPrefix: {
 		 *       'js': 'https://js.cdn.example.com',
-		 *       'css': 'https://js.cdn.example.com',
-		 *       'fallabck': 'https://cdn.example.com'
+		 *       'mjs': 'https://js.cdn.example.com', 
+		 *       'css': 'https://css.cdn.example.com',
+		 *       'fallback': 'https://cdn.example.com'
 		 *     }
 		 *   }
 		 * }
 		 * ```
 		 *
-		 * Object key is file extension, value is CDN assets prefix path. `fallabck` is default assets prefix cdn value set and it is a mandatory key. You can set the default values of other files by setting the value of `fallabck`.
-		 *
 		 */
 		assetsPrefix?: AssetsPrefix;
 		/**

From b36026ed3a95e05aa31d7688f1f4d95e38921beb Mon Sep 17 00:00:00 2001
From: Emanuele Stoppa <my.burning@gmail.com>
Date: Thu, 7 Mar 2024 09:52:32 +0000
Subject: [PATCH 21/29] Apply suggestions from code review

Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca>
---
 packages/astro/src/@types/astro.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/astro/src/@types/astro.ts b/packages/astro/src/@types/astro.ts
index 07ffa8f464f4..5c590b879f73 100644
--- a/packages/astro/src/@types/astro.ts
+++ b/packages/astro/src/@types/astro.ts
@@ -887,11 +887,9 @@ export interface AstroUserConfig {
 		 * @description
 		 * Specifies the prefix for Astro-generated asset links. This can be used if assets are served from a different domain than the current site.
 		 *
-		 * If this value is a `string`,
+		 * This requires uploading the assets in your local `./dist/_astro` folder to a corresponding `/_astro/` folder on the remote domain.
 		 *
-		 * For example, if this is set to `https://cdn.example.com`, assets will be fetched from `https://cdn.example.com/_astro/...` (regardless of the `base` option).
-		 * You would need to upload the files in `./dist/_astro/` to `https://cdn.example.com/_astro/` to serve the assets.
-		 * The process varies depending on how the third-party domain is hosted.
+		 * To fetch all assets uploaded to the same domain (e.g. `https://cdn.example.com/_astro/...`), set `assetsPrefix` to the root domain as a string (regardless of your `base` configuration):
 		 * To rename the `_astro` path, specify a new directory in `build.assets`.
 		 *
 		 * ```js

From 7e773a908ba1053ee2749b4e1776441af5925f11 Mon Sep 17 00:00:00 2001
From: Emanuele Stoppa <my.burning@gmail.com>
Date: Thu, 7 Mar 2024 13:58:02 +0000
Subject: [PATCH 22/29] chore: address Bjorn's comments

---
 packages/astro/src/assets/utils/getAssetsPrefix.ts | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/packages/astro/src/assets/utils/getAssetsPrefix.ts b/packages/astro/src/assets/utils/getAssetsPrefix.ts
index 38c0b5e9c497..1a8947b54978 100644
--- a/packages/astro/src/assets/utils/getAssetsPrefix.ts
+++ b/packages/astro/src/assets/utils/getAssetsPrefix.ts
@@ -1,13 +1,12 @@
 import type { AssetsPrefix } from '../../core/app/types.js';
 
-export function getAssetsPrefix(fileType: string, assetsPrefix?: AssetsPrefix): string {
+export function getAssetsPrefix(fileExtension: string, assetsPrefix?: AssetsPrefix): string {
 	if (!assetsPrefix) return '';
 	if (typeof assetsPrefix === 'string') return assetsPrefix;
-	fileType = fileType[0] === '.' ? fileType.slice(1) : fileType;
-	if (assetsPrefix[fileType]) {
-		return assetsPrefix[fileType];
-	} else if (assetsPrefix.fallback) {
-		return assetsPrefix.fallback;
+	// we assume the file extension has a leading '.' and we remove it
+	const dotLessFileExtension = fileExtension.slice(1);
+	if (assetsPrefix[dotLessFileExtension]) {
+		return assetsPrefix[dotLessFileExtension];
 	}
-	return '';
+	return assetsPrefix.fallback;
 }

From 8ed6f4f098e1cd50de881c0c938f892eb5b42da2 Mon Sep 17 00:00:00 2001
From: Emanuele Stoppa <my.burning@gmail.com>
Date: Thu, 7 Mar 2024 14:06:36 +0000
Subject: [PATCH 23/29] kill the variable

---
 packages/astro/src/core/render/ssr-element.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/astro/src/core/render/ssr-element.ts b/packages/astro/src/core/render/ssr-element.ts
index 284ef545cfb8..e1a319f401ee 100644
--- a/packages/astro/src/core/render/ssr-element.ts
+++ b/packages/astro/src/core/render/ssr-element.ts
@@ -5,8 +5,7 @@ import { getAssetsPrefix } from '../../assets/utils/getAssetsPrefix.js';
 
 export function createAssetLink(href: string, base?: string, assetsPrefix?: AssetsPrefix): string {
 	if (assetsPrefix) {
-		const fileType = fileExtension(href);
-		const pf = getAssetsPrefix(fileType, assetsPrefix);
+		const pf = getAssetsPrefix(fileExtension(href), assetsPrefix);
 		return joinPaths(pf, slash(href));
 	} else if (base) {
 		return prependForwardSlash(joinPaths(base, slash(href)));

From dcf45fe073fa5af3a2a4ea98f526c0c6975e2aba Mon Sep 17 00:00:00 2001
From: Emanuele Stoppa <my.burning@gmail.com>
Date: Thu, 7 Mar 2024 14:33:10 +0000
Subject: [PATCH 24/29] kill the variable /2

---
 packages/astro/src/core/build/plugins/plugin-manifest.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/astro/src/core/build/plugins/plugin-manifest.ts b/packages/astro/src/core/build/plugins/plugin-manifest.ts
index 6833a3352e69..8df06fda0320 100644
--- a/packages/astro/src/core/build/plugins/plugin-manifest.ts
+++ b/packages/astro/src/core/build/plugins/plugin-manifest.ts
@@ -164,8 +164,7 @@ function buildManifest(
 
 	const prefixAssetPath = (pth: string) => {
 		if (settings.config.build.assetsPrefix) {
-			const fileType = fileExtension(pth);
-			const pf = getAssetsPrefix(fileType, settings.config.build.assetsPrefix);
+			const pf = getAssetsPrefix(fileExtension(pth), settings.config.build.assetsPrefix);
 			return joinPaths(pf, pth);
 		} else {
 			return prependForwardSlash(joinPaths(settings.config.base, pth));

From 1e4faaea65e93a7bb8e587443f4adacfbe7698fa Mon Sep 17 00:00:00 2001
From: bluwy <bjornlu.dev@gmail.com>
Date: Fri, 8 Mar 2024 00:34:51 +0800
Subject: [PATCH 25/29] Fix CI fail

---
 ...-mult-cdn.test.js => astro-assets-prefix-multi-cdn.test.js} | 0
 packages/internal-helpers/src/path.ts                          | 3 ++-
 2 files changed, 2 insertions(+), 1 deletion(-)
 rename packages/astro/test/{astro-assets-prefix-mult-cdn.test.js => astro-assets-prefix-multi-cdn.test.js} (100%)

diff --git a/packages/astro/test/astro-assets-prefix-mult-cdn.test.js b/packages/astro/test/astro-assets-prefix-multi-cdn.test.js
similarity index 100%
rename from packages/astro/test/astro-assets-prefix-mult-cdn.test.js
rename to packages/astro/test/astro-assets-prefix-multi-cdn.test.js
diff --git a/packages/internal-helpers/src/path.ts b/packages/internal-helpers/src/path.ts
index 5ae8a84a4569..b480a2a4449f 100644
--- a/packages/internal-helpers/src/path.ts
+++ b/packages/internal-helpers/src/path.ts
@@ -94,5 +94,6 @@ export function slash(path: string) {
 }
 
 export function fileExtension(path: string) {
-	return path.split('.').pop() ?? '';
+	const ext = path.split('.').pop();
+	return ext ? `.${ext}` : '';
 }

From 112d50b51223e8196a41ff04606434a40927d0a0 Mon Sep 17 00:00:00 2001
From: Erika <3019731+Princesseuh@users.noreply.github.com>
Date: Thu, 7 Mar 2024 20:25:23 +0100
Subject: [PATCH 26/29] Apply suggestions from code review

Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca>
---
 .changeset/fluffy-readers-add.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.changeset/fluffy-readers-add.md b/.changeset/fluffy-readers-add.md
index cc874c705e10..0342ef4d5dda 100644
--- a/.changeset/fluffy-readers-add.md
+++ b/.changeset/fluffy-readers-add.md
@@ -3,11 +3,11 @@
 "astro": minor
 ---
 
-Adds the option to pass an object to `build.assetsPrefix`. This allows for the use of multiple CDN prefixes based on the target filetype.
+Adds the option to pass an object to `build.assetsPrefix`. This allows for the use of multiple CDN prefixes based on the target file type.
 
-When defining `build.assetsPrefix` as a object, the object must accept a key named `fallback`, which is used when as asset doesn't match an extension.
+When passing an object to `build.assetsPrefix`, you must also specify a `fallback` domain to be used for all other file types not specified.
 
-Each key of the object must match the extension of the file. 
+Specify a file extension as the key (e.g. 'js', 'png') and the URL serving your assets of that file type as the value:
 
 ```js
 // astro.config.mjs

From 45674bcfc8df0921a43484daa44569cd15ae9ae2 Mon Sep 17 00:00:00 2001
From: Sarah Rainsberger <sarah@rainsberger.ca>
Date: Thu, 7 Mar 2024 15:27:25 -0400
Subject: [PATCH 27/29] uniform code sample

---
 .changeset/fluffy-readers-add.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/fluffy-readers-add.md b/.changeset/fluffy-readers-add.md
index 0342ef4d5dda..22adc9bc621f 100644
--- a/.changeset/fluffy-readers-add.md
+++ b/.changeset/fluffy-readers-add.md
@@ -18,7 +18,7 @@ export default defineConfig({
         assetsPrefix: {
             'js': "https://js.cdn.example.com",
             'mjs': "https://js.cdn.example.com", // if you have .mjs files, you must add a new entry like this
-            "png": "https://images.cdn.example.com",
+            'png': "https://images.cdn.example.com",
             'fallback': "https://generic.cdn.example.com"
         }
     }

From a7e1699892b7c330d5c2a30c9a1f4d5b3d6aa26c Mon Sep 17 00:00:00 2001
From: peng <414326615@qq.com>
Date: Fri, 8 Mar 2024 11:05:21 +0800
Subject: [PATCH 28/29] add `.` string for fit getAssetsPrefix

---
 packages/astro/src/core/create-vite.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/astro/src/core/create-vite.ts b/packages/astro/src/core/create-vite.ts
index 27790a1632ac..73f3bd190b40 100644
--- a/packages/astro/src/core/create-vite.ts
+++ b/packages/astro/src/core/create-vite.ts
@@ -34,7 +34,7 @@ import { vitePluginSSRManifest } from '../vite-plugin-ssr-manifest/index.js';
 import type { Logger } from './logger/core.js';
 import { createViteLogger } from './logger/vite.js';
 import { vitePluginMiddleware } from './middleware/vite-plugin.js';
-import { joinPaths } from './path.js';
+import { joinPaths, fileExtension } from './path.js';
 import { isObject } from './util.js';
 import { getAssetsPrefix } from '../assets/utils/getAssetsPrefix.js';
 
@@ -218,7 +218,7 @@ export async function createVite(
 		commonConfig.experimental = {
 			renderBuiltUrl(filename, { type, hostType }) {
 				if (type === 'asset') {
-					return joinPaths(getAssetsPrefix(hostType, assetsPrefix), filename);
+					return joinPaths(getAssetsPrefix(fileExtension(hostType), assetsPrefix), filename);
 				}
 			},
 		};

From fc425bcdba7953e0eb96ca09825ce4bfc9a558b4 Mon Sep 17 00:00:00 2001
From: bluwy <bjornlu.dev@gmail.com>
Date: Fri, 8 Mar 2024 15:18:51 +0800
Subject: [PATCH 29/29] Fix extension function

---
 packages/astro/src/core/create-vite.ts | 4 ++--
 packages/internal-helpers/src/path.ts  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/astro/src/core/create-vite.ts b/packages/astro/src/core/create-vite.ts
index 73f3bd190b40..9ef4a117075e 100644
--- a/packages/astro/src/core/create-vite.ts
+++ b/packages/astro/src/core/create-vite.ts
@@ -34,7 +34,7 @@ import { vitePluginSSRManifest } from '../vite-plugin-ssr-manifest/index.js';
 import type { Logger } from './logger/core.js';
 import { createViteLogger } from './logger/vite.js';
 import { vitePluginMiddleware } from './middleware/vite-plugin.js';
-import { joinPaths, fileExtension } from './path.js';
+import { joinPaths } from './path.js';
 import { isObject } from './util.js';
 import { getAssetsPrefix } from '../assets/utils/getAssetsPrefix.js';
 
@@ -218,7 +218,7 @@ export async function createVite(
 		commonConfig.experimental = {
 			renderBuiltUrl(filename, { type, hostType }) {
 				if (type === 'asset') {
-					return joinPaths(getAssetsPrefix(fileExtension(hostType), assetsPrefix), filename);
+					return joinPaths(getAssetsPrefix(`.${hostType}`, assetsPrefix), filename);
 				}
 			},
 		};
diff --git a/packages/internal-helpers/src/path.ts b/packages/internal-helpers/src/path.ts
index b480a2a4449f..50daf97bce76 100644
--- a/packages/internal-helpers/src/path.ts
+++ b/packages/internal-helpers/src/path.ts
@@ -95,5 +95,5 @@ export function slash(path: string) {
 
 export function fileExtension(path: string) {
 	const ext = path.split('.').pop();
-	return ext ? `.${ext}` : '';
+	return ext !== path ? `.${ext}` : '';
 }