chore(web): upgrade to Jetty 12.0.0.alpha3

Also refactor virtual thread ExecutorService handling and integration
tests.

9 files changed, 159 insertions, 79 deletions

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 0ee21b5e..1e4278d2 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 eclipseCollections = "11.1.0"
-jetty = "12.0.0.alpha2"
+jetty = "12.0.0.alpha3"
 jmh = "1.36"
 junit = "5.9.1"
 mockito = "4.9.0"
diff --git a/subprojects/frontend/package.json b/subprojects/frontend/package.json
index a826755d..2e6d35d5 100644
--- a/subprojects/frontend/package.json
+++ b/subprojects/frontend/package.json
@@ -29,7 +29,7 @@
     "@codemirror/lint": "^6.1.0",
     "@codemirror/search": "^6.2.3",
     "@codemirror/state": "^6.1.4",
-    "@codemirror/view": "^6.7.0",
+    "@codemirror/view": "^6.7.1",
     "@emotion/react": "^11.10.5",
     "@emotion/styled": "^11.10.5",
     "@fontsource/inter": "^4.5.14",
@@ -54,7 +54,7 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "xstate": "^4.35.0",
-    "zod": "^3.19.1"
+    "zod": "^3.20.0"
   },
   "devDependencies": {
     "@lezer/generator": "^1.1.3",
@@ -88,7 +88,7 @@
     "prettier": "^2.8.1",
     "typescript": "4.9.3",
     "vite": "^4.0.0",
-    "vite-plugin-pwa": "^0.13.3",
+    "vite-plugin-pwa": "^0.14.0",
     "workbox-window": "^6.5.4"
   }
 }
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/ServerLauncher.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/ServerLauncher.java
index 960eef71..f49f46ee 100644
--- a/subprojects/language-web/src/main/java/tools/refinery/language/web/ServerLauncher.java
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/ServerLauncher.java
@@ -11,7 +11,6 @@ import org.eclipse.jetty.ee10.servlet.ServletHolder;
 import org.eclipse.jetty.ee10.servlet.SessionHandler;
 import org.eclipse.jetty.ee10.websocket.server.config.JettyWebSocketServletContainerInitializer;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.util.VirtualThreads;
 import org.eclipse.jetty.util.resource.Resource;
 import org.eclipse.jetty.util.resource.ResourceFactory;
 import org.slf4j.Logger;
