diff --git a/package-lock.json b/package-lock.json index 87fad9c5..e7bfeb29 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,7 +22,7 @@ "@mui/system": "^6.1.4", "@mui/x-date-pickers": "^7.21.0", "@uiw/react-codemirror": "^4.19.5", - "chartlets": "^0.0.29", + "chartlets": "^0.1.2", "classnames": "^2.2.6", "codemirror": "^6.0.1", "color-rgba": "^2.2.3", @@ -3700,24 +3700,20 @@ } }, "node_modules/chartlets": { - "version": "0.0.29", - "resolved": "https://registry.npmjs.org/chartlets/-/chartlets-0.0.29.tgz", - "integrity": "sha512-lXaK5f4x7Jo4KvosFexEafvuOdJsYUVNgUV/u/kEpQnGDZKspj4iumb0Fpd+QxbikB6TVvGlWj4F42MiQIDJCQ==", + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/chartlets/-/chartlets-0.1.2.tgz", + "integrity": "sha512-l74NFc3RpampONEEVhHukiDnqKp+Q7usiVXqRzlrzSrI2HQJBnAMs2rwQjMPSw8YX5fNJgDQUY85T2+75mgyTw==", "license": "MIT", "dependencies": { - "@emotion/react": "^11.13.3", - "@emotion/styled": "^11.13.0", - "@fontsource/roboto": "^5.1.0", - "@mui/material": "^6.1.5", - "microdiff": "^1.4.0", - "react": "^18.3.1", - "react-dom": "^18.3.1", - "react-vega": "^7.6.0", - "zustand": "^5.0.0" + "microdiff": "^1.4", + "zustand": "^5.0" }, "peerDependencies": { + "@mui/material": ">=6", "react": ">=18", - "react-dom": ">=18" + "react-dom": ">=18", + "react-vega": ">=7", + "vega-themes": ">=2" }, "peerDependenciesMeta": { "react": { @@ -4778,7 +4774,8 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-3.1.1.tgz", "integrity": "sha512-vf6IHUX2SBcA+5/+4883dsIjpBTqmfBjmYiWK1savxQmFk4JfBMLa7ynTYOs1Rolp/T1betJxHiGD3g1Mn8lUQ==", - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/fast-json-stable-stringify": { "version": "2.1.0", @@ -7169,6 +7166,7 @@ "resolved": "https://registry.npmjs.org/react-vega/-/react-vega-7.6.0.tgz", "integrity": "sha512-2oMML4wH9qWLnZPRxJm06ozwrVN/K+nkjqdI5/ofWWsrBnnH4iB9rRKrsV8px0nlWgZrwfdCH4g5RUiyyJHWSA==", "license": "Apache-2.0", + "peer": true, "dependencies": { "@types/react": "*", "fast-deep-equal": "^3.1.1", @@ -7973,7 +7971,8 @@ "version": "2.8.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", - "license": "0BSD" + "license": "0BSD", + "peer": true }, "node_modules/type-check": { "version": "0.4.0", @@ -8251,6 +8250,7 @@ "resolved": "https://registry.npmjs.org/vega-embed/-/vega-embed-6.29.0.tgz", "integrity": "sha512-PmlshTLtLFLgWtF/b23T1OwX53AugJ9RZ3qPE2c01VFAbgt3/GSNI/etzA/GzdrkceXFma+FDHNXUppKuM0U6Q==", "license": "BSD-3-Clause", + "peer": true, "dependencies": { "fast-json-patch": "^3.1.1", "json-stringify-pretty-compact": "^4.0.0", @@ -8270,7 +8270,8 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/json-stringify-pretty-compact/-/json-stringify-pretty-compact-4.0.0.tgz", "integrity": "sha512-3CNZ2DnrpByG9Nqj6Xo8vqbjT4F6N+tb4Gb28ESAZjYZ5yqvmc56J+/kuIwkaAMOyblTQhUW7PxMkUb8Q36N3Q==", - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/vega-encode": { "version": "4.10.1", @@ -8383,7 +8384,8 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/vega-interpreter/-/vega-interpreter-1.0.5.tgz", "integrity": "sha512-po6oTOmeQqr1tzTCdD15tYxAQLeUnOVirAysgVEemzl+vfmvcEP7jQmlc51jz0jMA+WsbmE6oJywisQPu/H0Bg==", - "license": "BSD-3-Clause" + "license": "BSD-3-Clause", + "peer": true }, "node_modules/vega-label": { "version": "1.3.0", @@ -8537,7 +8539,8 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/vega-schema-url-parser/-/vega-schema-url-parser-2.2.0.tgz", "integrity": "sha512-yAtdBnfYOhECv9YC70H2gEiqfIbVkq09aaE4y/9V/ovEFmH9gPKaEgzIZqgT7PSPQjKhsNkb6jk6XvSoboxOBw==", - "license": "BSD-3-Clause" + "license": "BSD-3-Clause", + "peer": true }, "node_modules/vega-selections": { "version": "5.4.2", @@ -8566,6 +8569,7 @@ "resolved": "https://registry.npmjs.org/vega-themes/-/vega-themes-2.15.0.tgz", "integrity": "sha512-DicRAKG9z+23A+rH/3w3QjJvKnlGhSbbUXGjBvYGseZ1lvj9KQ0BXZ2NS/+MKns59LNpFNHGi9us/wMlci4TOA==", "license": "BSD-3-Clause", + "peer": true, "peerDependencies": { "vega": "*", "vega-lite": "*" @@ -8588,6 +8592,7 @@ "resolved": "https://registry.npmjs.org/vega-tooltip/-/vega-tooltip-0.35.2.tgz", "integrity": "sha512-kuYcsAAKYn39ye5wKf2fq1BAxVcjoz0alvKp/G+7BWfIb94J0PHmwrJ5+okGefeStZnbXxINZEOKo7INHaj9GA==", "license": "BSD-3-Clause", + "peer": true, "dependencies": { "vega-util": "^1.17.2" }, @@ -8606,7 +8611,8 @@ "optional": true, "os": [ "linux" - ] + ], + "peer": true }, "node_modules/vega-transforms": { "version": "4.12.0", @@ -8646,7 +8652,8 @@ "version": "1.17.2", "resolved": "https://registry.npmjs.org/vega-util/-/vega-util-1.17.2.tgz", "integrity": "sha512-omNmGiZBdjm/jnHjZlywyYqafscDdHaELHx1q96n5UOz/FlO9JO99P4B3jZg391EFG8dqhWjQilSf2JH6F1mIw==", - "license": "BSD-3-Clause" + "license": "BSD-3-Clause", + "peer": true }, "node_modules/vega-view": { "version": "5.13.0", diff --git a/package.json b/package.json index addb6363..49dbbf45 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "classnames": "^2.2.6", "codemirror": "^6.0.1", "color-rgba": "^2.2.3", - "chartlets": "^0.0.29", + "chartlets": "^0.1.2", "date-fns": "^2.29.3", "fast-memoize": "^2.5.2", "fflate": "^0.7.4", diff --git a/src/components/ImprintPage.tsx b/src/components/ImprintPage.tsx index 3b5e2b55..ea05aa8e 100644 --- a/src/components/ImprintPage.tsx +++ b/src/components/ImprintPage.tsx @@ -37,7 +37,7 @@ const ImprintPage = ({ open, onClose }: ImprintPageProps) => { return ( diff --git a/src/ext/actions.ts b/src/ext/actions.ts index 78ac6f65..991bdedb 100644 --- a/src/ext/actions.ts +++ b/src/ext/actions.ts @@ -1,5 +1,7 @@ import { Dispatch, Store } from "redux"; import { initializeContributions } from "chartlets"; +import mui from "chartlets/plugins/mui"; +import vega from "chartlets/plugins/vega"; import { AppState } from "@/states/appState"; import { selectedServerSelector } from "@/selectors/controlSelectors"; @@ -9,6 +11,7 @@ export function initializeExtensions(store: Store) { return (_dispatch: Dispatch, getState: () => AppState) => { const apiServer = selectedServerSelector(getState()); initializeContributions({ + plugins: [mui(), vega()], hostStore: newDerivedStore(store), logging: { enabled: import.meta.env.DEV }, api: {