gulp and optimising versioning

gulpfile.js

@@ -116,7 +116,7 @@ var jsTasks = lazypipe()
 	.pipe(header, banner.main, {package: package})
 	.pipe(optimizejs)
 	.pipe(dest, paths.scripts.output)
-	.pipe(rename, {suffix: '.min'})
+	//.pipe(rename, {suffix: '.min'})
 	.pipe(uglify)
 	.pipe(optimizejs)
 	.pipe(header, banner.main, {package: package})
@@ -201,7 +201,7 @@ var buildStyles = function (done) {
 		]))
 		.pipe(header(banner.main, {package: package}))
 		.pipe(dest(paths.styles.output))
-		.pipe(rename({suffix: '.min'}))
+		//.pipe(rename({suffix: '.min'}))
 		.pipe(postcss([
 			minify({
 				discardComments: {
@@ -286,12 +286,12 @@ var watchSource = function (done) {
 exports.default = series(
 	cleanDist,
 	parallel(
-		updateAssetVersion,
 		buildScripts,
 		lintScripts,
 		buildStyles,
 		buildSVGs,
-		copyFiles
+		copyFiles,
+		updateAssetVersion
 	)
 );
 

package-lock.json

@@ -822,6 +822,16 @@
 			"integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=",
 			"dev": true
 		},
+		"camel-case": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz",
+			"integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=",
+			"dev": true,
+			"requires": {
+				"no-case": "^2.2.0",
+				"upper-case": "^1.1.1"
+			}
+		},
 		"camelcase": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
@@ -932,6 +942,23 @@
 				}
 			}
 		},
+		"clean-css": {
+			"version": "4.2.1",
+			"resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.1.tgz",
+			"integrity": "sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==",
+			"dev": true,
+			"requires": {
+				"source-map": "~0.6.0"
+			},
+			"dependencies": {
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+					"dev": true
+				}
+			}
+		},
 		"cli": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/cli/-/cli-1.0.1.tgz",
@@ -3370,6 +3397,31 @@
 				"through2": "^2.0.0"
 			}
 		},
+		"gulp-htmlmin": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/gulp-htmlmin/-/gulp-htmlmin-5.0.1.tgz",
+			"integrity": "sha512-ASlyDPZOSKjHYUifYV0rf9JPDflN9IRIb8lw2vRqtYMC4ljU3zAmnnaVXwFQ3H+CfXxZSUesZ2x7jrnPJu93jA==",
+			"dev": true,
+			"requires": {
+				"html-minifier": "^3.5.20",
+				"plugin-error": "^1.0.1",
+				"through2": "^2.0.3"
+			},
+			"dependencies": {
+				"plugin-error": {
+					"version": "1.0.1",
+					"resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
+					"integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
+					"dev": true,
+					"requires": {
+						"ansi-colors": "^1.0.1",
+						"arr-diff": "^4.0.0",
+						"arr-union": "^3.1.0",
+						"extend-shallow": "^3.0.2"
+					}
+				}
+			}
+		},
 		"gulp-jshint": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/gulp-jshint/-/gulp-jshint-2.1.0.tgz",
@@ -3532,6 +3584,47 @@
 				}
 			}
 		},
+		"gulp-usemin": {
+			"version": "0.3.30",
+			"resolved": "https://registry.npmjs.org/gulp-usemin/-/gulp-usemin-0.3.30.tgz",
+			"integrity": "sha512-nbnTpWiVWjoAn+vod/M24WvuUiMjT+v08SG1ycuTrIIxEEThQnI3JRz2ymT9Idm/DxpnlcToQMCShUHsl+APug==",
+			"dev": true,
+			"requires": {
+				"glob": "~7.1.1",
+				"gulp-concat": "~2.6.1",
+				"plugin-error": "~1.0.1",
+				"through2": "~2.0.3",
+				"vinyl": "~2.1.0"
+			},
+			"dependencies": {
+				"plugin-error": {
+					"version": "1.0.1",
+					"resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
+					"integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
+					"dev": true,
+					"requires": {
+						"ansi-colors": "^1.0.1",
+						"arr-diff": "^4.0.0",
+						"arr-union": "^3.1.0",
+						"extend-shallow": "^3.0.2"
+					}
+				},
+				"vinyl": {
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.1.0.tgz",
+					"integrity": "sha1-Ah+cLPlR1rk5lDyJ617lrdT9kkw=",
+					"dev": true,
+					"requires": {
+						"clone": "^2.1.1",
+						"clone-buffer": "^1.0.0",
+						"clone-stats": "^1.0.0",
+						"cloneable-readable": "^1.0.0",
+						"remove-trailing-separator": "^1.0.1",
+						"replace-ext": "^1.0.0"
+					}
+				}
+			}
+		},
 		"gulp-util": {
 			"version": "3.0.8",
 			"resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz",
@@ -3789,6 +3882,12 @@
 				"pinkie-promise": "^2.0.0"
 			}
 		},
