Skip to content
This repository was archived by the owner on Jan 28, 2023. It is now read-only.

Commit 5d99f34

Browse files
Backport SSR bugfix when manifest files are missing:
vuejs#11609 Also change build.dev.js to avoid the build process of Vue.js
1 parent bb253db commit 5d99f34

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

packages/vue-server-renderer/build.dev.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8848,8 +8848,12 @@ function mapIdToFile (id, clientManifest) {
88488848
fileIndices.forEach(function (index) {
88498849
var file = clientManifest.all[index];
88508850
// only include async files or non-js, non-css assets
8851-
if (clientManifest.async.indexOf(file) > -1 || !(/\.(js|css)($|\?)/.test(file))) {
8852-
files.push(file);
8851+
if (
8852+
file &&
8853+
(clientManifest.async.indexOf(file) > -1 ||
8854+
!/\.(js|css)($|\?)/.test(file))
8855+
) {
8856+
files.push(file)
88538857
}
88548858
});
88558859
}
@@ -8874,7 +8878,7 @@ var TemplateRenderer = function TemplateRenderer (options) {
88748878
this.inject = options.inject !== false;
88758879
// if no template option is provided, the renderer is created
88768880
// as a utility object for rendering assets like preload links and scripts.
8877-
8881+
88788882
var template = options.template;
88798883
this.parsedTemplate = template
88808884
? typeof template === 'string'

src/server/template-renderer/create-async-file-mapper.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,11 @@ function mapIdToFile (id, clientManifest) {
4444
fileIndices.forEach(index => {
4545
const file = clientManifest.all[index]
4646
// only include async files or non-js, non-css assets
47-
if (clientManifest.async.indexOf(file) > -1 || !(/\.(js|css)($|\?)/.test(file))) {
47+
if (
48+
file &&
49+
(clientManifest.async.indexOf(file) > -1 ||
50+
!/\.(js|css)($|\?)/.test(file))
51+
) {
4852
files.push(file)
4953
}
5054
})

0 commit comments

Comments
 (0)