Merge pull request #117 from reearth/deps/update-dependencies-security-fixes

chore: Deps/update dependencies security fixes

Author: bnimit

.eslintrc.yml

@@ -18,4 +18,4 @@ rules:
         order: asc
         caseInsensitive: true
   "@typescript-eslint/no-explicit-any":
-    - warn
+    - off

.github/workflows/ci.yml

@@ -10,14 +10,14 @@ jobs:
     name: Lint and Test
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v6
+      - uses: actions/setup-node@v6
         with:
           node-version: lts/*
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "path=$(yarn cache dir)" >> $GITHUB_OUTPUT
-      - uses: actions/cache@v3
+      - uses: actions/cache@v5
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.path }}
           key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}

.github/workflows/npm_release.yml

@@ -21,16 +21,16 @@ jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           token: ${{ secrets.PAT }}
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v6
         with:
           node-version: lts/*
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "path=$(yarn cache dir)" >> $GITHUB_OUTPUT
-      - uses: actions/cache@v3
+      - uses: actions/cache@v5
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.path }}
           key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}

.gitignore

@@ -10,6 +10,7 @@ lerna-debug.log*
 node_modules
 dist
 dist-ssr
+storybook-static
 *.local
 
 # Editor directories and files

.storybook/main.ts

@@ -1,21 +1,62 @@
 import type { StorybookConfig } from "@storybook/react-vite";
+import type { InlineConfig } from "vite";
 
 const config: StorybookConfig = {
   stories: ["../src/**/*.mdx", "../src/**/*.stories.@(js|jsx|mjs|ts|tsx)"],
+
   addons: [
     "@storybook/addon-onboarding",
     "@storybook/addon-links",
-    "@storybook/addon-essentials",
     "@chromatic-com/storybook",
-    "@storybook/addon-interactions",
+    "@storybook/addon-docs"
   ],
+
   framework: {
     name: "@storybook/react-vite",
     options: {
     },
   },
-  docs: {
-    autodocs: "tag",
+
+  async viteFinal(config: InlineConfig) {
+    // Dynamically import cesium plugin
+    const { default: cesium } = await import("vite-plugin-cesium");
+    const { readFileSync } = await import("fs");
+    const { resolve } = await import("path");
+    const { fileURLToPath } = await import("url");
+
+    const __dirname = fileURLToPath(new URL(".", import.meta.url));
+    const cesiumPackageJson = JSON.parse(
+      readFileSync(resolve(__dirname, "..", "node_modules", "cesium", "package.json"), "utf-8"),
+    );
+
+    return {
+      ...config,
+      plugins: [
+        ...(config.plugins || []),
+        cesium({ cesiumBaseUrl: `cesium-${cesiumPackageJson.version}/` }),
+      ],
+      resolve: {
+        ...config.resolve,
+        alias: {
+          ...config.resolve?.alias,
+          // Alias nosleep.js to its dist file which has proper exports
+          'nosleep.js': resolve(__dirname, '..', 'node_modules', 'nosleep.js', 'dist', 'NoSleep.js'),
+        },
+      },
+      optimizeDeps: {
+        ...config.optimizeDeps,
+        // Exclude Cesium from optimization due to worker files
+        exclude: [
+          ...(config.optimizeDeps?.exclude || []),
+          'cesium',
+        ],
+        // Keep resium included
+        include: [
+          ...(config.optimizeDeps?.include || []),
+          'resium',
+        ],
+      },
+    };
   },
 };
 export default config;

example/components/ui/button.tsx

@@ -32,8 +32,7 @@ const buttonVariants = cva(
 );
 
 export interface ButtonProps
-  extends React.ButtonHTMLAttributes<HTMLButtonElement>,
-    VariantProps<typeof buttonVariants> {
+  extends React.ButtonHTMLAttributes<HTMLButtonElement>, VariantProps<typeof buttonVariants> {
   asChild?: boolean;
 }
 

package.json

@@ -33,103 +33,100 @@
     "react-dom": "^19.0.0"
   },
   "dependencies": {
-    "@radix-ui/react-checkbox": "1.3.3",
-    "@radix-ui/react-dialog": "1.1.15",
-    "@radix-ui/react-icons": "1.3.2",
-    "@radix-ui/react-select": "2.2.6",
-    "@radix-ui/react-separator": "1.1.8",
-    "@radix-ui/react-slider": "1.3.6",
-    "@radix-ui/react-slot": "1.2.4",
-    "@radix-ui/react-switch": "1.2.6",
-    "@radix-ui/react-toggle": "1.1.10",
+    "@radix-ui/react-checkbox": "^1.3.3",
+    "@radix-ui/react-dialog": "^1.1.15",
+    "@radix-ui/react-icons": "^1.3.2",
+    "@radix-ui/react-select": "^2.2.6",
+    "@radix-ui/react-separator": "^1.1.8",
+    "@radix-ui/react-slider": "^1.3.6",
+    "@radix-ui/react-slot": "^1.2.4",
+    "@radix-ui/react-switch": "^1.2.6",
+    "@radix-ui/react-toggle": "^1.1.10",
     "@reearth/cesium-mvt-imagery-provider": "1.6.1",
     "@reearth/spatial-id-sdk": "0.0.0",
     "@rot1024/use-transition": "1.0.0",
     "@seznam/compose-react-refs": "1.0.6",
-    "@turf/invariant": "6.5.0",
-    "@turf/turf": "6.5.0",
-    "@types/proj4": "2.5.6",
+    "@turf/invariant": "^7.3.3",
+    "@turf/turf": "^7.3.3",
     "@ungap/event-target": "0.2.4",
     "@xstate/react": "3.2.1",
     "cesium-dnd": "1.1.0",
-    "csv-parse": "5.5.2",
-    "d3": "7.9.0",
-    "fast-xml-parser": "4.3.2",
-    "framer-motion": "11.0.27",
+    "csv-parse": "^6.1.0",
+    "d3": "^7.9.0",
+    "fast-xml-parser": "^5.3.3",
+    "framer-motion": "^12.29.2",
     "geojson": "0.5.0",
     "jotai": "1.12.1",
-    "js-md5": "0.7.3",
-    "jsep": "1.4.0",
-    "jsonpath-plus": "10.3.0",
-    "jszip": "3.10.1",
-    "lodash-es": "4.17.21",
-    "lru-cache": "8.0.4",
-    "pbf": "3.2.1",
-    "proj4": "2.20.2",
+    "js-md5": "^0.8.3",
+    "jsep": "^1.4.0",
+    "jsonpath-plus": "^10.3.0",
+    "jszip": "^3.10.1",
+    "lodash-es": "^4.17.23",
+    "lru-cache": "^11.2.5",
+    "pbf": "^4.0.1",
+    "proj4": "^2.20.2",
     "protomaps": "1.23.1",
     "react-dnd": "16.0.1",
     "react-dnd-html5-backend": "16.0.1",
-    "react-error-boundary": "4.0.11",
+    "react-error-boundary": "^6.1.0",
     "react-nl2br": "1.0.4",
-    "react-use": "17.6.0",
-    "resium": "1.18.4",
+    "react-use": "^17.6.0",
+    "resium": "^1.19.3",
     "suspend-react": "0.1.3",
-    "tailwind-merge": "2.5.2",
-    "tailwindcss": "3.4.10",
-    "tailwindcss-animate": "1.0.7",
+    "tailwind-merge": "^2.5.5",
+    "tailwindcss": "^3.4.17",
+    "tailwindcss-animate": "^1.0.7",
     "tiny-invariant": "1.3.3",
     "use-callback-ref": "1.3.3",
     "use-custom-compare": "1.5.0",
-    "uuid": "9.0.1",
+    "uuid": "^13.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.4.7",
-    "@storybook/addon-interactions": "8.4.7",
-    "@storybook/addon-links": "8.4.7",
-    "@storybook/addon-onboarding": "8.4.7",
-    "@storybook/blocks": "8.4.7",
-    "@storybook/react": "8.4.7",
-    "@storybook/react-vite": "8.4.7",
-    "@storybook/test": "8.4.7",
-    "@testing-library/jest-dom": "6.1.4",
-    "@testing-library/react": "14.0.0",
-    "@types/d3": "7.4.3",
-    "@types/geojson": "7946.0.16",
-    "@types/js-md5": "0.8.0",
-    "@types/lodash-es": "4.17.12",
-    "@types/node": "20.17.15",
-    "@types/pbf": "3.0.5",
-    "@types/react": "19.0.0",
-    "@types/react-dom": "19.0.0",
-    "@types/scheduler": "0.23.0",
-    "@types/uuid": "9.0.8",
-    "@vitejs/plugin-react": "4.2.1",
+    "@apollo/client": "^4.1.2",
+    "@chromatic-com/storybook": "^5.0.0",
+    "@emotion/jest": "^11.14.2",
+    "@storybook/addon-docs": "^10.2.3",
+    "@storybook/addon-links": "^10.2.3",
+    "@storybook/addon-onboarding": "^10.2.3",
+    "@storybook/react": "^10.2.3",
+    "@storybook/react-vite": "^10.2.3",
+    "@testing-library/dom": "^10.4.1",
+    "@testing-library/jest-dom": "^6.9.1",
+    "@testing-library/react": "^16.3.2",
+    "@types/d3": "^7.4.3",
+    "@types/geojson": "^7946.0.16",
+    "@types/js-md5": "^0.8.0",
+    "@types/lodash-es": "^4.17.12",
+    "@types/node": "^25.0.10",
+    "@types/pbf": "^3.0.5",
+    "@types/react": "^19.2.10",
+    "@types/react-dom": "^19.2.3",
+    "@types/scheduler": "^0.26.0",
+    "@vitejs/plugin-react": "^5.1.2",
     "@xstate/cli": "0.5.17",
-    "autoprefixer": "10.4.22",
-    "cesium": "1.118.0",
-    "class-variance-authority": "0.7.1",
-    "clsx": "2.1.1",
+    "autoprefixer": "^10.4.23",
+    "cesium": "^1.137.0",
+    "class-variance-authority": "^0.7.1",
+    "clsx": "^2.1.1",
     "eslint": "8.57.0",
     "eslint-config-reearth": "0.3.0",
-    "eslint-plugin-storybook": "0.8.0",
-    "jsdom": "22.1.0",
-    "postcss": "8.5.6",
-    "prettier": "3.1.0",
-    "react": "19.0.1",
-    "react-dom": "19.0.1",
-    "storybook": "8.4.7",
-    "typescript": "5.2.2",
-    "vite": "5.0.8",
+    "eslint-plugin-storybook": "^10.2.3",
+    "jsdom": "^27.4.0",
+    "postcss": "^8.5.6",
+    "prettier": "^3.8.1",
+    "react": "^19.2.4",
+    "react-dom": "^19.2.4",
+    "storybook": "^10.2.3",
+    "type-fest": "^5.4.2",
+    "typescript": "^5.9.3",
+    "vite": "^7.3.1",
     "vite-plugin-cesium": "1.2.23",
-    "vite-plugin-dts": "3.8.1",
+    "vite-plugin-dts": "^4.5.4",
     "vite-plugin-svgr": "4.5.0",
-    "vite-tsconfig-paths": "^4.3.2",
-    "vitest": "1.0.4",
-    "web-streams-polyfill": "3.2.1"
+    "vite-tsconfig-paths": "^6.0.5",
+    "vitest": "^4.0.18",
+    "web-streams-polyfill": "^4.2.0"
   },
   "resolutions": {
     "jackspeak": "3.1.2"

src/Map/Sketch/hooks.ts

@@ -16,8 +16,8 @@ import { v4 as uuidv4 } from "uuid";
 import { InterpreterFrom, StateFrom } from "xstate";
 
 import { ControlPointMouseEventHandler } from "../../engines/Cesium/Sketch";
+import { InteractionModeType } from "../../shared/interactionMode";
 import { useWindowEvent } from "../../utils/use-window-event";
-import { InteractionModeType } from "../../Visualizer/interactionMode";
 import { Feature, EngineRef, LayersRef, SketchRef } from "../types";
 import { useGet } from "../utils";
 

src/Map/Sketch/index.tsx

@@ -3,7 +3,7 @@
 import { ForwardRefRenderFunction, RefObject, forwardRef } from "react";
 
 import { ComputedLayer, SelectedFeatureInfo } from "../../mantle";
-import { InteractionModeType } from "../../Visualizer/interactionMode";
+import { InteractionModeType } from "../../shared/interactionMode";
 import { EngineRef, Feature, LayerSelectionReason, LayersRef, SketchRef } from "../types";
 
 import useHooks from "./hooks";

src/Map/SpatialId/hooks.ts

@@ -10,8 +10,8 @@ import {
 } from "react";
 import { v4 as uuid } from "uuid";
 
+import { InteractionModeType } from "../../shared/interactionMode";
 import { useWindowEvent } from "../../utils/use-window-event";
-import { InteractionModeType } from "../../Visualizer";
 import { GeoidRef } from "../Geoid/types";
 import { EngineRef, MouseEventProps } from "../types";
 
@@ -128,7 +128,7 @@ export default ({
     overrideInteractionMode?.(
       interactionModeRef.current === "spatialId"
         ? "default"
-        : interactionModeRef.current ?? "default",
+        : (interactionModeRef.current ?? "default"),
     );
     engineRef.current?.setCursor("default");
     engineRef.current?.requestRender();
@@ -197,15 +197,15 @@ export default ({
         setBaseCoordinateGeoid([
           props.lng,
           props.lat,
-          (terrainEnabled ? props.height ?? 0 : 0) - appliedGeoidHeight,
+          (terrainEnabled ? (props.height ?? 0) : 0) - appliedGeoidHeight,
         ]);
 
         setBasePosition(engineRef.current?.toXYZ(props.lng, props.lat, props.height ?? 0) ?? null);
 
         const initialSpaceSelectorSpace = createSpatialIdSpace(
           props.lng,
           props.lat,
-          (terrainEnabled ? props.height ?? 0 : 0) - appliedGeoidHeight,
+          (terrainEnabled ? (props.height ?? 0) : 0) - appliedGeoidHeight,
           pickOptions.zoom,
           appliedCenterGeoidHeight,
         );