Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2025-01-18 17:35:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(nitro): support built publicPath (#1479)

Browse Source
This commit is contained in:
Daniel Roe 2021-10-26 18:37:52 +01:00 committed by GitHub
parent 876857db5e
commit 41ff3b8efe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/nitro/src/runtime/app/render.ts
View File

@ -12,6 +12,8 @@ const PAYLOAD_JS = '/payload.js'
const getClientManifest = cachedImport(() => import('#build/dist/server/client.manifest.mjs')) const getClientManifest = cachedImport(() => import('#build/dist/server/client.manifest.mjs'))
const getSSRApp = cachedImport(() => import('#build/dist/server/server.mjs')) const getSSRApp = cachedImport(() => import('#build/dist/server/server.mjs'))
const publicPath = (publicConfig.app && publicConfig.app.assetsPath) || process.env.PUBLIC_PATH || '/_nuxt'
const getSSRRenderer = cachedResult(async () => { const getSSRRenderer = cachedResult(async () => {
// Load client manifest // Load client manifest
const clientManifest = await getClientManifest() const clientManifest = await getClientManifest()
@ -21,7 +23,7 @@ const getSSRRenderer = cachedResult(async () => {
if (!createSSRApp) { throw new Error('Server bundle is not available') } if (!createSSRApp) { throw new Error('Server bundle is not available') }
// Create renderer // Create renderer
const { renderToString } = await import('#nitro-renderer') const { renderToString } = await import('#nitro-renderer')
return createRenderer((createSSRApp), { clientManifest, renderToString, publicPath: clientManifest.publicPath || '/_nuxt' }).renderToString return createRenderer((createSSRApp), { clientManifest, renderToString, publicPath }).renderToString
}) })
const getSPARenderer = cachedResult(async () => { const getSPARenderer = cachedResult(async () => {
@ -37,7 +39,7 @@ const getSPARenderer = cachedResult(async () => {
renderStyles: () => '', renderStyles: () => '',
renderScripts: () => clientManifest.initial.map((s) => { renderScripts: () => clientManifest.initial.map((s) => {
const isMJS = !s.endsWith('.js') const isMJS = !s.endsWith('.js')
return `<script ${isMJS ? 'type="module"' : ''} src="${clientManifest.publicPath}${s}"></script>` return `<script ${isMJS ? 'type="module"' : ''} src="${publicPath}${s}"></script>`
}).join('') }).join('')
} }
} }