From c9e7811c5572f910525d52cff1ea9cc879e73ca7 Mon Sep 17 00:00:00 2001
From: NGPixel <github@ngpixel.com>
Date: Fri, 24 Apr 2020 17:40:41 -0400
Subject: [PATCH] fix: theme loading optimizations

---
 client/client-app.js  | 13 +++----------
 client/index-app.js   | 13 ++++++++-----
 client/index-setup.js |  4 +++-
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/client/client-app.js b/client/client-app.js
index 2b4b6254..feeadf2b 100644
--- a/client/client-app.js
+++ b/client/client-app.js
@@ -168,9 +168,9 @@ Vue.component('unauthorized', () => import(/* webpackChunkName: "unauthorized" *
 Vue.component('v-card-chin', () => import(/* webpackPrefetch: true, webpackChunkName: "ui-extra" */ './components/common/v-card-chin.vue'))
 Vue.component('welcome', () => import(/* webpackChunkName: "welcome" */ './components/welcome.vue'))
 
-Vue.component('nav-footer', () => import(/* webpackChunkName: "theme-page"  */ './themes/' + process.env.CURRENT_THEME + '/components/nav-footer.vue'))
-Vue.component('nav-sidebar', () => import(/* webpackChunkName: "theme-page" */ './themes/' + process.env.CURRENT_THEME + '/components/nav-sidebar.vue'))
-Vue.component('page', () => import(/* webpackChunkName: "theme-page" */ './themes/' + process.env.CURRENT_THEME + '/components/page.vue'))
+Vue.component('nav-footer', () => import(/* webpackChunkName: "theme" */ './themes/' + siteConfig.theme + '/components/nav-footer.vue'))
+Vue.component('nav-sidebar', () => import(/* webpackChunkName: "theme" */ './themes/' + siteConfig.theme + '/components/nav-sidebar.vue'))
+Vue.component('page', () => import(/* webpackChunkName: "theme" */ './themes/' + siteConfig.theme + '/components/page.vue'))
 
 let bootstrap = () => {
   // ====================================
@@ -210,13 +210,6 @@ let bootstrap = () => {
   // ----------------------------------
 
   window.boot.notify('vue')
-
-  // ====================================
-  // Load theme-specific code
-  // ====================================
-
-  // eslint-disable-next-line no-unused-expressions
-  import(/* webpackChunkName: "theme-page"  */ './themes/' + process.env.CURRENT_THEME + '/js/app.js')
 }
 
 window.boot.onDOMReady(bootstrap)
diff --git a/client/index-app.js b/client/index-app.js
index 7416c3e6..11c7805c 100644
--- a/client/index-app.js
+++ b/client/index-app.js
@@ -1,21 +1,24 @@
 require('core-js/stable')
 require('regenerator-runtime/runtime')
 
+/* global siteConfig */
+/* eslint-disable no-unused-expressions */
+
 switch (window.document.documentElement.lang) {
   case 'ar':
   case 'fa':
-    require('./scss/fonts/arabic.scss')
+    import(/* webpackChunkName: "fonts-arabic" */ './scss/fonts/arabic.scss')
     break
   default:
-    require('./scss/fonts/default.scss')
+    import(/* webpackChunkName: "fonts-default" */ './scss/fonts/default.scss')
     break
 }
 
 require('./scss/app.scss')
-require('./themes/' + process.env.CURRENT_THEME + '/scss/app.scss')
+import(/* webpackChunkName: "theme" */ './themes/' + siteConfig.theme + '/scss/app.scss')
 
-require('@mdi/font/css/materialdesignicons.css')
+import(/* webpackChunkName: "mdi" */ '@mdi/font/css/materialdesignicons.css')
 
 require('./helpers/compatibility.js')
 require('./client-app.js')
-require('./themes/' + process.env.CURRENT_THEME + '/js/app.js')
+import(/* webpackChunkName: "theme" */ './themes/' + siteConfig.theme + '/js/app.js')
diff --git a/client/index-setup.js b/client/index-setup.js
index fdbae985..4d398de0 100644
--- a/client/index-setup.js
+++ b/client/index-setup.js
@@ -1,8 +1,10 @@
 require('core-js/stable')
 require('regenerator-runtime/runtime')
 
+/* eslint-disable no-unused-expressions */
+
 require('./scss/app.scss')
-require('@mdi/font/css/materialdesignicons.css')
+import(/* webpackChunkName: "mdi" */ '@mdi/font/css/materialdesignicons.css')
 
 require('./helpers/compatibility.js')