Fix tests

NekR · NekR · commit ddec2aa93a7e · 2018-06-02T00:56:29.000+03:00
diff --git a/lib/index.js b/lib/index.js
@@ -154,7 +154,7 @@ var OfflinePlugin = (function () {
     if (this.appShell) {
       // Make appShell the latest in the chain so it could be overridden
       cacheMaps = (cacheMaps || []).concat({
-        match: new Function('url', '\n          if (url.pathname === location.pathname) {\n            return;\n          }\n\n          return new URL(' + JSON.stringify(this.appShell) + ', location);\n        '),
+        match: 'function(url) {\n          if (url.pathname === location.pathname) {\n            return;\n          }\n\n          return new URL(' + JSON.stringify(this.appShell) + ', location);\n        }',
         requestTypes: ['navigate']
       });
     }
diff --git a/src/index.js b/src/index.js
@@ -129,13 +129,13 @@ export default class OfflinePlugin {
     if (this.appShell) {
       // Make appShell the latest in the chain so it could be overridden
       cacheMaps = (cacheMaps || []).concat({
-        match: new Function('url', `
+        match: `function(url) {
           if (url.pathname === location.pathname) {
             return;
           }
 
           return new URL(${JSON.stringify(this.appShell)}, location);
-        `),
+        }`,
         requestTypes: ['navigate']
       });
     }
diff --git a/tests/legacy/fixtures/appshell-absolute-path/__expected/webpack2/sw.js b/tests/legacy/fixtures/appshell-absolute-path/__expected/webpack2/sw.js
@@ -873,15 +873,13 @@ function logGroup(title, assets) {
 loaders: {},
 cacheMaps: [
       {
-      match: function (url) {
-
+      match: function(url) {
           if (url.pathname === location.pathname) {
             return;
           }
 
           return new URL("/app-shell.html", location);
-        
-},
+        },
       to: null,
       requestTypes: ["navigate"],
     }
diff --git a/tests/legacy/fixtures/appshell-absolute-path/__expected/webpack3/sw.js b/tests/legacy/fixtures/appshell-absolute-path/__expected/webpack3/sw.js
@@ -864,15 +864,13 @@ function logGroup(title, assets) {
 loaders: {},
 cacheMaps: [
       {
-      match: function (url) {
-
+      match: function(url) {
           if (url.pathname === location.pathname) {
             return;
           }
 
           return new URL("/app-shell.html", location);
-        
-},
+        },
       to: null,
       requestTypes: ["navigate"],
     }
diff --git a/tests/legacy/fixtures/appshell-absolute-path/__expected/webpack4/sw.js b/tests/legacy/fixtures/appshell-absolute-path/__expected/webpack4/sw.js
@@ -885,15 +885,13 @@ function logGroup(title, assets) {
 loaders: {},
 cacheMaps: [
       {
-      match: function (url) {
-
+      match: function(url) {
           if (url.pathname === location.pathname) {
             return;
           }
 
           return new URL("/app-shell.html", location);
-        
-},
+        },
       to: null,
       requestTypes: ["navigate"],
     }
diff --git a/tests/legacy/fixtures/appshell-basic/__expected/webpack2/sw.js b/tests/legacy/fixtures/appshell-basic/__expected/webpack2/sw.js
@@ -873,15 +873,13 @@ function logGroup(title, assets) {
 loaders: {},
 cacheMaps: [
       {
-      match: function (url) {
-
+      match: function(url) {
           if (url.pathname === location.pathname) {
             return;
           }
 
           return new URL("/app-shell.html", location);
-        
-},
+        },
       to: null,
       requestTypes: ["navigate"],
     }
diff --git a/tests/legacy/fixtures/appshell-basic/__expected/webpack3/sw.js b/tests/legacy/fixtures/appshell-basic/__expected/webpack3/sw.js
@@ -864,15 +864,13 @@ function logGroup(title, assets) {
 loaders: {},
 cacheMaps: [
       {
-      match: function (url) {
-
+      match: function(url) {
           if (url.pathname === location.pathname) {
             return;
           }
 
           return new URL("/app-shell.html", location);
-        
-},
+        },
       to: null,
       requestTypes: ["navigate"],
     }
diff --git a/tests/legacy/fixtures/appshell-basic/__expected/webpack4/sw.js b/tests/legacy/fixtures/appshell-basic/__expected/webpack4/sw.js
@@ -885,15 +885,13 @@ function logGroup(title, assets) {
 loaders: {},
 cacheMaps: [
       {
-      match: function (url) {
-
+      match: function(url) {
           if (url.pathname === location.pathname) {
             return;
           }
 
           return new URL("/app-shell.html", location);
-        
-},
+        },
       to: null,
       requestTypes: ["navigate"],
     }

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ var OfflinePlugin = (function () {`
`154`	`154`	`if (this.appShell) {`
`155`	`155`	`// Make appShell the latest in the chain so it could be overridden`
`156`	`156`	`cacheMaps = (cacheMaps \|\| []).concat({`
`157`		`- match: new Function('url', '\n if (url.pathname === location.pathname) {\n return;\n }\n\n return new URL(' + JSON.stringify(this.appShell) + ', location);\n '),`
	`157`	`+ match: 'function(url) {\n if (url.pathname === location.pathname) {\n return;\n }\n\n return new URL(' + JSON.stringify(this.appShell) + ', location);\n }',`
`158`	`158`	`requestTypes: ['navigate']`
`159`	`159`	`});`
`160`	`160`	`}`
Original file line number	Diff line number	Diff line change
`@@ -873,15 +873,13 @@ function logGroup(title, assets) {`
`873`	`873`	`loaders: {},`
`874`	`874`	`cacheMaps: [`
`875`	`875`	`{`
`876`		`- match: function (url) {`
`877`		`-`
	`876`	`+ match: function(url) {`
`878`	`877`	`if (url.pathname === location.pathname) {`
`879`	`878`	`return;`
`880`	`879`	`}`
`881`	`880`
`882`	`881`	`return new URL("/app-shell.html", location);`
`883`		`-`
`884`		`-},`
	`882`	`+ },`
`885`	`883`	`to: null,`
`886`	`884`	`requestTypes: ["navigate"],`
`887`	`885`	`}`
Original file line number	Diff line number	Diff line change
`@@ -864,15 +864,13 @@ function logGroup(title, assets) {`
`864`	`864`	`loaders: {},`
`865`	`865`	`cacheMaps: [`
`866`	`866`	`{`
`867`		`- match: function (url) {`
`868`		`-`
	`867`	`+ match: function(url) {`
`869`	`868`	`if (url.pathname === location.pathname) {`
`870`	`869`	`return;`
`871`	`870`	`}`
`872`	`871`
`873`	`872`	`return new URL("/app-shell.html", location);`
`874`		`-`
`875`		`-},`
	`873`	`+ },`
`876`	`874`	`to: null,`
`877`	`875`	`requestTypes: ["navigate"],`
`878`	`876`	`}`
Original file line number	Diff line number	Diff line change
`@@ -885,15 +885,13 @@ function logGroup(title, assets) {`
`885`	`885`	`loaders: {},`
`886`	`886`	`cacheMaps: [`
`887`	`887`	`{`
`888`		`- match: function (url) {`
`889`		`-`
	`888`	`+ match: function(url) {`
`890`	`889`	`if (url.pathname === location.pathname) {`
`891`	`890`	`return;`
`892`	`891`	`}`
`893`	`892`
`894`	`893`	`return new URL("/app-shell.html", location);`
`895`		`-`
`896`		`-},`
	`894`	`+ },`
`897`	`895`	`to: null,`
`898`	`896`	`requestTypes: ["navigate"],`
`899`	`897`	`}`