Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(vite): provide default values for transformAssetUrls #24173

Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions packages/vite/src/client.ts
Expand Up @@ -16,6 +16,7 @@ import { devStyleSSRPlugin } from './plugins/dev-ssr-css'
import { runtimePathsPlugin } from './plugins/paths'
import { typeCheckPlugin } from './plugins/type-check'
import { viteNodePlugin } from './vite-node'
import { mergeTransformAssetUrls } from './vite'
import { createViteLogger } from './utils/logger'

export async function buildClient (ctx: ViteBuildContext) {
Expand Down Expand Up @@ -89,6 +90,11 @@ export async function buildClient (ctx: ViteBuildContext) {

clientConfig.customLogger = createViteLogger(clientConfig)

// Merge transformAssetsUrl with defaults
if (ctx.nuxt.options.vite.vue?.template?.transformAssetUrls) {
mergeTransformAssetUrls(clientConfig)
}

// In build mode we explicitly override any vite options that vite is relying on
// to detect whether to inject production or development code (such as HMR code)
if (!ctx.nuxt.options.dev) {
Expand Down
7 changes: 6 additions & 1 deletion packages/vite/src/server.ts
Expand Up @@ -5,7 +5,7 @@ import viteJsxPlugin from '@vitejs/plugin-vue-jsx'
import { logger, resolvePath, tryResolveModule } from '@nuxt/kit'
import { joinURL, withTrailingSlash, withoutLeadingSlash } from 'ufo'
import type { ViteConfig } from '@nuxt/schema'
import type { ViteBuildContext } from './vite'
import { type ViteBuildContext, mergeTransformAssetUrls } from './vite'
import { createViteLogger } from './utils/logger'
import { initViteNodeServer } from './vite-node'
import { writeManifest } from './manifest'
Expand Down Expand Up @@ -116,6 +116,11 @@ export async function buildServer (ctx: ViteBuildContext) {

serverConfig.customLogger = createViteLogger(serverConfig)

// Merge transformAssetsUrl with defaults
if (ctx.nuxt.options.vite.vue?.template?.transformAssetUrls) {
mergeTransformAssetUrls(serverConfig)
}

await ctx.nuxt.callHook('vite:extendConfig', serverConfig, { isClient: false, isServer: true })

serverConfig.plugins!.unshift(
Expand Down
14 changes: 14 additions & 0 deletions packages/vite/src/vite.ts
Expand Up @@ -203,3 +203,17 @@ export const bundle: NuxtBuilder['bundle'] = async (nuxt) => {
await buildClient(ctx)
await buildServer(ctx)
}

export function mergeTransformAssetUrls (config: ViteConfig) {
config.vue = vite.mergeConfig(config.vue || {}, {
template: {
transformAssetUrls: {
video: ['src', 'poster'],
source: ['src'],
img: ['src'],
image: ['xlink:href', 'href'],
use: ['xlink:href', 'href']
}
}
danielroe marked this conversation as resolved.
Show resolved Hide resolved
})
}