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.

Sign up for GitHub

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

Jump to bottom

feat(web): upgrade dependencies which don't include breaking changes #783

Merged
merged 3 commits into from
Nov 2, 2023
Merged

feat(web): upgrade dependencies which don't include breaking changes #783

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
57bf980
feat(web): upgrade deps for patch
keiya01 Nov 2, 2023
95131d3
update minor
keiya01 Nov 2, 2023
eb32b0c
remove ^
keiya01 Nov 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
119 changes: 59 additions & 60 deletions web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,101 +41,100 @@
"@graphql-codegen/typescript": "4.0.1",
"@graphql-codegen/typescript-operations": "4.0.1",
"@graphql-codegen/typescript-react-apollo": "3.3.7",
"@playwright/test": "1.33.0",
"@rollup/plugin-yaml": "4.1.0",
"@storybook/addon-essentials": "7.3.2",
"@storybook/addon-styling": "1.3.6",
"@storybook/addons": "7.3.2",
"@storybook/manager-api": "7.3.2",
"@storybook/react": "7.3.2",
"@storybook/react-vite": "7.3.2",
"@storybook/theming": "7.3.2",
"@testing-library/jest-dom": "5.16.5",
"@playwright/test": "1.39.0",
"@rollup/plugin-yaml": "4.1.2",
"@storybook/addon-essentials": "7.5.2",
"@storybook/addon-styling": "1.3.7",
"@storybook/addons": "7.5.2",
"@storybook/manager-api": "7.5.2",
"@storybook/react": "7.5.2",
"@storybook/react-vite": "7.5.2",
"@storybook/theming": "7.5.2",
"@testing-library/jest-dom": "6.1.4",
"@testing-library/react": "14.0.0",
"@testing-library/user-event": "14.4.3",
"@testing-library/user-event": "14.5.1",
"@types/apollo-upload-client": "17.0.2",
"@types/carbon__colors": "10.31.0",
"@types/gapi.auth2": "0.0.57",
"@types/gapi.client": "1.0.5",
"@types/carbon__colors": "10.31.2",
"@types/gapi.auth2": "0.0.59",
"@types/gapi.client": "1.0.7",
"@types/gapi.client.sheets": "4.0.20201031",
"@types/google.picker": "0.0.39",
"@types/js-md5": "0.7.0",
"@types/lodash-es": "4.17.7",
"@types/mapbox__vector-tile": "1.3.0",
"@types/node": "20.1.4",
"@types/google.picker": "0.0.41",
"@types/js-md5": "0.7.1",
"@types/lodash-es": "4.17.10",
"@types/mapbox__vector-tile": "1.3.3",
"@types/node": "20.8.10",
"@types/react": "18.2.6",
"@types/react-dom": "18.2.4",
"@types/react-ga": "2.3.0",
"@types/react-leaflet": "2.8.2",
"@types/styled-components": "5.1.26",
"@types/tinycolor2": "1.4.3",
"@types/uuid": "9.0.1",
"@vitejs/plugin-react": "4.0.0",
"@vitest/coverage-c8": "0.31.0",
"@types/styled-components": "5.1.29",
"@types/tinycolor2": "1.4.5",
"@types/uuid": "9.0.6",
"@vitejs/plugin-react": "4.1.0",
"@vitest/coverage-v8": "^0.34.6",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you remove ^ and vite again 🙏🏻

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed! eb32b0c

