From 7b1e90afa39a2b8cbafde50d8ffa3aa4a22a4210 Mon Sep 17 00:00:00 2001 From: Duo Duo Date: Wed, 9 Dec 2020 16:03:22 +0800 Subject: [PATCH] fix: make ssr-build-plugin compatible with webpack4/5 (fix #11718) --- src/server/template-renderer/index.js | 4 ++-- src/server/webpack-plugin/server.js | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/server/template-renderer/index.js b/src/server/template-renderer/index.js index c8927b2de2c..ea8585c571d 100644 --- a/src/server/template-renderer/index.js +++ b/src/server/template-renderer/index.js @@ -55,7 +55,7 @@ export default class TemplateRenderer { this.inject = options.inject !== false // if no template option is provided, the renderer is created // as a utility object for rendering assets like preload links and scripts. - + const { template } = options this.parsedTemplate = template ? typeof template === 'string' @@ -224,7 +224,7 @@ export default class TemplateRenderer { if (this.clientManifest) { const initial = this.preloadFiles.filter(({ file }) => isJS(file)) const async = (this.getUsedAsyncFiles(context) || []).filter(({ file }) => isJS(file)) - const needed = [initial[0]].concat(async, initial.slice(1)) + const needed = [].concat(initial[0] ? [initial[0]] : [], async, initial.slice(1)); return needed.map(({ file }) => { return `` }).join('') diff --git a/src/server/webpack-plugin/server.js b/src/server/webpack-plugin/server.js index ccd68fc86e1..ccb9cdd9624 100644 --- a/src/server/webpack-plugin/server.js +++ b/src/server/webpack-plugin/server.js @@ -59,6 +59,9 @@ export default class VueSSRServerPlugin { stats.assets.forEach(asset => { if (isJS(asset.name)) { bundle.files[asset.name] = compilation.assets[asset.name].source() + if (asset.info && asset.info.related && asset.info.related.sourceMap) { + bundle.maps[asset.info.related.sourceMap.replace(/\.map$/, '')] = JSON.parse(compilation.assets[asset.info.related.sourceMap].source()); + } } else if (asset.name.match(/\.js\.map$/)) { bundle.maps[asset.name.replace(/\.map$/, '')] = JSON.parse(compilation.assets[asset.name].source()) }