Skip to content

Commit 9bc30a7

Browse files
renovate[bot]keiya01
renovate[bot]
and
keiya01
authored
chore: update npm dependencies (#626)
* chore: update npm dependencies * fix * fix * fix test and type --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: keiya01 <[email protected]>
1 parent e09c037 commit 9bc30a7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+8354
-6813
lines changed

‎.storybook/main.ts

+3
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ const config: StorybookConfig = {
1919
},
2020
"@storybook/addon-storysource",
2121
],
22+
typescript: {
23+
reactDocgen: false,
24+
},
2225
viteFinal(config) {
2326
return mergeConfig(config, {
2427
base: "",

‎docs/package.json

+9-9
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"clear": "docusaurus clear"
1313
},
1414
"engines": {
15-
"node": ">=v18"
15+
"node": ">=20.12.0"
1616
},
1717
"browserslist": {
1818
"production": [
@@ -27,18 +27,18 @@
2727
]
2828
},
2929
"dependencies": {
30-
"@docusaurus/core": "2.4.1",
31-
"@docusaurus/preset-classic": "2.4.1",
32-
"clsx": "1.2.1",
30+
"@docusaurus/core": "3.2.0",
31+
"@docusaurus/preset-classic": "3.2.0",
32+
"clsx": "2.1.0",
3333
"react": "18.2.0",
3434
"react-dom": "18.2.0"
3535
},
3636
"devDependencies": {
37-
"@docusaurus/module-type-aliases": "2.4.1",
38-
"@tsconfig/docusaurus": "2.0.0",
39-
"@types/react": "18.2.14",
40-
"@types/react-helmet": "6.1.6",
37+
"@docusaurus/module-type-aliases": "3.2.0",
38+
"@tsconfig/docusaurus": "2.0.3",
39+
"@types/react": "18.2.73",
40+
"@types/react-helmet": "6.1.11",
4141
"@types/react-router-dom": "5.3.3",
42-
"typescript": "5.1.6"
42+
"typescript": "5.4.3"
4343
}
4444
}

‎docs/yarn.lock

+3,672-1,874
Large diffs are not rendered by default.

‎package.json

+27-27
Original file line numberDiff line numberDiff line change
@@ -36,43 +36,43 @@
3636
"dist"
3737
],
3838
"engines": {
39-
"node": ">=v18"
39+
"node": ">=20.11.0"
4040
},
4141
"peerDependencies": {
4242
"cesium": "1.x",
4343
"react": ">=18.2.0"
4444
},
4545
"devDependencies": {
46-
"@storybook/addon-essentials": "7.0.26",
47-
"@storybook/addon-storysource": "7.0.26",
48-
"@storybook/addons": "7.0.26",
49-
"@storybook/builder-vite": "7.0.26",
50-
"@storybook/react": "7.0.26",
51-
"@storybook/react-vite": "7.0.18",
52-
"@storybook/theming": "7.0.26",
53-
"@testing-library/jest-dom": "5.16.5",
54-
"@testing-library/react": "14.0.0",
55-
"@types/node": "18.16.19",
56-
"@types/react": "18.0.28",
57-
"@vitejs/plugin-react": "4.0.2",
58-
"c8": "8.0.0",
46+
"@storybook/addon-essentials": "8.0.5",
47+
"@storybook/addon-storysource": "8.0.5",
48+
"@storybook/addons": "7.6.17",
49+
"@storybook/builder-vite": "8.0.5",
50+
"@storybook/react": "8.0.5",
51+
"@storybook/react-vite": "8.0.5",
52+
"@storybook/theming": "8.0.5",
53+
"@testing-library/jest-dom": "6.4.2",
54+
"@testing-library/react": "14.2.2",
55+
"@types/node": "20.12.2",
56+
"@types/react": "18.2.73",
57+
"@vitejs/plugin-react": "4.2.1",
58+
"c8": "9.1.0",
5959
"cesium": "1.107.2",
60-
"eslint": "8.44.0",
61-
"eslint-config-reearth": "0.2.2",
62-
"globby": "13.2.2",
63-
"jsdom": "22.1.0",
64-
"npm-run-all": "4.1.5",
65-
"prettier": "2.8.8",
60+
"eslint": "8.57.0",
61+
"eslint-config-reearth": "0.3.0",
62+
"globby": "14.0.1",
63+
"jsdom": "24.0.0",
64+
"npm-run-all2": "5.0.0",
65+
"prettier": "3.2.5",
6666
"react": "18.2.0",
6767
"react-dom": "18.2.0",
68-
"storybook": "7.0.18",
68+
"storybook": "8.0.5",
6969
"ts-expect": "1.3.0",
70-
"ts-node": "10.9.1",
71-
"typescript": "5.1.6",
72-
"vite": "4.4.2",
70+
"ts-node": "10.9.2",
71+
"typescript": "5.4.3",
72+
"vite": "5.2.7",
7373
"vite-plugin-cesium": "1.2.22",
74-
"vite-plugin-dts": "2.1.0",
75-
"vitest": "0.29.2",
76-
"web-streams-polyfill": "3.2.1"
74+
"vite-plugin-dts": "3.8.1",
75+
"vitest": "1.4.0",
76+
"web-streams-polyfill": "4.0.0"
7777
}
7878
}

