create vendor.min.css and vendor.min.js

exceptionless · Oct 16, 2023 · b3b14e1 · b3b14e1
1 parent 90672fe
commit b3b14e1
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 7 deletions.
diff --git a/src/Exceptionless.Web/ClientApp.angular/grunt/task-configs/cacheBust.js b/src/Exceptionless.Web/ClientApp.angular/grunt/task-configs/cacheBust.js
@@ -1,6 +1,6 @@
 module.exports = {
     options: {
-        assets: ["app.min.css", "app.min.js", "app.config.js", "favicon.ico"],
+        assets: ["vendor.min.css", "vendor.min.js", "app.min.css", "app.min.js", "app.config.js", "favicon.ico"],
         baseDir: "./dist",
     },
     src: ["dist/index.html"],

diff --git a/src/Exceptionless.Web/ClientApp.angular/grunt/task-configs/cssmin.js b/src/Exceptionless.Web/ClientApp.angular/grunt/task-configs/cssmin.js
@@ -3,4 +3,11 @@ module.exports = {
         src: ["temp/app.css", "<%= dom_munger.data.appcss %>"],
         dest: "dist/app.min.css",
     },
+    vendor: {
+        src: [
+            "node_modules/bootstrap/dist/css/bootstrap.min.css",
+            "node_modules/font-awesome/css/font-awesome.min.css",
+        ],
+        dest: "dist/vendor.min.css",
+    },
 };
diff --git a/src/Exceptionless.Web/ClientApp.angular/grunt/task-configs/dom_munger.js b/src/Exceptionless.Web/ClientApp.angular/grunt/task-configs/dom_munger.js
@@ -12,10 +12,12 @@ module.exports = {
         options: {
             remove: ['script[data-remove!="false"]', 'link[data-remove="true"]'],
             append: [
+                { selector: "body", html: '<script src="/vendor.min.js"></script>' },
                 {
                     selector: "body",
                     html: '<script src="/app.min.js"></script><script src="/app.config.js"></script>',
                 },
+                { selector: "head", html: '<link rel="stylesheet" href="/vendor.min.css">' },
                 { selector: "head", html: '<link rel="stylesheet" href="/app.min.css">' },
             ],
         },

diff --git a/src/Exceptionless.Web/ClientApp.angular/grunt/task-configs/uglify.js b/src/Exceptionless.Web/ClientApp.angular/grunt/task-configs/uglify.js
@@ -10,4 +10,12 @@ module.exports = {
         src: "dist/app.js",
         dest: "dist/app.min.js",
     },
+    vendor: {
+        src: [
+            "node_modules/jquery/dist/jquery.min.js",
+            "node_modules/bootstrap/dist/js/bootstrap.min.js",
+            "node_modules/lodash/lodash.min.js",
+        ],
+        dest: "dist/vendor.min.js",
+    },
 };
diff --git a/src/Exceptionless.Web/ClientApp.angular/index.html b/src/Exceptionless.Web/ClientApp.angular/index.html
@@ -30,7 +30,7 @@
         <meta name="msapplication-task" content="name=New Events; action-uri=/new; icon-uri=/img/icons/new.ico" />
         <meta name="msapplication-task" content="name=Events; action-uri=/; icon-uri=/img/icons/events.ico" />
 
-        <link rel="dns-prefetch" href="https://cdn.jsdelivr.net" />
+        <link rel="dns-prefetch" href="https://cdn.jsdelivr.net" data-remove="true" />
         <link rel="dns-prefetch" href="https://fonts.googleapis.com" />
         <link rel="dns-prefetch" href="https://widget.intercom.io" />
         <link rel="dns-prefetch" href="https://www.googletagmanager.com" />
@@ -48,8 +48,16 @@
         <link rel="apple-touch-icon" sizes="114x114" href="/touch-icon-ipad-114.png" />
         <link rel="apple-touch-icon" sizes="144x144" href="/touch-icon-ipad-144.png" />
 
-        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@3.4.1/dist/css/bootstrap.min.css" />
-        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/font-awesome@4.7.0/css/font-awesome.min.css" />
+        <link
+            rel="stylesheet"
+            href="https://cdn.jsdelivr.net/npm/bootstrap@3.4.1/dist/css/bootstrap.min.css"
+            data-remove="true"
+        />
+        <link
+            rel="stylesheet"
+            href="https://cdn.jsdelivr.net/npm/font-awesome@4.7.0/css/font-awesome.min.css"
+            data-remove="true"
+        />
         <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700" />
 
         <link href="app.less" type="text/css" rel="stylesheet/less" data-concat="true" data-remove="true" />
@@ -62,17 +70,17 @@
         <script
             src="https://cdn.jsdelivr.net/npm/jquery@3.7.0/dist/jquery.min.js"
             data-concat="false"
-            data-remove="false"
+            data-remove="true"
         ></script>
         <script
             src="https://cdn.jsdelivr.net/npm/bootstrap@3.3.7/dist/js/bootstrap.min.js"
             data-concat="false"
-            data-remove="false"
+            data-remove="true"
         ></script>
         <script
             src="https://cdn.jsdelivr.net/npm/lodash@4.17.21/lodash.min.js"
             data-concat="false"
-            data-remove="false"
+            data-remove="true"
         ></script>
 
         <!-- Livereload script for development only (stripped during dist build) -->