test/vue
1
0
Fork 0
mirror of https://gitee.com/vuejs/vue.git synced 2024-12-04 21:17:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(server): use path.posix.join to generate public path (#8177)

Browse Source 
fix #8167
This commit is contained in:
Herrington Darkholme 2018-10-25 01:02:11 +08:00 committed by Evan You
parent ecac831691
commit 46b8d2c59d
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/server/template-renderer/index.js
View File

@ -60,7 +60,7 @@ export default class TemplateRenderer {
// extra functionality with client manifest
if (options.clientManifest) {
const clientManifest = this.clientManifest = options.clientManifest
this.publicPath = clientManifest.publicPath.replace(/\/$/, '')
this.publicPath = clientManifest.publicPath
// preload/prefetch directives
this.preloadFiles = (clientManifest.initial || []).map(normalizeFile)
this.prefetchFiles = (clientManifest.async || []).map(normalizeFile)
@ -114,7 +114,7 @@ export default class TemplateRenderer {
return (
// render links for css files
(cssFiles.length
? cssFiles.map(({ file }) => `<link rel="stylesheet" href="${this.publicPath}/${file}">`).join('')
? cssFiles.map(({ file }) => `<link rel="stylesheet" href="${this.getPublicPath(file)}">`).join('')
: '') +
// context.styles is a getter exposed by vue-style-loader which contains
// the inline component styles collected during SSR
@ -153,7 +153,7 @@ export default class TemplateRenderer {
extra = ` type="font/${extension}" crossorigin`
}
return `<link rel="preload" href="${
this.publicPath}/${file
this.getPublicPath(file)
}"${
asType !== '' ? ` as="${asType}"` : ''
}${
@ -179,7 +179,7 @@ export default class TemplateRenderer {
if (alreadyRendered(file)) {
return ''
}
return `<link rel="prefetch" href="${this.publicPath}/${file}">`
return `<link rel="prefetch" href="${this.getPublicPath(file)}">`
}).join('')
} else {
return ''
@ -206,7 +206,7 @@ export default class TemplateRenderer {
const async = (this.getUsedAsyncFiles(context) || []).filter(({ file }) => isJS(file))
const needed = [initial[0]].concat(async || [], initial.slice(1))
return needed.map(({ file }) => {
return `<script src="${this.publicPath}/${file}" defer></script>`
return `<script src="${this.getPublicPath(file)}" defer></script>`
}).join('')
} else {
return ''
@ -228,6 +228,10 @@ export default class TemplateRenderer {
}
return new TemplateStream(this, this.parsedTemplate, context || {})
}
getPublicPath (file: string) {
return path.posix.join(this.publicPath, file)
}
}
function normalizeFile (file: string): Resource {

1
test/ssr/ssr-template.spec.js
View File

@ -11,6 +11,7 @@ function generateClientManifest (file, cb) {
compileWithWebpack(file, {
output: {
path: '/',
publicPath: '/',
filename: '[name].js'
},
optimization: {