"@welldone-software/why-did-you-render": "7.0.1",
"c8": "7.13.0",
"del-cli": "5.0.0",
"dotenv": "16.0.3",
"del-cli": "5.1.0",
"dotenv": "16.3.1",
"eslint": "8.40.0",
"eslint-config-reearth": "0.2.2",
"eslint-plugin-playwright": "0.12.0",
"eslint-plugin-storybook": "0.6.13",
"eslint-plugin-storybook": "0.6.15",
"husky": "8.0.3",
"i18next-parser": "8.0.0",
"jsdom": "22.0.0",
"i18next-parser": "8.9.0",
"jsdom": "22.1.0",
"lint-staged": "13.2.2",
"npm-run-all": "4.1.5",
"prettier": "2.8.8",
"read-env": "2.0.0",
"rollup": "3.22.1",
"rollup-plugin-visualizer": "5.9.0",
"storybook": "7.3.2",
"rollup": "4.2.0",
"rollup-plugin-visualizer": "5.9.2",
"storybook": "7.5.2",
"ts-node": "10.9.1",
"type-fest": "3.10.0",
"type-fest": "4.6.0",
"typescript": "5.0.4",
"typescript-styled-plugin": "0.18.3",
"vite": "4.4.9",
"vite": "4.5.0",
"vite-plugin-cesium": "1.2.22",
"vite-tsconfig-paths": "4.2.0",
"vitest": "0.31.0",
"vite-tsconfig-paths": "4.2.1",
"vitest": "0.34.6",
"web-streams-polyfill": "3.2.1"
},
"dependencies": {
"@apollo/client": "3.8.1",
"@auth0/auth0-react": "2.1.0",
"@aws-amplify/ui-react": "5.0.2",
"@carbon/colors": "11.18.0",
"@emotion/react": "11.11.0",
"@auth0/auth0-react": "2.2.2",
"@aws-amplify/ui-react": "5.3.1",
"@carbon/colors": "11.20.1",
"@emotion/react": "11.11.1",
"@emotion/styled": "11.11.0",
"@floating-ui/react": "0.24.7",
"@lexical/react": "0.12.0",
"@lexical/react": "0.12.2",
"@mapbox/vector-tile": "1.3.1",
"@monaco-editor/react": "4.6.0",
"@popperjs/core": "2.11.7",
"@popperjs/core": "2.11.8",
"@rot1024/use-transition": "1.0.0",
"@sentry/browser": "7.51.2",
"@sentry/browser": "7.77.0",
"@seznam/compose-react-refs": "1.0.6",
"@turf/turf": "6.5.0",
"@types/escape-string-regexp": "2.0.1",
"@ungap/event-target": "0.2.4",
"apollo-link-sentry": "3.2.3",
"apollo-upload-client": "17.0.0",
"array-move": "4.0.0",
"aws-amplify": "5.2.2",
"axios": "1.4.0",
"aws-amplify": "5.3.11",
"axios": "1.6.0",
"cesium": "1.105.2",
"cesium-dnd": "1.1.0",
"cesium-mvt-imagery-provider": "1.3.0",
"core-js": "3.30.2",
"crypto-js": "4.1.1",
"csv-parse": "5.3.10",
"core-js": "3.33.2",
"crypto-js": "4.2.0",
"csv-parse": "5.5.2",
"date-fns": "2.30.0",
"dayjs": "1.11.7",
"dayjs": "1.11.10",
"detect-browser": "5.3.0",
"escape-string-regexp": "5.0.0",
"fast-xml-parser": "4.2.2",
"formik": "2.2.9",
"github-markdown-css": "5.2.0",
"fast-xml-parser": "4.3.2",
"formik": "2.4.5",
"github-markdown-css": "5.4.0",
"graphiql": "2.4.4",
"graphql": "16.6.0",
"i18next": "22.4.15",
Expand All @@ -146,8 +145,8 @@
"jsep": "1.3.8",
"jsonpath-plus": "7.2.0",
"jszip": "3.10.1",
"leaflet": "1.9.3",
"lexical": "0.12.0",
"leaflet": "1.9.4",
"lexical": "0.12.2",
"localforage": "1.10.0",
"lodash-es": "4.17.21",
"lru-cache": "8.0.4",
Expand All @@ -166,17 +165,17 @@
"react-dnd-html5-backend": "16.0.1",
"react-dom": "18.2.0",
"react-dropzone": "14.2.3",
"react-error-boundary": "4.0.4",
"react-error-boundary": "4.0.11",
"react-ga": "3.3.1",
"react-ga4": "2.1.0",
"react-i18next": "12.2.2",
"react-inlinesvg": "3.0.2",
"react-leaflet": "4.2.1",
"react-markdown": "8.0.7",
"react-nl2br": "1.0.4",
"react-player": "2.12.0",
"react-player": "2.13.0",
"react-popper": "2.3.0",
"react-router-dom": "6.11.1",
"react-router-dom": "6.18.0",
"react-spinners": "0.13.8",
"react-use": "17.4.0",
"react18-json-view": "0.2.6",
Expand All @@ -185,8 +184,8 @@
"tinycolor2": "1.6.0",
"ts-easing": "0.2.0",
"use-callback-ref": "1.3.0",
"use-custom-compare": "1.3.0",
"use-custom-compare": "1.4.0",
"use-file-input": "1.0.0",
"uuid": "9.0.0"
"uuid": "9.0.1"
}
}
8 changes: 7 additions & 1 deletion web/src/beta/lib/core/engines/Cesium/Feature/Raster/mvt.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,13 @@ export const useMVT = ({
return "polyline";
case "Point":
return "marker";
default:
return;
}
})();
const computedFeature = ((): ComputedFeature | void => {
const layer = cachedCalculatedLayerRef.current?.layer;
if (layer?.type !== "simple") {
if (layer?.type !== "simple" || !appearanceType) {
return;
}
const feature = makeFeature("", mvtFeature, tile, appearanceType);
Expand Down Expand Up @@ -144,8 +146,12 @@ export const useMVT = ({
return "polyline";
case "Point":
return "marker";
default:
return;
}
})();
if (!appearanceType) return;

const id = mvtFeature.id
? String(mvtFeature.id)
: idFromGeometry(mvtFeature.loadGeometry(), tile);
Expand Down
8 changes: 7 additions & 1 deletion web/src/classic/core/engines/Cesium/Feature/Raster/mvt.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,13 @@ export const useMVT = ({
return "polyline";
case "Point":
return "marker";
default:
return;
}
})();
const computedFeature = ((): ComputedFeature | void => {
const layer = cachedCalculatedLayerRef.current?.layer;
if (layer?.type !== "simple") {
if (layer?.type !== "simple" || !appearanceType) {
return;
}
const feature = makeFeature("", mvtFeature, tile, appearanceType);
Expand Down Expand Up @@ -144,8 +146,12 @@ export const useMVT = ({
return "polyline";
case "Point":
return "marker";
default:
return;
}
})();
if (!appearanceType) return;

const id = mvtFeature.id
? String(mvtFeature.id)
: idFromGeometry(mvtFeature.loadGeometry(), tile);
Expand Down
2 changes: 1 addition & 1 deletion web/src/test/setup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable @typescript-eslint/no-namespace */
import { type EmotionMatchers, matchers as emotionMatchers } from "@emotion/jest";
import domMatchers from "@testing-library/jest-dom/matchers";
import * as domMatchers from "@testing-library/jest-dom/matchers";
import { cleanup } from "@testing-library/react";
import { afterEach, expect, vi } from "vitest";

Expand Down