Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(web): upgrade yarn dependencies #1216

Merged
merged 8 commits into from
Aug 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
125 changes: 63 additions & 62 deletions web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,111 +29,112 @@
"build-storybook": "storybook build"
},
"devDependencies": {
"@emotion/jest": "11.11.0",
"@emotion/jest": "11.13.0",
"@graphql-codegen/cli": "5.0.2",
"@graphql-codegen/fragment-matcher": "5.0.2",
"@graphql-codegen/introspection": "4.0.3",
"@graphql-codegen/typescript": "4.0.6",
"@graphql-codegen/typescript-operations": "4.2.0",
"@graphql-codegen/typescript": "4.0.9",
"@graphql-codegen/typescript-operations": "4.2.3",
"@graphql-codegen/typescript-react-apollo": "4.3.0",
"@mapbox/vector-tile": "1.3.1",
"@playwright/test": "1.43.1",
"@mapbox/vector-tile": "2.0.3",
"@playwright/test": "1.46.1",
"@rollup/plugin-yaml": "4.1.2",
"@storybook/addon-essentials": "8.0.8",
"@storybook/addon-interactions": "8.0.8",
"@storybook/addon-links": "8.0.8",
"@storybook/blocks": "8.0.8",
"@storybook/react": "8.0.8",
"@storybook/react-vite": "8.0.8",
"@storybook/addon-essentials": "8.2.9",
"@storybook/addon-interactions": "8.2.9",
"@storybook/addon-links": "8.2.9",
"@storybook/blocks": "8.2.9",
"@storybook/react": "8.2.9",
"@storybook/react-vite": "8.2.9",
"@storybook/testing-library": "0.2.2",
"@testing-library/jest-dom": "6.4.2",
"@testing-library/react": "15.0.2",
"@testing-library/jest-dom": "6.5.0",
"@testing-library/react": "16.0.1",
"@testing-library/react-hooks": "8.0.1",
"@testing-library/user-event": "14.5.2",
"@types/apollo-upload-client": "18.0.0",
"@types/file-saver": "2.0.7",
"@types/js-md5": "0.7.2",
"@types/mapbox__vector-tile": "1.3.4",
"@types/node": "20.12.7",
"@types/node": "22.5.1",
"@types/object-hash": "3.0.6",
"@types/react": "18.2.79",
"@types/react-dom": "18.2.25",
"@types/react-resizable": "3.0.7",
"@types/react": "18.3.4",
"@types/react-dom": "18.3.0",
"@types/react-resizable": "3.0.8",
"@types/react-router-dom": "5.3.3",
"@vitejs/plugin-react": "4.3.0",
"@vitest/coverage-v8": "1.6.0",
"axios": "^1.7.2",
"dotenv": "^16.4.5",
"@vitejs/plugin-react": "4.3.1",
"@vitest/coverage-v8": "2.0.5",
"axios": "1.7.5",
"dotenv": "16.4.5",
"eslint": "9.9.1",
"eslint-config-reearth": "0.3.6",
"eslint-plugin-playwright": "1.6.2",
"eslint-plugin-storybook": "0.8.0",
"globals": "15.3.0",
"i18next-parser": "8.13.0",
"globals": "15.9.0",
"i18next-parser": "9.0.2",
"jest": "29.7.0",
"jsdom": "24.0.0",
"jsdom": "25.0.0",
"less": "4.2.0",
"msw": "2.2.14",
"msw": "2.4.1",
"npm-run-all": "4.1.5",
"prettier": "3.3.0",
"prettier": "3.3.3",
"prop-types": "15.8.1",
"read-env": "2.0.0",
"storybook": "8.0.8",
"storybook": "8.2.9",
"ts-node": "10.9.2",
"typescript": "5.4.5",
"vite": "5.2.12",
"typescript": "5.5.4",
"vite": "5.4.2",
"vite-plugin-cesium": "1.2.23",
"vitest": "1.6.0"
"vitest": "2.0.5"
},
"dependencies": {
"@ant-design/compatible": "5.1.2",
"@ant-design/cssinjs": "1.20.0",
"@ant-design/icons": "5.3.6",
"@ant-design/pro-components": "2.7.2",
"@ant-design/pro-layout": "7.19.2",
"@ant-design/pro-provider": "^2.14.7",
"@ant-design/pro-table": "3.15.3",
"@apollo/client": "3.9.11",
"@ant-design/compatible": "5.1.3",
"@ant-design/cssinjs": "1.21.1",
"@ant-design/icons": "5.4.0",
"@ant-design/pro-components": "2.7.15",
"@ant-design/pro-layout": "7.19.12",
"@ant-design/pro-provider": "2.14.9",
"@ant-design/pro-table": "3.16.6",
"@apollo/client": "3.11.5",
"@auth0/auth0-react": "2.2.4",
"@emotion/react": "11.11.4",
"@emotion/styled": "11.11.5",
"@monaco-editor/react": "^4.6.0",
"@emotion/react": "11.13.3",
"@emotion/styled": "11.13.0",
"@monaco-editor/react": "4.6.0",
"@reearth/core": "0.0.7-alpha.13",
"ajv": "8.17.1",
"antd": "5.16.2",
"antd": "5.20.3",
"apollo-upload-client": "18.0.1",
"aws-amplify": "5.3.18",
"cesium": "1.117.0",
"aws-amplify": "5.3.21",
"cesium": "1.120.0",
"cesium-mvt-imagery-provider": "1.4.1",
"dayjs": "1.11.10",
"firebase": "10.12.5",
"dayjs": "1.11.13",
"firebase": "10.13.1",
"firebaseui": "6.1.0",
"formik": "2.4.5",
"graphiql": "3.2.0",
"graphql": "16.8.1",
"html-react-parser": "5.1.10",
"i18next": "23.11.2",
"i18next-browser-languagedetector": "7.2.1",
"jotai": "2.8.0",
"formik": "2.4.6",
"graphiql": "3.7.1",
"graphql": "16.9.0",
"html-react-parser": "5.1.15",
"i18next": "23.14.0",
"i18next-browser-languagedetector": "8.0.0",
"jotai": "2.9.3",
"js-file-download": "0.4.12",
"js-md5": "0.8.3",
"lodash.tonumber": "4.0.3",
"mini-svg-data-uri": "1.4.4",
"monaco-editor": "^0.50.0",
"monaco-editor": "0.51.0",
"object-hash": "3.0.0",
"rc-field-form": "^2.2.0",
"rc-menu": "^9.14.0",
"rc-table": "^7.46.1",
"react": "18.2.0",
"react-dom": "18.2.0",
"rc-field-form": "2.4.0",
"rc-menu": "9.15.1",
"rc-table": "7.47.5",
"react": "18.3.1",
"react-dom": "18.3.1",
"react-drag-listview": "2.0.0",
"react-i18next": "14.1.0",
"react-i18next": "15.0.1",
"react-json-tree": "0.19.0",
"react-markdown": "9.0.1",
"react-resizable": "3.0.5",
"react-router-dom": "6.22.3",
"react-router-dom": "6.26.1",
"react-svg": "16.1.34",
"remark-gfm": "4.0.0",
"resium": "1.17.4",
"resium": "1.18.2",
"ulid": "2.3.0"
},
"resolutions": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ const AccountServiceForm: React.FC<Props> = ({ user, onLanguageUpdate }) => {
);
};