‎src/Billboard/Billboard.stories.tsx

+48-42
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,63 @@
1-
import { Meta, Story } from "@storybook/react";
1+
import { Meta, StoryObj } from "@storybook/react";
22
import { Cartesian3, Color, Transforms } from "cesium";
33

44
import BillboardCollection from "../BillboardCollection";
55
import { events } from "../core/storybook";
66
import Viewer from "../Viewer";
77

8-
import Billboard, { BillboardProps } from "./Billboard";
8+
import Billboard from "./Billboard";
9+
10+
type Story = StoryObj<typeof Billboard>;
911

1012
export default {
1113
title: "Billboard",
1214
component: BillboardCollection,
1315
} as Meta;
1416

15-
const Template: Story<BillboardProps> = args => (
16-
<Viewer full>
17-
<BillboardCollection
18-
modelMatrix={Transforms.eastNorthUpToFixedFrame(Cartesian3.fromDegrees(-75.59777, 40.03883))}>
19-
{(
20-
[
21-
[Color.ORANGE, new Cartesian3(0.0, 0.0, 0.0)],
22-
[Color.YELLOW, new Cartesian3(1000000.0, 0.0, 0.0)],
23-
[Color.GREEN, new Cartesian3(0.0, 1000000.0, 0.0)],
24-
[Color.CYAN, new Cartesian3(0.0, 0.0, 1000000.0)],
25-
] as const
26-
).map((p, i) => (
27-
<Billboard key={i} id={`billboard-${i}`} {...args} color={p[0]} position={p[1]} />
28-
))}
29-
</BillboardCollection>
30-
</Viewer>
31-
);
32-
33-
export const Basic = Template.bind({});
34-
35-
Basic.args = {
36-
image: "example.png",
37-
scale: 0.1,
17+
export const Basic: Story = {
18+
args: {
19+
image: "example.png",
20+
scale: 0.1,
21+
},
22+
render: args => (
23+
<Viewer full>
24+
<BillboardCollection
25+
modelMatrix={Transforms.eastNorthUpToFixedFrame(
26+
Cartesian3.fromDegrees(-75.59777, 40.03883),
27+
)}>
28+
{(
29+
[
30+
[Color.ORANGE, new Cartesian3(0.0, 0.0, 0.0)],
31+
[Color.YELLOW, new Cartesian3(1000000.0, 0.0, 0.0)],
32+
[Color.GREEN, new Cartesian3(0.0, 1000000.0, 0.0)],
33+
[Color.CYAN, new Cartesian3(0.0, 0.0, 1000000.0)],
34+
] as const
35+
).map((p, i) => (
36+
<Billboard key={i} id={`billboard-${i}`} {...args} color={p[0]} position={p[1]} />
37+
))}
38+
</BillboardCollection>
39+
</Viewer>
40+
),
3841
};
3942

40-
export const Events: Story<BillboardProps> = args => (
41-
<Viewer full>
42-
<BillboardCollection
43-
modelMatrix={Transforms.eastNorthUpToFixedFrame(Cartesian3.fromDegrees(-75.59777, 40.03883))}>
44-
<Billboard
45-
{...args}
46-
color={Color.ORANGE}
47-
position={new Cartesian3(0.0, 0.0, 0.0)}
48-
{...events}
49-
/>
50-
</BillboardCollection>
51-
</Viewer>
52-
);
53-
54-
Events.args = {
55-
image: "example.png",
56-
scale: 0.1,
43+
export const Events: Story = {
44+
args: {
45+
image: "example.png",
46+
scale: 0.1,
47+
},
48+
render: args => (
49+
<Viewer full>
50+
<BillboardCollection
51+
modelMatrix={Transforms.eastNorthUpToFixedFrame(
52+
Cartesian3.fromDegrees(-75.59777, 40.03883),
53+
)}>
54+
<Billboard
55+
{...args}
56+
color={Color.ORANGE}
57+
position={new Cartesian3(0.0, 0.0, 0.0)}
58+
{...events}
59+
/>
60+
</BillboardCollection>
61+
</Viewer>
62+
),
5763
};

‎src/Camera/Camera.stories.tsx

+12-8
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,24 @@
11
import { actions } from "@storybook/addon-actions";
2-
import { Story, Meta } from "@storybook/react";
2+
import { Meta, StoryObj } from "@storybook/react";
33
import { Cartesian3 } from "cesium";
44

55
import CameraFlyTo from "../CameraFlyTo";
66
import Viewer from "../Viewer";
77

8-
import Camera, { CameraProps } from "./Camera";
8+
import Camera from "./Camera";
9+
10+
type Story = StoryObj<typeof Camera>;
911

1012
export default {
1113
title: "Camera",
1214
component: Camera,
1315
} as Meta;
1416

15-
export const Basic: Story<CameraProps> = args => (
16-
<Viewer full>
17-
<Camera {...args} {...actions("onMoveEnd", "onMoveStart", "onChange")} />
18-
<CameraFlyTo duration={5} destination={Cartesian3.fromDegrees(139.767052, 35.681167, 100)} />
19-
</Viewer>
20-
);
17+
export const Basic: Story = {
18+
render: args => (
19+
<Viewer full>
20+
<Camera {...args} {...actions("onMoveEnd", "onMoveStart", "onChange")} />
21+
<CameraFlyTo duration={5} destination={Cartesian3.fromDegrees(139.767052, 35.681167, 100)} />
22+
</Viewer>
23+
),
24+
};

‎src/CameraFlyTo/CameraFlyTo.stories.tsx

+31-26
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,46 @@
1-
import { Story, Meta } from "@storybook/react";
1+
import { Meta, StoryObj } from "@storybook/react";
22
import { Cartesian3 } from "cesium";
33
import { useState } from "react";
44

55
import Viewer from "../Viewer";
66

7-
import CameraFlyTo, { CameraFlyToProps } from "./CameraFlyTo";
7+
import CameraFlyTo from "./CameraFlyTo";
8+
9+
type Story = StoryObj<typeof CameraFlyTo>;
810

911
export default {
1012
title: "CameraFlyTo",
1113
component: CameraFlyTo,
1214
} as Meta;
1315

14-
export const Basic: Story<CameraFlyToProps> = args => (
15-
<Viewer full>
16-
<CameraFlyTo {...args} destination={Cartesian3.fromDegrees(139.767052, 35.681167, 100)} />
17-
</Viewer>
18-
);
19-
20-
Basic.args = { duration: 5 };
21-
22-
export const Once: Story<CameraFlyToProps> = args => {
23-
const [once, setOnce] = useState(true);
24-
return (
16+
export const Basic: Story = {
17+
args: { duration: 5 },
18+
render: args => (
2519
<Viewer full>
26-
<button
27-
style={{ position: "absolute", top: "0", left: "0" }}
28-
onClick={() => setOnce(o => !o)}>
29-
Once: {once.toString()}
30-
</button>
31-
<CameraFlyTo
32-
{...args}
33-
duration={5}
34-
destination={Cartesian3.fromDegrees(139.767052, 35.681167, 100)}
35-
once={once}
36-
/>
20+
<CameraFlyTo {...args} destination={Cartesian3.fromDegrees(139.767052, 35.681167, 100)} />
3721
</Viewer>
38-
);
22+
),
3923
};
4024

41-
Once.args = { duration: 5 };
25+
export const Once: Story = {
26+
args: { duration: 5 },
27+
render: args => {
28+
// eslint-disable-next-line react-hooks/rules-of-hooks
29+
const [once, setOnce] = useState(true);
30+
return (
31+
<Viewer full>
32+
<button
33+
style={{ position: "absolute", top: "0", left: "0" }}
34+
onClick={() => setOnce(o => !o)}>
35+
Once: {once.toString()}
36+
</button>
37+
<CameraFlyTo
38+
{...args}
39+
duration={5}
40+
destination={Cartesian3.fromDegrees(139.767052, 35.681167, 100)}
41+
once={once}
42+
/>
43+
</Viewer>
44+
);
45+
},
46+
};

‎src/CameraLookAt/CameraLookAt.stories.tsx

+14-11
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,25 @@
1-
import { Story, Meta } from "@storybook/react";
1+
import { StoryObj, Meta } from "@storybook/react";
22
import { Cartesian3 } from "cesium";
33

44
import Viewer from "../Viewer";
55

6-
import CameraLookAt, { CameraLookAtProps } from "./CameraLookAt";
6+
import CameraLookAt from "./CameraLookAt";
7+
8+
type Story = StoryObj<typeof CameraLookAt>;
79

810
export default {
911
title: "CameraLookAt",
1012
component: CameraLookAt,
1113
} as Meta;
1214

13-
export const Basic: Story<CameraLookAtProps> = args => (
14-
<Viewer full>
15-
<CameraLookAt {...args} />
16-
</Viewer>
17-
);
18-
19-
Basic.args = {
20-
target: Cartesian3.fromDegrees(-123.0744619, 44.0503706, 50),
21-
offset: new Cartesian3(30, 30, -10),
15+
export const Basic: Story = {
16+
args: {
17+
target: Cartesian3.fromDegrees(-123.0744619, 44.0503706, 50),
18+
offset: new Cartesian3(30, 30, -10),
19+
},
20+
render: args => (
21+
<Viewer full>
22+
<CameraLookAt {...args} />
23+
</Viewer>
24+
),
2225
};

0 commit comments

Comments
 (0)