Moved included files before install

Allows included files to use sw-toolbox.
jkleinsc · Jan 11, 2016 · c9b0af4 · c9b0af4
1 parent e33bb21
commit c9b0af4
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/lib/service-worker.js b/lib/service-worker.js
@@ -90,14 +90,6 @@ BroccoliServiceWorker.prototype.write = function(readTree, destDir) {
           }
         });
       }
-      if (skipWaiting || debug) {
-        lines.push("self.addEventListener('install', function(event) {");
-         addDebugLine("'Handling install event. Resources to pre-fetch:', urlsToPrefetch", debug, lines);
-        if (skipWaiting) {
-          lines.push("  if (self.skipWaiting) { self.skipWaiting(); }");
-        }
-        lines.push("});");
-      }
       if (swIncludeFiles && swIncludeFiles.length) {
         swIncludeFiles.forEach(function(file) {
           lines.push(fs.readFileSync(file));
@@ -109,6 +101,15 @@ BroccoliServiceWorker.prototype.write = function(readTree, destDir) {
           lines.push(fs.readFileSync(srcFile));
         });
       }
+      if (skipWaiting || debug) {
+        lines.push("self.addEventListener('install', function(event) {");
+         addDebugLine("'Handling install event. Resources to pre-fetch:', urlsToPrefetch", debug, lines);
+        if (skipWaiting) {
+          lines.push("  if (self.skipWaiting) { self.skipWaiting(); }");
+        }
+        lines.push("});");
+      }
+
       lines.push(getFileContents('delete-old-caches.js'));
       if (fallback.length) {
         lines.push(getFileContents('fallback-response.js'));