const StyledForm = styled(Form)`
const StyledForm = styled(Form<FormType>)`
max-width: 400px;
`;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ type Props = {
handleProperties: (prop: Property) => void;
};

export type Property = Record<string, string | number | boolean>;
export type Property = Record<string, unknown>;

type URLTemplate = `http${"s" | ""}://${string}/{z}/{x}/{y}${string}`;
type TileCoordinates = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ const GeometryItem: React.FC<Props> = ({
}, [currentValue, typeCheck, value]);

const placeholderContent = useMemo(() => {
const key = Array.isArray(supportedTypes) ? supportedTypes[0] : supportedTypes ?? "POINT";
const key = Array.isArray(supportedTypes) ? supportedTypes[0] : (supportedTypes ?? "POINT");
const obj: {
type: string;
coordinates?: unknown;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ItemType } from "antd/lib/menu/hooks/useItems";
import { ItemType } from "antd/lib/menu/interface";
import { useCallback, useEffect, useState } from "react";

import Icon from "@reearth-cms/components/atoms/Icon";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ItemType } from "antd/lib/menu/hooks/useItems";
import { ItemType } from "antd/lib/menu/interface";
import { useCallback, useEffect, useState } from "react";

import Icon from "@reearth-cms/components/atoms/Icon";
Expand Down
6 changes: 3 additions & 3 deletions web/src/components/molecules/Content/Form/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ const ContentForm: React.FC<Props> = ({
return [];
}
} else {
return dayjs.isDayjs(value) ? transformDayjsToString(value) : value ?? "";
return dayjs.isDayjs(value) ? transformDayjsToString(value) : (value ?? "");
}
}, []);

Expand Down Expand Up @@ -374,7 +374,7 @@ const ContentForm: React.FC<Props> = ({
const type = model?.metadataSchema?.fields?.find(field => field.id === key)?.type;
if (type) {
metaFields.push({
value: dayjs.isDayjs(value) ? transformDayjsToString(value) : value ?? "",
value: dayjs.isDayjs(value) ? transformDayjsToString(value) : (value ?? ""),
schemaFieldId: key,
type,
});
Expand Down Expand Up @@ -408,7 +408,7 @@ const ContentForm: React.FC<Props> = ({
const metaFields: { schemaFieldId: string; type: FieldType; value: string }[] = [];
for (const [key, value] of Object.entries(metaValues)) {
metaFields.push({
value: (dayjs.isDayjs(value) ? transformDayjsToString(value) : value ?? "") as string,
value: (dayjs.isDayjs(value) ? transformDayjsToString(value) : (value ?? "")) as string,
schemaFieldId: key,
type: model?.metadataSchema?.fields?.find(field => field.id === key)?.type as FieldType,
});
Expand Down
2 changes: 1 addition & 1 deletion web/src/components/molecules/Content/Table/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -711,7 +711,7 @@ const ContentTable: React.FC<Props> = ({
currentView.columns?.forEach((col, index) => {
const colKey = (metaColumn as readonly string[]).includes(col.field.type)
? col.field.type
: col.field.id ?? "";
: (col.field.id ?? "");
cols[colKey] = { show: col.visible, order: index, fixed: col.fixed };
});
return cols;
Expand Down
4 changes: 2 additions & 2 deletions web/src/components/molecules/Schema/FieldModal/hooks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -155,15 +155,15 @@ export default (
case "Select": {
const defaultValue = Array.isArray(values.defaultValue)
? values.defaultValue.filter((value: string) => value)
: values.defaultValue ?? "";
: (values.defaultValue ?? "");
return {
select: { defaultValue, values: values.values ?? [] },
};
}
case "Integer": {
const defaultValue = Array.isArray(values.defaultValue)
? values.defaultValue.filter((value: number | string) => typeof value === "number")
: values.defaultValue ?? "";
: (values.defaultValue ?? "");
return {
integer: {
defaultValue,
Expand Down
Loading
Loading