+		"he": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+			"integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+			"dev": true
+		},
 		"hex-color-regex": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz",
@@ -3828,6 +3927,29 @@
 			"integrity": "sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ==",
 			"dev": true
 		},
+		"html-minifier": {
+			"version": "3.5.21",
+			"resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.21.tgz",
+			"integrity": "sha512-LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA==",
+			"dev": true,
+			"requires": {
+				"camel-case": "3.0.x",
+				"clean-css": "4.2.x",
+				"commander": "2.17.x",
+				"he": "1.2.x",
+				"param-case": "2.1.x",
+				"relateurl": "0.2.x",
+				"uglify-js": "3.4.x"
+			},
+			"dependencies": {
+				"commander": {
+					"version": "2.17.1",
+					"resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
+					"integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==",
+					"dev": true
+				}
+			}
+		},
 		"htmlparser2": {
 			"version": "3.8.3",
 			"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz",
@@ -4900,6 +5022,12 @@
 				"signal-exit": "^3.0.0"
 			}
 		},
+		"lower-case": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz",
+			"integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=",
+			"dev": true
+		},
 		"lru-cache": {
 			"version": "4.1.5",
 			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
@@ -5173,6 +5301,15 @@
 			"integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
 			"dev": true
 		},
+		"no-case": {
+			"version": "2.3.2",
+			"resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
+			"integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
+			"dev": true,
+			"requires": {
+				"lower-case": "^1.1.1"
+			}
+		},
 		"node-gyp": {
 			"version": "3.8.0",
 			"resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz",
@@ -5631,6 +5768,15 @@
 			"integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==",
 			"dev": true
 		},
+		"param-case": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz",
+			"integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=",
+			"dev": true,
+			"requires": {
+				"no-case": "^2.2.0"
+			}
+		},
 		"parse-filepath": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
@@ -6638,6 +6784,12 @@
 				"safe-regex": "^1.1.0"
 			}
 		},
+		"relateurl": {
+			"version": "0.2.7",
+			"resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
+			"integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=",
+			"dev": true
+		},
 		"remove-bom-buffer": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz",
@@ -8041,6 +8193,30 @@
 			"integrity": "sha512-uRdSdu1oA1rncCQL7sCj8vSyZkgtL7faaw9Tc9rZ3mGgraQ7+Pdx7w5mnOSF3gw9ZNG6oc+KXfkon3bKuROm0g==",
 			"dev": true
 		},
+		"uglify-js": {
+			"version": "3.4.10",
+			"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.10.tgz",
+			"integrity": "sha512-Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw==",
+			"dev": true,
+			"requires": {
+				"commander": "~2.19.0",
+				"source-map": "~0.6.1"
+			},
+			"dependencies": {
+				"commander": {
+					"version": "2.19.0",
+					"resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
+					"integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==",
+					"dev": true
+				},
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+					"dev": true
+				}
+			}
+		},
 		"ultron": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
@@ -8180,6 +8356,12 @@
 			"integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
 			"dev": true
 		},
