Skip to content

Commit ebe5441

Browse files
authored
Merge pull request #121 from reearth/chore/package-updates-safe
chore: package updates safe
2 parents 296cb2c + 4572d05 commit ebe5441

15 files changed

Lines changed: 2305 additions & 2272 deletions

File tree

.github/workflows/npm_release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
git push --tags
5454
5555
- name: Release to NPM
56-
uses: JS-DevTools/npm-publish@v3
56+
uses: JS-DevTools/npm-publish@v4
5757
with:
5858
token: ${{ secrets.NPM_TOKEN }}
5959
tag: ${{ inputs.tag }}

.github/workflows/pr_title.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,10 @@ jobs:
2121
- uses: actions/labeler@v4
2222
with:
2323
repo-token: ${{ secrets.GITHUB_TOKEN }}
24-
- uses: amannn/action-semantic-pull-request@v5
24+
- uses: amannn/action-semantic-pull-request@v6
2525
env:
2626
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
27+
with:
2728
ignoreLabels: meta
2829
subjectPattern: ^(?![A-Z]).+$
2930
subjectPatternError: |

.storybook/main.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,15 @@ const config: StorybookConfig = {
3232
return {
3333
...config,
3434
plugins: [
35-
...(config.plugins || []),
35+
...(config.plugins || []).filter((p: any) => p?.name !== "vite:dts"),
3636
cesium({ cesiumBaseUrl: `cesium-${cesiumPackageJson.version}/` }),
3737
],
3838
resolve: {
3939
...config.resolve,
4040
alias: {
4141
...config.resolve?.alias,
42+
// csv-parse main entry uses Node.js streams; use browser ESM build instead
43+
'csv-parse': 'csv-parse/browser/esm',
4244
// Alias nosleep.js to its dist file which has proper exports
4345
'nosleep.js': resolve(__dirname, '..', 'node_modules', 'nosleep.js', 'dist', 'NoSleep.js'),
4446
},

example/global.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
@tailwind base;
2-
@tailwind components;
3-
@tailwind utilities;
1+
@import "tailwindcss";
2+
@plugin "tailwindcss-animate";
3+
@config "../tailwind.config.js";
44

55
@layer base {
66
* {

package.json

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,21 +42,21 @@
4242
"@radix-ui/react-slot": "^1.2.4",
4343
"@radix-ui/react-switch": "^1.2.6",
4444
"@radix-ui/react-toggle": "^1.1.10",
45-
"@reearth/cesium-mvt-imagery-provider": "1.6.1",
45+
"@reearth/cesium-mvt-imagery-provider": "1.6.2",
4646
"@reearth/spatial-id-sdk": "0.0.0",
4747
"@rot1024/use-transition": "1.0.0",
4848
"@seznam/compose-react-refs": "1.0.6",
4949
"@turf/invariant": "^7.3.3",
5050
"@turf/turf": "^7.3.3",
5151
"@ungap/event-target": "0.2.4",
52-
"@xstate/react": "3.2.1",
52+
"@xstate/react": "^6.1.0",
5353
"cesium-dnd": "1.1.0",
5454
"csv-parse": "^6.1.0",
5555
"d3": "^7.9.0",
5656
"fast-xml-parser": "^5.3.3",
5757
"framer-motion": "^12.29.2",
5858
"geojson": "0.5.0",
59-
"jotai": "1.12.1",
59+
"jotai": "^2.18.0",
6060
"js-md5": "^0.8.3",
6161
"jsep": "^1.4.0",
6262
"jsonpath-plus": "^10.3.0",
@@ -65,22 +65,22 @@
6565
"lru-cache": "^11.2.5",
6666
"pbf": "^4.0.1",
6767
"proj4": "^2.20.2",
68-
"protomaps": "1.23.1",
68+
"protomaps-leaflet": "^5.1.0",
6969
"react-dnd": "16.0.1",
7070
"react-dnd-html5-backend": "16.0.1",
7171
"react-error-boundary": "^6.1.0",
7272
"react-nl2br": "1.0.4",
7373
"react-use": "^17.6.0",
7474
"resium": "^1.19.3",
7575
"suspend-react": "0.1.3",
76-
"tailwind-merge": "^2.5.5",
77-
"tailwindcss": "^3.4.17",
76+
"tailwind-merge": "^3.5.0",
77+
"tailwindcss": "^4.2.1",
7878
"tailwindcss-animate": "^1.0.7",
7979
"tiny-invariant": "1.3.3",
8080
"use-callback-ref": "1.3.3",
8181
"use-custom-compare": "1.5.0",
8282
"uuid": "^13.0.0",
83-
"xstate": "4.38.2"
83+
"xstate": "^5.28.0"
8484
},
8585
"devDependencies": {
8686
"@apollo/client": "^4.1.2",
@@ -105,14 +105,15 @@
105105
"@types/scheduler": "^0.26.0",
106106
"@vitejs/plugin-react": "^5.1.2",
107107
"@xstate/cli": "0.5.17",
108+
"@tailwindcss/postcss": "^4.2.1",
108109
"autoprefixer": "^10.4.23",
109110
"cesium": "^1.137.0",
110111
"class-variance-authority": "^0.7.1",
111112
"clsx": "^2.1.1",
112113
"eslint": "8.57.0",
113114
"eslint-config-reearth": "0.3.0",
114115
"eslint-plugin-storybook": "^10.2.3",
115-
"jsdom": "^27.4.0",
116+
"jsdom": "^28.1.0",
116117
"postcss": "^8.5.6",
117118
"prettier": "^3.8.1",
118119
"react": "^19.2.4",

postcss.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
export default {
22
plugins: {
3-
tailwindcss: {},
3+
"@tailwindcss/postcss": {},
44
autoprefixer: {},
55
},
66
}

src/Map/Sketch/hooks.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313
useState,
1414
} from "react";
1515
import { v4 as uuidv4 } from "uuid";
16-
import { InterpreterFrom, StateFrom } from "xstate";
16+
import { ActorRefFrom, StateFrom } from "xstate";
1717

1818
import { ControlPointMouseEventHandler } from "../../engines/Cesium/Sketch";
1919
import { InteractionModeType } from "../../shared/interactionMode";
@@ -65,7 +65,7 @@ type Props = {
6565
const sketchMachine = createSketchMachine();
6666

6767
export type sketchState = StateFrom<typeof sketchMachine>;
68-
export type SketchInterpreter = InterpreterFrom<typeof sketchMachine>;
68+
export type SketchInterpreter = ActorRefFrom<typeof sketchMachine>;
6969

7070
export default function ({
7171
ref,

0 commit comments

Comments
 (0)