@@ -44,13 +43,7 @@ public class ServerLauncher {
         private final Server server;
 
         public ServerLauncher(InetSocketAddress bindAddress, String[] allowedOrigins, String webSocketUrl) {
-                server = new Server(bindAddress);
-                enableVirtualThreads(server);
-                if (server.getThreadPool() instanceof VirtualThreads.Configurable virtualThreadsConfigurable) {
-                        // Change this to setVirtualThreadsExecutor once
-                        // https://github.com/eclipse/jetty.project/commit/83154b4ffe4767ef44981598d6c26e6a5d32e57c gets released.
-                        virtualThreadsConfigurable.setUseVirtualThreads(VirtualThreads.areSupported());
-                }
+                server = VirtualThreadUtils.newServerWithVirtualThreadsThreadPool("jetty", bindAddress);
                 var handler = new ServletContextHandler();
                 addSessionHandler(handler);
                 addProblemServlet(handler, allowedOrigins);
@@ -150,14 +143,6 @@ public class ServerLauncher {
                 }
         }
 
-        public static void enableVirtualThreads(Server server) {
-                if (server.getThreadPool() instanceof VirtualThreads.Configurable virtualThreadsConfigurable) {
-                        // Change this to setVirtualThreadsExecutor once
-                        // https://github.com/eclipse/jetty.project/commit/83154b4ffe4767ef44981598d6c26e6a5d32e57c gets released.
-                        virtualThreadsConfigurable.setUseVirtualThreads(VirtualThreads.areSupported());
-                }
-        }
-
         private static String getListenAddress() {
                 var listenAddress = System.getenv("LISTEN_ADDRESS");
                 if (listenAddress == null) {
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/VirtualThreadUtils.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/VirtualThreadUtils.java
new file mode 100644
index 00000000..a055e755
--- /dev/null
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/VirtualThreadUtils.java
@@ -0,0 +1,52 @@
+package tools.refinery.language.web;
+
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
+import org.eclipse.jetty.util.thread.QueuedThreadPool;
+import org.eclipse.jetty.util.thread.ThreadPool;
+
+import java.net.InetSocketAddress;
+import java.time.Duration;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+public final class VirtualThreadUtils {
+        private VirtualThreadUtils() {
+                throw new IllegalStateException("This is a static utility class and should not be instantiated directly");
+        }
+
+        public static ExecutorService newNamedVirtualThreadsExecutor(String name) {
+                // Based on
+                // https://github.com/eclipse/jetty.project/blob/83154b4ffe4767ef44981598d6c26e6a5d32e57c/jetty-server/src/main/config/etc/jetty-threadpool-virtual-preview.xml
+                return Executors.newThreadPerTaskExecutor(Thread.ofVirtual()
+                                .allowSetThreadLocals(true)
+                                .inheritInheritableThreadLocals(false)
+                                .name(name + "-virtual-", 0)
+                                .factory());
+        }
+
+        public static ThreadPool newThreadPoolWithVirtualThreadsExecutor(String name) {
+                // Based on
+                // https://github.com/eclipse/jetty.project/blob/83154b4ffe4767ef44981598d6c26e6a5d32e57c/jetty-server/src/main/config/etc/jetty-threadpool-virtual-preview.xml
+                int timeout = (int) Duration.ofMinutes(1).toMillis();
+                var threadPool = new QueuedThreadPool(200, 10, timeout, -1, null, null);
+                threadPool.setName(name);
+                threadPool.setDetailedDump(false);
+                threadPool.setVirtualThreadsExecutor(newNamedVirtualThreadsExecutor(name));
+                return threadPool;
+        }
+
+        public static Server newServerWithVirtualThreadsThreadPool(String name, InetSocketAddress listenAddress) {
+                var server = new Server(newThreadPoolWithVirtualThreadsExecutor(name));
+                var connector = new ServerConnector(server);
+                try {
+                        connector.setHost(listenAddress.getHostName());
+                        connector.setPort(listenAddress.getPort());
+                        server.addConnector(connector);
+                } catch (Exception e) {
+                        connector.close();
+                        throw e;
+                }
+                return server;
+        }
+}
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/VirtualThreadExecutorServiceProvider.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/VirtualThreadExecutorServiceProvider.java
index ead98927..abbcbd53 100644
--- a/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/VirtualThreadExecutorServiceProvider.java
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/VirtualThreadExecutorServiceProvider.java
@@ -1,9 +1,9 @@
 package tools.refinery.language.web.xtext;
 
 import org.eclipse.xtext.ide.ExecutorServiceProvider;
+import tools.refinery.language.web.VirtualThreadUtils;
 
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 
 public class VirtualThreadExecutorServiceProvider extends ExecutorServiceProvider {
         private static final String THREAD_POOL_NAME = "xtextWeb";
@@ -11,10 +11,6 @@ public class VirtualThreadExecutorServiceProvider extends ExecutorServiceProvide
         @Override
         protected ExecutorService createInstance(String key) {
                 var name = key == null ? THREAD_POOL_NAME : THREAD_POOL_NAME + "-" + key;
-                return Executors.newThreadPerTaskExecutor(Thread.ofVirtual()
-                                .allowSetThreadLocals(true)
-                                .inheritInheritableThreadLocals(false)
-                                .name(name + "-", 0)
-                                .factory());
+                return VirtualThreadUtils.newNamedVirtualThreadsExecutor(name);
         }
 }
diff --git a/subprojects/language-web/src/test/java/tools/refinery/language/web/ProblemWebSocketServletIntegrationTest.java b/subprojects/language-web/src/test/java/tools/refinery/language/web/ProblemWebSocketServletIntegrationTest.java
index 24fab4e3..ecbefc4f 100644
--- a/subprojects/language-web/src/test/java/tools/refinery/language/web/ProblemWebSocketServletIntegrationTest.java
+++ b/subprojects/language-web/src/test/java/tools/refinery/language/web/ProblemWebSocketServletIntegrationTest.java
@@ -14,9 +14,7 @@ import org.eclipse.jetty.http.HttpStatus;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.xtext.testing.GlobalRegistries;
 import org.eclipse.xtext.testing.GlobalRegistries.GlobalStateMemento;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.*;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 import tools.refinery.language.web.tests.WebSocketIntegrationTestClient;
@@ -25,6 +23,7 @@ import tools.refinery.language.web.xtext.servlet.XtextWebSocketServlet;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
+import java.net.ServerSocket;
 import java.net.URI;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
@@ -34,18 +33,29 @@ import static org.hamcrest.Matchers.*;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 class ProblemWebSocketServletIntegrationTest {
-        private static final int SERVER_PORT = 28080;
+        private static final String HOSTNAME = "127.0.0.1";
 
         private static final String SERVLET_URI = "/xtext-service";
 
         private GlobalStateMemento stateBeforeInjectorCreation;
 
+        private TestInfo testInfo;
+
+        private int serverPort;
+
         private Server server;
 
         private WebSocketClient client;
 
         @BeforeEach
-        void beforeEach() throws Exception {
+        void beforeEach(TestInfo testInfo) throws Exception {
+                this.testInfo = testInfo;
+                // Find a free port for running the test. See e.g., https://stackoverflow.com/a/65937797
+                try (var serverSocket = new ServerSocket()) {
+                        serverSocket.setReuseAddress(true);
+                        serverSocket.bind(new InetSocketAddress(HOSTNAME, 0));
+                        serverPort = serverSocket.getLocalPort();
+                }
                 stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
                 client = new WebSocketClient();
                 client.start();
@@ -147,7 +157,7 @@ class ProblemWebSocketServletIntegrationTest {
                 }
         }
 
-        @ParameterizedTest(name = "Origin: {0}")
+        @ParameterizedTest(name = "validOriginTest(\"{0}\")")
         @ValueSource(strings = { "https://refinery.example", "https://refinery.example:443", "HTTPS://REFINERY.EXAMPLE" })
         void validOriginTest(String origin) {
                 startServer("https://refinery.example,https://refinery.example:443");
@@ -176,8 +186,9 @@ class ProblemWebSocketServletIntegrationTest {
         }
 
         private void startServer(String allowedOrigins) {
-                server = new Server(new InetSocketAddress(SERVER_PORT));
-                ServerLauncher.enableVirtualThreads(server);
+                var testName = getClass().getSimpleName() + "-" + testInfo.getDisplayName();
+                var listenAddress = new InetSocketAddress(HOSTNAME, serverPort);
+                server = VirtualThreadUtils.newServerWithVirtualThreadsThreadPool(testName, listenAddress);
                 var handler = new ServletContextHandler();
                 var holder = new ServletHolder(ProblemWebSocketServlet.class);
                 if (allowedOrigins != null) {
@@ -201,7 +212,8 @@ class ProblemWebSocketServletIntegrationTest {
                 upgradeRequest.setSubProtocols(subProtocols);
                 CompletableFuture<Session> sessionFuture;
                 try {
-                        sessionFuture = client.connect(webSocketClient, URI.create("ws://localhost:" + SERVER_PORT + SERVLET_URI),
+                        sessionFuture = client.connect(webSocketClient,
+                                        URI.create("ws://%s:%d%s".formatted(HOSTNAME, serverPort, SERVLET_URI)),
                                         upgradeRequest);
                 } catch (IOException e) {
                         throw new AssertionError("Unexpected exception while connection to websocket", e);
diff --git a/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/AwaitTerminationExecutorServiceProvider.java b/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/AwaitTerminationExecutorServiceProvider.java
index 25343109..c634e8fc 100644
--- a/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/AwaitTerminationExecutorServiceProvider.java
+++ b/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/AwaitTerminationExecutorServiceProvider.java
@@ -13,7 +13,7 @@ public class AwaitTerminationExecutorServiceProvider extends VirtualThreadExecut
 
         @Override
         protected ExecutorService createInstance(String key) {
-                var instance = new RestartableCachedThreadPool();
+                var instance = new RestartableCachedThreadPool(() -> super.createInstance(key));
                 synchronized (servicesToShutDown) {
                         servicesToShutDown.add(instance);
                 }
diff --git a/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/RestartableCachedThreadPool.java b/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/RestartableCachedThreadPool.java
index a8655313..cf805eda 100644
--- a/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/RestartableCachedThreadPool.java
+++ b/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/RestartableCachedThreadPool.java
@@ -1,5 +1,6 @@
 package tools.refinery.language.web.tests;
 
+import com.google.inject.Provider;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -13,14 +14,17 @@ public class RestartableCachedThreadPool implements ExecutorService {
 
         private ExecutorService delegate;
 
-        public RestartableCachedThreadPool() {
-                delegate = createExecutorService();
+        private final Provider<ExecutorService> executorServiceProvider;
+
+        public RestartableCachedThreadPool(Provider<ExecutorService> executorServiceProvider) {
+                this.executorServiceProvider = executorServiceProvider;
+                delegate = executorServiceProvider.get();
         }
 
         public void waitForAllTasksToFinish() {
                 delegate.shutdown();
                 waitForTermination();
-                delegate = createExecutorService();
+                delegate = executorServiceProvider.get();
         }
 
         public void waitForTermination() {
@@ -35,10 +39,6 @@ public class RestartableCachedThreadPool implements ExecutorService {
                 }
         }
 
-        protected ExecutorService createExecutorService() {
-                return Executors.newCachedThreadPool();
-        }
-
         @Override
         public boolean awaitTermination(long arg0, @NotNull TimeUnit arg1) throws InterruptedException {
                 return delegate.awaitTermination(arg0, arg1);
diff --git a/yarn.lock b/yarn.lock
index d56377b8..49c00e98 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1359,14 +1359,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@codemirror/view@npm:^6.0.0, @codemirror/view@npm:^6.6.0, @codemirror/view@npm:^6.7.0":
-  version: 6.7.0
-  resolution: "@codemirror/view@npm:6.7.0"
+"@codemirror/view@npm:^6.0.0, @codemirror/view@npm:^6.6.0, @codemirror/view@npm:^6.7.1":
+  version: 6.7.1
+  resolution: "@codemirror/view@npm:6.7.1"
   dependencies:
     "@codemirror/state": ^6.1.4
     style-mod: ^4.0.0
     w3c-keyname: ^2.2.4
-  checksum: 9271ffee2889ed42137966424aa11d664fe2ebffec0254b22fbe5817db2c0f6da48b01bd5a8d532390b7678d26583c5329cc0c6f9fba964d7e28405f4f996554
+  checksum: 75a5846d61e63027e9bf1dfd0b507932934cb7650b7959c1191e68b161eb1756e9773f964c4331970b51864aef8f7954bc5cc8fdb51b0f6533de6c20568833ed
   languageName: node
   linkType: hard
 
@@ -2098,7 +2098,7 @@ __metadata:
     "@codemirror/lint": ^6.1.0
     "@codemirror/search": ^6.2.3
     "@codemirror/state": ^6.1.4
-    "@codemirror/view": ^6.7.0
+    "@codemirror/view": ^6.7.1
     "@emotion/react": ^11.10.5
     "@emotion/styled": ^11.10.5
     "@fontsource/inter": ^4.5.14
@@ -2153,10 +2153,10 @@ __metadata:
     react-dom: ^18.2.0
     typescript: 4.9.3
     vite: ^4.0.0
-    vite-plugin-pwa: ^0.13.3
+    vite-plugin-pwa: ^0.14.0
     workbox-window: ^6.5.4
     xstate: ^4.35.0
-    zod: ^3.19.1
+    zod: ^3.20.0
   languageName: unknown
   linkType: soft
 
@@ -2214,15 +2214,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/plugin-replace@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "@rollup/plugin-replace@npm:4.0.0"
+"@rollup/plugin-replace@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "@rollup/plugin-replace@npm:5.0.1"
   dependencies:
-    "@rollup/pluginutils": ^3.1.0
-    magic-string: ^0.25.7
+    "@rollup/pluginutils": ^5.0.1
+    magic-string: ^0.26.4
   peerDependencies:
-    rollup: ^1.20.0 || ^2.0.0
-  checksum: b61701e612661a46da06ca88f390c3839b586708abc0329a476411b90aa8ac59fe94437ede4c3fe53fea268b3054ea9d7d4ee851d7bd0cb7a5f06906002067cb
+    rollup: ^1.20.0||^2.0.0||^3.0.0
+  peerDependenciesMeta:
+    rollup:
+      optional: true
+  checksum: d5f98a93dd24086ed1bf70e9299230d1fddae9b132280e2daaca855dba2307eccd5490553e2a03b701b7411593d2921d2d675e5d906b4754c57152f8c50adb07
   languageName: node
   linkType: hard
 
@@ -2239,6 +2242,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@rollup/pluginutils@npm:^5.0.1":
+  version: 5.0.2
+  resolution: "@rollup/pluginutils@npm:5.0.2"
+  dependencies:
+    "@types/estree": ^1.0.0
+    estree-walker: ^2.0.2
+    picomatch: ^2.3.1
+  peerDependencies:
+    rollup: ^1.20.0||^2.0.0||^3.0.0
+  peerDependenciesMeta:
+    rollup:
+      optional: true
+  checksum: edea15e543bebc7dcac3b0ac8bc7b8e8e6dbd46e2864dbe5dd28072de1fbd5b0e10d545a610c0edaa178e8a7ac432e2a2a52e547ece1308471412caba47db8ce
+  languageName: node
+  linkType: hard
+
 "@surma/rollup-plugin-off-main-thread@npm:^2.2.3":
   version: 2.2.3
   resolution: "@surma/rollup-plugin-off-main-thread@npm:2.2.3"
@@ -2393,7 +2412,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/estree@npm:*":
+"@types/estree@npm:*, @types/estree@npm:^1.0.0":
   version: 1.0.0
   resolution: "@types/estree@npm:1.0.0"
   checksum: 910d97fb7092c6738d30a7430ae4786a38542023c6302b95d46f49420b797f21619cdde11fa92b338366268795884111c2eb10356e4bd2c8ad5b92941e9e6443
@@ -4133,6 +4152,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"estree-walker@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "estree-walker@npm:2.0.2"
+  checksum: 6151e6f9828abe2259e57f5fd3761335bb0d2ebd76dc1a01048ccee22fabcfef3c0859300f6d83ff0d1927849368775ec5a6d265dde2f6de5a1be1721cd94efc
+  languageName: node
+  linkType: hard
+
 "esutils@npm:^2.0.2":
   version: 2.0.3
   resolution: "esutils@npm:2.0.3"
@@ -4154,16 +4180,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fast-glob@npm:^3.2.11, fast-glob@npm:^3.2.9":
-  version: 3.2.11
-  resolution: "fast-glob@npm:3.2.11"
+"fast-glob@npm:^3.2.11, fast-glob@npm:^3.2.12, fast-glob@npm:^3.2.9":
+  version: 3.2.12
+  resolution: "fast-glob@npm:3.2.12"
   dependencies:
     "@nodelib/fs.stat": ^2.0.2
     "@nodelib/fs.walk": ^1.2.3
     glob-parent: ^5.1.2
     merge2: ^1.3.0
     micromatch: ^4.0.4
-  checksum: f473105324a7780a20c06de842e15ddbb41d3cb7e71d1e4fe6e8373204f22245d54f5ab9e2061e6a1c613047345954d29b022e0e76f5c28b1df9858179a0e6d7
+  checksum: 0b1990f6ce831c7e28c4d505edcdaad8e27e88ab9fa65eedadb730438cfc7cde4910d6c975d6b7b8dc8a73da4773702ebcfcd6e3518e73938bb1383badfe01c2
   languageName: node
   linkType: hard
 
@@ -5227,6 +5253,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"magic-string@npm:^0.26.4":
+  version: 0.26.7
+  resolution: "magic-string@npm:0.26.7"
+  dependencies:
+    sourcemap-codec: ^1.4.8
+  checksum: 89b0d60cbb32bbf3d1e23c46ea93db082d18a8230b972027aecb10a40bba51be519ecce0674f995571e3affe917b76b09f59d8dbc9a1b2c9c4102a2b6e8a2b01
+  languageName: node
+  linkType: hard
+
 "make-fetch-happen@npm:^9.1.0":
   version: 9.1.0
   resolution: "make-fetch-happen@npm:9.1.0"
@@ -6179,7 +6214,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rollup@npm:^2.43.1, rollup@npm:^2.79.0":
+"rollup@npm:^2.43.1":
   version: 2.79.1
   resolution: "rollup@npm:2.79.1"
   dependencies:
@@ -6193,9 +6228,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rollup@npm:^3.7.0":
-  version: 3.7.0
-  resolution: "rollup@npm:3.7.0"
+"rollup@npm:^3.7.0, rollup@npm:^3.7.2":
+  version: 3.7.3
+  resolution: "rollup@npm:3.7.3"
   dependencies:
     fsevents: ~2.3.2
   dependenciesMeta:
@@ -6203,7 +6238,7 @@ __metadata:
       optional: true
   bin:
     rollup: dist/bin/rollup
-  checksum: 9a407469cd25e1255fb5a5956eff53ff963c90ffba949ec81ea8104d1271e1ce377c28231078d96c2d14a8a9727a06d1d2421f3db4d11b74d46cbcc2a02c3768
+  checksum: b7703e806693919f1600fc937bccb5c0f39af38e1c9351c34ce4272bcc6f8742ddfc0f1d138d3ad3478b8048c51787f04b2464abb14b1f8655dd2b6a7102c43e
   languageName: node
   linkType: hard
 
@@ -6872,22 +6907,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vite-plugin-pwa@npm:^0.13.3":
-  version: 0.13.3
-  resolution: "vite-plugin-pwa@npm:0.13.3"
+"vite-plugin-pwa@npm:^0.14.0":
+  version: 0.14.0
+  resolution: "vite-plugin-pwa@npm:0.14.0"
   dependencies:
-    "@rollup/plugin-replace": ^4.0.0
+    "@rollup/plugin-replace": ^5.0.1
     debug: ^4.3.4
-    fast-glob: ^3.2.11
+    fast-glob: ^3.2.12
     pretty-bytes: ^6.0.0
-    rollup: ^2.79.0
+    rollup: ^3.7.2
     workbox-build: ^6.5.4
     workbox-window: ^6.5.4
   peerDependencies:
-    vite: ^3.1.0
+    vite: ^3.1.0 || ^4.0.0
     workbox-build: ^6.5.4
     workbox-window: ^6.5.4
-  checksum: be1e8699e2fb4fea98454d20c8df4bcbd828aecb2b714a1251405fde4dc9ac9c95520b33fdfc1a3d91d51f9d920501d93f57f4f0a2f1361ba38785c86e4756a4
+  checksum: b6e2ba73b75bea5bff83418a3ffd484af8efd06556a5f5ccbb76426f00f84548b575d27d5b4c005c3cd44eab450c8e39417a7568073bfe4d92201a7e846f6bea
   languageName: node
   linkType: hard
 
@@ -7219,9 +7254,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"zod@npm:^3.19.1":
-  version: 3.19.1
-  resolution: "zod@npm:3.19.1"
-  checksum: 56e420ea5845912324a8fc61833714a2aec84954e418b52660d76502183c6e62fef9447cbfa64349640c5ce190cf2c24267e006bb80f066183e2f3fa9fe11864
+"zod@npm:^3.20.0":
+  version: 3.20.0
+  resolution: "zod@npm:3.20.0"
+  checksum: 34e5aa865b1093bf2630af2d88c4c02004e07b52a1140082c58c986adf41cdfc99be7094860c904b42eabfb1a15e05305a9eeb2a20745ba2beb5c01f40577ca5
   languageName: node
   linkType: hard