chore(web): upgrade dependencies (#104)

Author: airslice

web/.yarn/install-state.gz

@@ -9,7 +9,11 @@
     "resolutions": {
         "@apollo/client": "3.8.1",
         "@zip.js/zip.js": "2.7.48",
-        "@cesium/engine": "9.0.0"
+        "@cesium/engine": "9.0.0",
+        "cookie": "^0.7.0",
+        "jsonpath-plus": "10.3.0",
+        "glob": "^11.1.0",
+        "js-yaml": "4.1.1"
     },
     "scripts": {
         "start": "yarn && vite",
@@ -41,14 +45,14 @@
     },
     "devDependencies": {
         "@emotion/jest": "11.11.0",
-        "@graphql-codegen/cli": "3.3.1",
-        "@graphql-codegen/client-preset": "4.0.1",
-        "@graphql-codegen/fragment-matcher": "4.0.1",
-        "@graphql-codegen/introspection": "4.0.0",
-        "@graphql-codegen/typescript": "4.0.1",
-        "@graphql-codegen/typescript-operations": "4.0.1",
-        "@graphql-codegen/typescript-react-apollo": "3.3.7",
-        "@playwright/test": "1.39.0",
+        "@graphql-codegen/cli": "6.1.0",
+        "@graphql-codegen/client-preset": "5.2.0",
+        "@graphql-codegen/fragment-matcher": "6.0.0",
+        "@graphql-codegen/introspection": "5.0.0",
+        "@graphql-codegen/typescript": "5.0.5",
+        "@graphql-codegen/typescript-operations": "5.0.5",
+        "@graphql-codegen/typescript-react-apollo": "4.3.3",
+        "@playwright/test": "1.55.1",
         "@rollup/plugin-yaml": "4.1.2",
         "@storybook/addon-essentials": "7.5.2",
         "@storybook/addon-styling": "1.3.7",
@@ -67,6 +71,7 @@
         "@types/gapi.client.sheets": "4.0.20201031",
         "@types/google.picker": "0.0.41",
         "@types/js-md5": "0.7.1",
+        "@types/js-yaml": "^4.0.9",
         "@types/lodash-es": "4.17.10",
         "@types/mapbox__vector-tile": "1.3.3",
         "@types/node": "22.13.14",
@@ -78,7 +83,7 @@
         "@types/tinycolor2": "1.4.5",
         "@types/uuid": "9.0.6",
         "@vitejs/plugin-react-swc": "3.7.1",
-        "@vitest/coverage-v8": "1.6.1",
+        "@vitest/coverage-v8": "4.0.14",
         "@welldone-software/why-did-you-render": "7.0.1",
         "del-cli": "5.1.0",
         "dotenv": "16.3.1",
@@ -100,17 +105,17 @@
         "type-fest": "4.6.0",
         "typescript": "5.0.4",
         "typescript-styled-plugin": "0.18.3",
-        "vite": "5.4.20",
+        "vite": "5.4.21",
         "vite-plugin-cesium": "1.2.23",
         "vite-plugin-svgr": "4.5.0",
         "vite-tsconfig-paths": "5.1.4",
-        "vitest": "1.6.1",
+        "vitest": "4.0.14",
         "web-streams-polyfill": "3.2.1"
     },
     "dependencies": {
         "@apollo/client": "3.8.1",
         "@auth0/auth0-react": "2.2.2",
-        "@aws-amplify/ui-react": "5.3.1",
+        "@aws-amplify/ui-react": "6.13.1",
         "@carbon/colors": "11.20.1",
         "@cesium/engine": "9.0.0",
         "@emotion/react": "11.11.1",
@@ -133,7 +138,7 @@
         "apollo-link-sentry": "3.2.3",
         "apollo-upload-client": "17.0.0",
         "array-move": "4.0.0",
-        "aws-amplify": "5.3.11",
+        "aws-amplify": "6.15.8",
         "axios": "1.12.0",
         "cesium": "1.116.0",
         "cesium-dnd": "1.1.0",
@@ -157,7 +162,7 @@
         "jotai": "1.12.1",
         "js-file-download": "0.4.12",
         "js-md5": "0.7.3",
-        "js-yaml": "4.1.0",
+        "js-yaml": "4.1.1",
         "jsep": "1.3.8",
         "jsonpath-plus": "10.3.0",
         "jszip": "3.10.1",

web/package.json

@@ -1,8 +1,13 @@
-import { describe, expect, test, vi } from "vitest";
+import { afterEach, describe, expect, test, vi } from "vitest";
 
 import { interval, intervalDuring, tweenInterval } from "./raf";
 
 describe("interval", () => {
+  afterEach(() => {
+    vi.restoreAllMocks();
+    vi.useRealTimers();
+  });
+
   test("regular", () => {
     vi.useFakeTimers();
     const requestAnimationFrame = vi.spyOn(window, "requestAnimationFrame");
@@ -73,6 +78,11 @@ describe("interval", () => {
   });
 });
 
+afterEach(() => {
+  vi.restoreAllMocks();
+  vi.useRealTimers();
+});
+
 test("intervalDuring", () => {
   vi.useFakeTimers();
   const requestAnimationFrame = vi.spyOn(window, "requestAnimationFrame");

web/src/beta/utils/raf.test.ts

@@ -1,8 +1,13 @@
-import { describe, expect, test, vi } from "vitest";
+import { afterEach, describe, expect, test, vi } from "vitest";
 
 import { interval, intervalDuring, tweenInterval } from "./raf";
 
 describe("interval", () => {
+  afterEach(() => {
+    vi.restoreAllMocks();
+    vi.useRealTimers();
+  });
+
   test("regular", () => {
     vi.useFakeTimers();
     const requestAnimationFrame = vi.spyOn(window, "requestAnimationFrame");
@@ -73,6 +78,11 @@ describe("interval", () => {
   });
 });
 
+afterEach(() => {
+  vi.restoreAllMocks();
+  vi.useRealTimers();
+});
+
 test("intervalDuring", () => {
   vi.useFakeTimers();
   const requestAnimationFrame = vi.spyOn(window, "requestAnimationFrame");

web/src/classic/gql/graphql-client-api.tsx

@@ -1,4 +1,4 @@
-import { Auth } from "@aws-amplify/auth";
+import { getCurrentUser, signOut, fetchAuthSession, signInWithRedirect } from "aws-amplify/auth";
 import { useState, useEffect } from "react";
 
 import { logOutFromTenant } from "@reearth/services/config";
@@ -13,7 +13,7 @@ export const useCognitoAuth = (): AuthHook => {
   useEffect(() => {
     const checkUser = async () => {
       try {
-        const cognitoUser = await Auth.currentAuthenticatedUser();
+        const cognitoUser = await getCurrentUser();
         setUser(cognitoUser);
       } catch (err) {
         if (err instanceof Error) {
@@ -29,19 +29,19 @@ export const useCognitoAuth = (): AuthHook => {
   }, []);
 
   const getAccessToken = async () => {
-    const session = await Auth.currentSession();
-    return session.getIdToken().getJwtToken();
+    const session = await fetchAuthSession();
+    return session.tokens?.idToken?.toString() || "";
   };
 
   const login = () => {
     logOutFromTenant();
-    Auth.federatedSignIn();
+    signInWithRedirect();
   };
 
   const logout = async () => {
     logOutFromTenant();
     try {
-      await Auth.signOut();
+      await signOut();
       setUser(null);
     } catch (err) {
       if (err instanceof Error) {

web/src/classic/util/raf.test.ts

@@ -23,15 +23,19 @@ export const configureCognito = (cognitoConfig: CognitoParams) => {
 
   const config = {
     Auth: {
-      region: cognitoRegion,
-      userPoolId: cognitoUserPoolId,
-      userPoolWebClientId: cognitoUserPoolWebClientId,
-      oauth: {
-        scope: cognitoOauthScope,
-        domain: cognitoOauthDomain,
-        redirectSignIn: cognitoOauthRedirectSignIn,
-        redirectSignOut: cognitoOauthRedirectSignOut,
-        responseType: cognitoOauthResponseType,
+      Cognito: {
+        region: cognitoRegion,
+        userPoolId: cognitoUserPoolId || "",
+        userPoolClientId: cognitoUserPoolWebClientId || "",
+        loginWith: {
+          oauth: {
+            domain: cognitoOauthDomain || "",
+            scopes: cognitoOauthScope || [],
+            redirectSignIn: [cognitoOauthRedirectSignIn || ""],
+            redirectSignOut: [cognitoOauthRedirectSignOut || ""],
+            responseType: (cognitoOauthResponseType as "code" | "token") || "code",
+          },
+        },
       },
     },
   };