From d1d9d638410a86f0542bbd54a705e2c0e27f709f Mon Sep 17 00:00:00 2001
From: Priyank Patel <priyankp390@gmail.com>
Date: Mon, 23 Jul 2018 18:54:19 +0000
Subject: [PATCH] webpack: Combine archive-style bundle into archive.

---
 templates/zerver/archive/index.html |  1 -
 tools/webpack.assets.json           | 14 ++++++--------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/templates/zerver/archive/index.html b/templates/zerver/archive/index.html
index 9b5ce2176a..8f1afa2a8d 100644
--- a/templates/zerver/archive/index.html
+++ b/templates/zerver/archive/index.html
@@ -15,7 +15,6 @@
     {{ render_bundle('katex', attrs='nonce="%s"' % (csp_nonce)) }}
     {{ render_bundle('portico') }}
     {{ render_bundle('archive') }}
-    {{ render_bundle('archive-styles') }}
 
 {% endblock %}
 
diff --git a/tools/webpack.assets.json b/tools/webpack.assets.json
index fea66aaeb6..c0ecbe70e1 100644
--- a/tools/webpack.assets.json
+++ b/tools/webpack.assets.json
@@ -14,7 +14,11 @@
         "./static/js/templates.js",
         "./static/js/stream_color.js",
         "./static/js/scroll_bar.js",
-        "./static/templates/compiled.js"
+        "./static/templates/compiled.js",
+        "./node_modules/katex/dist/katex.css",
+        "./static/styles/zulip.scss",
+        "./static/styles/media.scss",
+        "./static/styles/archive.scss"
     ],
     "portico": [
         "./static/js/portico/header.js",
@@ -70,11 +74,5 @@
     ],
     "translations": "./static/js/translations.js",
     "zxcvbn": "./node_modules/zxcvbn/dist/zxcvbn.js",
-    "app": "./static/js/bundles/app.js",
-    "archive-styles": [
-        "./node_modules/katex/dist/katex.css",
-        "./static/styles/zulip.scss",
-        "./static/styles/media.scss",
-        "./static/styles/archive.scss"
-    ]
+    "app": "./static/js/bundles/app.js"
 }