From 495c25a019fcaa4a5a79719744027be201da7a16 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 31 Jul 2018 11:41:05 -0400
Subject: [PATCH] fix: defensive html chunk sorting

close #1993
---
 packages/@vue/cli-service/lib/config/app.js | 37 ++++++++++++++-------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/packages/@vue/cli-service/lib/config/app.js b/packages/@vue/cli-service/lib/config/app.js
index db0ebdf55c..3da0d40f27 100644
--- a/packages/@vue/cli-service/lib/config/app.js
+++ b/packages/@vue/cli-service/lib/config/app.js
@@ -48,6 +48,31 @@ module.exports = (api, options) => {
     // HTML plugin
     const resolveClientEnv = require('../util/resolveClientEnv')
 
+    // #1669 html-webpack-plugin's default sort uses toposort which cannot
+    // handle cyclic deps in certain cases. Monkey patch it to handle the case
+    // before we can upgrade to its 4.0 version (incompatible with preload atm)
+    const chunkSorters = require('html-webpack-plugin/lib/chunksorter')
+    const depSort = chunkSorters.dependency
+    chunkSorters.auto = chunkSorters.dependency = (chunks, ...args) => {
+      try {
+        return depSort(chunks, ...args)
+      } catch (e) {
+        // fallback to a manual sort if that happens...
+        return chunks.sort((a, b) => {
+          // make sure user entry is loaded last so user CSS can override
+          // vendor CSS
+          if (a.id === 'app') {
+            return 1
+          } else if (b.id === 'app') {
+            return -1
+          } else if (a.entry !== b.entry) {
+            return b.entry ? -1 : 1
+          }
+          return 0
+        })
+      }
+    }
+
     const htmlOptions = {
       templateParameters: (compilation, assets, pluginOptions) => {
         // enhance html-webpack-plugin's built in template params
@@ -81,18 +106,6 @@ module.exports = (api, options) => {
           removeScriptTypeAttributes: true
           // more options:
           // https://github.com/kangax/html-minifier#options-quick-reference
-        },
-        // #1669 default sort mode uses toposort which cannot handle cyclic deps
-        // in certain cases, and in webpack 4, chunk order in HTML doesn't
-        // matter anyway
-        chunksSortMode: (a, b) => {
-          if (a.entry !== b.entry) {
-            // make sure entry is loaded last so user CSS can override
-            // vendor CSS
-            return b.entry ? -1 : 1
-          } else {
-            return 0
-          }
         }
       })