Merge branch 'develop' into feature/3156

magento · Sep 1, 2021 · 1543a9c · 1543a9c
2 parents 60bdb18 + 3399d31
commit 1543a9c
Show file tree

Hide file tree

Showing 4 changed files with 197 additions and 249 deletions.
diff --git a/packages/pwa-buildpack/package.json b/packages/pwa-buildpack/package.json
@@ -87,7 +87,7 @@
     "terser-webpack-plugin": "~1.2.3",
     "wait-for-expect": "~1.2.0",
     "webpack": "~4.46.0",
-    "workbox-webpack-plugin": "~6.0.2"
+    "workbox-webpack-plugin": "~6.2.4"
   },
   "peerDependencies": {
     "@babel/core": "~7.3.4",
@@ -99,15 +99,12 @@
     "postcss-loader": "~4.3.0",
     "terser-webpack-plugin": "~1.2.3",
     "webpack": "~4.46.0",
-    "workbox-webpack-plugin": "~6.0.2"
+    "workbox-webpack-plugin": "~6.2.4"
   },
   "engines": {
     "node": ">=10.x",
     "yarn": ">=1.12.0"
   },
-  "resolutions": {
-    "workbox-build": "~6.0.2"
-  },
   "pwa-studio": {
     "targets": {
       "declare": "./lib/BuildBus/declare-base",

diff --git a/packages/venia-concept/package.json b/packages/venia-concept/package.json
@@ -116,13 +116,13 @@
     "webpack-bundle-analyzer": "~3.3.2",
     "webpack-cli": "~3.2.3",
     "webpack-dev-server": "~3.2.1",
-    "workbox-cacheable-response": "~6.0.2",
-    "workbox-core": "~6.0.2",
-    "workbox-expiration": "~6.0.2",
-    "workbox-precaching": "~6.0.2",
-    "workbox-routing": "~6.0.2",
-    "workbox-strategies": "~6.0.2",
-    "workbox-webpack-plugin": "~6.0.2"
+    "workbox-cacheable-response": "~6.2.4",
+    "workbox-core": "~6.2.4",
+    "workbox-expiration": "~6.2.4",
+    "workbox-precaching": "~6.2.4",
+    "workbox-routing": "~6.2.4",
+    "workbox-strategies": "~6.2.4",
+    "workbox-webpack-plugin": "~6.2.4"
   },
   "optionalDependencies": {
     "sharp": "~0.23.3"
@@ -131,9 +131,6 @@
     "node": ">=10.x",
     "yarn": ">=1.12.0"
   },
-  "resolutions": {
-    "workbox-build": "~6.0.2"
-  },
   "module": "src/index.js",
   "es2015": "src/index.js",
   "esnext": "src/index.js",

diff --git a/packages/venia-concept/src/ServiceWorker/setupWorkbox.js b/packages/venia-concept/src/ServiceWorker/setupWorkbox.js
@@ -6,7 +6,7 @@ export default function() {
      * Import and Instantiate workbox object.
      */
     importScripts(
-        'https://storage.googleapis.com/workbox-cdn/releases/6.0.2/workbox-sw.js'
+        'https://storage.googleapis.com/workbox-cdn/releases/6.2.4/workbox-sw.js'
     );
 
     /**