Refactored the default globPatterns to be []

GoogleChrome · Dec 21, 2017 · 1aed68d · 1aed68d
1 parent bd5091b
commit 1aed68d
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 16 deletions.
diff --git a/packages/workbox-build/src/entry-points/options/defaults.js b/packages/workbox-build/src/entry-points/options/defaults.js
@@ -15,11 +15,9 @@
 */
 
 module.exports = {
-  getManifestGlobPatterns: [],
-  generateSWStringGlobPatterns: [],
   globFollow: true,
   globIgnores: ['**/node_modules/**/*'],
-  globPatterns: ['**/*.{js,css,html}'],
+  globPatterns: [],
   globStrict: true,
   maximumFileSizeToCacheInBytes: 2 * 1024 * 1024,
   clientsClaim: false,

diff --git a/packages/workbox-build/src/entry-points/options/generate-sw-string-schema.js b/packages/workbox-build/src/entry-points/options/generate-sw-string-schema.js
@@ -17,12 +17,9 @@
 const joi = require('joi');
 
 const commonGenerateSchema = require('./common-generate-schema');
-const defaults = require('./defaults');
 
 // Define some additional constraints.
 module.exports = commonGenerateSchema.keys({
   globDirectory: joi.string(),
-  globPatterns: joi.array().items(joi.string()).default(
-    defaults.generateSWStringGlobPatterns),
   importScripts: joi.array().items(joi.string()).required(),
 });
diff --git a/packages/workbox-build/src/entry-points/options/get-manifest-schema.js b/packages/workbox-build/src/entry-points/options/get-manifest-schema.js
@@ -17,11 +17,8 @@
 const joi = require('joi');
 
 const baseSchema = require('./base-schema');
-const defaults = require('./defaults');
 
 // Define some additional constraints.
 module.exports = baseSchema.keys({
   globDirectory: joi.string().required(),
-  globPatterns: joi.array().items(joi.string()).default(
-    defaults.generateSWStringGlobPatterns),
 });
diff --git a/test/workbox-build/node/entry-points/generate-sw-string.js b/test/workbox-build/node/entry-points/generate-sw-string.js
@@ -9,6 +9,7 @@ describe(`[workbox-build] entry-points/generate-sw-string.js (End to End)`, func
   const DEFAULT_IMPORT_SCRIPTS = ['workbox.js'];
   const BASE_OPTIONS = {
     importScripts: DEFAULT_IMPORT_SCRIPTS,
+    globPatterns: ['**/*.{js,css,html}'],
   };
   const REQUIRED_PARAMS = [
     'importScripts',

diff --git a/test/workbox-build/node/entry-points/generate-sw.js b/test/workbox-build/node/entry-points/generate-sw.js
@@ -15,6 +15,7 @@ describe(`[workbox-build] entry-points/generate-sw.js (End to End)`, function()
   const GLOB_DIR = path.join(__dirname, '..', '..', 'static', 'example-project-1');
   const BASE_OPTIONS = {
     globDirectory: GLOB_DIR,
+    globPatterns: ['**/*.{js,css,html}'],
     swDest: tempy.file(),
   };
   const REQUIRED_PARAMS = [

diff --git a/test/workbox-build/node/entry-points/get-manifest.js b/test/workbox-build/node/entry-points/get-manifest.js
@@ -9,6 +9,7 @@ describe(`[workbox-build] entry-points/get-manifest.js (End to End)`, function()
   const SRC_DIR = path.join(__dirname, '..', '..', 'static', 'example-project-1');
   const BASE_OPTIONS = {
     globDirectory: SRC_DIR,
+    globPatterns: ['**/*.{js,css,html}'],
   };
   const REQUIRED_PARAMS = ['globDirectory'];
   const SUPPORTED_PARAMS = [
@@ -119,9 +120,9 @@ describe(`[workbox-build] entry-points/get-manifest.js (End to End)`, function()
     });
 
     it(`should use defaults when all the required parameters, and 'globPatterns' are present`, async function() {
-      const options = Object.assign({
+      const options = Object.assign({}, BASE_OPTIONS, {
         globPatterns: ['**/*.html', '**/*.js'],
-      }, BASE_OPTIONS);
+      });
 
       const {count, size, manifestEntries} = await getManifest(options);
 
@@ -161,10 +162,10 @@ describe(`[workbox-build] entry-points/get-manifest.js (End to End)`, function()
     });
 
     it(`should use defaults when all the required parameters, 'globIgnores', and 'globPatterns' are present`, async function() {
-      const options = Object.assign({
+      const options = Object.assign({}, BASE_OPTIONS, {
         globPatterns: ['**/*.css', '**/*.js'],
         globIgnores: ['node_modules/**/*', '**/*2*'],
-      }, BASE_OPTIONS);
+      });
 
       const {count, size, manifestEntries} = await getManifest(options);
 

diff --git a/test/workbox-build/node/entry-points/inject-manifest.js b/test/workbox-build/node/entry-points/inject-manifest.js
@@ -11,6 +11,7 @@ describe(`[workbox-build] entry-points/inject-manifest.js (End to End)`, functio
   const SW_SRC_DIR = path.join(__dirname, '..', '..', 'static', 'sw-injections');
   const BASE_OPTIONS = {
     globDirectory: GLOB_DIR,
+    globPatterns: ['**/*.{js,css,html}'],
     swDest: tempy.file(),
     swSrc: path.join(SW_SRC_DIR, 'basic.js'),
   };

diff --git a/test/workbox-build/node/entry-points/options/validate.js b/test/workbox-build/node/entry-points/options/validate.js
@@ -26,7 +26,7 @@ describe(`[workbox-build] entry-points/options/validate.js`, function() {
     expect(options).to.eql({
       globFollow: true,
       globIgnores: ['**/node_modules/**/*'],
-      globPatterns: ['**/*.{js,css,html}'],
+      globPatterns: [],
       globStrict: true,
       maximumFileSizeToCacheInBytes: 2097152,
     });
@@ -39,7 +39,7 @@ describe(`[workbox-build] entry-points/options/validate.js`, function() {
     expect(options).to.eql({
       globFollow: true,
       globIgnores: ['**/node_modules/**/*'],
-      globPatterns: ['**/*.{js,css,html}'],
+      globPatterns: [],
       globStrict: true,
       maximumFileSizeToCacheInBytes,
     });
@@ -53,7 +53,7 @@ describe(`[workbox-build] entry-points/options/validate.js`, function() {
       dontCacheBustUrlsMatching,
       globFollow: true,
       globIgnores: ['**/node_modules/**/*'],
-      globPatterns: ['**/*.{js,css,html}'],
+      globPatterns: [],
       globStrict: true,
       maximumFileSizeToCacheInBytes: 2097152,
     });