From 87990ea8cc4c271060d511cba9afc8cae727a665 Mon Sep 17 00:00:00 2001 From: dangreen Date: Mon, 19 Dec 2022 15:02:44 +0400 Subject: [PATCH] feat: restore CommonJS bundle --- package.json | 9 +- pnpm-lock.yaml | 283 ++++++++++++++++++++++++++++------------------- rollup.config.js | 17 ++- src/chart.tsx | 27 +++-- tsconfig.json | 2 +- 5 files changed, 201 insertions(+), 137 deletions(-) diff --git a/package.json b/package.json index 7fa8a4a50..078ced344 100644 --- a/package.json +++ b/package.json @@ -26,8 +26,9 @@ "exports": "./src/index.ts", "publishConfig": { "exports": { + "types": "./dist/index.d.ts", "import": "./dist/index.js", - "types": "./dist/index.d.ts" + "require": "./dist/index.cjs" }, "directory": "package" }, @@ -55,7 +56,7 @@ "updateGitHooks": "simple-git-hooks" }, "peerDependencies": { - "chart.js": "^4.0.0", + "chart.js": "^4.1.1", "react": "^16.8.0 || ^17.0.0 || ^18.0.0" }, "devDependencies": { @@ -86,7 +87,7 @@ "@vitejs/plugin-react": "^3.0.0", "@vitest/coverage-c8": "^0.25.2", "browserslist": "^4.17.3", - "chart.js": "^4.0.1", + "chart.js": "^4.1.1", "chartjs-adapter-date-fns": "^3.0.0", "chartjs-plugin-annotation": "^2.0.1", "chartjs-plugin-zoom": "^2.0.0", @@ -117,7 +118,7 @@ "size-limit": "^8.0.0", "standard-version": "^9.3.1", "tsd": "^0.25.0", - "typescript": "^4.9.3", + "typescript": "^4.9.4", "vite": "^4.0.0", "vitest": "^0.25.2", "vitest-canvas-mock": "^0.2.1" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a08708cfb..0722594e6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -28,7 +28,7 @@ specifiers: '@vitejs/plugin-react': ^3.0.0 '@vitest/coverage-c8': ^0.25.2 browserslist: ^4.17.3 - chart.js: ^4.0.1 + chart.js: ^4.1.1 chartjs-adapter-date-fns: ^3.0.0 chartjs-plugin-annotation: ^2.0.1 chartjs-plugin-zoom: ^2.0.0 @@ -59,7 +59,7 @@ specifiers: size-limit: ^8.0.0 standard-version: ^9.3.1 tsd: ^0.25.0 - typescript: ^4.9.3 + typescript: ^4.9.4 vite: ^4.0.0 vitest: ^0.25.2 vitest-canvas-mock: ^0.2.1 @@ -71,13 +71,13 @@ devDependencies: '@rollup/plugin-node-resolve': 15.0.1_rollup@3.3.0 '@size-limit/preset-big-lib': 8.1.0_hu52ztukd3brasuh732gxdx5lq '@storybook/addon-actions': 6.5.13_biqbaboplfbrettd7655fr4n2y - '@storybook/addon-controls': 6.5.13_j6n3fnfl3ogrh2anobl27pcriu - '@storybook/addon-docs': 6.5.13_j6n3fnfl3ogrh2anobl27pcriu + '@storybook/addon-controls': 6.5.13_gx5nmzcckj6uccw7lz6m7gptrm + '@storybook/addon-docs': 6.5.13_gx5nmzcckj6uccw7lz6m7gptrm '@storybook/addons': 6.5.13_biqbaboplfbrettd7655fr4n2y - '@storybook/builder-vite': 0.2.5_zfiyq7l2z7ufqj42yzvkvzwsgy + '@storybook/builder-vite': 0.2.5_fqod4hi6ckdidcc4b7t7y2sdsu '@storybook/client-api': 6.5.13_biqbaboplfbrettd7655fr4n2y '@storybook/client-logger': 6.5.13 - '@storybook/react': 6.5.13_3sepuovf3dtfhe63jxsoci7ui4 + '@storybook/react': 6.5.13_rzkwssihpjinfy56wjte5xrcbe '@swc/core': 1.3.18 '@swc/helpers': 0.4.13 '@testing-library/jest-dom': 5.16.5 @@ -87,15 +87,15 @@ devDependencies: '@types/react': 18.0.25 '@types/react-dom': 18.0.9 '@types/testing-library__jest-dom': 5.14.5 - '@typescript-eslint/eslint-plugin': 5.43.0_nyvtogynqlwtf2idoqyimls6fu - '@typescript-eslint/parser': 5.43.0_77fvizpdb3y4icyeo2mf4eo7em + '@typescript-eslint/eslint-plugin': 5.43.0_xspifk7brbsnyg562jkgvazaje + '@typescript-eslint/parser': 5.43.0_yfqovispp7u7jaktymfaqwl2py '@vitejs/plugin-react': 3.0.0_vite@4.0.2 '@vitest/coverage-c8': 0.25.2_jsdom@20.0.2 browserslist: 4.21.4 - chart.js: 4.0.1 - chartjs-adapter-date-fns: 3.0.0_thp3sedjxvmiqxrdsmekdnimom - chartjs-plugin-annotation: 2.0.1_chart.js@4.0.1 - chartjs-plugin-zoom: 2.0.0_chart.js@4.0.1 + chart.js: 4.1.1 + chartjs-adapter-date-fns: 3.0.0_iln6v37jwapfq6ambblo6nwala + chartjs-plugin-annotation: 2.0.1_chart.js@4.1.1 + chartjs-plugin-zoom: 2.0.0_chart.js@4.1.1 clean-publish: 4.0.1 commitizen: 4.2.5_@swc+core@1.3.18 date-fns: 2.29.3 @@ -123,7 +123,7 @@ devDependencies: size-limit: 8.1.0 standard-version: 9.5.0 tsd: 0.25.0 - typescript: 4.9.3 + typescript: 4.9.4 vite: 4.0.2_@types+node@18.11.9 vitest: 0.25.2_jsdom@20.0.2 vitest-canvas-mock: 0.2.1_vitest@0.25.2 @@ -2587,16 +2587,40 @@ packages: '@types/node': 14.18.33 chalk: 4.1.2 cosmiconfig: 7.1.0 - cosmiconfig-typescript-loader: 4.2.0_qoh33be55smklb2oyrgdyddh4a + cosmiconfig-typescript-loader: 4.2.0_wb7bklcl6jlvxijczjyxggip4a lodash: 4.17.21 resolve-from: 5.0.0 - ts-node: 10.9.1_noisjdkgnneiujhl36l4s2bvea - typescript: 4.9.3 + ts-node: 10.9.1_tcswbobcmtsn6igcp4l6g5pfhu + typescript: 4.9.4 transitivePeerDependencies: - '@swc/core' - '@swc/wasm' dev: true + /@commitlint/load/17.3.0_@swc+core@1.3.18: + resolution: {integrity: sha512-u/pV6rCAJrCUN+HylBHLzZ4qj1Ew3+eN9GBPhNi9otGxtOfA8b+8nJSxaNbcC23Ins/kcpjGf9zPSVW7628Umw==} + engines: {node: '>=v14'} + dependencies: + '@commitlint/config-validator': 17.1.0 + '@commitlint/execute-rule': 17.0.0 + '@commitlint/resolve-extends': 17.3.0 + '@commitlint/types': 17.0.0 + '@types/node': 14.18.33 + chalk: 4.1.2 + cosmiconfig: 7.1.0 + cosmiconfig-typescript-loader: 4.2.0_wb7bklcl6jlvxijczjyxggip4a + lodash.isplainobject: 4.0.6 + lodash.merge: 4.6.2 + lodash.uniq: 4.5.0 + resolve-from: 5.0.0 + ts-node: 10.9.1_tcswbobcmtsn6igcp4l6g5pfhu + typescript: 4.9.4 + transitivePeerDependencies: + - '@swc/core' + - '@swc/wasm' + dev: true + optional: true + /@commitlint/message/17.2.0: resolution: {integrity: sha512-/4l2KFKxBOuoEn1YAuuNNlAU05Zt7sNsC9H0mPdPm3chOrT4rcX0pOqrQcLtdMrMkJz0gC7b3SF80q2+LtdL9Q==} engines: {node: '>=v14'} @@ -2634,6 +2658,19 @@ packages: resolve-global: 1.0.0 dev: true + /@commitlint/resolve-extends/17.3.0: + resolution: {integrity: sha512-Lf3JufJlc5yVEtJWC8o4IAZaB8FQAUaVlhlAHRACd0TTFizV2Lk2VH70et23KgvbQNf7kQzHs/2B4QZalBv6Cg==} + engines: {node: '>=v14'} + dependencies: + '@commitlint/config-validator': 17.1.0 + '@commitlint/types': 17.0.0 + import-fresh: 3.3.0 + lodash.mergewith: 4.6.2 + resolve-from: 5.0.0 + resolve-global: 1.0.0 + dev: true + optional: true + /@commitlint/rules/17.2.0: resolution: {integrity: sha512-1YynwD4Eh7HXZNpqG8mtUlL2pSX2jBy61EejYJv4ooZPcg50Ak7LPOyD3a9UZnsE76AXWFBz+yo9Hv4MIpAa0Q==} engines: {node: '>=v14'} @@ -3041,7 +3078,7 @@ packages: chalk: 4.1.2 dev: true - /@joshwooding/vite-plugin-react-docgen-typescript/0.0.5_dblhdeqtshg5ipboc6morcuhpe: + /@joshwooding/vite-plugin-react-docgen-typescript/0.0.5_dpxuw3r62ifu7qhmptvgc7emmm: resolution: {integrity: sha512-HwAEj/vAP1+hzBfIv9DTCyg+1O0/LG48Up7j1RmJ+pFwjb/wRxzUBco4LqKFKe7SZ0M6IyASNh1oKP3yHnJElA==} peerDependencies: typescript: '>= 4.3.x' @@ -3051,8 +3088,8 @@ packages: glob: 7.2.3 glob-promise: 4.2.2_glob@7.2.3 magic-string: 0.26.7 - react-docgen-typescript: 2.2.2_typescript@4.9.3 - typescript: 4.9.3 + react-docgen-typescript: 2.2.2_typescript@4.9.4 + typescript: 4.9.4 vite: 4.0.2_@types+node@18.11.9 dev: true @@ -3108,6 +3145,10 @@ packages: '@jridgewell/sourcemap-codec': 1.4.14 dev: true + /@kurkle/color/0.3.1: + resolution: {integrity: sha512-hW0GwZj06z/ZFUW2Espl7toVDjghJN+EKqyXzPSV8NV89d5BYp5rRMBJoc+aUN0x5OXDMeRQHazejr2Xmqj2tw==} + dev: true + /@mdx-js/mdx/1.6.22: resolution: {integrity: sha512-AMxuLxPz2j5/6TpF/XSdKpQP1NlG0z11dFOlq+2IP/lSgl11GY8ji6S/rgsViN/L0BDvHvUMruRb7ub+24LUYA==} dependencies: @@ -3493,7 +3534,7 @@ packages: uuid-browser: 3.1.0 dev: true - /@storybook/addon-controls/6.5.13_j6n3fnfl3ogrh2anobl27pcriu: + /@storybook/addon-controls/6.5.13_gx5nmzcckj6uccw7lz6m7gptrm: resolution: {integrity: sha512-lYq3uf2mlVevm0bi6ueL3H6TpUMRYW9s/pTNTVJT225l27kLdFR9wEKxAkCBrlKaTgDLJmzzDRsJE3NLZlR/5Q==} peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 @@ -3508,7 +3549,7 @@ packages: '@storybook/api': 6.5.13_biqbaboplfbrettd7655fr4n2y '@storybook/client-logger': 6.5.13 '@storybook/components': 6.5.13_biqbaboplfbrettd7655fr4n2y - '@storybook/core-common': 6.5.13_j6n3fnfl3ogrh2anobl27pcriu + '@storybook/core-common': 6.5.13_gx5nmzcckj6uccw7lz6m7gptrm '@storybook/csf': 0.0.2--canary.4566f4d.1 '@storybook/node-logger': 6.5.13 '@storybook/store': 6.5.13_biqbaboplfbrettd7655fr4n2y @@ -3527,7 +3568,7 @@ packages: - webpack-command dev: true - /@storybook/addon-docs/6.5.13_j6n3fnfl3ogrh2anobl27pcriu: + /@storybook/addon-docs/6.5.13_gx5nmzcckj6uccw7lz6m7gptrm: resolution: {integrity: sha512-RG/NjsheD9FixZ789RJlNyNccaR2Cuy7CtAwph4oUNi3aDFjtOI8Oe9L+FOT7qtVnZLw/YMjF+pZxoDqJNKLPw==} peerDependencies: '@storybook/mdx2-csf': ^0.0.3 @@ -3548,7 +3589,7 @@ packages: '@storybook/addons': 6.5.13_biqbaboplfbrettd7655fr4n2y '@storybook/api': 6.5.13_biqbaboplfbrettd7655fr4n2y '@storybook/components': 6.5.13_biqbaboplfbrettd7655fr4n2y - '@storybook/core-common': 6.5.13_j6n3fnfl3ogrh2anobl27pcriu + '@storybook/core-common': 6.5.13_gx5nmzcckj6uccw7lz6m7gptrm '@storybook/core-events': 6.5.13 '@storybook/csf': 0.0.2--canary.4566f4d.1 '@storybook/docs-tools': 6.5.13_biqbaboplfbrettd7655fr4n2y @@ -3630,7 +3671,7 @@ packages: util-deprecate: 1.0.2 dev: true - /@storybook/builder-vite/0.2.5_zfiyq7l2z7ufqj42yzvkvzwsgy: + /@storybook/builder-vite/0.2.5_fqod4hi6ckdidcc4b7t7y2sdsu: resolution: {integrity: sha512-0PktEaYsbR6gGE/YDkW/tI1VxVnaPNZpHGpiWfDU7c5hjCajWYzdFTgHOwcXT8tiTs+WN/rvoCPT2iAhSCcHIw==} peerDependencies: '@storybook/mdx2-csf': ^0.0.3 @@ -3648,8 +3689,8 @@ packages: vue-docgen-api: optional: true dependencies: - '@joshwooding/vite-plugin-react-docgen-typescript': 0.0.5_dblhdeqtshg5ipboc6morcuhpe - '@storybook/core-common': 6.5.13_j6n3fnfl3ogrh2anobl27pcriu + '@joshwooding/vite-plugin-react-docgen-typescript': 0.0.5_dpxuw3r62ifu7qhmptvgc7emmm + '@storybook/core-common': 6.5.13_gx5nmzcckj6uccw7lz6m7gptrm '@storybook/mdx1-csf': 0.0.4_react@18.2.0 '@storybook/node-logger': 6.5.13 '@storybook/semver': 7.3.2 @@ -3676,7 +3717,7 @@ packages: - webpack-command dev: true - /@storybook/builder-webpack4/6.5.13_j6n3fnfl3ogrh2anobl27pcriu: + /@storybook/builder-webpack4/6.5.13_gx5nmzcckj6uccw7lz6m7gptrm: resolution: {integrity: sha512-Agqy3IKPv3Nl8QqdS7PjtqLp+c0BD8+/3A2ki/YfKqVz+F+J34EpbZlh3uU053avm1EoNQHSmhZok3ZlWH6O7A==} peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 @@ -3694,7 +3735,7 @@ packages: '@storybook/client-api': 6.5.13_biqbaboplfbrettd7655fr4n2y '@storybook/client-logger': 6.5.13 '@storybook/components': 6.5.13_biqbaboplfbrettd7655fr4n2y - '@storybook/core-common': 6.5.13_j6n3fnfl3ogrh2anobl27pcriu + '@storybook/core-common': 6.5.13_gx5nmzcckj6uccw7lz6m7gptrm '@storybook/core-events': 6.5.13 '@storybook/node-logger': 6.5.13 '@storybook/preview-web': 6.5.13_biqbaboplfbrettd7655fr4n2y @@ -3712,12 +3753,12 @@ packages: css-loader: 3.6.0_webpack@4.46.0 file-loader: 6.2.0_webpack@4.46.0 find-up: 5.0.0 - fork-ts-checker-webpack-plugin: 4.1.6_7gjrtr2fo3jjstcxw4vighex4q + fork-ts-checker-webpack-plugin: 4.1.6_gbvv5hkcxnnqi3a2cmdchs4dcm glob: 7.2.3 glob-promise: 3.4.0_glob@7.2.3 global: 4.4.0 html-webpack-plugin: 4.5.2_webpack@4.46.0 - pnp-webpack-plugin: 1.6.4_typescript@4.9.3 + pnp-webpack-plugin: 1.6.4_typescript@4.9.4 postcss: 7.0.39 postcss-flexbugs-fixes: 4.2.1 postcss-loader: 4.3.0_gzaxsinx64nntyd3vmdqwl7coe @@ -3728,7 +3769,7 @@ packages: style-loader: 1.3.0_webpack@4.46.0 terser-webpack-plugin: 4.2.3_webpack@4.46.0 ts-dedent: 2.2.0 - typescript: 4.9.3 + typescript: 4.9.4 url-loader: 4.1.1_lit45vopotvaqup7lrvlnvtxwy util-deprecate: 1.0.2 webpack: 4.46.0 @@ -3830,7 +3871,7 @@ packages: util-deprecate: 1.0.2 dev: true - /@storybook/core-client/6.5.13_5ey2xofmun3swml4ceosmuhnmq: + /@storybook/core-client/6.5.13_fzk2o5r53sgjs5saca2d7spkha: resolution: {integrity: sha512-YuELbRokTBdqjbx/R4/7O4rou9kvbBIOJjlUkor9hdLLuJ3P0yGianERGNkZFfvcfMBAxU0p52o7QvDldSR3kA==} peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 @@ -3861,13 +3902,13 @@ packages: react-dom: 18.2.0_react@18.2.0 regenerator-runtime: 0.13.10 ts-dedent: 2.2.0 - typescript: 4.9.3 + typescript: 4.9.4 unfetch: 4.2.0 util-deprecate: 1.0.2 - webpack: 4.46.0 + webpack: 5.75.0_@swc+core@1.3.18 dev: true - /@storybook/core-client/6.5.13_ep3nicfz4qcahezcs7kmkfeniq: + /@storybook/core-client/6.5.13_o3ten7nsuz3dqqktls46i6uq3y: resolution: {integrity: sha512-YuELbRokTBdqjbx/R4/7O4rou9kvbBIOJjlUkor9hdLLuJ3P0yGianERGNkZFfvcfMBAxU0p52o7QvDldSR3kA==} peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 @@ -3898,13 +3939,13 @@ packages: react-dom: 18.2.0_react@18.2.0 regenerator-runtime: 0.13.10 ts-dedent: 2.2.0 - typescript: 4.9.3 + typescript: 4.9.4 unfetch: 4.2.0 util-deprecate: 1.0.2 - webpack: 5.75.0_@swc+core@1.3.18 + webpack: 4.46.0 dev: true - /@storybook/core-common/6.5.13_j6n3fnfl3ogrh2anobl27pcriu: + /@storybook/core-common/6.5.13_gx5nmzcckj6uccw7lz6m7gptrm: resolution: {integrity: sha512-+DVZrRsteE9pw0X5MNffkdBgejQnbnL+UOG3qXkE9xxUamQALnuqS/w1BzpHE9WmOHuf7RWMKflyQEW3OLKAJg==} peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 @@ -3948,7 +3989,7 @@ packages: express: 4.18.2 file-system-cache: 1.1.0 find-up: 5.0.0 - fork-ts-checker-webpack-plugin: 6.5.2_7gjrtr2fo3jjstcxw4vighex4q + fork-ts-checker-webpack-plugin: 6.5.2_gbvv5hkcxnnqi3a2cmdchs4dcm fs-extra: 9.1.0 glob: 7.2.3 handlebars: 4.7.7 @@ -3964,7 +4005,7 @@ packages: slash: 3.0.0 telejson: 6.0.8 ts-dedent: 2.2.0 - typescript: 4.9.3 + typescript: 4.9.4 util-deprecate: 1.0.2 webpack: 4.46.0 transitivePeerDependencies: @@ -3981,7 +4022,7 @@ packages: core-js: 3.26.1 dev: true - /@storybook/core-server/6.5.13_j6n3fnfl3ogrh2anobl27pcriu: + /@storybook/core-server/6.5.13_gx5nmzcckj6uccw7lz6m7gptrm: resolution: {integrity: sha512-vs7tu3kAnFwuINio1p87WyqDNlFyZESmeh9s7vvrZVbe/xS/ElqDscr9DT5seW+jbtxufAaHsx+JUTver1dheQ==} peerDependencies: '@storybook/builder-webpack5': '*' @@ -3998,17 +4039,17 @@ packages: optional: true dependencies: '@discoveryjs/json-ext': 0.5.7 - '@storybook/builder-webpack4': 6.5.13_j6n3fnfl3ogrh2anobl27pcriu - '@storybook/core-client': 6.5.13_5ey2xofmun3swml4ceosmuhnmq - '@storybook/core-common': 6.5.13_j6n3fnfl3ogrh2anobl27pcriu + '@storybook/builder-webpack4': 6.5.13_gx5nmzcckj6uccw7lz6m7gptrm + '@storybook/core-client': 6.5.13_o3ten7nsuz3dqqktls46i6uq3y + '@storybook/core-common': 6.5.13_gx5nmzcckj6uccw7lz6m7gptrm '@storybook/core-events': 6.5.13 '@storybook/csf': 0.0.2--canary.4566f4d.1 '@storybook/csf-tools': 6.5.13 - '@storybook/manager-webpack4': 6.5.13_j6n3fnfl3ogrh2anobl27pcriu + '@storybook/manager-webpack4': 6.5.13_gx5nmzcckj6uccw7lz6m7gptrm '@storybook/node-logger': 6.5.13 '@storybook/semver': 7.3.2 '@storybook/store': 6.5.13_biqbaboplfbrettd7655fr4n2y - '@storybook/telemetry': 6.5.13_j6n3fnfl3ogrh2anobl27pcriu + '@storybook/telemetry': 6.5.13_gx5nmzcckj6uccw7lz6m7gptrm '@types/node': 16.18.3 '@types/node-fetch': 2.6.2 '@types/pretty-hrtime': 1.0.1 @@ -4039,7 +4080,7 @@ packages: slash: 3.0.0 telejson: 6.0.8 ts-dedent: 2.2.0 - typescript: 4.9.3 + typescript: 4.9.4 util-deprecate: 1.0.2 watchpack: 2.4.0 webpack: 4.46.0 @@ -4058,7 +4099,7 @@ packages: - webpack-command dev: true - /@storybook/core/6.5.13_7khqvkzlfo4tiikgj2kefpsg2q: + /@storybook/core/6.5.13_2elm6tsgtwxjreqwq2bb3txkdm: resolution: {integrity: sha512-kw1lCgbsxzUimGww6t5rmuWJmFPe9kGGyzIqvj4RC4BBcEsP40LEu9XhSfvnb8vTOLIULFZeZpdRFfJs4TYbUw==} peerDependencies: '@storybook/builder-webpack5': '*' @@ -4075,11 +4116,11 @@ packages: typescript: optional: true dependencies: - '@storybook/core-client': 6.5.13_ep3nicfz4qcahezcs7kmkfeniq - '@storybook/core-server': 6.5.13_j6n3fnfl3ogrh2anobl27pcriu + '@storybook/core-client': 6.5.13_fzk2o5r53sgjs5saca2d7spkha + '@storybook/core-server': 6.5.13_gx5nmzcckj6uccw7lz6m7gptrm react: 18.2.0 react-dom: 18.2.0_react@18.2.0 - typescript: 4.9.3 + typescript: 4.9.4 webpack: 5.75.0_@swc+core@1.3.18 transitivePeerDependencies: - '@storybook/mdx2-csf' @@ -4142,7 +4183,7 @@ packages: - supports-color dev: true - /@storybook/manager-webpack4/6.5.13_j6n3fnfl3ogrh2anobl27pcriu: + /@storybook/manager-webpack4/6.5.13_gx5nmzcckj6uccw7lz6m7gptrm: resolution: {integrity: sha512-pURzS5W3XM0F7bCBWzpl7TRsuy+OXFwLXiWLaexuvo0POZe31Ueo2A1R4rx3MT5Iee8O9mYvG2XTmvK9MlLefQ==} peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 @@ -4156,8 +4197,8 @@ packages: '@babel/plugin-transform-template-literals': 7.18.9_@babel+core@7.20.5 '@babel/preset-react': 7.18.6_@babel+core@7.20.5 '@storybook/addons': 6.5.13_biqbaboplfbrettd7655fr4n2y - '@storybook/core-client': 6.5.13_5ey2xofmun3swml4ceosmuhnmq - '@storybook/core-common': 6.5.13_j6n3fnfl3ogrh2anobl27pcriu + '@storybook/core-client': 6.5.13_o3ten7nsuz3dqqktls46i6uq3y + '@storybook/core-common': 6.5.13_gx5nmzcckj6uccw7lz6m7gptrm '@storybook/node-logger': 6.5.13 '@storybook/theming': 6.5.13_biqbaboplfbrettd7655fr4n2y '@storybook/ui': 6.5.13_biqbaboplfbrettd7655fr4n2y @@ -4174,7 +4215,7 @@ packages: fs-extra: 9.1.0 html-webpack-plugin: 4.5.2_webpack@4.46.0 node-fetch: 2.6.7 - pnp-webpack-plugin: 1.6.4_typescript@4.9.3 + pnp-webpack-plugin: 1.6.4_typescript@4.9.4 react: 18.2.0 react-dom: 18.2.0_react@18.2.0 read-pkg-up: 7.0.1 @@ -4184,7 +4225,7 @@ packages: telejson: 6.0.8 terser-webpack-plugin: 4.2.3_webpack@4.46.0 ts-dedent: 2.2.0 - typescript: 4.9.3 + typescript: 4.9.4 url-loader: 4.1.1_lit45vopotvaqup7lrvlnvtxwy util-deprecate: 1.0.2 webpack: 4.46.0 @@ -4301,7 +4342,7 @@ packages: util-deprecate: 1.0.2 dev: true - /@storybook/react-docgen-typescript-plugin/1.0.2-canary.6.9d540b91e815f8fc2f8829189deb00553559ff63.0_vfotqvx6lgcbf3upbs6hgaza4q: + /@storybook/react-docgen-typescript-plugin/1.0.2-canary.6.9d540b91e815f8fc2f8829189deb00553559ff63.0_3fkjkrd3audxnith3e7fo4fnxi: resolution: {integrity: sha512-eVg3BxlOm2P+chijHBTByr90IZVUtgRW56qEOLX7xlww2NBuKrcavBlcmn+HH7GIUktquWkMPtvy6e0W0NgA5w==} peerDependencies: typescript: '>= 3.x' @@ -4312,15 +4353,15 @@ packages: find-cache-dir: 3.3.2 flat-cache: 3.0.4 micromatch: 4.0.5 - react-docgen-typescript: 2.2.2_typescript@4.9.3 + react-docgen-typescript: 2.2.2_typescript@4.9.4 tslib: 2.4.1 - typescript: 4.9.3 + typescript: 4.9.4 webpack: 5.75.0_@swc+core@1.3.18 transitivePeerDependencies: - supports-color dev: true - /@storybook/react/6.5.13_3sepuovf3dtfhe63jxsoci7ui4: + /@storybook/react/6.5.13_rzkwssihpjinfy56wjte5xrcbe: resolution: {integrity: sha512-4gO8qihEkVZ8RNm9iQd7G2iZz4rRAHizJ6T5m58Sn21fxfyg9zAMzhgd0JzXuPXR8lTTj4AvRyPv1Qx7b43smg==} engines: {node: '>=10.13.0'} hasBin: true @@ -4353,12 +4394,12 @@ packages: '@pmmmwh/react-refresh-webpack-plugin': 0.5.9_ohj47mxwagpoxvu7nhhwxzphqm '@storybook/addons': 6.5.13_biqbaboplfbrettd7655fr4n2y '@storybook/client-logger': 6.5.13 - '@storybook/core': 6.5.13_7khqvkzlfo4tiikgj2kefpsg2q - '@storybook/core-common': 6.5.13_j6n3fnfl3ogrh2anobl27pcriu + '@storybook/core': 6.5.13_2elm6tsgtwxjreqwq2bb3txkdm + '@storybook/core-common': 6.5.13_gx5nmzcckj6uccw7lz6m7gptrm '@storybook/csf': 0.0.2--canary.4566f4d.1 '@storybook/docs-tools': 6.5.13_biqbaboplfbrettd7655fr4n2y '@storybook/node-logger': 6.5.13 - '@storybook/react-docgen-typescript-plugin': 1.0.2-canary.6.9d540b91e815f8fc2f8829189deb00553559ff63.0_vfotqvx6lgcbf3upbs6hgaza4q + '@storybook/react-docgen-typescript-plugin': 1.0.2-canary.6.9d540b91e815f8fc2f8829189deb00553559ff63.0_3fkjkrd3audxnith3e7fo4fnxi '@storybook/semver': 7.3.2 '@storybook/store': 6.5.13_biqbaboplfbrettd7655fr4n2y '@types/estree': 0.0.51 @@ -4383,7 +4424,7 @@ packages: read-pkg-up: 7.0.1 regenerator-runtime: 0.13.10 ts-dedent: 2.2.0 - typescript: 4.9.3 + typescript: 4.9.4 util-deprecate: 1.0.2 webpack: 5.75.0_@swc+core@1.3.18 transitivePeerDependencies: @@ -4477,11 +4518,11 @@ packages: util-deprecate: 1.0.2 dev: true - /@storybook/telemetry/6.5.13_j6n3fnfl3ogrh2anobl27pcriu: + /@storybook/telemetry/6.5.13_gx5nmzcckj6uccw7lz6m7gptrm: resolution: {integrity: sha512-PFJEfGbunmfFWabD3rdCF8EHH+45578OHOkMPpXJjqXl94vPQxUH2XTVKQgEQJbYrgX0Vx9Z4tSkdMHuzYDbWQ==} dependencies: '@storybook/client-logger': 6.5.13 - '@storybook/core-common': 6.5.13_j6n3fnfl3ogrh2anobl27pcriu + '@storybook/core-common': 6.5.13_gx5nmzcckj6uccw7lz6m7gptrm chalk: 4.1.2 core-js: 3.26.1 detect-package-manager: 2.0.1 @@ -5006,7 +5047,7 @@ packages: dev: true optional: true - /@typescript-eslint/eslint-plugin/5.43.0_nyvtogynqlwtf2idoqyimls6fu: + /@typescript-eslint/eslint-plugin/5.43.0_xspifk7brbsnyg562jkgvazaje: resolution: {integrity: sha512-wNPzG+eDR6+hhW4yobEmpR36jrqqQv1vxBq5LJO3fBAktjkvekfr4BRl+3Fn1CM/A+s8/EiGUbOMDoYqWdbtXA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -5017,23 +5058,23 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/parser': 5.43.0_77fvizpdb3y4icyeo2mf4eo7em + '@typescript-eslint/parser': 5.43.0_yfqovispp7u7jaktymfaqwl2py '@typescript-eslint/scope-manager': 5.43.0 - '@typescript-eslint/type-utils': 5.43.0_77fvizpdb3y4icyeo2mf4eo7em - '@typescript-eslint/utils': 5.43.0_77fvizpdb3y4icyeo2mf4eo7em + '@typescript-eslint/type-utils': 5.43.0_yfqovispp7u7jaktymfaqwl2py + '@typescript-eslint/utils': 5.43.0_yfqovispp7u7jaktymfaqwl2py debug: 4.3.4 eslint: 7.32.0 ignore: 5.2.0 natural-compare-lite: 1.4.0 regexpp: 3.2.0 semver: 7.3.8 - tsutils: 3.21.0_typescript@4.9.3 - typescript: 4.9.3 + tsutils: 3.21.0_typescript@4.9.4 + typescript: 4.9.4 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/parser/5.43.0_77fvizpdb3y4icyeo2mf4eo7em: + /@typescript-eslint/parser/5.43.0_yfqovispp7u7jaktymfaqwl2py: resolution: {integrity: sha512-2iHUK2Lh7PwNUlhFxxLI2haSDNyXvebBO9izhjhMoDC+S3XI9qt2DGFUsiJ89m2k7gGYch2aEpYqV5F/+nwZug==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -5045,10 +5086,10 @@ packages: dependencies: '@typescript-eslint/scope-manager': 5.43.0 '@typescript-eslint/types': 5.43.0 - '@typescript-eslint/typescript-estree': 5.43.0_typescript@4.9.3 + '@typescript-eslint/typescript-estree': 5.43.0_typescript@4.9.4 debug: 4.3.4 eslint: 7.32.0 - typescript: 4.9.3 + typescript: 4.9.4 transitivePeerDependencies: - supports-color dev: true @@ -5061,7 +5102,7 @@ packages: '@typescript-eslint/visitor-keys': 5.43.0 dev: true - /@typescript-eslint/type-utils/5.43.0_77fvizpdb3y4icyeo2mf4eo7em: + /@typescript-eslint/type-utils/5.43.0_yfqovispp7u7jaktymfaqwl2py: resolution: {integrity: sha512-K21f+KY2/VvYggLf5Pk4tgBOPs2otTaIHy2zjclo7UZGLyFH86VfUOm5iq+OtDtxq/Zwu2I3ujDBykVW4Xtmtg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -5071,12 +5112,12 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/typescript-estree': 5.43.0_typescript@4.9.3 - '@typescript-eslint/utils': 5.43.0_77fvizpdb3y4icyeo2mf4eo7em + '@typescript-eslint/typescript-estree': 5.43.0_typescript@4.9.4 + '@typescript-eslint/utils': 5.43.0_yfqovispp7u7jaktymfaqwl2py debug: 4.3.4 eslint: 7.32.0 - tsutils: 3.21.0_typescript@4.9.3 - typescript: 4.9.3 + tsutils: 3.21.0_typescript@4.9.4 + typescript: 4.9.4 transitivePeerDependencies: - supports-color dev: true @@ -5086,7 +5127,7 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /@typescript-eslint/typescript-estree/5.43.0_typescript@4.9.3: + /@typescript-eslint/typescript-estree/5.43.0_typescript@4.9.4: resolution: {integrity: sha512-BZ1WVe+QQ+igWal2tDbNg1j2HWUkAa+CVqdU79L4HP9izQY6CNhXfkNwd1SS4+sSZAP/EthI1uiCSY/+H0pROg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -5101,13 +5142,13 @@ packages: globby: 11.1.0 is-glob: 4.0.3 semver: 7.3.8 - tsutils: 3.21.0_typescript@4.9.3 - typescript: 4.9.3 + tsutils: 3.21.0_typescript@4.9.4 + typescript: 4.9.4 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/utils/5.43.0_77fvizpdb3y4icyeo2mf4eo7em: + /@typescript-eslint/utils/5.43.0_yfqovispp7u7jaktymfaqwl2py: resolution: {integrity: sha512-8nVpA6yX0sCjf7v/NDfeaOlyaIIqL7OaIGOWSPFqUKK59Gnumd3Wa+2l8oAaYO2lk0sO+SbWFWRSvhu8gLGv4A==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -5117,7 +5158,7 @@ packages: '@types/semver': 7.3.13 '@typescript-eslint/scope-manager': 5.43.0 '@typescript-eslint/types': 5.43.0 - '@typescript-eslint/typescript-estree': 5.43.0_typescript@4.9.3 + '@typescript-eslint/typescript-estree': 5.43.0_typescript@4.9.4 eslint: 7.32.0 eslint-scope: 5.1.1 eslint-utils: 3.0.0_eslint@7.32.0 @@ -6596,35 +6637,37 @@ packages: resolution: {integrity: sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==} dev: true - /chart.js/4.0.1: - resolution: {integrity: sha512-5/8/9eBivwBZK81mKvmIwTb2Pmw4D/5h1RK9fBWZLLZ8mCJ+kfYNmV9rMrGoa5Hgy2/wVDBMLSUDudul2/9ihA==} + /chart.js/4.1.1: + resolution: {integrity: sha512-P0pCosNXp+LR8zO/QTkZKT6Hb7p0DPFtypEeVOf+6x06hX13NIb75R0DXUA4Ksx/+48chDQKtCCmRCviQRTqsA==} engines: {pnpm: ^7.0.0} + dependencies: + '@kurkle/color': 0.3.1 dev: true - /chartjs-adapter-date-fns/3.0.0_thp3sedjxvmiqxrdsmekdnimom: + /chartjs-adapter-date-fns/3.0.0_iln6v37jwapfq6ambblo6nwala: resolution: {integrity: sha512-Rs3iEB3Q5pJ973J93OBTpnP7qoGwvq3nUnoMdtxO+9aoJof7UFcRbWcIDteXuYd1fgAvct/32T9qaLyLuZVwCg==} peerDependencies: chart.js: '>=2.8.0' date-fns: '>=2.0.0' dependencies: - chart.js: 4.0.1 + chart.js: 4.1.1 date-fns: 2.29.3 dev: true - /chartjs-plugin-annotation/2.0.1_chart.js@4.0.1: + /chartjs-plugin-annotation/2.0.1_chart.js@4.1.1: resolution: {integrity: sha512-I+bbmiGuxW68DuhFuCS+oSJN4bzX9d3Z+xJ34+4YhrC68+fncRZgNARgJYqlkCD9s+JQohCkZ0iK/GNr+3Ug2A==} peerDependencies: chart.js: ^3.7.0 dependencies: - chart.js: 4.0.1 + chart.js: 4.1.1 dev: true - /chartjs-plugin-zoom/2.0.0_chart.js@4.0.1: + /chartjs-plugin-zoom/2.0.0_chart.js@4.1.1: resolution: {integrity: sha512-bqpi7DGy9a5hX7ThKl/xQaLzXvneSwhS0w/lNimZ8AJaoRVMKz5JfUoqwciJYV5ixKXJbgyvwC9HcJnyVsYmjg==} peerDependencies: chart.js: '>=3.2.0' dependencies: - chart.js: 4.0.1 + chart.js: 4.1.1 hammerjs: 2.0.8 dev: true @@ -7213,7 +7256,7 @@ packages: resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==} dev: true - /cosmiconfig-typescript-loader/4.2.0_qoh33be55smklb2oyrgdyddh4a: + /cosmiconfig-typescript-loader/4.2.0_wb7bklcl6jlvxijczjyxggip4a: resolution: {integrity: sha512-NkANeMnaHrlaSSlpKGyvn2R4rqUDeE/9E5YHx+b4nwo0R8dZyAqcih8/gxpCZvqWP9Vf6xuLpMSzSgdVEIM78g==} engines: {node: '>=12', npm: '>=6'} peerDependencies: @@ -7224,8 +7267,8 @@ packages: dependencies: '@types/node': 14.18.33 cosmiconfig: 7.1.0 - ts-node: 10.9.1_noisjdkgnneiujhl36l4s2bvea - typescript: 4.9.3 + ts-node: 10.9.1_tcswbobcmtsn6igcp4l6g5pfhu + typescript: 4.9.4 dev: true /cosmiconfig/6.0.0: @@ -7446,7 +7489,7 @@ packages: longest: 2.0.1 word-wrap: 1.2.3 optionalDependencies: - '@commitlint/load': 17.2.0_@swc+core@1.3.18 + '@commitlint/load': 17.3.0_@swc+core@1.3.18 transitivePeerDependencies: - '@swc/core' - '@swc/wasm' @@ -8404,7 +8447,7 @@ packages: eslint-import-resolver-webpack: optional: true dependencies: - '@typescript-eslint/parser': 5.43.0_77fvizpdb3y4icyeo2mf4eo7em + '@typescript-eslint/parser': 5.43.0_yfqovispp7u7jaktymfaqwl2py debug: 3.2.7 eslint: 7.32.0 eslint-import-resolver-node: 0.3.6 @@ -8433,7 +8476,7 @@ packages: '@typescript-eslint/parser': optional: true dependencies: - '@typescript-eslint/parser': 5.43.0_77fvizpdb3y4icyeo2mf4eo7em + '@typescript-eslint/parser': 5.43.0_yfqovispp7u7jaktymfaqwl2py array-includes: 3.1.6 array.prototype.flat: 1.3.1 debug: 2.6.9 @@ -9228,7 +9271,7 @@ packages: signal-exit: 3.0.7 dev: true - /fork-ts-checker-webpack-plugin/4.1.6_7gjrtr2fo3jjstcxw4vighex4q: + /fork-ts-checker-webpack-plugin/4.1.6_gbvv5hkcxnnqi3a2cmdchs4dcm: resolution: {integrity: sha512-DUxuQaKoqfNne8iikd14SAkh5uw4+8vNifp6gmA73yYNS6ywLIWSLD/n/mBzHQRpW3J7rbATEakmiA8JvkTyZw==} engines: {node: '>=6.11.5', yarn: '>=1.0.0'} peerDependencies: @@ -9249,14 +9292,14 @@ packages: minimatch: 3.1.2 semver: 5.7.1 tapable: 1.1.3 - typescript: 4.9.3 + typescript: 4.9.4 webpack: 4.46.0 worker-rpc: 0.1.1 transitivePeerDependencies: - supports-color dev: true - /fork-ts-checker-webpack-plugin/6.5.2_7gjrtr2fo3jjstcxw4vighex4q: + /fork-ts-checker-webpack-plugin/6.5.2_gbvv5hkcxnnqi3a2cmdchs4dcm: resolution: {integrity: sha512-m5cUmF30xkZ7h4tWUgTAcEaKmUW7tfyUyTqNNOz7OxWJ0v1VWKTcOvH8FWHUwSjlW/356Ijc9vi3XfcPstpQKA==} engines: {node: '>=10', yarn: '>=1.0.0'} peerDependencies: @@ -9284,7 +9327,7 @@ packages: schema-utils: 2.7.0 semver: 7.3.8 tapable: 1.1.3 - typescript: 4.9.3 + typescript: 4.9.4 webpack: 4.46.0 dev: true @@ -11135,6 +11178,11 @@ packages: resolution: {integrity: sha512-fPMfXjGQEV9Xsq/8MTSgUf255gawYRbjwMyDbcvDhXgV7enSZA0hynz6vMPnpAb5iONEzBHBPsT+0zes5Z301g==} dev: true + /lodash.isplainobject/4.0.6: + resolution: {integrity: sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==} + dev: true + optional: true + /lodash.map/4.6.0: resolution: {integrity: sha512-worNHGKLDetmcEYDvh2stPCrrQRkP20E4l0iIS7F8EvzMqBBi7ltvFN5m1HvTf1P7Jk1txKhvFcmYsCr8O2F1Q==} dev: true @@ -11143,6 +11191,11 @@ packages: resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==} dev: true + /lodash.mergewith/4.6.2: + resolution: {integrity: sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==} + dev: true + optional: true + /lodash.truncate/4.4.2: resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==} dev: true @@ -12502,11 +12555,11 @@ packages: irregular-plurals: 3.3.0 dev: true - /pnp-webpack-plugin/1.6.4_typescript@4.9.3: + /pnp-webpack-plugin/1.6.4_typescript@4.9.4: resolution: {integrity: sha512-7Wjy+9E3WwLOEL30D+m8TSTF7qJJUJLONBnwQp0518siuMxUQUbgZwssaFX+QKlZkjHZcw/IpZCt/H0srrntSg==} engines: {node: '>=6'} dependencies: - ts-pnp: 1.2.0_typescript@4.9.3 + ts-pnp: 1.2.0_typescript@4.9.4 transitivePeerDependencies: - typescript dev: true @@ -12922,12 +12975,12 @@ packages: webpack: 4.46.0 dev: true - /react-docgen-typescript/2.2.2_typescript@4.9.3: + /react-docgen-typescript/2.2.2_typescript@4.9.4: resolution: {integrity: sha512-tvg2ZtOpOi6QDwsb3GZhOjDkkX0h8Z2gipvTg6OVMUyoYoURhEiRNePT8NZItTVCDh39JJHnLdfCOkzoLbFnTg==} peerDependencies: typescript: '>= 4.3.x' dependencies: - typescript: 4.9.3 + typescript: 4.9.4 dev: true /react-docgen/5.4.3: @@ -14646,7 +14699,7 @@ packages: engines: {node: '>=6.10'} dev: true - /ts-node/10.9.1_noisjdkgnneiujhl36l4s2bvea: + /ts-node/10.9.1_tcswbobcmtsn6igcp4l6g5pfhu: resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==} hasBin: true peerDependencies: @@ -14673,12 +14726,12 @@ packages: create-require: 1.1.1 diff: 4.0.2 make-error: 1.3.6 - typescript: 4.9.3 + typescript: 4.9.4 v8-compile-cache-lib: 3.0.1 yn: 3.1.1 dev: true - /ts-pnp/1.2.0_typescript@4.9.3: + /ts-pnp/1.2.0_typescript@4.9.4: resolution: {integrity: sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw==} engines: {node: '>=6'} peerDependencies: @@ -14687,7 +14740,7 @@ packages: typescript: optional: true dependencies: - typescript: 4.9.3 + typescript: 4.9.4 dev: true /tsconfig-paths/3.14.1: @@ -14720,14 +14773,14 @@ packages: resolution: {integrity: sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==} dev: true - /tsutils/3.21.0_typescript@4.9.3: + /tsutils/3.21.0_typescript@4.9.4: resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==} engines: {node: '>= 6'} peerDependencies: typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta' dependencies: tslib: 1.14.1 - typescript: 4.9.3 + typescript: 4.9.4 dev: true /tty-browserify/0.0.0: @@ -14806,8 +14859,8 @@ packages: resolution: {integrity: sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==} dev: true - /typescript/4.9.3: - resolution: {integrity: sha512-CIfGzTelbKNEnLpLdGFgdyKhG23CKdKgQPOBc+OUNrkJ2vr+KSzsSV5kq5iWhEQbok+quxgGzrAtGWCyU7tHnA==} + /typescript/4.9.4: + resolution: {integrity: sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==} engines: {node: '>=4.2.0'} hasBin: true dev: true diff --git a/rollup.config.js b/rollup.config.js index 0ba1c974f..0bd37a265 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -36,9 +36,16 @@ export default { input: pkg.exports, plugins: plugins('defaults and supports es6-module'), external, - output: { - file: pkg.publishConfig.exports.import, - format: 'es', - sourcemap: true, - }, + output: [ + { + file: pkg.publishConfig.exports.import, + format: 'es', + sourcemap: true, + }, + { + file: pkg.publishConfig.exports.require, + format: 'cjs', + sourcemap: true, + }, + ], }; diff --git a/src/chart.tsx b/src/chart.tsx index 166358fd3..471433a06 100644 --- a/src/chart.tsx +++ b/src/chart.tsx @@ -16,7 +16,10 @@ function ChartComponent< TData = DefaultDataPoint, TLabel = unknown >( - { + props: ChartProps, + ref: ForwardedRef> +) { + const { height = 150, width = 300, redraw = false, @@ -27,14 +30,10 @@ function ChartComponent< plugins = [], fallbackContent, updateMode, - ...props - }: ChartProps, - ref: ForwardedRef> -) { - type TypedChartJS = ChartJS; - + ...canvasProps + } = props as ChartProps; const canvasRef = useRef(null); - const chartRef = useRef(); + const chartRef = useRef(); const renderChart = () => { if (!canvasRef.current) return; @@ -101,12 +100,16 @@ function ChartComponent< }, []); return ( - + {fallbackContent} ); } -export const Chart: BaseChartComponent = forwardRef( - ChartComponent -) as BaseChartComponent; +export const Chart = forwardRef(ChartComponent) as BaseChartComponent; diff --git a/tsconfig.json b/tsconfig.json index 038083b46..143dce7e3 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -11,7 +11,7 @@ /* Modules */ "baseUrl": ".", "module": "ESNext", - "moduleResolution": "Node", // restore to "NodeNext" after Chart.js update + "moduleResolution": "NodeNext", "resolveJsonModule": true, /* Emit */ "declaration": true,