feat(grunt): move service_worker file globs option to config

sparanoid · Jan 16, 2017 · 7c94736 · 7c94736
1 parent fa43158
commit 7c94736
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/Gruntfile.coffee b/Gruntfile.coffee
@@ -297,11 +297,7 @@ module.exports = (grunt) ->
           baseDir: "<%= config.dist %>"
           workerFile: "service-worker.js"
           workerDir: "<%= config.dist %><%= config.base %>"
-          staticFileGlobs: [
-            "**/*.{css,html,jpg,gif,png,svg}"
-            "**/img/**.*"
-            "**/js/**.js"
-          ]
+          staticFileGlobs: "<%= config.cfg.service_worker.files %>"
 
     usebanner:
       options:

diff --git a/_app/_includes/_amsf.html b/_app/_includes/_amsf.html
@@ -434,7 +434,7 @@
   Service Worker
 {% endcomment %}
 {% capture amsf_service_worker %}
-  {% if site.service_worker == true and site.dev == false %}
+  {% if site.service_worker.enabled == true and site.dev == false %}
     <script>
       if ('serviceWorker' in navigator) {
         navigator.serviceWorker.register('{{ "/service-worker.js" | prepend: site.base }}').then(function (registration) {

diff --git a/_config.init.yml b/_config.init.yml
@@ -120,8 +120,12 @@ primary_color:  '#ff00b4'
 
 # Service Worker Precache support
 # Service Worker does not work on HTTP
-# Default       true
-service_worker: true
+service_worker:
+  enabled:      true
+  file_globs:
+    - "**/*.{css,html,jpg,gif,png,svg}"
+    - "**/img/**.*"
+    - "**/js/**.js"
 
 # Google Analytics tracking code
 google_analytics:

diff --git a/_config.yml b/_config.yml
@@ -120,8 +120,12 @@ primary_color:  '#ff00b4'
 
 # Service Worker Precache support
 # Service Worker does not work on HTTP
-# Default       true
-service_worker: true
+service_worker:
+  enabled:      true
+  files:
+    - "**/*.{css,html,jpg,gif,png,svg}"
+    - "**/img/**.*"
+    - "**/js/**.js"
 
 # Google Analytics tracking code
 google_analytics: