From 6c54498e0a6bdf506c4b93845f9ddfad883575bd Mon Sep 17 00:00:00 2001
From: Ayumi Hamasaki <asianspawebsite@gmail.com>
Date: Fri, 19 Apr 2019 06:09:26 +0100
Subject: [PATCH] Added Preload and Version Numbers (#4272)

Fixes #4271. Credit to @ayumihamsaki.
---
 modules/backend/layouts/_head.htm | 18 ++++++++++++++++--
 modules/backend/layouts/auth.htm  | 28 +++++++++++++++++++---------
 2 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/modules/backend/layouts/_head.htm b/modules/backend/layouts/_head.htm
index 98597d49b..3b0a20635 100644
--- a/modules/backend/layouts/_head.htm
+++ b/modules/backend/layouts/_head.htm
@@ -14,9 +14,13 @@
 <?php
     $coreBuild = System\Models\Parameter::get('system::core.build', 1);
 ?>
+
 <link href="<?= Url::asset('modules/system/assets/ui/storm.css') ?>?v<?= $coreBuild ?>" rel="stylesheet">
 <link href="<?= Backend::skinAsset('assets/css/october.css') ?>?v<?= $coreBuild ?>" rel="stylesheet">
 
+<link rel="preload" href="<?= Url::asset('modules/system/assets/ui/storm.css') ?>?v<?= $coreBuild ?>" as="style">
+<link rel="preload" href="<?= Backend::skinAsset('assets/css/october.css') ?>?v<?= $coreBuild ?>" as="style">
+
 <script data-cfasync="false" src="<?= Backend::skinAsset('assets/js/vendor/jquery.min.js') ?>?v<?= $coreBuild ?>"></script>
 <script data-cfasync="false" src="<?= Backend::skinAsset('assets/js/vendor/jquery-migrate.min.js') ?>?v<?= $coreBuild ?>"></script>
 <script data-cfasync="false" src="<?= Url::asset('modules/system/assets/js/framework.js') ?>?v<?= $coreBuild ?>"></script>
@@ -24,8 +28,18 @@
 <script data-cfasync="false" src="<?= Backend::skinAsset('assets/js/october-min.js') ?>?v<?= $coreBuild ?>"></script>
 <script data-cfasync="false" src="<?= Url::asset('modules/system/assets/js/lang/lang.'.App::getLocale().'.js') ?>?v<?= $coreBuild ?>"></script>
 
-<script data-cfasync="false" src="<?= Backend::skinAsset('assets/js/october.flyout.js') ?>"></script>
-<script data-cfasync="false" src="<?= Backend::skinAsset('assets/js/october.tabformexpandcontrols.js') ?>"></script>
+<link rel="preload" href="<?= Backend::skinAsset('assets/js/vendor/jquery.min.js') ?>?v<?= $coreBuild ?>" as="script">
+<link rel="preload" href="<?= Backend::skinAsset('assets/js/vendor/jquery-migrate.min.js') ?>?v<?= $coreBuild ?>" as="script">
+<link rel="preload" href="<?= Url::asset('modules/system/assets/js/framework.js') ?>?v<?= $coreBuild ?>" as="script">
+<link rel="preload" href="<?= Url::asset('modules/system/assets/ui/storm-min.js') ?>?v<?= $coreBuild ?>" as="script">
+<link rel="preload" href="<?= Backend::skinAsset('assets/js/october-min.js') ?>?v<?= $coreBuild ?>" as="script">
+<link rel="preload" href="<?= Url::asset('modules/system/assets/js/lang/lang.'.App::getLocale().'.js') ?>?v<?= $coreBuild ?>" as="script">
+
+<script data-cfasync="false" src="<?= Backend::skinAsset('assets/js/october.flyout.js') ?>?v<?= $coreBuild ?>"></script>
+<script data-cfasync="false" src="<?= Backend::skinAsset('assets/js/october.tabformexpandcontrols.js') ?>?v<?= $coreBuild ?>"></script>
+
+<link rel="preload" href="<?= Backend::skinAsset('assets/js/october.flyout.js') ?>?v<?= $coreBuild ?>" as="script">
+<link rel="preload" href="<?= Backend::skinAsset('assets/js/october.tabformexpandcontrols.js') ?>?v<?= $coreBuild ?>" as="script">
 
 <?= $this->makeAssets() ?>
 <?= Block::placeholder('head') ?>
diff --git a/modules/backend/layouts/auth.htm b/modules/backend/layouts/auth.htm
index b0f76d751..2741d8304 100644
--- a/modules/backend/layouts/auth.htm
+++ b/modules/backend/layouts/auth.htm
@@ -9,15 +9,25 @@
         <meta name="csrf-token" content="<?= csrf_token() ?>">
         <link rel="icon" type="image/png" href="<?= e(Backend\Models\BrandSetting::getFavicon()) ?>">
         <title><?= e(trans('backend::lang.auth.title')) ?></title>
-        <link href="<?= Url::asset('modules/system/assets/ui/storm.css') ?>" rel="stylesheet">
-        <link href="<?= Url::to('modules/backend/assets/css/october.css') ?>" rel="stylesheet">
-        <script data-cfasync="false" src="<?= Url::to('modules/backend/assets/js/vendor/jquery.min.js') ?>"></script>
-        <script data-cfasync="false" src="<?= Url::to('modules/backend/assets/js/vendor/jquery-migrate.min.js') ?>"></script>
-        <script data-cfasync="false" src="<?= Url::to('modules/system/assets/js/framework.js') ?>"></script>
-        <script data-cfasync="false" src="<?= Url::asset('modules/system/assets/ui/storm-min.js') ?>"></script>
-        <script data-cfasync="false" src="<?= Url::to('modules/backend/assets/js/october-min.js') ?>"></script>
-        <script data-cfasync="false" src="<?= Url::to('modules/backend/assets/js/auth/auth.js') ?>"></script>
-        <script data-cfasync="false" src="<?= Url::asset('modules/system/assets/js/lang/lang.'.App::getLocale().'.js') ?>"></script>
+        <link href="<?= Url::asset('modules/system/assets/ui/storm.css') ?>?v<?= $coreBuild ?>" rel="stylesheet">
+        <link href="<?= Url::to('modules/backend/assets/css/october.css') ?>?v<?= $coreBuild ?>" rel="stylesheet">
+        <link rel="preload" href="<?= Url::asset('modules/system/assets/ui/storm.css') ?>?v<?= $coreBuild ?>" as="style">
+        <link rel="preload" href="<?= Backend::skinAsset('assets/css/october.css') ?>?v<?= $coreBuild ?>" as="style">
+        <script data-cfasync="false" src="<?= Url::to('modules/backend/assets/js/vendor/jquery.min.js') ?>?v<?= $coreBuild ?>"></script>
+        <script data-cfasync="false" src="<?= Url::to('modules/backend/assets/js/vendor/jquery-migrate.min.js') ?>?v<?= $coreBuild ?>"></script>
+        <script data-cfasync="false" src="<?= Url::to('modules/system/assets/js/framework.js') ?>?v<?= $coreBuild ?>"></script>
+        <script data-cfasync="false" src="<?= Url::asset('modules/system/assets/ui/storm-min.js') ?>?v<?= $coreBuild ?>"></script>
+        <script data-cfasync="false" src="<?= Url::to('modules/backend/assets/js/october-min.js') ?>?v<?= $coreBuild ?>"></script>
+        <script data-cfasync="false" src="<?= Url::to('modules/backend/assets/js/auth/auth.js') ?>?v<?= $coreBuild ?>"></script>
+        <script data-cfasync="false" src="<?= Url::asset('modules/system/assets/js/lang/lang.'.App::getLocale().'.js') ?>?v<?= $coreBuild ?>"></script>
+        <link rel="preload" href="<?= Backend::skinAsset('assets/js/vendor/jquery.min.js') ?>?v<?= $coreBuild ?>" as="script">
+        <link rel="preload" href="<?= Backend::skinAsset('assets/js/vendor/jquery-migrate.min.js') ?>?v<?= $coreBuild ?>" as="script">
+        <link rel="preload" href="<?= Url::asset('modules/system/assets/js/framework.js') ?>?v<?= $coreBuild ?>" as="script">
+        <link rel="preload" href="<?= Url::asset('modules/system/assets/ui/storm-min.js') ?>?v<?= $coreBuild ?>" as="script">
+        <link rel="preload" href="<?= Backend::skinAsset('assets/js/october-min.js') ?>?v<?= $coreBuild ?>" as="script">
+        <link rel="preload" href="<?= Url::to('modules/backend/assets/js/auth/auth.js') ?>?v<?= $coreBuild ?>" as="script">
+        <link rel="preload" href="<?= Url::asset('modules/system/assets/js/lang/lang.'.App::getLocale().'.js') ?>?v<?= $coreBuild ?>" as="script">
+
         <?= $this->makeAssets() ?>
         <?= Block::placeholder('head') ?>
         <?= $this->makeLayoutPartial('custom_styles') ?>