Merge pull request #75 from noahstreller/dependabot/npm_and_yarn/mult…

…i-39819528c7

app/sw.ts

@@ -1,18 +1,25 @@
-import { defaultCache } from "@serwist/next/browser";
-import type { PrecacheEntry } from "@serwist/precaching";
-import { installSerwist } from "@serwist/sw";
+import { defaultCache } from "@serwist/next/worker";
+import type { PrecacheEntry, SerwistGlobalConfig } from "serwist";
+import { Serwist } from "serwist";
 
-declare const self: ServiceWorkerGlobalScope & {
-  // Change this attribute's name to your `injectionPoint`.
-  // `injectionPoint` is an InjectManifest option.
-  // See https://serwist.pages.dev/docs/build/inject-manifest/configuring
-  __SW_MANIFEST: (PrecacheEntry | string)[] | undefined;
-};
+// This declares the value of `injectionPoint` to TypeScript.
+// `injectionPoint` is the string that will be replaced by the
+// actual precache manifest. By default, this string is set to
+// `"self.__SW_MANIFEST"`.
+declare global {
+  interface WorkerGlobalScope extends SerwistGlobalConfig {
+    __SW_MANIFEST: (PrecacheEntry | string)[] | undefined;
+  }
+}
 
-installSerwist({
+declare const self: ServiceWorkerGlobalScope;
+
+const serwist = new Serwist({
   precacheEntries: self.__SW_MANIFEST,
   skipWaiting: true,
   clientsClaim: true,
   navigationPreload: true,
   runtimeCaching: defaultCache,
 });
+
+serwist.addEventListeners();

components/create-grade-form.tsx

@@ -128,11 +128,7 @@ export function CreateGradeForm({
       );
     }
     refresh();
-    if (
-      !preferences?.newEntitySheetShouldStayOpen ??
-      !defaultPreferences.newEntitySheetShouldStayOpen
-    )
-      setDrawerOpen(false);
+    if (!preferences?.newEntitySheetShouldStayOpen) setDrawerOpen(false);
   }
 
   return (

components/grade-for-subject-form.tsx

@@ -98,11 +98,7 @@ export function CreateGradeFormForSubject({
       addGradeToast(grade, subject.name ?? "");
     }
     refresh();
-    if (
-      !preferences?.newEntitySheetShouldStayOpen ??
-      !defaultPreferences.newEntitySheetShouldStayOpen
-    )
-      setDrawerOpen(false);
+    if (!preferences?.newEntitySheetShouldStayOpen) setDrawerOpen(false);
   }
 
   return (

next.config.js → next.config.mjs

@@ -1,13 +1,15 @@
 /** @type {import('next').NextConfig} */
-const createNextIntlPlugin = require("next-intl/plugin");
+import withSerwistInit from "@serwist/next";
+import createNextIntlPlugin from "next-intl/plugin";
+
 const withNextIntl = createNextIntlPlugin();
-const withSerwist = require("@serwist/next").default({
+const withSerwist = withSerwistInit({
   swSrc: "app/sw.ts",
   swDest: "public/sw.js",
   disable: process.env.NODE_ENV === "development",
 });
 
-module.exports = withSerwist(
+export default withSerwist(
   withNextIntl({
     reactStrictMode: false,
   })