Address PR feedback: host+liveHost only, must-revalidate, resourceTypes, @ts-ignore replaceAll

Made-with: Cursor

Author: davidnuescheler

src/extension/auth.js

@@ -19,7 +19,7 @@ import { ADMIN_ORIGIN, ADMIN_ORIGIN_NEW } from './utils/admin.js';
 const { host: adminHost } = new URL(ADMIN_ORIGIN);
 const { host: newAdminHost } = new URL(ADMIN_ORIGIN_NEW);
 
-/** Cache-Control max-age in seconds for added project hosts (HTML/JSON). 60 = 1 minute. */
+/** Cache-Control max-age in seconds for added project hosts (HTML, JSON and code): 1 minute. */
 export const CACHE_MAX_AGE_SECONDS = 60;
 
 function getRandomId() {
@@ -39,21 +39,20 @@ export function getHostDomain(host) {
 /**
  * Builds declarativeNetRequest rules that set Cache-Control on responses
  * for added project hosts.
- * @param {Object[]} projectConfigs Configs with host, previewHost, liveHost, reviewHost
+ * @param {Object[]} projectConfigs Configs with host, liveHost
  * @returns {Object[]} Rules to add
  */
 export function getCacheControlRules(projectConfigs) {
   const rules = [];
   projectConfigs
     .flatMap((p) => [
       p?.host,
-      p?.previewHost,
       p?.liveHost,
-      p?.reviewHost,
     ].filter(Boolean).map(getHostDomain))
     .filter(Boolean)
     .filter((domain, i, self) => self.indexOf(domain) === i)
     .forEach((domain) => {
+      // @ts-ignore
       const escaped = domain.replaceAll(/\./g, '\\.');
       rules.push({
         id: getRandomId(),
@@ -63,7 +62,7 @@ export function getCacheControlRules(projectConfigs) {
           responseHeaders: [{
             header: 'Cache-Control',
             operation: 'set',
-            value: `max-age=${CACHE_MAX_AGE_SECONDS}`,
+            value: `max-age=${CACHE_MAX_AGE_SECONDS}, must-revalidate`,
           }],
         },
         condition: {
@@ -74,11 +73,8 @@ export function getCacheControlRules(projectConfigs) {
             'sub_frame',
             'script',
             'stylesheet',
-            'image',
             'xmlhttprequest',
-            'media',
             'font',
-            'other',
           ],
         },
       });

test/auth.test.js

@@ -77,22 +77,20 @@ describe('Test auth', () => {
   describe('getCacheControlRules', () => {
     it('returns one rule per unique host', () => {
       const configs = [
-        { host: 'prod.example.com', previewHost: 'preview.example.com' },
+        { host: 'prod.example.com' },
         { liveHost: 'live.example.com' },
       ];
       const rules = getCacheControlRules(configs);
-      expect(rules).to.have.lengthOf(3);
+      expect(rules).to.have.lengthOf(2);
       expect(rules.every((r) => r.action?.responseHeaders?.[0]?.header === 'Cache-Control')).to.be.true;
-      expect(rules.every((r) => r.action.responseHeaders[0].value === `max-age=${CACHE_MAX_AGE_SECONDS}`)).to.be.true;
+      expect(rules.every((r) => r.action.responseHeaders[0].value === `max-age=${CACHE_MAX_AGE_SECONDS}, must-revalidate`)).to.be.true;
       const filters = rules.map((r) => r.condition.regexFilter);
       expect(filters).to.include('^https://prod\\.example\\.com/.*');
-      expect(filters).to.include('^https://preview\\.example\\.com/.*');
       expect(filters).to.include('^https://live\\.example\\.com/.*');
     });
     it('deduplicates same host across configs', () => {
       const configs = [
-        { host: 'same.com', previewHost: 'same.com' },
-        { liveHost: 'same.com' },
+        { host: 'same.com', liveHost: 'same.com' },
       ];
       const rules = getCacheControlRules(configs);
       expect(rules).to.have.lengthOf(1);
@@ -106,7 +104,7 @@ describe('Test auth', () => {
     });
     it('returns empty array for empty or no valid hosts', () => {
       expect(getCacheControlRules([])).to.deep.equal([]);
-      expect(getCacheControlRules([{ host: '' }, { previewHost: null }])).to.deep.equal([]);
+      expect(getCacheControlRules([{ host: '' }, { liveHost: null }])).to.deep.equal([]);
     });
   });