From bf71321431ec4e3352ed03051d90454eb621dfe2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexandre=20Bult=C3=A9?= Date: Mon, 25 May 2026 13:39:14 +0200 Subject: [PATCH 1/4] chore(charts): add dedicated entrypoint --- components/Charts/ChartConfigurator.vue | 2 +- datagouv-components/package.json | 4 ++++ datagouv-components/src/chart.ts | 5 +++++ datagouv-components/src/main.ts | 6 ------ 4 files changed, 10 insertions(+), 7 deletions(-) create mode 100644 datagouv-components/src/chart.ts diff --git a/components/Charts/ChartConfigurator.vue b/components/Charts/ChartConfigurator.vue index 60698f5e0..65b3d37ab 100644 --- a/components/Charts/ChartConfigurator.vue +++ b/components/Charts/ChartConfigurator.vue @@ -399,7 +399,7 @@ import { useAPI } from '~/utils/api' import ChartFilterRow from './ChartFilterRow.vue' import type { DatasetSuggest } from '~/types/types' -const ChartViewerWrapper = defineAsyncComponent(() => import('@datagouv/components-next').then(m => m.ChartViewerWrapper)) +const ChartViewerWrapper = defineAsyncComponent(() => import('@datagouv/components-next/chart').then(m => m.ChartViewerWrapper)) const form = defineModel({ required: true, diff --git a/datagouv-components/package.json b/datagouv-components/package.json index 94117e79f..0f539aa92 100644 --- a/datagouv-components/package.json +++ b/datagouv-components/package.json @@ -17,6 +17,10 @@ ] }, "main": "./src/main.ts", + "exports": { + ".": "./src/main.ts", + "./chart": "./src/chart.ts" + }, "sideEffects": false, "files": [ "assets", diff --git a/datagouv-components/src/chart.ts b/datagouv-components/src/chart.ts new file mode 100644 index 000000000..29be52e94 --- /dev/null +++ b/datagouv-components/src/chart.ts @@ -0,0 +1,5 @@ +import ChartViewer from './components/Chart/ChartViewer.vue' +import ChartViewerWrapper from './components/Chart/ChartViewerWrapper.vue' +import SmallChart from './components/SmallChart.vue' + +export { ChartViewer, ChartViewerWrapper, SmallChart } diff --git a/datagouv-components/src/main.ts b/datagouv-components/src/main.ts index b7543eaf2..3680e33ed 100644 --- a/datagouv-components/src/main.ts +++ b/datagouv-components/src/main.ts @@ -82,9 +82,6 @@ import ReuseHorizontalCard from './components/ReuseHorizontalCard.vue' import ReuseDetails from './components/ReuseDetails.vue' import SchemaCard from './components/SchemaCard.vue' import SimpleBanner from './components/SimpleBanner.vue' -import SmallChart from './components/SmallChart.vue' -import ChartViewer from './components/Chart/ChartViewer.vue' -import ChartViewerWrapper from './components/Chart/ChartViewerWrapper.vue' import StatBox from './components/StatBox.vue' import Tab from './components/Tabs/Tab.vue' import TabGroup from './components/Tabs/TabGroup.vue' @@ -344,9 +341,6 @@ export { ReuseHorizontalCard, SchemaCard, SimpleBanner, - SmallChart, - ChartViewer, - ChartViewerWrapper, StatBox, OpenApiViewer, Tab, From 2010c61c94b9e565f53d7ce682b6ff62b6b50f15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexandre=20Bult=C3=A9?= Date: Mon, 25 May 2026 13:42:06 +0200 Subject: [PATCH 2/4] fix assets path --- datagouv-components/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/datagouv-components/package.json b/datagouv-components/package.json index 0f539aa92..15ea55929 100644 --- a/datagouv-components/package.json +++ b/datagouv-components/package.json @@ -19,7 +19,8 @@ "main": "./src/main.ts", "exports": { ".": "./src/main.ts", - "./chart": "./src/chart.ts" + "./chart": "./src/chart.ts", + "./assets/*": "./assets/*" }, "sideEffects": false, "files": [ From 5bdb9b2d2891e988878ed8e97f1ef198a2597850 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexandre=20Bult=C3=A9?= Date: Mon, 25 May 2026 13:46:32 +0200 Subject: [PATCH 3/4] fix dist path --- datagouv-components/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/datagouv-components/package.json b/datagouv-components/package.json index 15ea55929..afb8999ce 100644 --- a/datagouv-components/package.json +++ b/datagouv-components/package.json @@ -20,7 +20,8 @@ "exports": { ".": "./src/main.ts", "./chart": "./src/chart.ts", - "./assets/*": "./assets/*" + "./assets/*": "./assets/*", + "./dist/*": "./dist/*" }, "sideEffects": false, "files": [ From 03c43334634a75ea23c5e2843d2f0d666991f8ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexandre=20Bult=C3=A9?= Date: Tue, 26 May 2026 10:50:14 +0200 Subject: [PATCH 4/4] make echarts a peer dep --- datagouv-components/package.json | 5 +++-- pnpm-lock.yaml | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/datagouv-components/package.json b/datagouv-components/package.json index afb8999ce..a2814836d 100644 --- a/datagouv-components/package.json +++ b/datagouv-components/package.json @@ -53,7 +53,6 @@ "@vueuse/router": "^14.2.1", "chart.js": "^4.4.8", "dompurify": "^3.2.5", - "echarts": "^6.0.0", "geopf-extensions-openlayers": "^1.0.0-beta.10", "leaflet": "^1.9.4", "maplibre-gl": "^5.6.2", @@ -94,6 +93,7 @@ "@vue/eslint-config-prettier": "^10.2.0", "@vue/eslint-config-typescript": "^14.3.0", "@vue/tsconfig": "^0.8.0", + "echarts": "^6.0.0", "eslint": "^9.18.0", "eslint-plugin-vue": "^10.0", "jiti": "^2.4.2", @@ -110,7 +110,8 @@ }, "peerDependencies": { "vue": "^3.5.13", - "vue-router": "^4.5.0 || ^5.0.0" + "vue-router": "^4.5.0 || ^5.0.0", + "echarts": "^6.0.0" }, "scarfSettings": { "enabled": false diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b6d76ba12..c71bcca78 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -248,9 +248,6 @@ importers: dompurify: specifier: ^3.2.5 version: 3.2.7 - echarts: - specifier: ^6.0.0 - version: 6.0.0 geopf-extensions-openlayers: specifier: ^1.0.0-beta.10 version: 1.0.0-beta.10 @@ -366,6 +363,9 @@ importers: '@vue/tsconfig': specifier: ^0.8.0 version: 0.8.1(typescript@5.9.3)(vue@3.5.33(typescript@5.9.3)) + echarts: + specifier: ^6.0.0 + version: 6.0.0 eslint: specifier: ^9.18.0 version: 9.36.0(jiti@2.6.1)