refactor: upgrade Jotai to v2 and use yarn v4

.github/workflows/ci.yml

@@ -23,6 +23,8 @@ jobs:
           key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
           restore-keys: |
             ${{ runner.os }}-yarn-
+      - name: corepack
+        run: corepack enable
       - name: Run install
         run: yarn install --frozen-lockfile
       - name: Run lint

.gitignore

@@ -12,6 +12,8 @@ dist
 dist-ssr
 *.local
 
+.yarn
+
 # Editor directories and files
 .vscode/*
 !.vscode/extensions.json

.yarnrc.yml

@@ -0,0 +1 @@
+nodeLinker: node-modules

package.json

@@ -54,10 +54,11 @@
     "cesium-dnd": "1.1.0",
     "csv-parse": "5.5.2",
     "d3": "7.9.0",
+    "escape-string-regexp": "4.0.0",
     "fast-xml-parser": "4.3.2",
     "framer-motion": "11.0.27",
     "geojson": "0.5.0",
-    "jotai": "1.12.1",
+    "jotai": "2.9.3",
     "js-md5": "0.7.3",
     "jsep": "1.3.8",
     "jsonpath-plus": "7.2.0",
@@ -71,7 +72,7 @@
     "react-dnd-html5-backend": "16.0.1",
     "react-error-boundary": "4.0.11",
     "react-nl2br": "1.0.4",
-    "react-use": "17.5.0",
+    "react-use": "17.5.1",
     "resium": "1.18.2",
     "suspend-react": "0.1.3",
     "tailwind-merge": "2.5.2",
@@ -80,11 +81,10 @@
     "tiny-invariant": "1.3.3",
     "use-callback-ref": "1.3.2",
     "use-custom-compare": "1.4.0",
-    "uuid": "9.0.1",
+    "uuid": "10.0.0",
     "xstate": "4.38.2"
   },
   "devDependencies": {
-    "@apollo/client": "3.8.1",
     "@chromatic-com/storybook": "^1.3.3",
     "@emotion/jest": "11.11.0",
     "@storybook/addon-essentials": "8.0.8",
@@ -117,6 +117,7 @@
     "clsx": "2.1.1",
     "eslint": "8.57.0",
     "eslint-config-reearth": "0.3.0",
+    "eslint-plugin-import": "2.31.0",
     "eslint-plugin-react-hooks": "4.6.0",
     "eslint-plugin-react-refresh": "0.4.6",
     "eslint-plugin-storybook": "0.8.0",
@@ -135,7 +136,5 @@
     "vitest": "1.0.4",
     "web-streams-polyfill": "3.2.1"
   },
-  "resolutions": {
-    "jackspeak": "2.1.1"
-  }
+  "packageManager": "[email protected]"
 }

src/mantle/atoms/compute.test.ts

@@ -85,16 +85,17 @@ test("computeAtom", async () => {
     status: "ready",
     features: [],
     originalFeatures: [],
-  }),
-    await waitFor(() =>
-      expect(result.current.result).toEqual({
-        id: "xxx",
-        layer,
-        status: "ready",
-        features: [],
-        originalFeatures: [],
-      }),
-    );
+  });
+
+  await waitFor(() =>
+    expect(result.current.result).toEqual({
+      id: "xxx",
+      layer,
+      status: "ready",
+      features: [],
+      originalFeatures: [],
+    }),
+  );
 
   // delete delegatedDataTypes
   act(() => {
@@ -187,7 +188,7 @@ test("computeAtom", async () => {
     layer,
     status: "fetching",
     features: [...toComputedFeature(features), ...toComputedFeature(features2)],
-    originalFeatures: [...features, ...features3],
+    originalFeatures: [...features, ...features2],
   });
 
   await waitFor(() =>

src/mantle/atoms/compute.ts

@@ -43,7 +43,7 @@ export function computeAtom(cache?: typeof globalDataFeaturesCache) {
   });
 
   const layer = atom<Layer | undefined>(undefined);
-  const overrides = atom<Record<string, any> | undefined, Record<string, any> | undefined>(
+  const overrides = atom<Record<string, any> | undefined, [Record<string, any> | undefined], void>(
     undefined,
     (_, set, value) => {
       set(overrides, pick(value, appearanceKeys));
@@ -308,7 +308,7 @@ export function computeAtom(cache?: typeof globalDataFeaturesCache) {
     await set(compute, { forceUpdateData: true });
   });
 
-  return atom<ComputedLayer | undefined, Command>(
+  return atom<ComputedLayer | undefined, [Command], void>(
     g => g(get),
     async (_, s, value) => {
       switch (value.type) {

src/test/utils.tsx

@@ -1,10 +1,6 @@
-// TODO: remove MockedProvider after double-checking the test here is not necessary
-// import { MockedProvider as MockedGqlProvider, MockedResponse } from "@apollo/client/testing";
 import { render as rtlRender } from "@testing-library/react";
 import { vitest } from "vitest";
 
-// import { Provider as I18nProvider } from "../services/i18n";
-
 // react-inlinesvg is not displayed in test.
 // see detail: https://github.com/gilbarbara/react-inlinesvg/issues/145
 vitest.mock("react-inlinesvg", () => {
@@ -22,11 +18,7 @@ vitest.mock("react-inlinesvg", () => {
   };
 });
 
-const render = (
-  ui: React.ReactElement,
-  // queryMocks?: readonly MockedResponse<Record<string, any>>[],
-  { ...renderOptions } = {},
-) => {
+const render = (ui: React.ReactElement, { ...renderOptions } = {}) => {
   const Wrapper: React.FC<{ children?: React.ReactNode }> = ({ children }) => {
     return <>{children}</>;
   };