Thanks to visit codestin.com
Credit goes to github.com

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 17 additions & 12 deletions packages/vite/src/plugins/public-dirs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,10 @@ import { dirname, relative } from 'pathe'
import MagicString from 'magic-string'

const PREFIX = 'virtual:public?'
const CSS_URL_RE = /url\((\/[^)]+)\)/g

export const VitePublicDirsPlugin = createUnplugin((options: { sourcemap?: boolean }) => {
const nitro = useNitro()

function resolveFromPublicAssets (id: string) {
for (const dir of nitro.options.publicAssets) {
if (!id.startsWith(withTrailingSlash(dir.baseURL || '/'))) { continue }
const path = id.replace(/[?#].*$/, '').replace(withTrailingSlash(dir.baseURL || '/'), withTrailingSlash(dir.dir))
if (existsSync(path)) {
return id
}
}
}
const { resolveFromPublicAssets } = useResolveFromPublicAssets()

return {
name: 'nuxt:vite-public-dir-resolution',
Expand Down Expand Up @@ -83,4 +74,18 @@ export const VitePublicDirsPlugin = createUnplugin((options: { sourcemap?: boole
}
})

const CSS_URL_RE = /url\((\/[^)]+)\)/g
export function useResolveFromPublicAssets () {
const nitro = useNitro()

function resolveFromPublicAssets (id: string) {
for (const dir of nitro.options.publicAssets) {
if (!id.startsWith(withTrailingSlash(dir.baseURL || '/'))) { continue }
const path = id.replace(/[?#].*$/, '').replace(withTrailingSlash(dir.baseURL || '/'), withTrailingSlash(dir.dir))
if (existsSync(path)) {
return id
}
}
}

return { resolveFromPublicAssets }
}
8 changes: 8 additions & 0 deletions packages/vite/src/utils/logger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { logger } from '@nuxt/kit'
import { hasTTY, isCI } from 'std-env'
import clear from 'clear'
import type { NuxtOptions } from '@nuxt/schema'
import { useResolveFromPublicAssets } from '../plugins/public-dirs'

let duplicateCount = 0
let lastType: vite.LogType | null = null
Expand All @@ -26,11 +27,18 @@ export function createViteLogger (config: vite.InlineConfig): vite.Logger {
const canClearScreen = hasTTY && !isCI && config.clearScreen
const clearScreen = canClearScreen ? clear : () => {}

const { resolveFromPublicAssets } = useResolveFromPublicAssets()

function output (type: vite.LogType, msg: string, options: vite.LogErrorOptions = {}) {
if (typeof msg === 'string' && !process.env.DEBUG) {
// TODO: resolve upstream in Vite
// Hide sourcemap warnings related to node_modules
if (msg.startsWith('Sourcemap') && msg.includes('node_modules')) { return }
// Hide warnings about externals produced by https://github.com/vitejs/vite/blob/v5.2.11/packages/vite/src/node/plugins/css.ts#L350-L355
if (msg.includes('didn\'t resolve at build time, it will remain unchanged to be resolved at runtime')) {
const id = msg.trim().match(/^([^ ]+) referenced in/m)?.[1]
if (id && resolveFromPublicAssets(id)) { return }
}
}

const sameAsLast = lastType === type && lastMsg === msg
Expand Down