Removed unused js framework and updated tasks to bundle all files to one

kristoffer-tvera · Apr 14, 2018 · 2b6748e · 2b6748e
1 parent 879fe49
commit 2b6748e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -86,6 +86,8 @@ module.exports = function (grunt) {
           sourceMapStyle: 'link'
         },
         src: [
+          "js/main.js",
+          "js/plugins.js",
           "js/partial/one.js",
           "js/partial/two.js",
         ],
@@ -184,6 +186,7 @@ module.exports = function (grunt) {
   grunt.loadNpmTasks('grunt-sass');
   grunt.loadNpmTasks('grunt-contrib-concat');
   grunt.loadNpmTasks('grunt-contrib-uglify');
+  grunt.loadNpmTasks('grunt-contrib-clean');
   grunt.loadNpmTasks('grunt-concurrent');
   grunt.loadNpmTasks('grunt-notify');
   grunt.loadNpmTasks('grunt-postcss');
@@ -197,7 +200,8 @@ module.exports = function (grunt) {
       'postcss:expanded',
       'postcss:min',
       'concat:dist',
-      'uglify:dist'
+      'uglify:dist',
+      'clean:temp'
     ]
   );
 

diff --git a/Test.txt b/Test.txt
diff --git a/index.html b/index.html
@@ -27,7 +27,7 @@
     <meta name="theme-color" content="#ffffff">
 
     <link rel="stylesheet" href="css/materialize.min.css">
-    <link rel="stylesheet" href="css/main.css">
+    <link rel="stylesheet" href="css/site.min.css">
 </head>
 
 <body>
@@ -38,13 +38,9 @@
     <!-- Add your site or application content here -->
     <p>Hello world! This is HTML5 Boilerplate.</p>
     <script src="js/vendor/modernizr-3.5.0.min.js"></script>
-    <script src="https://code.jquery.com/jquery-3.2.1.min.js" integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4="
-        crossorigin="anonymous"></script>
-    <script>window.jQuery || document.write('<script src="js/vendor/jquery-3.2.1.min.js"><\/script>')</script>
     <script src="js/vendor/materialize.min.js"></script>
-    <script src="js/plugins.js"></script>
-    <script src="js/main.js"></script>
+    <script src="js/site.min.js"></script>
 
 </body>
 
-</html>
+</html>
diff --git a/js/vendor/jquery-3.2.1.min.js b/js/vendor/jquery-3.2.1.min.js