+		"upper-case": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
+			"integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=",
+			"dev": true
+		},
 		"uri-js": {
 			"version": "4.2.2",
 			"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",

package.json

@@ -34,6 +34,7 @@
 		"gulp-flatmap": "^1.0.2",
 		"gulp-hasher": "^0.1.0",
 		"gulp-header": "^2.0.5",
+		"gulp-htmlmin": "^5.0.1",
 		"gulp-jshint": "^2.1.0",
 		"gulp-optimize-js": "^1.1.0",
 		"gulp-postcss": "^8.0.0",
@@ -41,6 +42,7 @@
 		"gulp-sass": "^4.0.2",
 		"gulp-svgmin": "^2.1.0",
 		"gulp-terser": "^1.1.7",
+		"gulp-usemin": "^0.3.30",
 		"jshint": "^2.9.6",
 		"jshint-stylish": "^2.2.1",
 		"lazypipe": "^1.0.1"

src/copy/Kontakt.html

@@ -13,9 +13,9 @@
 
 <link rel='preconnect' href='https://cdnjs.cloudflare.com' crossorigin>
 <link rel='preconnect' href='https://pagead2.googlesyndication.com' crossorigin>
-<script async src="js/modernizer-webp.js"></script>
+<script async src="/js/modernizer-webp.js"></script>
-<link rel="stylesheet" async href="css/main.css">
+<link rel="stylesheet" async href="/css/main.css">
-<link rel='preload' async href='img/background85.webp' as='image' type='image/webp'>
+<link rel='preload' async href='/img/background85.webp' as='image' type='image/webp'>
 <link disabled class="lateLoader" rel='stylesheet' defer href='https://fonts.googleapis.com/icon?family=Material+Icons'>
 <link rel="stylesheet" defer href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.2/css/materialize.min.css">
 <script data-ad-client="ca-pub-5143923140938916" defer src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
@@ -31,12 +31,12 @@
   FAVICON
   XXXXXXX
   -->
-<link rel="apple-touch-icon" sizes="180x180" href="img/favicon/apple-touch-icon.png">
+<link rel="apple-touch-icon" sizes="180x180" href="/img/favicon/apple-touch-icon.png">
-<link rel="icon" type="image/png" href="img/favicon/favicon-32x32.png" sizes="32x32">
+<link rel="icon" type="image/png" href="/img/favicon/favicon-32x32.png" sizes="32x32">
-<link rel="icon" type="image/png" href="img/favicon/favicon-16x16.png" sizes="16x16">
+<link rel="icon" type="image/png" href="/img/favicon/favicon-16x16.png" sizes="16x16">
-<link rel="manifest" href="img/favicon/manifest.json">
+<link rel="manifest" href="/img/favicon/manifest.json">
-<link rel="mask-icon" href="img/favicon/safari-pinned-tab.svg" color="#2b5797">
+<link rel="mask-icon" href="/img/favicon/safari-pinned-tab.svg" color="#2b5797">
-<link rel="shortcut icon" href="img/favicon/favicon.ico">
+<link rel="shortcut icon" href="/img/favicon/favicon.ico">
 <meta name="apple-mobile-web-app-title" content="Meritv&auml;rde">
 <meta name="application-name" content="Meritv&auml;rde">
 <meta name="msapplication-TileColor" content="#2b5797">
@@ -78,7 +78,7 @@ Information om själva sidan hittar du i "Om oss" rutan på startsidan.
 </div>
 </header>
 <script defer src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
-<script defer src="js/material.min.js"></script>
+<script defer src="/js/material.min.js"></script>
-<script defer src="js/smallScript.js"></script>
+<script defer src="/js/smallScript.js"></script>
 </body>
 </html>

src/copy/include/html_head.php

@@ -1,33 +1,33 @@
 <?php
 
-echo "
+echo '
 
-<meta http-equiv='content-language' content='sv-SE'>
+<meta http-equiv="content-language" content="sv-SE">
-<meta name='viewport' content='width=device-width, initial-scale=1.0, user-scalable=yes'>
+<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
-<meta name='description' content='Beräkna ditt meritvärde inför univeritet eller högskola'>
+<meta name="description" content="Beräkna ditt meritvärde inför univeritet eller högskola">
-<meta name='author' content='Felix Schulze'>
+<meta name="author" content="Felix Schulze">
-<meta HTTP-EQUIV='CACHE-CONTROL' CONTENT='public'>
+<meta HTTP-EQUIV="CACHE-CONTROL" CONTENT="public">
 
 
 
-<meta property='og:type' content='website'>
+<meta property="og:type" content="website">
-<meta property='og:site_name' content='Meritkollen'>
+<meta property="og:site_name" content="Meritkollen">
-<meta property='og:title' content='Räkna ut meritvärde'>
+<meta property="og:title" content="Räkna ut meritvärde">
-<meta property='og:url' content='https://meritkollen.se'>
+<meta property="og:url" content="https://meritkollen.se">
-<meta property='og:description' content='Beräkna ditt gymnasie meritvärde inför univeritet eller högskola'>
+<meta property="og:description" content="Beräkna ditt gymnasie meritvärde inför univeritet eller högskola">
-<meta name='title' content='Räkna ut ditt meritvärde'>
+<meta name="title" content="Räkna ut ditt meritvärde">
 
-<link rel='preconnect' href='https://cdnjs.cloudflare.com' crossorigin>
+<link rel="preconnect" href="https://cdnjs.cloudflare.com" crossorigin>
-<link rel='preconnect' href='https://pagead2.googlesyndication.com' crossorigin>
+<link rel="preconnect" href="https://pagead2.googlesyndication.com" crossorigin>
-<script async src='js/modernizer-webp.js'></script>
+<script async src="/js/modernizer-webp.js"></script>
-<link rel='preload' async href='img/background85.webp' as='image' type='image/webp'>
+<link rel="preload" async href="/img/background85.webp" as="image" type="image/webp">
-<link disabled class='lateLoader' rel='stylesheet' defer href='https://fonts.googleapis.com/icon?family=Material+Icons'>
+<link disabled class="lateLoader" rel="stylesheet" defer href="https://fonts.googleapis.com/icon?family=Material+Icons">
-<link rel='stylesheet' defer href='https://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.2/css/materialize.min.css'>
+<link rel="stylesheet" defer href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.2/css/materialize.min.css">
-<script data-ad-client='ca-pub-5143923140938916' defer src='https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js'></script>
+<script data-ad-client="ca-pub-5143923140938916" defer src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
-<link rel='stylesheet' async href='css/main.css'>
+<link rel="stylesheet" async href="/css/main.css">
 
 <!--[if lt IE 9]>
-    <script src='https://cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv.js'></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv.js"></script>
   <![endif]-->
 
 
@@ -36,18 +36,18 @@ echo "
   FAVICON
   XXXXXXX
   -->
-<link rel='apple-touch-icon' sizes='180x180' href='img/favicon/apple-touch-icon.png'>
+<link rel="apple-touch-icon" sizes="180x180" href="/img/favicon/apple-touch-icon.png">
-<link rel='icon' type='image/png' href='img/favicon/favicon-32x32.png' sizes='32x32'>
+<link rel="icon" type="image/png" href="/img/favicon/favicon-32x32.png" sizes="32x32">
-<link rel='icon' type='image/png' href='img/favicon/favicon-16x16.png' sizes='16x16'>
+<link rel="icon" type="image/png" href="/img/favicon/favicon-16x16.png" sizes="16x16">
-<link rel='manifest' href='img/favicon/manifest.json'>
+<link rel="manifest" href="/img/favicon/manifest.json">
-<link rel='mask-icon' href='img/favicon/safari-pinned-tab.svg' color='#2b5797'>
+<link rel="mask-icon" href="/img/favicon/safari-pinned-tab.svg" color="#2b5797">
-<link rel='shortcut icon' href='img/favicon/favicon.ico'>
+<link rel="shortcut icon" href="/img/favicon/favicon.ico">
-<meta name='apple-mobile-web-app-title' content='Meritv&auml;rde'>
+<meta name="apple-mobile-web-app-title" content="Meritv&auml;rde">
-<meta name='application-name' content='Meritv&auml;rde'>
+<meta name="application-name" content="Meritv&auml;rde">
-<meta name='msapplication-TileColor' content='#2b5797'>
+<meta name="msapplication-TileColor" content="#2b5797">
-<meta name='msapplication-TileImage' content='img/favicon/mstile-144x144.png'>
+<meta name="msapplication-TileImage" content="img/favicon/mstile-144x144.png">
-<meta name='msapplication-config' content='img/favicon/browserconfig.xml'>
+<meta name="msapplication-config" content="img/favicon/browserconfig.xml">
-<meta name='theme-color' content='#27233a'>
+<meta name="theme-color" content="#27233a">
 
 
-";
+';

src/copy/include/info.php

@@ -5,7 +5,7 @@ echo "
   <div style='margin:30px;'>
   <h1>Tips</h1><br>
   <h5>Glömt bort vilken kurs som innehåller vad? Håll muspekaren över en icke standard kurs för att se mer info.</h5><br><br>
-  <img src='img/tips.jpg' width='100%' height='auto' alt='Tips' style='max-width:450px; margin:auto; display:block;'/>
+  <img src='/img/tips.jpg' width='100%' height='auto' alt='Tips' style='max-width:450px; margin:auto; display:block;'/>
 </div>
 </div>
 <!--popup-->