diff --git a/adapter/src/components/ServerVersionProvider.js b/adapter/src/components/ServerVersionProvider.js
index be03f6986..b707aabed 100644
--- a/adapter/src/components/ServerVersionProvider.js
+++ b/adapter/src/components/ServerVersionProvider.js
@@ -30,6 +30,8 @@ export const ServerVersionProvider = ({
                 setState({ loading: false, systemInfo })
             })
             .catch((e) => {
+                // Todo: If this is a network error, the app cannot load -- handle that gracefully here
+                // if (e === 'Network error') { ... }
                 setState({ loading: false, error: e })
             })
 
diff --git a/adapter/src/utils/api.js b/adapter/src/utils/api.js
index cef437793..94e08e046 100644
--- a/adapter/src/utils/api.js
+++ b/adapter/src/utils/api.js
@@ -14,7 +14,7 @@ const request = (url, options) => {
         })
             .then((response) => {
                 if (response.status !== 200) {
-                    reject('Request failed', response.statusText)
+                    reject('Request failed ' + response.statusText)
                     return
                 }
                 try {
diff --git a/cli/package.json b/cli/package.json
index b13c9e4df..81e6c5702 100644
--- a/cli/package.json
+++ b/cli/package.json
@@ -67,7 +67,8 @@
         "terser-webpack-plugin": "^5.3.1",
         "webpack": "^5.41.1",
         "webpack-dev-server": "^4.7.4",
-        "workbox-build": "^6.1.5"
+        "workbox-build": "^6.1.5",
+        "workbox-webpack-plugin": "^6.5.4"
     },
     "bin": {
         "d2-app-scripts": "./bin/d2-app-scripts"
diff --git a/cli/src/commands/build.js b/cli/src/commands/build.js
index 6049159da..226b103bd 100644
--- a/cli/src/commands/build.js
+++ b/cli/src/commands/build.js
@@ -132,11 +132,14 @@ const handler = async ({
                 await shell.build()
 
                 if (config.entryPoints.plugin) {
+                    reporter.info('Building plugin...')
                     await plugin.build()
                 }
 
                 if (config.pwa.enabled) {
-                    reporter.info('Injecting precache manifest...')
+                    reporter.info(
+                        'Injecting supplementary precache manifest...'
+                    )
                     await injectPrecacheManifest(paths, config)
                 }
             } else {
diff --git a/cli/src/lib/parseConfig.js b/cli/src/lib/parseConfig.js
index 6de328646..998233d29 100644
--- a/cli/src/lib/parseConfig.js
+++ b/cli/src/lib/parseConfig.js
@@ -42,6 +42,7 @@ const validateConfig = (config) => {
             process.exit(1)
         }
     })
+    // Todo: make sure apps with plugins have `pwa_enabled: true` in the config
     return true
 }
 
diff --git a/cli/src/lib/plugin/build.js b/cli/src/lib/plugin/build.js
index fa48f0b4a..0d4f9572b 100644
--- a/cli/src/lib/plugin/build.js
+++ b/cli/src/lib/plugin/build.js
@@ -8,10 +8,14 @@ const { reporter } = require('@dhis2/cli-helpers-engine')
 const webpack = require('webpack')
 const webpackConfigFactory = require('./webpack.config')
 
-module.exports = async ({ paths }) => {
+module.exports = async ({ config, paths }) => {
     reporter.debug('Building plugin...')
 
-    const webpackConfig = webpackConfigFactory({ env: 'production', paths })
+    const webpackConfig = webpackConfigFactory({
+        env: 'production',
+        config,
+        paths,
+    })
     const compiler = webpack(webpackConfig)
     return new Promise((resolve, reject) => {
         compiler.run((err, stats) => {
diff --git a/cli/src/lib/plugin/start.js b/cli/src/lib/plugin/start.js
index eb98d8a64..83253e5c3 100644
--- a/cli/src/lib/plugin/start.js
+++ b/cli/src/lib/plugin/start.js
@@ -9,8 +9,13 @@ const webpack = require('webpack')
 const WebpackDevServer = require('webpack-dev-server')
 const webpackConfigFactory = require('./webpack.config')
 
-module.exports = async ({ port, paths }) => {
-    const webpackConfig = webpackConfigFactory({ env: 'production', paths })
+module.exports = async ({ port, config, paths }) => {
+    const webpackConfig = webpackConfigFactory({
+        // todo: change to development, but this creates a compilation error
+        env: 'production',
+        config,
+        paths,
+    })
     const compiler = webpack(webpackConfig)
 
     const host = process.env.HOST || 'localhost'
diff --git a/cli/src/lib/plugin/webpack.config.js b/cli/src/lib/plugin/webpack.config.js
index 28dc18bf8..a5d97c2c9 100644
--- a/cli/src/lib/plugin/webpack.config.js
+++ b/cli/src/lib/plugin/webpack.config.js
@@ -8,7 +8,9 @@ const getCSSModuleLocalIdent = require('react-dev-utils/getCSSModuleLocalIdent')
 const getPublicUrlOrPath = require('react-dev-utils/getPublicUrlOrPath')
 const TerserPlugin = require('terser-webpack-plugin')
 const webpack = require('webpack')
+const WorkboxWebpackPlugin = require('workbox-webpack-plugin')
 const makeBabelConfig = require('../../../config/makeBabelConfig')
+const { getPWAEnvVars } = require('../pwa')
 const getShellEnv = require('../shell/env')
 
 const babelWebpackConfig = {
@@ -21,7 +23,7 @@ const babelWebpackConfig = {
 const cssRegex = /\.css$/
 const cssModuleRegex = /\.module\.css$/
 
-module.exports = ({ env: webpackEnv, paths }) => {
+module.exports = ({ env: webpackEnv, config, paths }) => {
     const isProduction = webpackEnv === 'production'
     const isDevelopment = !isProduction
 
@@ -31,7 +33,12 @@ module.exports = ({ env: webpackEnv, paths }) => {
         process.env.PUBLIC_URL
     )
 
-    const shellEnv = getShellEnv({ plugin: 'true' })
+    const shellEnv = getShellEnv({
+        plugin: 'true',
+        name: config.title,
+        // todo: need to make sure PWA is enabled for plugins
+        ...getPWAEnvVars(config),
+    })
 
     // "style" loader turns CSS into JS modules that inject <style> tags.
     // "css" loader resolves paths in CSS and adds assets as dependencies.
@@ -99,6 +106,10 @@ module.exports = ({ env: webpackEnv, paths }) => {
             chunkFilename: isProduction
                 ? 'static/js/plugin-[name].[contenthash:8].chunk.js'
                 : 'static/js/plugin-[name].chunk.js',
+            // ! dhis2: this at least gets fonts to match the CRA build,
+            // but is re-outputting them
+            assetModuleFilename: 'static/media/[name].[hash][ext]',
+            // TODO: investigate dev source maps here (devtoolModuleFilenameTemplate)
         },
         optimization: {
             minimize: isProduction,
@@ -180,6 +191,27 @@ module.exports = ({ env: webpackEnv, paths }) => {
                 resourceRegExp: /^\.\/locale$/,
                 contextRegExp: /moment$/,
             }),
+            // dhis2: Inject plugin static assets to the existing SW's precache manifest
+            process.env.NODE_ENV === 'production' &&
+                new WorkboxWebpackPlugin.InjectManifest({
+                    swSrc: paths.shellBuildServiceWorker,
+                    injectionPoint: 'self.__WB_PLUGIN_MANIFEST',
+                    // Skip compiling the SW, which happens in the app build step
+                    compileSrc: false,
+                    dontCacheBustURLsMatching: /\.[0-9a-f]{8}\./,
+                    exclude: [
+                        /\.map$/,
+                        /asset-manifest\.json$/,
+                        /LICENSE/,
+                        // TODO dhis2: locales are weird in the plugin build -
+                        // Ignore them in precache manifest for now
+                        /moment-locales/,
+                    ],
+                    // Bump up the default maximum size (2mb) that's precached,
+                    // to make lazy-loading failure scenarios less likely.
+                    // See https://github.com/cra-template/pwa/issues/13#issuecomment-722667270
+                    maximumFileSizeToCacheInBytes: 5 * 1024 * 1024,
+                }),
         ].filter(Boolean),
         module: {
             rules: [
@@ -223,6 +255,9 @@ module.exports = ({ env: webpackEnv, paths }) => {
                             use: getStyleLoaders({
                                 importLoaders: 1,
                                 sourceMap: true,
+                                modules: {
+                                    mode: 'icss',
+                                },
                             }),
                             // Don't consider CSS imports dead code even if the
                             // containing package claims to have no side effects.
@@ -236,6 +271,7 @@ module.exports = ({ env: webpackEnv, paths }) => {
                                 importLoaders: 1,
                                 sourceMap: true,
                                 modules: {
+                                    mode: 'local',
                                     getLocalIdent: getCSSModuleLocalIdent,
                                 },
                             }),
@@ -246,23 +282,24 @@ module.exports = ({ env: webpackEnv, paths }) => {
                         // This loader doesn't use a "test" so it will catch all modules
                         // that fall through the other loaders.
                         {
-                            loader: require.resolve('file-loader'),
                             // Exclude `js` files to keep "css" loader working as it injects
                             // its runtime that would otherwise be processed through "file" loader.
                             // Also exclude `html` and `json` extensions so they get processed
                             // by webpacks internal loaders.
                             exclude: [
+                                /^$/,
                                 /\.(js|mjs|jsx|ts|tsx)$/,
                                 /\.html$/,
                                 /\.json$/,
                             ],
-                            options: {
-                                name: 'static/media/[name].[hash:8].[ext]',
-                            },
+                            type: 'asset/resource',
                         },
                     ],
                 },
             ],
         },
+        // Saves some chunk size logging
+        performance: false,
+        // stats: 'verbose',
     }
 }
diff --git a/pwa/src/service-worker/service-worker.js b/pwa/src/service-worker/service-worker.js
index 6f934f6ba..65c9f1ecd 100644
--- a/pwa/src/service-worker/service-worker.js
+++ b/pwa/src/service-worker/service-worker.js
@@ -60,6 +60,11 @@ export function setUpServiceWorker() {
         // Includes all built assets and index.html
         const precacheManifest = self.__WB_MANIFEST || []
 
+        // Same thing for built plugin assets
+        const pluginPrecacheManifest = self.__WB_PLUGIN_MANIFEST || []
+        precacheAndRoute(pluginPrecacheManifest)
+
+        // todo: also do this routing for plugin.html
         // Extract index.html from the manifest to precache, then route
         // in a custom way
         const indexHtmlManifestEntry = precacheManifest.find(({ url }) =>
@@ -128,7 +133,8 @@ export function setUpServiceWorker() {
         // `additionalManifestEntries` option in d2.config.js; see the docs and
         // 'injectPrecacheManifest.js' in the CLI package.
         // '[]' fallback prevents an error when switching pwa enabled to disabled
-        precacheAndRoute(self.__WB_BUILD_MANIFEST || [])
+        const sharedBuildManifest = self.__WB_BUILD_MANIFEST || []
+        precacheAndRoute(sharedBuildManifest)
     }
 
     // Request handler during recording mode: ALL requests are cached
diff --git a/pwa/src/service-worker/utils.js b/pwa/src/service-worker/utils.js
index 8e71063b8..a081ffe58 100644
--- a/pwa/src/service-worker/utils.js
+++ b/pwa/src/service-worker/utils.js
@@ -6,6 +6,12 @@ import {
 } from '../lib/sections-db.js'
 
 const CACHE_KEEP_LIST = ['other-assets', 'app-shell']
+const APP_ADAPTER_URL_PATTERNS = [
+    /\/api(\/\d+)?\/system\/info/, // from ServerVersionProvider
+    /\/api(\/\d+)?\/userSettings/, // useLocale
+    /\/api(\/\d+)?\/me\?fields=id$/, // useVerifyLatestUser
+]
+
 // '[]' Fallback prevents error when switching from pwa enabled to disabled
 const APP_SHELL_URL_FILTER_PATTERNS = JSON.parse(
     process.env
@@ -46,6 +52,14 @@ export function setUpKillSwitchServiceWorker() {
 }
 
 export function urlMeetsAppShellCachingCriteria(url) {
+    // Cache this request if it is important for the app adapter to load
+    const isAdapterRequest = APP_ADAPTER_URL_PATTERNS.some((pattern) =>
+        pattern.test(url.href)
+    )
+    if (isAdapterRequest) {
+        return true
+    }
+
     // Don't cache if pwa.caching.omitExternalRequests in d2.config is true
     if (
         OMIT_EXTERNAL_REQUESTS_FROM_APP_SHELL &&
diff --git a/yarn.lock b/yarn.lock
index ff8d40285..a4786f720 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8191,6 +8191,11 @@ idb@^6.0.0, idb@^6.1.4:
   resolved "https://registry.yarnpkg.com/idb/-/idb-6.1.5.tgz#dbc53e7adf1ac7c59f9b2bf56e00b4ea4fce8c7b"
   integrity sha512-IJtugpKkiVXQn5Y+LteyBCNk1N8xpGV3wWZk9EVtZWH8DYkjBn0bX1XnGP9RkyZF0sAcywa6unHqSWKe7q4LGw==
 
+idb@^7.0.1:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/idb/-/idb-7.0.2.tgz#7a067e20dd16539938e456814b7d714ba8db3892"
+  integrity sha512-jjKrT1EnyZewQ/gCBb/eyiYrhGzws2FeY92Yx8qT9S9GeQAmo4JFVIiWRIfKW/6Ob9A+UDAOW9j9jn58fy2HIg==
+
 identity-obj-proxy@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/identity-obj-proxy/-/identity-obj-proxy-3.0.0.tgz#94d2bda96084453ef36fbc5aaec37e0f79f1fc14"
@@ -14657,6 +14662,14 @@ workbox-background-sync@6.5.3:
     idb "^6.1.4"
     workbox-core "6.5.3"
 
+workbox-background-sync@6.5.4:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/workbox-background-sync/-/workbox-background-sync-6.5.4.tgz#3141afba3cc8aa2ae14c24d0f6811374ba8ff6a9"
+  integrity sha512-0r4INQZMyPky/lj4Ou98qxcThrETucOde+7mRGJl13MPJugQNKeZQOdIJe/1AchOP23cTqHcN/YVpD6r8E6I8g==
+  dependencies:
+    idb "^7.0.1"
+    workbox-core "6.5.4"
+
 workbox-broadcast-update@6.5.3:
   version "6.5.3"
   resolved "https://registry.yarnpkg.com/workbox-broadcast-update/-/workbox-broadcast-update-6.5.3.tgz#fc2ad79cf507e22950cda9baf1e9a0ccc43f31bc"
@@ -14664,6 +14677,13 @@ workbox-broadcast-update@6.5.3:
   dependencies:
     workbox-core "6.5.3"
 
+workbox-broadcast-update@6.5.4:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/workbox-broadcast-update/-/workbox-broadcast-update-6.5.4.tgz#8441cff5417cd41f384ba7633ca960a7ffe40f66"
+  integrity sha512-I/lBERoH1u3zyBosnpPEtcAVe5lwykx9Yg1k6f8/BGEPGaMMgZrwVrqL1uA9QZ1NGGFoyE6t9i7lBjOlDhFEEw==
+  dependencies:
+    workbox-core "6.5.4"
+
 workbox-build@6.5.3, workbox-build@^6.1.5:
   version "6.5.3"
   resolved "https://registry.yarnpkg.com/workbox-build/-/workbox-build-6.5.3.tgz#38e3f286d63d2745bff4d1478bb3a6ab5c8b1170"
@@ -14707,6 +14727,49 @@ workbox-build@6.5.3, workbox-build@^6.1.5:
     workbox-sw "6.5.3"
     workbox-window "6.5.3"
 
+workbox-build@6.5.4:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/workbox-build/-/workbox-build-6.5.4.tgz#7d06d31eb28a878817e1c991c05c5b93409f0389"
+  integrity sha512-kgRevLXEYvUW9WS4XoziYqZ8Q9j/2ziJYEtTrjdz5/L/cTUa2XfyMP2i7c3p34lgqJ03+mTiz13SdFef2POwbA==
+  dependencies:
+    "@apideck/better-ajv-errors" "^0.3.1"
+    "@babel/core" "^7.11.1"
+    "@babel/preset-env" "^7.11.0"
+    "@babel/runtime" "^7.11.2"
+    "@rollup/plugin-babel" "^5.2.0"
+    "@rollup/plugin-node-resolve" "^11.2.1"
+    "@rollup/plugin-replace" "^2.4.1"
+    "@surma/rollup-plugin-off-main-thread" "^2.2.3"
+    ajv "^8.6.0"
+    common-tags "^1.8.0"
+    fast-json-stable-stringify "^2.1.0"
+    fs-extra "^9.0.1"
+    glob "^7.1.6"
+    lodash "^4.17.20"
+    pretty-bytes "^5.3.0"
+    rollup "^2.43.1"
+    rollup-plugin-terser "^7.0.0"
+    source-map "^0.8.0-beta.0"
+    stringify-object "^3.3.0"
+    strip-comments "^2.0.1"
+    tempy "^0.6.0"
+    upath "^1.2.0"
+    workbox-background-sync "6.5.4"
+    workbox-broadcast-update "6.5.4"
+    workbox-cacheable-response "6.5.4"
+    workbox-core "6.5.4"
+    workbox-expiration "6.5.4"
+    workbox-google-analytics "6.5.4"
+    workbox-navigation-preload "6.5.4"
+    workbox-precaching "6.5.4"
+    workbox-range-requests "6.5.4"
+    workbox-recipes "6.5.4"
+    workbox-routing "6.5.4"
+    workbox-strategies "6.5.4"
+    workbox-streams "6.5.4"
+    workbox-sw "6.5.4"
+    workbox-window "6.5.4"
+
 workbox-cacheable-response@6.5.3:
   version "6.5.3"
   resolved "https://registry.yarnpkg.com/workbox-cacheable-response/-/workbox-cacheable-response-6.5.3.tgz#b1f8c2bc599a7be8f7e3c262535629c558738e47"
@@ -14714,11 +14777,23 @@ workbox-cacheable-response@6.5.3:
   dependencies:
     workbox-core "6.5.3"
 
+workbox-cacheable-response@6.5.4:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/workbox-cacheable-response/-/workbox-cacheable-response-6.5.4.tgz#a5c6ec0c6e2b6f037379198d4ef07d098f7cf137"
+  integrity sha512-DCR9uD0Fqj8oB2TSWQEm1hbFs/85hXXoayVwFKLVuIuxwJaihBsLsp4y7J9bvZbqtPJ1KlCkmYVGQKrBU4KAug==
+  dependencies:
+    workbox-core "6.5.4"
+
 workbox-core@6.5.3, workbox-core@^6.1.5:
   version "6.5.3"
   resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-6.5.3.tgz#bca038a9ef0d7a634a6db2a60f45313ed22ac249"
   integrity sha512-Bb9ey5n/M9x+l3fBTlLpHt9ASTzgSGj6vxni7pY72ilB/Pb3XtN+cZ9yueboVhD5+9cNQrC9n/E1fSrqWsUz7Q==
 
+workbox-core@6.5.4:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-6.5.4.tgz#df48bf44cd58bb1d1726c49b883fb1dffa24c9ba"
+  integrity sha512-OXYb+m9wZm8GrORlV2vBbE5EC1FKu71GGp0H4rjmxmF4/HLbMCoTFws87M3dFwgpmg0v00K++PImpNQ6J5NQ6Q==
+
 workbox-expiration@6.5.3:
   version "6.5.3"
   resolved "https://registry.yarnpkg.com/workbox-expiration/-/workbox-expiration-6.5.3.tgz#efc0811f371a2ede1052b9de1c4f072b71d50503"
@@ -14727,6 +14802,14 @@ workbox-expiration@6.5.3:
     idb "^6.1.4"
     workbox-core "6.5.3"
 
+workbox-expiration@6.5.4:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/workbox-expiration/-/workbox-expiration-6.5.4.tgz#501056f81e87e1d296c76570bb483ce5e29b4539"
+  integrity sha512-jUP5qPOpH1nXtjGGh1fRBa1wJL2QlIb5mGpct3NzepjGG2uFFBn4iiEBiI9GUmfAFR2ApuRhDydjcRmYXddiEQ==
+  dependencies:
+    idb "^7.0.1"
+    workbox-core "6.5.4"
+
 workbox-google-analytics@6.5.3:
   version "6.5.3"
   resolved "https://registry.yarnpkg.com/workbox-google-analytics/-/workbox-google-analytics-6.5.3.tgz#cc8c3a61f449131660a4ed2f5362d9a3599b18fe"
@@ -14737,6 +14820,16 @@ workbox-google-analytics@6.5.3:
     workbox-routing "6.5.3"
     workbox-strategies "6.5.3"
 
+workbox-google-analytics@6.5.4:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/workbox-google-analytics/-/workbox-google-analytics-6.5.4.tgz#c74327f80dfa4c1954cbba93cd7ea640fe7ece7d"
+  integrity sha512-8AU1WuaXsD49249Wq0B2zn4a/vvFfHkpcFfqAFHNHwln3jK9QUYmzdkKXGIZl9wyKNP+RRX30vcgcyWMcZ9VAg==
+  dependencies:
+    workbox-background-sync "6.5.4"
+    workbox-core "6.5.4"
+    workbox-routing "6.5.4"
+    workbox-strategies "6.5.4"
+
 workbox-navigation-preload@6.5.3:
   version "6.5.3"
   resolved "https://registry.yarnpkg.com/workbox-navigation-preload/-/workbox-navigation-preload-6.5.3.tgz#81b74f598b11aa07e2cf1c21af7a826a4f0f70b3"
@@ -14744,6 +14837,13 @@ workbox-navigation-preload@6.5.3:
   dependencies:
     workbox-core "6.5.3"
 
+workbox-navigation-preload@6.5.4:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/workbox-navigation-preload/-/workbox-navigation-preload-6.5.4.tgz#ede56dd5f6fc9e860a7e45b2c1a8f87c1c793212"
+  integrity sha512-IIwf80eO3cr8h6XSQJF+Hxj26rg2RPFVUmJLUlM0+A2GzB4HFbQyKkrgD5y2d84g2IbJzP4B4j5dPBRzamHrng==
+  dependencies:
+    workbox-core "6.5.4"
+
 workbox-precaching@6.5.3, workbox-precaching@^6.1.5:
   version "6.5.3"
   resolved "https://registry.yarnpkg.com/workbox-precaching/-/workbox-precaching-6.5.3.tgz#c870312b2ef901d790ab9e48da084e776c62af47"
@@ -14753,6 +14853,15 @@ workbox-precaching@6.5.3, workbox-precaching@^6.1.5:
     workbox-routing "6.5.3"
     workbox-strategies "6.5.3"
 
+workbox-precaching@6.5.4:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/workbox-precaching/-/workbox-precaching-6.5.4.tgz#740e3561df92c6726ab5f7471e6aac89582cab72"
+  integrity sha512-hSMezMsW6btKnxHB4bFy2Qfwey/8SYdGWvVIKFaUm8vJ4E53JAY+U2JwLTRD8wbLWoP6OVUdFlXsTdKu9yoLTg==
+  dependencies:
+    workbox-core "6.5.4"
+    workbox-routing "6.5.4"
+    workbox-strategies "6.5.4"
+
 workbox-range-requests@6.5.3:
   version "6.5.3"
   resolved "https://registry.yarnpkg.com/workbox-range-requests/-/workbox-range-requests-6.5.3.tgz#e624ac82ff266a5e4f236d055797def07949d941"
@@ -14760,6 +14869,13 @@ workbox-range-requests@6.5.3:
   dependencies:
     workbox-core "6.5.3"
 
+workbox-range-requests@6.5.4:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/workbox-range-requests/-/workbox-range-requests-6.5.4.tgz#86b3d482e090433dab38d36ae031b2bb0bd74399"
+  integrity sha512-Je2qR1NXCFC8xVJ/Lux6saH6IrQGhMpDrPXWZWWS8n/RD+WZfKa6dSZwU+/QksfEadJEr/NfY+aP/CXFFK5JFg==
+  dependencies:
+    workbox-core "6.5.4"
+
 workbox-recipes@6.5.3:
   version "6.5.3"
   resolved "https://registry.yarnpkg.com/workbox-recipes/-/workbox-recipes-6.5.3.tgz#15beac9d8ae7a3a1c100218094a824b4dd3fd59a"
@@ -14772,6 +14888,18 @@ workbox-recipes@6.5.3:
     workbox-routing "6.5.3"
     workbox-strategies "6.5.3"
 
+workbox-recipes@6.5.4:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/workbox-recipes/-/workbox-recipes-6.5.4.tgz#cca809ee63b98b158b2702dcfb741b5cc3e24acb"
+  integrity sha512-QZNO8Ez708NNwzLNEXTG4QYSKQ1ochzEtRLGaq+mr2PyoEIC1xFW7MrWxrONUxBFOByksds9Z4//lKAX8tHyUA==
+  dependencies:
+    workbox-cacheable-response "6.5.4"
+    workbox-core "6.5.4"
+    workbox-expiration "6.5.4"
+    workbox-precaching "6.5.4"
+    workbox-routing "6.5.4"
+    workbox-strategies "6.5.4"
+
 workbox-routing@6.5.3, workbox-routing@^6.1.5:
   version "6.5.3"
   resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-6.5.3.tgz#a0a699d8cc90b5692bd3df24679acbbda3913777"
@@ -14779,6 +14907,13 @@ workbox-routing@6.5.3, workbox-routing@^6.1.5:
   dependencies:
     workbox-core "6.5.3"
 
+workbox-routing@6.5.4:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-6.5.4.tgz#6a7fbbd23f4ac801038d9a0298bc907ee26fe3da"
+  integrity sha512-apQswLsbrrOsBUWtr9Lf80F+P1sHnQdYodRo32SjiByYi36IDyL2r7BH1lJtFX8fwNHDa1QOVY74WKLLS6o5Pg==
+  dependencies:
+    workbox-core "6.5.4"
+
 workbox-strategies@6.5.3, workbox-strategies@^6.1.5:
   version "6.5.3"
   resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-6.5.3.tgz#4bea9a48fee16cf43766e0d8138296773c8a9783"
@@ -14786,6 +14921,13 @@ workbox-strategies@6.5.3, workbox-strategies@^6.1.5:
   dependencies:
     workbox-core "6.5.3"
 
+workbox-strategies@6.5.4:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-6.5.4.tgz#4edda035b3c010fc7f6152918370699334cd204d"
+  integrity sha512-DEtsxhx0LIYWkJBTQolRxG4EI0setTJkqR4m7r4YpBdxtWJH1Mbg01Cj8ZjNOO8etqfA3IZaOPHUxCs8cBsKLw==
+  dependencies:
+    workbox-core "6.5.4"
+
 workbox-streams@6.5.3:
   version "6.5.3"
   resolved "https://registry.yarnpkg.com/workbox-streams/-/workbox-streams-6.5.3.tgz#b6860290031caa7d0e46ad7142315c94359c780b"
@@ -14794,11 +14936,24 @@ workbox-streams@6.5.3:
     workbox-core "6.5.3"
     workbox-routing "6.5.3"
 
+workbox-streams@6.5.4:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/workbox-streams/-/workbox-streams-6.5.4.tgz#1cb3c168a6101df7b5269d0353c19e36668d7d69"
+  integrity sha512-FXKVh87d2RFXkliAIheBojBELIPnWbQdyDvsH3t74Cwhg0fDheL1T8BqSM86hZvC0ZESLsznSYWw+Va+KVbUzg==
+  dependencies:
+    workbox-core "6.5.4"
+    workbox-routing "6.5.4"
+
 workbox-sw@6.5.3:
   version "6.5.3"
   resolved "https://registry.yarnpkg.com/workbox-sw/-/workbox-sw-6.5.3.tgz#cd2f0c086f4496acd25774ed02c48504189bebdd"
   integrity sha512-BQBzm092w+NqdIEF2yhl32dERt9j9MDGUTa2Eaa+o3YKL4Qqw55W9yQC6f44FdAHdAJrJvp0t+HVrfh8AiGj8A==
 
+workbox-sw@6.5.4:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/workbox-sw/-/workbox-sw-6.5.4.tgz#d93e9c67924dd153a61367a4656ff4d2ae2ed736"
+  integrity sha512-vo2RQo7DILVRoH5LjGqw3nphavEjK4Qk+FenXeUsknKn14eCNedHOXWbmnvP4ipKhlE35pvJ4yl4YYf6YsJArA==
+
 workbox-webpack-plugin@^6.4.1:
   version "6.5.3"
   resolved "https://registry.yarnpkg.com/workbox-webpack-plugin/-/workbox-webpack-plugin-6.5.3.tgz#c37bb323be4952311565c07db51054fe59c87d73"
@@ -14810,6 +14965,17 @@ workbox-webpack-plugin@^6.4.1:
     webpack-sources "^1.4.3"
     workbox-build "6.5.3"
 
+workbox-webpack-plugin@^6.5.4:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/workbox-webpack-plugin/-/workbox-webpack-plugin-6.5.4.tgz#baf2d3f4b8f435f3469887cf4fba2b7fac3d0fd7"
+  integrity sha512-LmWm/zoaahe0EGmMTrSLUi+BjyR3cdGEfU3fS6PN1zKFYbqAKuQ+Oy/27e4VSXsyIwAw8+QDfk1XHNGtZu9nQg==
+  dependencies:
+    fast-json-stable-stringify "^2.1.0"
+    pretty-bytes "^5.4.1"
+    upath "^1.2.0"
+    webpack-sources "^1.4.3"
+    workbox-build "6.5.4"
+
 workbox-window@6.5.3:
   version "6.5.3"
   resolved "https://registry.yarnpkg.com/workbox-window/-/workbox-window-6.5.3.tgz#4ade70056cb73477ef1cd8fea7cfd0ecbd825c7f"
@@ -14818,6 +14984,14 @@ workbox-window@6.5.3:
     "@types/trusted-types" "^2.0.2"
     workbox-core "6.5.3"
 
+workbox-window@6.5.4:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/workbox-window/-/workbox-window-6.5.4.tgz#d991bc0a94dff3c2dbb6b84558cff155ca878e91"
+  integrity sha512-HnLZJDwYBE+hpG25AQBO8RUWBJRaCsI9ksQJEp3aCOFCaG5kqaToAYXFRAHxzRluM2cQbGzdQF5rjKPWPA1fug==
+  dependencies:
+    "@types/trusted-types" "^2.0.2"
+    workbox-core "6.5.4"
+
 wrap-ansi@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"