Skip to content

Commit c6bf13f

Browse files
Ready for merge
1 parent 9589b48 commit c6bf13f

18 files changed

+9266
-86
lines changed

debug/nuxt3/app.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ const { barChartProps, barChartRef } = useBarChart({
5353
5454
function shuffleData() {
5555
data.value = shuffle(data.value);
56-
console.log(barChartRef.value.chartInstance.update());
56+
console.log(barChartRef.value.chartInstance);
5757
}
5858
</script>
5959

debug/nuxt3/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
"@types/lodash-es": "^4.17.5",
1414
"chart.js": "^3.7.0",
1515
"lodash-es": "^4.17.21",
16-
"vue-chart-3": "^3.1.0-beta-11"
16+
"vue-chart-3": "^3.1.0-rc.8"
1717
}
1818
}

debug/nuxt3/yarn.lock

+43-6
Original file line numberDiff line numberDiff line change
@@ -911,6 +911,13 @@
911911
dependencies:
912912
"@vue/shared" "3.2.30"
913913

914+
915+
version "3.2.31"
916+
resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.2.31.tgz#fc90aa2cdf695418b79e534783aca90d63a46bbd"
917+
integrity sha512-HVr0l211gbhpEKYr2hYe7hRsV91uIVGFYNHj73njbARVGHQvIojkImKMaZNDdoDZOIkMsBc9a1sMqR+WZwfSCw==
918+
dependencies:
919+
"@vue/shared" "3.2.31"
920+
914921
915922
version "3.2.30"
916923
resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.2.30.tgz#1acc119ff8a49c06af6b03611bc4e03f464ca8a2"
@@ -919,6 +926,14 @@
919926
"@vue/reactivity" "3.2.30"
920927
"@vue/shared" "3.2.30"
921928

929+
"@vue/[email protected]", "@vue/runtime-core@^3.2.31":
930+
version "3.2.31"
931+
resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.2.31.tgz#9d284c382f5f981b7a7b5971052a1dc4ef39ac7a"
932+
integrity sha512-Kcog5XmSY7VHFEMuk4+Gap8gUssYMZ2+w+cmGI6OpZWYOEIcbE0TPzzPHi+8XTzAgx1w/ZxDFcXhZeXN5eKWsA==
933+
dependencies:
934+
"@vue/reactivity" "3.2.31"
935+
"@vue/shared" "3.2.31"
936+
922937
923938
version "3.2.30"
924939
resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.2.30.tgz#16a85b359ea1fff9b1dd61e9d00e93f4652aba5e"
@@ -928,6 +943,15 @@
928943
"@vue/shared" "3.2.30"
929944
csstype "^2.6.8"
930945

946+
"@vue/runtime-dom@^3.2.31":
947+
version "3.2.31"
948+
resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.2.31.tgz#79ce01817cb3caf2c9d923f669b738d2d7953eff"
949+
integrity sha512-N+o0sICVLScUjfLG7u9u5XCjvmsexAiPt17GNnaWHJUfsKed5e85/A3SWgKxzlxx2SW/Hw7RQxzxbXez9PtY3g==
950+
dependencies:
951+
"@vue/runtime-core" "3.2.31"
952+
"@vue/shared" "3.2.31"
953+
csstype "^2.6.8"
954+
931955
932956
version "3.2.30"
933957
resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.2.30.tgz#4acccad3933475d07b94560c6cb205363975b969"
@@ -941,6 +965,11 @@
941965
resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.30.tgz#e2ba8f6692399c27c81c668ecd3f1a4e13ee2f5e"
942966
integrity sha512-B3HouBtUxcfu2w2d+VhdLcVBXKYYhXiFMAfQ+hoe8NUhKkPRkWDIqhpuehCZxVQ3S2dN1P1WfKGlxGC+pfmxGg==
943967

968+
969+
version "3.2.31"
970+
resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.31.tgz#c90de7126d833dcd3a4c7534d534be2fb41faa4e"
971+
integrity sha512-ymN2pj6zEjiKJZbrf98UM2pfDd6F2H7ksKw7NDt/ZZ1fh5Ei39X5tABugtT03ZRlWd9imccoK0hE8hpjpU7irQ==
972+
944973
"@vueuse/head@^0.7.5":
945974
version "0.7.5"
946975
resolved "https://registry.yarnpkg.com/@vueuse/head/-/head-0.7.5.tgz#0284e3dc53ea6709196956bf25115eea863a847a"
@@ -3620,7 +3649,7 @@ murmurhash-es@^0.1.1:
36203649
resolved "https://registry.yarnpkg.com/murmurhash-es/-/murmurhash-es-0.1.1.tgz#e4d7943eed19b0c1b66f5bb071fce52c7a052782"
36213650
integrity sha512-IfA8KVe9dxv28F9KSJ8EpJP2jgO1br6xInnFaPDjQKosEfpTMAx8v1eGCUzOvcZDstadm3mdP95JILrYs0mNsg==
36223651

