Merge pull request #233 from remix-pwa/dev

Pushing patches upstream
remix-pwa · May 20, 2024 · 48c22f6 · 48c22f6
2 parents a7e3188 + 955e0b2
commit 48c22f6
Show file tree

Hide file tree

Showing 11 changed files with 107 additions and 479 deletions.
diff --git a/README.md b/README.md
@@ -1,8 +1,5 @@
 <h1 align='center'>Remix PWA</h1>
 
-> 💻 Huge thanks to [Jacob Ebey](https://github.com/jacob-ebey) for the idea and
-> [original implementation](https://github.com/jacob-ebey/remix-pwa) of PWA in Remix.
-
 Remix PWA is a collection of JavaScript libraries and utilities that make it easy to build [Progressive Web Apps (PWAs)](https://developer.mozilla.org/en-US/docs/Web/Progressive_web_apps) with Remix.
 
 *💻 Huge thanks to [Jacob Ebey](https://github.com/jacob-ebey) for the idea and [original implementation](https://github.com/jacob-ebey/remix-pwa) of PWA in Remix.*

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/sw/CHANGELOG.md b/packages/sw/CHANGELOG.md
@@ -1,3 +1,10 @@
+## @remix-pwa/sw 3.0.7-dev.1 (2024-05-20)
+
+
+### Bug Fixes
+
+* **sw:** re-fixing opaque response patch f0530fc
+
 ## @remix-pwa/sw 3.0.6 (2024-05-20)
 
 

diff --git a/packages/sw/package.json b/packages/sw/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-pwa/sw",
-  "version": "3.0.6",
+  "version": "3.0.7-dev.1",
   "description": "Service Worker APIs and utilities for Remix PWA",
   "repository": {
     "type": "git",

diff --git a/packages/sw/src/cache/CacheFirst.ts b/packages/sw/src/cache/CacheFirst.ts
@@ -61,13 +61,9 @@ export class CacheFirst extends BaseStrategy {
   }
 
   private async validateResponse(response: Response): Promise<boolean> {
-    if (!this.cacheableResponse) {
-      return true;
-    }
+    if (this.isOpaqueResponse(response)) return false;
 
-    if (this.isOpaqueResponse(response)) {
-      return false;
-    }
+    if (!this.cacheableResponse) return true;
 
     const { headers = {}, statuses = [] } = this.cacheableResponse;
 

diff --git a/packages/sw/src/cache/CacheOnly.ts b/packages/sw/src/cache/CacheOnly.ts
@@ -1,5 +1,5 @@
 import { isHttpRequest } from '../utils/utils.js';
-import { BaseStrategy, CACHE_TIMESTAMP_HEADER } from './BaseStrategy.js';
+import { BaseStrategy } from './BaseStrategy.js';
 import type { CacheFriendlyOptions, CacheOptions } from './types.js';
 import { mergeHeaders } from './utils.js';
 

diff --git a/packages/sw/src/cache/NetworkFirst.ts b/packages/sw/src/cache/NetworkFirst.ts
@@ -62,13 +62,9 @@ export class NetworkFirst extends BaseStrategy {
   }
 
   private async validateResponse(response: Response): Promise<boolean> {
-    if (!this.cacheableResponse) {
-      return true;
-    }
+    if (this.isOpaqueResponse(response)) return false;
 
-    if (this.isOpaqueResponse(response)) {
-      return false;
-    }
+    if (!this.cacheableResponse) return true;
 
     const { headers = {}, statuses = [] } = this.cacheableResponse;
 

diff --git a/packages/sw/src/cache/StaleWhileRevalidate.ts b/packages/sw/src/cache/StaleWhileRevalidate.ts
@@ -1,5 +1,5 @@
 import { isHttpRequest } from '../utils/utils.js';
-import { BaseStrategy, CACHE_TIMESTAMP_HEADER } from './BaseStrategy.js';
+import { BaseStrategy } from './BaseStrategy.js';
 import type { CacheOptions, SWROptions } from './types.js';
 import { mergeHeaders } from './utils.js';
 

diff --git a/packages/sync/CHANGELOG.md b/packages/sync/CHANGELOG.md
@@ -1,3 +1,13 @@
+## @remix-pwa/sync 3.0.2-dev.1 (2024-05-20)
+
+
+
+
+
+### Dependencies
+
+* **@remix-pwa/sw:** upgraded to 3.0.7-dev.1
+
 ## @remix-pwa/sync 3.0.1 (2024-05-20)
 
 

diff --git a/packages/sync/package.json b/packages/sync/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-pwa/sync",
-  "version": "3.0.1",
+  "version": "3.0.2-dev.1",
   "description": "A Background Sync addon for Remix PWA",
   "repository": {
     "type": "git",
@@ -34,7 +34,7 @@
     "rimraf": "^5.0.5"
   },
   "dependencies": {
-    "@remix-pwa/sw": "^3.0.6",
+    "@remix-pwa/sw": "^3.0.7-dev.1",
     "idb": "^8.0.0"
   }
 }
diff --git a/playground/package.json b/playground/package.json
@@ -23,8 +23,8 @@
   "dependencies": {
     "@remix-pwa/client": "3.0.4",
     "@remix-pwa/push": "2.10.1",
-    "@remix-pwa/sw": "3.0.5",
-    "@remix-pwa/sync": "3.0.0",
+    "@remix-pwa/sw": "3.0.6",
+    "@remix-pwa/sync": "3.0.1",
     "@remix-pwa/worker-runtime": "2.1.2",
     "@remix-run/node": "^2.8.1",
     "@remix-run/react": "^2.8.1",