feat: use @antv/vendor to replace d3 package (#6594)

* chore: use vendor as d3 lib * chore: upgrade vendor to 1.0.3 * fix: d3-hierarchy Node not found * chore: use vendor replace __test__ d3 pkg * fix: jest config & lock vendor version * chore: add ignore & missing in vendor replace * chore: remove vendor dev dependencies
antvis · Jan 23, 2025 · dac27dd · dac27dd
1 parent 8a310b7
commit dac27dd
Show file tree

Hide file tree

Showing 149 changed files with 271 additions and 239 deletions.
diff --git a/__tests__/plots/animation/aapl-area-keyframe.ts b/__tests__/plots/animation/aapl-area-keyframe.ts
@@ -1,9 +1,9 @@
-import { csv } from 'd3-fetch';
-import { autoType } from 'd3-dsv';
+import { csv } from '@antv/vendor/d3-fetch';
+import { autoType } from '@antv/vendor/d3-dsv';
 import { G2Spec } from '../../../src';
 
 export async function aaplAreaKeyframe(): Promise<G2Spec> {
-  const data = await csv('data/aapl.csv', autoType);
+  const data = await csv<any>('data/aapl.csv', autoType);
   const missing = data.map((d) => ({
     ...d,
     close: d.date.getUTCMonth() <= 3 ? NaN : d.close,
@@ -24,6 +24,7 @@ export async function aaplAreaKeyframe(): Promise<G2Spec> {
       connectFillOpacity: 0.15,
     },
   };
+  // @ts-ignore
   return {
     type: 'timingKeyframe',
     width: 800,

diff --git a/__tests__/plots/animation/polio-point-stack-enter.ts b/__tests__/plots/animation/polio-point-stack-enter.ts
@@ -1,4 +1,4 @@
-import { interpolateHcl } from 'd3-interpolate';
+import { interpolateHcl } from '@antv/vendor/d3-interpolate';
 import { G2Spec } from '../../../src';
 
 /**

diff --git a/__tests__/plots/animation/stocks-keyframe.ts b/__tests__/plots/animation/stocks-keyframe.ts
@@ -1,5 +1,5 @@
-import { csv } from 'd3-fetch';
-import { autoType } from 'd3-dsv';
+import { csv } from '@antv/vendor/d3-fetch';
+import { autoType } from '@antv/vendor/d3-dsv';
 import { G2Spec } from '../../../src';
 
 const facetLine = (data) => ({

diff --git a/__tests__/plots/interaction/gdp2-point-chart-fisheye.ts b/__tests__/plots/interaction/gdp2-point-chart-fisheye.ts
@@ -1,5 +1,5 @@
-import { csv } from 'd3-fetch';
-import { autoType } from 'd3-dsv';
+import { csv } from '@antv/vendor/d3-fetch';
+import { autoType } from '@antv/vendor/d3-dsv';
 import { G2Spec, PLOT_CLASS_NAME } from '../../../src';
 import { step } from './utils';
 

diff --git a/__tests__/plots/interaction/indices-line-brush-series.ts b/__tests__/plots/interaction/indices-line-brush-series.ts
@@ -1,5 +1,5 @@
-import { csv } from 'd3-fetch';
-import { autoType } from 'd3-dsv';
+import { csv } from '@antv/vendor/d3-fetch';
+import { autoType } from '@antv/vendor/d3-dsv';
 import { G2Spec, PLOT_CLASS_NAME } from '../../../src';
 import { brush } from './penguins-point-brush';
 

diff --git a/__tests__/plots/interaction/indices-line-chart-facet-brush-shared.ts b/__tests__/plots/interaction/indices-line-chart-facet-brush-shared.ts
@@ -1,5 +1,5 @@
-import { csv } from 'd3-fetch';
-import { autoType } from 'd3-dsv';
+import { csv } from '@antv/vendor/d3-fetch';
+import { autoType } from '@antv/vendor/d3-dsv';
 import { G2Spec, PLOT_CLASS_NAME } from '../../../src';
 import { brush } from './penguins-point-brush';
 

diff --git a/__tests__/plots/interaction/indices-line-chart-facet.ts b/__tests__/plots/interaction/indices-line-chart-facet.ts
@@ -1,5 +1,5 @@
-import { csv } from 'd3-fetch';
-import { autoType } from 'd3-dsv';
+import { csv } from '@antv/vendor/d3-fetch';
+import { autoType } from '@antv/vendor/d3-dsv';
 import { G2Spec, PLOT_CLASS_NAME } from '../../../src';
 import { step } from './utils';
 

diff --git a/__tests__/plots/interaction/indices-line-chart-index-series.ts b/__tests__/plots/interaction/indices-line-chart-index-series.ts
@@ -1,5 +1,5 @@
-import { csv } from 'd3-fetch';
-import { autoType } from 'd3-dsv';
+import { csv } from '@antv/vendor/d3-fetch';
+import { autoType } from '@antv/vendor/d3-dsv';
 import { G2Spec, ELEMENT_CLASS_NAME } from '../../../src';
 import { step } from './utils';
 

diff --git a/__tests__/plots/interaction/indices-line-crosshairs-xy.ts b/__tests__/plots/interaction/indices-line-crosshairs-xy.ts
@@ -1,5 +1,5 @@
-import { csv } from 'd3-fetch';
-import { autoType } from 'd3-dsv';
+import { csv } from '@antv/vendor/d3-fetch';
+import { autoType } from '@antv/vendor/d3-dsv';
 import { G2Spec, PLOT_CLASS_NAME } from '../../../src';
 import { step } from './utils';
 

diff --git a/__tests__/plots/interaction/points-point-regression-quad-inset.ts b/__tests__/plots/interaction/points-point-regression-quad-inset.ts
@@ -1,4 +1,5 @@
-import { regressionQuad } from 'd3-regression';
+// @ts-ignore
+import { regressionQuad } from '@antv/vendor/d3-regression';
 import { G2Spec, PLOT_CLASS_NAME } from '../../../src';
 import { points } from '../../data/points';
 import { step } from './utils';

diff --git a/__tests__/plots/interaction/points-point-regression-quad-transpose.ts b/__tests__/plots/interaction/points-point-regression-quad-transpose.ts
@@ -1,4 +1,5 @@
-import { regressionQuad } from 'd3-regression';
+// @ts-ignore
+import { regressionQuad } from '@antv/vendor/d3-regression';
 import { G2Spec, PLOT_CLASS_NAME } from '../../../src';
 import { points } from '../../data/points';
 import { step } from './utils';

diff --git a/__tests__/plots/interaction/points-point-regression-quad.ts b/__tests__/plots/interaction/points-point-regression-quad.ts
@@ -1,4 +1,5 @@
-import { regressionQuad } from 'd3-regression';
+// @ts-ignore
+import { regressionQuad } from '@antv/vendor/d3-regression';
 import { G2Spec, PLOT_CLASS_NAME } from '../../../src';
 import { points } from '../../data/points';
 import { step } from './utils';

diff --git a/__tests__/plots/interaction/points-point-tooltip-marker.ts b/__tests__/plots/interaction/points-point-tooltip-marker.ts
@@ -1,4 +1,5 @@
-import { regressionQuad } from 'd3-regression';
+// @ts-ignore
+import { regressionQuad } from '@antv/vendor/d3-regression';
 import { G2Spec, PLOT_CLASS_NAME } from '../../../src';
 import { points } from '../../data/points';
 import { step } from './utils';

diff --git a/__tests__/plots/interaction/unemployment-choropleth.ts b/__tests__/plots/interaction/unemployment-choropleth.ts
@@ -1,6 +1,6 @@
-import { tsv } from 'd3-fetch';
+import { tsv } from '@antv/vendor/d3-fetch';
 import { feature } from 'topojson';
-import { autoType } from 'd3-dsv';
+import { autoType } from '@antv/vendor/d3-dsv';
 import { G2Spec, ELEMENT_CLASS_NAME } from '../../../src';
 import { step } from './utils';
 

diff --git a/__tests__/plots/static/airports-point-choropleth.ts b/__tests__/plots/static/airports-point-choropleth.ts
@@ -1,6 +1,6 @@
-import { csv } from 'd3-fetch';
+import { csv } from '@antv/vendor/d3-fetch';
 import { feature } from 'topojson';
-import { autoType } from 'd3-dsv';
+import { autoType } from '@antv/vendor/d3-dsv';
 import { G2Spec } from '../../../src';
 
 export async function airportsPointChoropleth(): Promise<G2Spec> {

diff --git a/__tests__/plots/static/barley-line-trail.ts b/__tests__/plots/static/barley-line-trail.ts
@@ -1,6 +1,6 @@
-import { csv } from 'd3-fetch';
-import { autoType } from 'd3-dsv';
-import { rollup } from 'd3-array';
+import { csv } from '@antv/vendor/d3-fetch';
+import { autoType } from '@antv/vendor/d3-dsv';
+import { rollup } from '@antv/vendor/d3-array';
 import { G2Spec } from '../../../src';
 
 export async function barleyLineTrail(): Promise<G2Spec> {

diff --git a/__tests__/plots/static/barley-point-facet-rect-col-z-index.ts b/__tests__/plots/static/barley-point-facet-rect-col-z-index.ts
@@ -1,6 +1,6 @@
-import { csv } from 'd3-fetch';
-import { autoType } from 'd3-dsv';
-import { groupSort, median } from 'd3-array';
+import { csv } from '@antv/vendor/d3-fetch';
+import { autoType } from '@antv/vendor/d3-dsv';
+import { groupSort, median } from '@antv/vendor/d3-array';
 import { G2Spec } from '../../../src';
 
 export async function barleyPointFacetRectColZIndex(): Promise<G2Spec> {

diff --git a/__tests__/plots/static/barley-point-facet-rect-col.ts b/__tests__/plots/static/barley-point-facet-rect-col.ts
@@ -1,6 +1,6 @@
-import { csv } from 'd3-fetch';
-import { autoType } from 'd3-dsv';
-import { groupSort, median } from 'd3-array';
+import { csv } from '@antv/vendor/d3-fetch';
+import { autoType } from '@antv/vendor/d3-dsv';
+import { groupSort, median } from '@antv/vendor/d3-array';
 import { G2Spec } from '../../../src';
 
 export async function barleyPointFacetRectCol(): Promise<G2Spec> {

diff --git a/__tests__/plots/static/cars2-point-jitterX.ts b/__tests__/plots/static/cars2-point-jitterX.ts
@@ -1,4 +1,4 @@
-import * as d3 from 'd3-random';
+import * as d3 from '@antv/vendor/d3-random';
 import { G2Spec } from '../../../src';
 
 export function cars2PointJitterX(): G2Spec {

diff --git a/__tests__/plots/static/cars2-point-jitterY.ts b/__tests__/plots/static/cars2-point-jitterY.ts
@@ -1,4 +1,4 @@
-import * as d3 from 'd3-random';
+import * as d3 from '@antv/vendor/d3-random';
 import { G2Spec } from '../../../src';
 
 export function cars2PointJitterY(): G2Spec {

diff --git a/__tests__/plots/static/countries-50m-projection-comparison.ts b/__tests__/plots/static/countries-50m-projection-comparison.ts
@@ -1,5 +1,9 @@
 import { feature } from 'topojson';
-import { geoPolyconic, geoRectangularPolyconic } from 'd3-geo-projection';
+import {
+  geoPolyconic,
+  geoRectangularPolyconic,
+  // @ts-ignore
+} from '@antv/vendor/d3-geo-projection';
 import { G2Spec } from '../../../src';
 
 export async function countries50mProjectionComparison(): Promise<G2Spec> {

diff --git a/__tests__/plots/static/diamond-point-jitter-polar.ts b/__tests__/plots/static/diamond-point-jitter-polar.ts
@@ -1,4 +1,4 @@
-import * as d3 from 'd3-random';
+import * as d3 from '@antv/vendor/d3-random';
 import { G2Spec } from '../../../src';
 
 export function diamondPointJitterPolar(): G2Spec {

diff --git a/__tests__/plots/static/energy-sankey-custom-tooltip.ts b/__tests__/plots/static/energy-sankey-custom-tooltip.ts
@@ -1,5 +1,5 @@
-import { csv } from 'd3-fetch';
-import { autoType } from 'd3-dsv';
+import { csv } from '@antv/vendor/d3-fetch';
+import { autoType } from '@antv/vendor/d3-dsv';
 import { G2Spec } from '../../../src';
 
 export async function energySankeyCustomTooltip(): Promise<G2Spec> {

diff --git a/__tests__/plots/static/energy-sankey-custom.ts b/__tests__/plots/static/energy-sankey-custom.ts
@@ -1,10 +1,10 @@
-import { csv } from 'd3-fetch';
-import { autoType } from 'd3-dsv';
-import { schemeTableau10 } from 'd3-scale-chromatic';
+import { csv } from '@antv/vendor/d3-fetch';
+import { autoType } from '@antv/vendor/d3-dsv';
+import { schemeTableau10 } from '@antv/vendor/d3-scale-chromatic';
 import { G2Spec } from '../../../src';
 
 export async function energySankeyCustom(): Promise<G2Spec> {
-  const links = await csv('data/energy.csv', autoType);
+  const links = await csv<any>('data/energy.csv', autoType);
 
   const mockData = () => {
     const LS = links.map((d) => d.source);

diff --git a/__tests__/plots/static/energy-sankey-defaults.ts b/__tests__/plots/static/energy-sankey-defaults.ts
@@ -1,5 +1,5 @@
-import { csv } from 'd3-fetch';
-import { autoType } from 'd3-dsv';
+import { csv } from '@antv/vendor/d3-fetch';
+import { autoType } from '@antv/vendor/d3-dsv';
 import { G2Spec } from '../../../src';
 
 export async function energySankeyDefaults(): Promise<G2Spec> {

diff --git a/__tests__/plots/static/energy-sankey-view-custom-tooltip.ts b/__tests__/plots/static/energy-sankey-view-custom-tooltip.ts
@@ -1,5 +1,5 @@
-import { csv } from 'd3-fetch';
-import { autoType } from 'd3-dsv';
+import { csv } from '@antv/vendor/d3-fetch';
+import { autoType } from '@antv/vendor/d3-dsv';
 import { G2Spec } from '../../../src';
 
 export async function energySankeyViewCustomTooltip(): Promise<G2Spec> {

diff --git a/__tests__/plots/static/english-wordCloud.ts b/__tests__/plots/static/english-wordCloud.ts
@@ -1,4 +1,4 @@
-import { randomUniform, randomLcg } from 'd3-random';
+import { randomUniform, randomLcg } from '@antv/vendor/d3-random';
 import { G2Spec } from '../../../src';
 import { text } from '../../data/txt-wordCloud';
 

diff --git a/__tests__/plots/static/flare-point-circle-pack-custom-auto-padding.ts b/__tests__/plots/static/flare-point-circle-pack-custom-auto-padding.ts
@@ -1,4 +1,4 @@
-import { interpolateHcl } from 'd3-interpolate';
+import { interpolateHcl } from '@antv/vendor/d3-interpolate';
 import { G2Spec } from '../../../src';
 
 export async function flarePointCirclePackCustomAutoPadding(): Promise<G2Spec> {

diff --git a/__tests__/plots/static/flare-point-circle-pack-custom.ts b/__tests__/plots/static/flare-point-circle-pack-custom.ts
@@ -1,4 +1,4 @@
-import { interpolateHcl } from 'd3-interpolate';
+import { interpolateHcl } from '@antv/vendor/d3-interpolate';
 import { G2Spec } from '../../../src';
 
 export async function flarePointCirclePackCustom(): Promise<G2Spec> {

diff --git a/__tests__/plots/static/flare-treemap-custom.ts b/__tests__/plots/static/flare-treemap-custom.ts
@@ -1,4 +1,4 @@
-import { schemeTableau10 } from 'd3-scale-chromatic';
+import { schemeTableau10 } from '@antv/vendor/d3-scale-chromatic';
 import { G2Spec } from '../../../src';
 
 export async function flareTreemapCustom(): Promise<G2Spec> {

diff --git a/__tests__/plots/static/hale-choropleth-world.ts b/__tests__/plots/static/hale-choropleth-world.ts
@@ -1,13 +1,13 @@
-import { csv } from 'd3-fetch';
+import { csv } from '@antv/vendor/d3-fetch';
 import { feature, mesh } from 'topojson';
-import { autoType } from 'd3-dsv';
+import { autoType } from '@antv/vendor/d3-dsv';
 import { G2Spec } from '../../../src';
 
 export async function haleChoroplethWorld(): Promise<G2Spec> {
   const world = await fetch('data/countries-50m.json').then((res) =>
     res.json(),
   );
-  const hale = (await csv('data/hale.csv', autoType)).map((d) => ({
+  const hale = (await csv<any>('data/hale.csv', autoType)).map((d) => ({
     ...d,
     hale: Number.isNaN(d.hale) ? d.hale : d.hale,
   }));

diff --git a/__tests__/plots/static/income-statement-by-region-interval-custom.ts b/__tests__/plots/static/income-statement-by-region-interval-custom.ts
@@ -1,4 +1,4 @@
-import { group } from 'd3-array';
+import { group } from '@antv/vendor/d3-array';
 import { incomeStatementByRegion } from '../../data/incomeStatementByRegion';
 
 export function incomeStatementByRegionIntervalCustom() {

diff --git a/__tests__/plots/static/indices-line-chart-facet-axis.ts b/__tests__/plots/static/indices-line-chart-facet-axis.ts
@@ -1,5 +1,5 @@
-import { csv } from 'd3-fetch';
-import { autoType } from 'd3-dsv';
+import { csv } from '@antv/vendor/d3-fetch';
+import { autoType } from '@antv/vendor/d3-dsv';
 import { G2Spec } from '../../../src';
 
 export async function indicesLineChartFacetAxis(): Promise<G2Spec> {

diff --git a/__tests__/plots/static/indices-line-point-scale-key.ts b/__tests__/plots/static/indices-line-point-scale-key.ts
@@ -1,5 +1,5 @@
-import { csv } from 'd3-fetch';
-import { autoType } from 'd3-dsv';
+import { csv } from '@antv/vendor/d3-fetch';
+import { autoType } from '@antv/vendor/d3-dsv';
 import { G2Spec } from '../../../src';
 
 export async function indicesLinePointScaleKey(): Promise<G2Spec> {

diff --git a/__tests__/plots/static/miserable-force-custom.ts b/__tests__/plots/static/miserable-force-custom.ts
@@ -1,4 +1,4 @@
-import { schemeTableau10 } from 'd3-scale-chromatic';
+import { schemeTableau10 } from '@antv/vendor/d3-scale-chromatic';
 import { G2Spec } from '../../../src';
 
 export function miserableForceCustom(): G2Spec {

diff --git a/__tests__/plots/static/month-interval-facet-circle.ts b/__tests__/plots/static/month-interval-facet-circle.ts
@@ -1,4 +1,4 @@
-import * as d3 from 'd3-random';
+import * as d3 from '@antv/vendor/d3-random';
 import { G2Spec } from '../../../src';
 
 export function monthIntervalFacetCircle(): G2Spec {

diff --git a/__tests__/plots/static/month-interval-facet-rect.ts b/__tests__/plots/static/month-interval-facet-rect.ts
@@ -1,4 +1,4 @@
-import * as d3 from 'd3-random';
+import * as d3 from '@antv/vendor/d3-random';
 import { G2Spec } from '../../../src';
 
 export function monthIntervalFacetRect(): G2Spec {

diff --git a/__tests__/plots/static/month-interval-radial-facet-rect.ts b/__tests__/plots/static/month-interval-radial-facet-rect.ts
@@ -1,4 +1,4 @@
-import * as d3 from 'd3-random';
+import * as d3 from '@antv/vendor/d3-random';
 import { G2Spec } from '../../../src';
 
 export function monthIntervalRadialFacetRect(): G2Spec {

diff --git a/__tests__/plots/static/philosophy-wordCloud-custom.ts b/__tests__/plots/static/philosophy-wordCloud-custom.ts
@@ -1,4 +1,4 @@
-import { randomUniform, randomLcg } from 'd3-random';
+import { randomUniform, randomLcg } from '@antv/vendor/d3-random';
 import { G2Spec } from '../../../src';
 
 export function philosophyWordCloudCustom(): G2Spec {

diff --git a/__tests__/plots/static/philosophy-wordCloud-default.ts b/__tests__/plots/static/philosophy-wordCloud-default.ts
@@ -1,4 +1,4 @@
-import { randomUniform, randomLcg } from 'd3-random';
+import { randomUniform, randomLcg } from '@antv/vendor/d3-random';
 import { G2Spec } from '../../../src';
 
 export function philosophyWordCloudDefault(): G2Spec {

diff --git a/__tests__/plots/static/philosophy-wordCloud-image.ts b/__tests__/plots/static/philosophy-wordCloud-image.ts
@@ -1,4 +1,4 @@
-import { randomUniform, randomLcg } from 'd3-random';
+import { randomUniform, randomLcg } from '@antv/vendor/d3-random';
 import { G2Spec } from '../../../src';
 
 export function philosophyWordCloudImage(): G2Spec {

diff --git a/__tests__/plots/static/premier-league-table.ts b/__tests__/plots/static/premier-league-table.ts
@@ -1,4 +1,4 @@
-import { median } from 'd3-array';
+import { median } from '@antv/vendor/d3-array';
 import { G2Spec } from '../../../src';
 
 const logos = {

diff --git a/__tests__/plots/static/temperature2-line-threshold.ts b/__tests__/plots/static/temperature2-line-threshold.ts
@@ -1,6 +1,6 @@
-import { csv } from 'd3-fetch';
-import { autoType } from 'd3-dsv';
-import { median } from 'd3-array';
+import { csv } from '@antv/vendor/d3-fetch';
+import { autoType } from '@antv/vendor/d3-dsv';
+import { median } from '@antv/vendor/d3-array';
 import { G2Spec } from '../../../src';
 
 export async function temperature2LineThreshold(): Promise<G2Spec> {

diff --git a/__tests__/plots/static/train-line-multi-axes-auto-padding-tick-method.ts b/__tests__/plots/static/train-line-multi-axes-auto-padding-tick-method.ts
@@ -1,9 +1,9 @@
-import { csv } from 'd3-fetch';
-import { autoType } from 'd3-dsv';
+import { csv } from '@antv/vendor/d3-fetch';
+import { autoType } from '@antv/vendor/d3-dsv';
 import { G2Spec } from '../../../src';
 
 export async function tranLineMultiAxesAutoPaddingTickMethod(): Promise<G2Spec> {
-  const data = await csv('data/train.csv', autoType);
+  const data = await csv<any>('data/train.csv', autoType);
   const distanceName = new Map(data.map((d) => [d.distance, d.name]));
   const xAxis = {
     tickMethod: () => Array.from(distanceName.keys()),

diff --git a/__tests__/plots/static/train-line-multi-axes.ts b/__tests__/plots/static/train-line-multi-axes.ts
@@ -1,9 +1,14 @@
-import { csv } from 'd3-fetch';
-import { autoType } from 'd3-dsv';
+import { csv } from '@antv/vendor/d3-fetch';
+import { autoType } from '@antv/vendor/d3-dsv';
 import { G2Spec } from '../../../src';
 
+interface Row {
+  distance: number;
+  name: string;
+}
+
 export async function tranLineMultiAxes(): Promise<G2Spec> {
-  const data = await csv('data/train.csv', autoType);
+  const data = await csv<Row>('data/train.csv', autoType);
   const distanceName = new Map(data.map((d) => [d.distance, d.name]));
   const xAxis = {
     tickMethod: () => Array.from(distanceName.keys()),

diff --git a/__tests__/plots/static/unemployment-choropleth.ts b/__tests__/plots/static/unemployment-choropleth.ts
@@ -1,6 +1,6 @@
-import { tsv } from 'd3-fetch';
+import { tsv } from '@antv/vendor/d3-fetch';
 import { feature } from 'topojson';
-import { autoType } from 'd3-dsv';
+import { autoType } from '@antv/vendor/d3-dsv';
 import { G2Spec } from '../../../src';
 
 export async function unemploymentChoropleth(): Promise<G2Spec> {