fix(nuxt): resolve nitro config entries in layers (nuxt aliases)

packages/nuxt/src/core/nitro.ts

@@ -153,10 +153,7 @@ export async function initNitro (nuxt: Nuxt & { _nitro?: Nitro }) {
  maxAge: 31536000 /* 1 year */,
  baseURL: nuxt.options.app.buildAssetsDir,
  },
- ...nuxt.options._layers
- .map(layer => join(layer.config.srcDir, (layer.config.rootDir === nuxt.options.rootDir ? nuxt.options : layer.config).dir?.public || 'public'))
- .filter(dir => existsSync(dir))
- .map(dir => ({ dir })),
+ ...(await resolvePublicFolders(nuxt)),
  ],
  prerender: {
  failOnError: true,
@@ -229,6 +226,8 @@ export async function initNitro (nuxt: Nuxt & { _nitro?: Nitro }) {
  logLevel: logLevelMapReverse[nuxt.options.logLevel],
  } satisfies NitroConfig)
 
+ await resolvePublicAssets(nuxt)
+
  // Resolve user-provided paths
  nitroConfig.srcDir = resolve(nuxt.options.rootDir, nuxt.options.srcDir, nitroConfig.srcDir!)
  nitroConfig.ignore = [...(nitroConfig.ignore || []), ...resolveIgnorePatterns(nitroConfig.srcDir), `!${join(nuxt.options.buildDir, 'dist/client', nuxt.options.app.buildAssetsDir)}/**/*`]
@@ -594,3 +593,34 @@ async function spaLoadingTemplate (nuxt: Nuxt) {
 
  return ''
 }
+
+async function resolvePublicFolders (nuxt: Nuxt) {
+ const { dir: rootDir, srcDir, alias: rootAlias } = nuxt.options
+ const dirs = await Promise.all(nuxt.options._layers.map((layer) => {
+ const [path, cwd, alias] = layer.config.rootDir === nuxt.options.rootDir
+ ? [rootDir.public || 'public', srcDir, rootAlias]
+ : [layer.config.dir?.public || 'public', layer.config.srcDir, layer.config.alias]
+ return resolvePath(path, { cwd, alias: alias as Record<string, string> })
+ }))
+
+ return dirs.filter(dir => existsSync(dir)).map(dir => ({ dir }))
+}
+
+async function resolvePublicAssets (nuxt: Nuxt) {
+ const { dir: rootDir, srcDir, alias: rootAlias } = nuxt.options
+ await Promise.all(nuxt.options._layers.map((layer) => {
+ return Promise.all((layer.config.nitro?.publicAssets || []).map(async (publicAsset) => {
+ if (!publicAsset) {
+ return
+ }
+ const [path, cwd, alias] = layer.config.rootDir === nuxt.options.rootDir
+ ? [publicAsset.dir || rootDir.public || 'public', srcDir, rootAlias]
+ : [publicAsset.dir || layer.config.dir?.public || 'public', layer.config.srcDir, layer.config.alias]
+ const dir = await resolvePath(path, { cwd, alias: alias as Record<string, string> })
+ // TODO: should warn if missing?
+ if (existsSync(dir)) {
+ publicAsset.dir = dir
+ }
+ }))
+ }))
+}

packages/nuxt/src/core/plugins/layer-aliasing.ts

@@ -21,12 +21,13 @@ export const LayerAliasingPlugin = createUnplugin((options: LayerAliasingOptions
  const srcDir = layer.config.srcDir || layer.cwd
  const rootDir = layer.config.rootDir || layer.cwd
 
- aliases[srcDir] = {
- '~': layer.config?.alias?.['~'] || srcDir,
- '@': layer.config?.alias?.['@'] || srcDir,
- '~~': layer.config?.alias?.['~~'] || rootDir,
- '@@': layer.config?.alias?.['@@'] || rootDir,
- }
+ // expose layer aliases
+ layer.config.alias ??= {}
+ layer.config.alias['~'] = layer.config.alias?.['~'] || srcDir
+ layer.config.alias['@'] = layer.config.alias?.['@'] || srcDir
+ layer.config.alias['~~'] = layer.config.alias?.['~~'] || rootDir
+ layer.config.alias['@@'] = layer.config.alias?.['@@'] || rootDir
+ aliases[srcDir] = { ...(layer.config.alias as Record<string, string>) }
  }
  const layers = Object.keys(aliases).sort((a, b) => b.length - a.length)
 

test/basic.test.ts

@@ -1821,6 +1821,10 @@ describe('public directories', () => {
  expect(html).toContain('"/public.svg"')
  expect(html).toContain('"/custom/file.svg"')
  })
+ it('should resolve subfolder image from public assets using alias in dir', async () => {
+ const html = await $fetch('/public-assets-alias')
+ expect(html).toContain('"/subfolder/1x1.png"')
+ })
 })
 
 // TODO: dynamic paths in dev

test/fixtures/basic/nuxt.config.ts

@@ -51,6 +51,11 @@ export default defineNuxtConfig({
  dir: '../custom-public',
  baseURL: '/custom',
  },
+ {
+ baseURL: 'subfolder',
+ dir: '~/public-alias/subfolder',
+ maxAge: 31536000,
+ },
  ],
  esbuild: {
  options: {

test/fixtures/basic/pages/public-assets-alias.vue

@@ -0,0 +1,5 @@
+<template>
+ <div>
+ <img src="/subfolder/1x1.png">
+ </div>
+</template>