From 6d44a641937b543a9f010380c9185a5f25e1b627 Mon Sep 17 00:00:00 2001
From: Felix Schulze <thefeli73@hotmail.com>
Date: Mon, 11 Nov 2019 00:07:36 +0100
Subject: [PATCH] fix gulpfile for service worker, adjustment in SW, remove
 comment

---
 gulpfile.js           | 11 +++++++++--
 src/cache-polyfill.js | 22 ++--------------------
 src/sw.js             |  8 ++++----
 3 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index efd00dd..77ce0a7 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -113,9 +113,7 @@ var cleanDist = function (done) {
 
 // Repeated JavaScript tasks
 var jsTasks = lazypipe()
-	.pipe(header, banner.main, {package: package})
 	.pipe(optimizejs)
-	.pipe(dest, paths.scripts.output)
 	//.pipe(rename, {suffix: '.min'})
 	.pipe(uglify)
 	.pipe(optimizejs)
@@ -241,6 +239,14 @@ var updateAssetVersion = function (done) {
 		.pipe(hashsrc({build_dir:paths.output,src_path:"src",hash_len:"6",query_name:"v",exts:[".json"]}))
 		.pipe(dest(paths.output));
 };
+var updateSWVersion = function (done) {
+	return src('src/sw.js')
+		.pipe(hashsrc({build_dir:paths.output,src_path:"src",hash_len:"6",query_name:"v",
+			regex:/\s*(?:(")([^"]*)|(')([^']*))/ig,
+			analyze: function analyze(match){return {prefix: "'",link:match[4],suffix: ''};}
+		}))
+		.pipe(dest(paths.output));
+};
 
 // Watch for changes to the src directory
 var startServer = function (done) {
@@ -290,6 +296,7 @@ exports.default = series(
 	),
 	buildStyles,
 	updateAssetVersion,
+	updateSWVersion
 );
 
 // Watch and reload
diff --git a/src/cache-polyfill.js b/src/cache-polyfill.js
index d5563f0..a8e7884 100644
--- a/src/cache-polyfill.js
+++ b/src/cache-polyfill.js
@@ -1,21 +1,3 @@
-/*
- *
- *  Air Horner
- *  Copyright 2015 Google Inc. All rights reserved.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License
- *
- */
 if (!Cache.prototype.add) {
   Cache.prototype.add = function add(request) {
     return this.addAll([request]);
@@ -36,7 +18,7 @@ if (!Cache.prototype.addAll) {
 
     return Promise.resolve().then(function() {
       if (arguments.length < 1) throw new TypeError();
-      
+
       // Simulate sequence<(Request or USVString)> binding:
       var sequence = [];
 
@@ -98,4 +80,4 @@ if (!CacheStorage.prototype.match) {
       }, Promise.resolve());
     });
   };
-}
\ No newline at end of file
+}
diff --git a/src/sw.js b/src/sw.js
index 70e2568..ff0d8db 100644
--- a/src/sw.js
+++ b/src/sw.js
@@ -13,10 +13,10 @@ self.addEventListener('install', function(e) {
 		'/Samhäll',
 		'/Teknik',
 		'/Kontakt',
-		'/css/main.min.css',
-		'/img/tips.jpg ',
-		'/img/background.jpg ',
-		'/img/background85.webp ',
+		'/css/main.css',
+		'/img/tips.jpg',
+		'/img/background.jpg',
+		'/img/background85.webp',
 		'/img/favicon/manifest.json',
 		'/img/favicon/android-chrome-192x192.png',
 		'/img/favicon/favicon-32x32.png',