fix: make ssr-plugin compatible with wp4/5(vuejs#11718)

lduoduo · Dec 9, 2020 · b641e1b · b641e1b
1 parent 4f81b5d
commit b641e1b
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 1 deletion.
diff --git a/src/server/webpack-plugin/client.js b/src/server/webpack-plugin/client.js
@@ -19,6 +19,20 @@ export default class VueSSRClientPlugin {
       const initialFiles = uniq(Object.keys(stats.entrypoints)
         .map(name => stats.entrypoints[name].assets)
         .reduce((assets, all) => all.concat(assets), [])
+        .map(function (file) {
+          if (typeof file === "string") {
+            return file;
+          }
+
+          if (
+            Object.prototype.toString.call(file) === "[object Object]" &&
+            file.name
+          ) {
+            return file.name;
+          }
+
+          throw new Error(`file structure is not correct: ${file}`);
+        })
         .filter((file) => isJS(file) || isCSS(file)))
 
       const asyncFiles = allFiles

diff --git a/src/server/webpack-plugin/server.js b/src/server/webpack-plugin/server.js
@@ -20,7 +20,21 @@ export default class VueSSRServerPlugin {
         return cb()
       }
 
-      const entryAssets = entryInfo.assets.filter(isJS)
+      const entryAssets = entryInfo.assets
+        .map(function (file) {
+          if (typeof file === "string") {
+            return file;
+          }
+
+          if (
+            Object.prototype.toString.call(file) === "[object Object]" &&
+            file.name
+          ) {
+            return file.name;
+          }
+
+          throw new Error(`file structure is not correct: ${file}`);
+        }).filter(isJS)
 
       if (entryAssets.length > 1) {
         throw new Error(