Rename x-rsf-cache-control to x-sw-cache-control.

Author: markbrocato

service-worker/bootstrap.js

@@ -357,7 +357,7 @@ workbox.routing.registerRoute(matchRuntimePath, async context => {
           // 2. it provide that to client and server build as a webpack define
           // 3. we should monkey-patch xhr to send x-rsf-api-version as a request header on all requests
 
-          if (apiRes.headers.get('x-rsf-cache-control')) {
+          if (apiRes.headers.get('x-sw-cache-control')) {
             const path = url.pathname
 
             caches.open(cacheName).then(cache => {

src/utils/withCaching.js

@@ -3,13 +3,13 @@
  * handler calls `e.preventDefault()`.
  *
  * @param {Function} handler The original event handle supplied to the component
- * @param {Function} defaultHandler A handler to run unless `e.preventDefault()` was called.
+ * @param {Number} maxAgeSeconds The time in seconds that a result should be kept in the service worker cache.
  * @return {Function}
  */
-export default function withCaching(handler, { browser, edge }) {
+export default function withCaching(handler, maxAgeSeconds) {
   return (req, res) => {
-    if (browser.maxAgeSeconds) {
-      res.setHeader('x-rsf-cache-control', `max-age: ${browser.maxAgeSeconds}`)
+    if (maxAgeSeconds) {
+      res.setHeader('x-sw-cache-control', `max-age: ${maxAgeSeconds}`)
     }
 
     return handler(req, res)

test/utils/withCaching.test.js

@@ -1,18 +1,18 @@
 import withCaching from 'react-storefront/utils/withCaching'
 
 describe('withCaching', () => {
-  it('should set header if maxAgeSeconds are present on the browser', () => {
+  it('should set header if maxAgeSeconds is present', () => {
     const res = { setHeader: jest.fn() }
 
-    withCaching(jest.fn(), { browser: { maxAgeSeconds: 10 } })({}, res)
+    withCaching(jest.fn(), 10)({}, res)
 
     expect(res.setHeader).toBeCalled()
   })
 
-  it('should not set header if maxAgeSeconds are not present on the browser', () => {
+  it('should not set header if maxAgeSeconds are not present', () => {
     const res = { setHeader: jest.fn() }
 
-    withCaching(jest.fn(), { browser: {} })({}, res)
+    withCaching(jest.fn())({}, res)
 
     expect(res.setHeader).not.toBeCalled()
   })