Commitf077ed1

committed

fix(ssr): fix ssr template publicPath generation

1 parent93850f4 commitf077ed1Copy full SHA for f077ed1

File tree

1 file changed

-9

lines changed

src/server/template-renderer
- index.js

1 file changed

-9

lines changed

`‎src/server/template-renderer/index.js‎`

Lines changed: 8 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,10 @@ export default class TemplateRenderer {`
`60`	`60`	`// extra functionality with client manifest`
`61`	`61`	`if(options.clientManifest){`
`62`	`62`	`constclientManifest=this.clientManifest=options.clientManifest`
`63`		`-this.publicPath=clientManifest.publicPath`
	`63`	`+// ensure publicPath ends with /`
	`64`	`+this.publicPath=clientManifest.publicPath===''`
	`65`	`+ ?''`
	`66`	`+ :clientManifest.publicPath.replace(/([^\/])$/,'$1/')`
`64`	`67`	`// preload/prefetch directives`
`65`	`68`	`this.preloadFiles=(clientManifest.initial\|\|[]).map(normalizeFile)`
`66`	`69`	`this.prefetchFiles=(clientManifest.async\|\|[]).map(normalizeFile)`
`@@ -114,7 +117,7 @@ export default class TemplateRenderer {`
`114`	`117`	`return(`
`115`	`118`	`// render links for css files`
`116`	`119`	`(cssFiles.length`
`117`		- ?cssFiles.map(({ file})=>`<link rel="stylesheet" href="${this.getPublicPath(file)}">`).join('')
	`120`	+ ?cssFiles.map(({ file})=>`<link rel="stylesheet" href="${this.publicPath}${file}">`).join('')
`118`	`121`	`:'')+`
`119`	`122`	`// context.styles is a getter exposed by vue-style-loader which contains`
`120`	`123`	`// the inline component styles collected during SSR`
`@@ -153,7 +156,7 @@ export default class TemplateRenderer {`
`153`	`156`	extra=` type="font/${extension}" crossorigin`
`154`	`157`	`}`
`155`	`158`	return`<link rel="preload" href="${
`156`		`-this.getPublicPath(file)`
	`159`	`+this.publicPath}${file`
`157`	`160`	`}"${`
`158`	`161`	asType!=='' ?` as="${asType}"` :''
`159`	`162`	`}${`
`@@ -179,7 +182,7 @@ export default class TemplateRenderer {`
`179`	`182`	`if(alreadyRendered(file)){`
`180`	`183`	`return''`
`181`	`184`	`}`
`182`		-return`<link rel="prefetch" href="${this.getPublicPath(file)}">`
	`185`	+return`<link rel="prefetch" href="${this.publicPath}${file}">`
`183`	`186`	`}).join('')`
`184`	`187`	`}else{`
`185`	`188`	`return''`
`@@ -206,7 +209,7 @@ export default class TemplateRenderer {`
`206`	`209`	`constasync=(this.getUsedAsyncFiles(context)\|\|[]).filter(({ file})=>isJS(file))`
`207`	`210`	`constneeded=[initial[0]].concat(async\|\|[],initial.slice(1))`
`208`	`211`	`returnneeded.map(({ file})=>{`
`209`		-return`<script src="${this.getPublicPath(file)}" defer></script>`
	`212`	+return`<script src="${this.publicPath}${file}" defer></script>`
`210`	`213`	`}).join('')`
`211`	`214`	`}else{`
`212`	`215`	`return''`
`@@ -228,10 +231,6 @@ export default class TemplateRenderer {`
`228`	`231`	`}`
`229`	`232`	`returnnewTemplateStream(this,this.parsedTemplate,context\|\|{})`
`230`	`233`	`}`
`231`		`-`
`232`		`-getPublicPath(file:string){`
`233`		`-returnpath.posix.join(this.publicPath,file)`
`234`		`-}`
`235`	`234`	`}`
`236`	`235`
`237`	`236`	`functionnormalizeFile(file:string):Resource{`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitf077ed1

File tree

1 file changed

1 file changed

`‎src/server/template-renderer/index.js‎`

0 commit comments