3623-
nanoid@^3.1.32, nanoid@^3.2.0, nanoid@latest:
3652+
nanoid@^3.1.32, nanoid@^3.2.0:
36243653
version "3.2.0"
36253654
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.2.0.tgz#62667522da6673971cca916a6d3eff3f415ff80c"
36263655
integrity sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==
@@ -3979,6 +4008,11 @@ parseurl@~1.3.3:
39794008
resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
39804009
integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
39814010

4011+
4012+
version "0.1.1"
4013+
resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
4014+
integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
4015+
39824016
path-exists@^4.0.0:
39834017
version "4.0.0"
39844018
resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
@@ -5245,13 +5279,16 @@ vue-bundle-renderer@^0.3.5:
52455279
dependencies:
52465280
bundle-runner "^0.0.1"
52475281

5248-
vue-chart-3@^3.1.0-beta-11:
5249-
version "3.1.0-beta-9"
5250-
resolved "https://registry.yarnpkg.com/vue-chart-3/-/vue-chart-3-3.1.0-beta-9.tgz#a6848b546ae5db74cbda54dc600faaa67b77977c"
5251-
integrity sha512-zdwmTCSZO38lhZlK7/pwWoUwQLvdSRniSI77mIaAkCL06dQkKFNMFJ/CBQYc/72SnZa1/Ct5nBThzn77UzrzLA==
5282+
vue-chart-3@^3.1.0-rc.8:
5283+
version "3.1.0-rc.8"
5284+
resolved "https://registry.yarnpkg.com/vue-chart-3/-/vue-chart-3-3.1.0-rc.8.tgz#59556e76cee3f3295314a83da5ba2e6bcd29fcd4"
5285+
integrity sha512-ywtZ2pe3LXXiLADSfO3dSGWrBRcj6LfYefs9NUDLOvIhlWeVup1Ac+nLJ2RTBzmlIja5cSSCCtbQ+8UBrZLq9w==
52525286
dependencies:
5287+
"@vue/runtime-core" "^3.2.31"
5288+
"@vue/runtime-dom" "^3.2.31"
52535289
csstype latest
5254-
nanoid latest
5290+
lodash-es "^4.17.21"
5291+
pascalcase "0.1.1"
52555292

52565293
vue-loader@^17.0.0:
52575294
version "17.0.0"

debug/vite/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"chart.js": "^3.7.0",
1212
"lodash-es": "^4.17.21",
1313
"vue": "^3.2.25",
14-
"vue-chart-3": "^3.1.0-beta-11"
14+
"vue-chart-3": "^3.1.0-rc.8"
1515
},
1616
"devDependencies": {
1717
"@vitejs/plugin-vue": "^2.0.0",

debug/vite/pnpm-lock.yaml

+38-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

debug/vite/src/App.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<script setup lang="tsx">
99
import { Chart, registerables } from 'chart.js';
1010
import type { ChartData } from 'chart.js';
11-
// import { BarChart, useBarChart } from 'vue-chart-3';
12-
import { BarChart, defineChartComponent, useBarChart } from '../../../dist';
11+
import { BarChart, useBarChart } from 'vue-chart-3';
12+
// import { BarChart, defineChartComponent, useBarChart } from '../../../dist';
1313
1414
import { ref, computed } from 'vue';
1515
import { shuffle } from 'lodash-es';

debug/vue-cli/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
"lint": "vue-cli-service lint"
99
},
1010
"dependencies": {
11-
"chart.js": "^3.6.0",
11+
"chart.js": "^3.7.1",
1212
"core-js": "^3.19.1",
1313
"vue": "^3.2.25",
14-
"vue-chart-3": "^3.1.0-beta-11"
14+
"vue-chart-3": "^3.1.0-rc.6"
1515
},
1616
"devDependencies": {
1717
"@typescript-eslint/eslint-plugin": "^5.10.2",

debug/vue-cli/pnpm-lock.yaml

+36-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

debug/vue-cli/src/App.vue

+2-1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ export default defineComponent({
5353
const { barChartProps, barChartRef } = useBarChart({
5454
chartData: testData,
5555
options: options,
56+
jsx: true,
5657
});
5758
5859
function shuffleData() {
@@ -72,7 +73,7 @@ export default defineComponent({
7273
return () => (
7374
<div id="app" style={{ width: '400px' }}>
7475
<button onClick={shuffleData}>Shuffle</button>
75-
<BarChart chartData={testData.value} ref={barChartRef} class="test" />
76+
<BarChart {...barChartProps.value} class="test" />
7677
</div>
7778
);
7879
},

0 commit comments

Comments
 (0)