Merge cc80b1c into cce5980

uber · Jun 7, 2020 · dc073da · dc073da
2 parents cce5980 + cc80b1c
commit dc073da
Show file tree

Hide file tree

Showing 126 changed files with 399 additions and 328 deletions.
diff --git a/codemods/fix-import-paths.js b/codemods/fix-import-paths.js
@@ -0,0 +1,25 @@
+/* eslint-env node */
+const fs = require('fs');
+
+module.exports = function transformer(file, api) {
+  const j = api.jscodeshift;
+
+  return j(file.source)
+    .find(j.ImportDeclaration)
+    .forEach(p => {
+      const importPath = p.value.source.value;
+      if (isLocalImport(importPath)) {
+        p.value.source.value = `~/${importPath}`;
+      }
+    })
+    .toSource();
+};
+
+const PREFIX = './packages/react-vis/src/';
+function isLocalImport(importPath) {
+  const checks = [importPath, importPath + '/index.js', importPath + '.js'].map(
+    x => PREFIX + x
+  );
+
+  return checks.some(x => fs.existsSync(x));
+}
diff --git a/codemods/fix-showcase-imports.js b/codemods/fix-showcase-imports.js
@@ -0,0 +1,30 @@
+/* eslint-env node,jscodeshift */
+// const j = require('jscodeshift');
+
+module.exports = function transformer(file, api) {
+  const j = api.jscodeshift;
+  return j(file.source)
+    .find(j.ImportDeclaration)
+    .forEach(p => {
+      const importPath = p.value.source.value;
+      if (!importPath.startsWith('react-vis/')) {
+        return;
+      }
+      if (p.value.specifiers.length === 0) {
+        return;
+      }
+
+      if (
+        p.value.specifiers.length === 1 &&
+        p.value.specifiers[0].type === 'ImportDefaultSpecifier'
+      ) {
+        j(p).replaceWith(
+          j.importDeclaration(
+            [j.importSpecifier(j.identifier(p.value.specifiers[0].local.name))],
+            j.literal('react-vis')
+          )
+        );
+      }
+    })
+    .toSource();
+};
diff --git a/packages/react-vis/.babelrc.json b/packages/react-vis/.babelrc.json
@@ -1,7 +1,10 @@
 {
   "plugins": [
     ["module-resolver", {
-      "root": ["src"]
+      "root": ["."],
+      "alias": {
+        "^~/(.+)": "./src/\\1"
+      }
     }]
   ]
 }
diff --git a/packages/react-vis/jest.config.js b/packages/react-vis/jest.config.js
@@ -6,5 +6,9 @@ module.exports = {
     '^.+\\.js$': path.resolve(__dirname, './jestBabelTransform.js')
   },
   setupFilesAfterEnv: ['./jest.setup.js'],
+  rootDir: '.',
+  moduleNameMapper: {
+    '^~/(.*)': '<rootDir>/src/$1'
+  },
   snapshotSerializers: ['enzyme-to-json/serializer']
 };
diff --git a/packages/react-vis/jsconfig.json b/packages/react-vis/jsconfig.json
@@ -0,0 +1,8 @@
+{
+  "compilerOptions": {
+    "baseUrl": ".",
+    "paths": {
+      "~/*": ["src/*"]
+    }
+  }
+}
diff --git a/packages/react-vis/package.json b/packages/react-vis/package.json
@@ -21,6 +21,7 @@
   },
   "scripts": {
     "docs": "./publish-docs.sh",
+    "lint": "eslint .",
     "clean": "rm -rf dist es bundle.* index.html && mkdir dist es",
     "start": "(cd showcase && command -v yarn >/dev/null && yarn && npm start || npm install && npm start)",
     "build:browser": "browserify src/index.js -t [ babelify --rootMode upward ] --standalone reactVis | uglifyjs > dist/dist.min.js",
@@ -111,4 +112,4 @@
     "node": "10.20.1",
     "yarn": "1.22.4"
   }
-}
+}
diff --git a/packages/react-vis/src/index.js b/packages/react-vis/src/index.js
@@ -18,59 +18,59 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-export AbstractSeries from 'plot/series/abstract-series';
-export ArcSeries from 'plot/series/arc-series';
-export AreaSeries from 'plot/series/area-series';
-export Borders from 'plot/borders';
-export ChartLabel from 'plot/chart-label';
-export CircularGridLines from 'plot/circular-grid-lines';
-export ContourSeries from 'plot/series/contour-series';
-export Crosshair from 'plot/crosshair';
-export CustomSVGSeries from 'plot/series/custom-svg-series';
-export DecorativeAxis from 'plot/axis/decorative-axis';
-export GradientDefs from 'plot/gradient-defs';
-export GridLines from 'plot/grid-lines';
-export HeatmapSeries from 'plot/series/heatmap-series';
-export HexbinSeries from 'plot/series/hexbin-series';
-export Highlight from 'plot/highlight';
-export Hint from 'plot/hint';
-export HorizontalBarSeries from 'plot/series/horizontal-bar-series';
-export HorizontalBarSeriesCanvas from 'plot/series/horizontal-bar-series-canvas';
-export HorizontalGridLines from 'plot/horizontal-grid-lines';
-export HorizontalRectSeries from 'plot/series/horizontal-rect-series';
-export HorizontalRectSeriesCanvas from 'plot/series/horizontal-rect-series-canvas';
-export LabelSeries from 'plot/series/label-series';
-export LineMarkSeries from 'plot/series/line-mark-series';
-export LineMarkSeriesCanvas from 'plot/series/line-mark-series-canvas';
-export LineSeries from 'plot/series/line-series';
-export LineSeriesCanvas from 'plot/series/line-series-canvas';
-export MarkSeries from 'plot/series/mark-series';
-export MarkSeriesCanvas from 'plot/series/mark-series-canvas';
-export PolygonSeries from 'plot/series/polygon-series';
-export VerticalBarSeries from 'plot/series/vertical-bar-series';
-export VerticalBarSeriesCanvas from 'plot/series/vertical-bar-series-canvas';
-export VerticalGridLines from 'plot/vertical-grid-lines';
-export VerticalRectSeries from 'plot/series/vertical-rect-series';
-export VerticalRectSeriesCanvas from 'plot/series/vertical-rect-series-canvas';
-export Voronoi from 'plot/voronoi';
-export RectSeries from 'plot/series/rect-series';
-export RectSeriesCanvas from 'plot/series/rect-series-canvas';
-export WhiskerSeries from 'plot/series/whisker-series';
-export XYPlot from 'plot/xy-plot';
-export XAxis from 'plot/axis/x-axis';
-export YAxis from 'plot/axis/y-axis';
+export AbstractSeries from '~/plot/series/abstract-series';
+export ArcSeries from '~/plot/series/arc-series';
+export AreaSeries from '~/plot/series/area-series';
+export Borders from '~/plot/borders';
+export ChartLabel from '~/plot/chart-label';
+export CircularGridLines from '~/plot/circular-grid-lines';
+export ContourSeries from '~/plot/series/contour-series';
+export Crosshair from '~/plot/crosshair';
+export CustomSVGSeries from '~/plot/series/custom-svg-series';
+export DecorativeAxis from '~/plot/axis/decorative-axis';
+export GradientDefs from '~/plot/gradient-defs';
+export GridLines from '~/plot/grid-lines';
+export HeatmapSeries from '~/plot/series/heatmap-series';
+export HexbinSeries from '~/plot/series/hexbin-series';
+export Highlight from '~/plot/highlight';
+export Hint from '~/plot/hint';
+export HorizontalBarSeries from '~/plot/series/horizontal-bar-series';
+export HorizontalBarSeriesCanvas from '~/plot/series/horizontal-bar-series-canvas';
+export HorizontalGridLines from '~/plot/horizontal-grid-lines';
+export HorizontalRectSeries from '~/plot/series/horizontal-rect-series';
+export HorizontalRectSeriesCanvas from '~/plot/series/horizontal-rect-series-canvas';
+export LabelSeries from '~/plot/series/label-series';
+export LineMarkSeries from '~/plot/series/line-mark-series';
+export LineMarkSeriesCanvas from '~/plot/series/line-mark-series-canvas';
+export LineSeries from '~/plot/series/line-series';
+export LineSeriesCanvas from '~/plot/series/line-series-canvas';
+export MarkSeries from '~/plot/series/mark-series';
+export MarkSeriesCanvas from '~/plot/series/mark-series-canvas';
+export PolygonSeries from '~/plot/series/polygon-series';
+export VerticalBarSeries from '~/plot/series/vertical-bar-series';
+export VerticalBarSeriesCanvas from '~/plot/series/vertical-bar-series-canvas';
+export VerticalGridLines from '~/plot/vertical-grid-lines';
+export VerticalRectSeries from '~/plot/series/vertical-rect-series';
+export VerticalRectSeriesCanvas from '~/plot/series/vertical-rect-series-canvas';
+export Voronoi from '~/plot/voronoi';
+export RectSeries from '~/plot/series/rect-series';
+export RectSeriesCanvas from '~/plot/series/rect-series-canvas';
+export WhiskerSeries from '~/plot/series/whisker-series';
+export XYPlot from '~/plot/xy-plot';
+export XAxis from '~/plot/axis/x-axis';
+export YAxis from '~/plot/axis/y-axis';
 
-export ContinuousColorLegend from 'legends/continuous-color-legend';
-export ContinuousSizeLegend from 'legends/continuous-size-legend';
-export DiscreteColorLegend from 'legends/discrete-color-legend';
-export SearchableDiscreteColorLegend from 'legends/searchable-discrete-color-legend';
+export ContinuousColorLegend from '~/legends/continuous-color-legend';
+export ContinuousSizeLegend from '~/legends/continuous-size-legend';
+export DiscreteColorLegend from '~/legends/discrete-color-legend';
+export SearchableDiscreteColorLegend from '~/legends/searchable-discrete-color-legend';
 
-export ParallelCoordinates from 'parallel-coordinates';
-export RadarChart from 'radar-chart';
-export RadialChart from 'radial-chart';
-export Sankey from 'sankey';
-export Sunburst from 'sunburst';
-export Treemap from 'treemap';
+export ParallelCoordinates from '~/parallel-coordinates';
+export RadarChart from '~/radar-chart';
+export RadialChart from '~/radial-chart';
+export Sankey from '~/sankey';
+export Sunburst from '~/sunburst';
+export Treemap from '~/treemap';
 
 export ContentClipPath from './plot/content-clip-path';
 
@@ -83,5 +83,5 @@ export {
   FlexibleHeightXYPlot
 } from './make-vis-flexible';
 
-export AxisUtils from 'utils/axis-utils';
-export ScaleUtils from 'utils/scales-utils';
+export AxisUtils from '~/utils/axis-utils';
+export ScaleUtils from '~/utils/scales-utils';
diff --git a/packages/react-vis/src/legends/continuous-color-legend.js b/packages/react-vis/src/legends/continuous-color-legend.js
@@ -22,8 +22,8 @@ import React from 'react';
 
 import PropTypes from 'prop-types';
 
-import {CONTINUOUS_COLOR_RANGE} from 'theme';
-import {getCombinedClassName} from 'utils/styling-utils';
+import {CONTINUOUS_COLOR_RANGE} from '~/theme';
+import {getCombinedClassName} from '~/utils/styling-utils';
 
 const propTypes = {
   className: PropTypes.string,

diff --git a/packages/react-vis/src/legends/continuous-size-legend.js b/packages/react-vis/src/legends/continuous-size-legend.js
@@ -21,7 +21,7 @@
 import React from 'react';
 
 import PropTypes from 'prop-types';
-import {getCombinedClassName} from 'utils/styling-utils';
+import {getCombinedClassName} from '~/utils/styling-utils';
 
 const propTypes = {
   className: PropTypes.string,

diff --git a/packages/react-vis/src/legends/discrete-color-legend.js b/packages/react-vis/src/legends/discrete-color-legend.js
@@ -21,9 +21,9 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-import DiscreteColorLegendItem from 'legends/discrete-color-legend-item';
-import {DISCRETE_COLOR_RANGE} from 'theme';
-import {getCombinedClassName} from 'utils/styling-utils';
+import DiscreteColorLegendItem from '~/legends/discrete-color-legend-item';
+import {DISCRETE_COLOR_RANGE} from '~/theme';
+import {getCombinedClassName} from '~/utils/styling-utils';
 
 function DiscreteColorLegend({
   className,

diff --git a/packages/react-vis/src/legends/searchable-discrete-color-legend.js b/packages/react-vis/src/legends/searchable-discrete-color-legend.js
@@ -21,8 +21,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-import DiscreteColorLegend from 'legends/discrete-color-legend';
-import {getCombinedClassName} from 'utils/styling-utils';
+import DiscreteColorLegend from '~/legends/discrete-color-legend';
+import {getCombinedClassName} from '~/utils/styling-utils';
 
 const propTypes = {
   ...DiscreteColorLegend.propTypes,

diff --git a/packages/react-vis/src/make-vis-flexible.js b/packages/react-vis/src/make-vis-flexible.js
@@ -21,8 +21,8 @@
 import React from 'react';
 import window from 'global/window';
 
-import XYPlot from 'plot/xy-plot';
-import {getDOMNode} from 'utils/react-utils';
+import XYPlot from '~/plot/xy-plot';
+import {getDOMNode} from '~/utils/react-utils';
 
 const CONTAINER_REF = 'container';
 

diff --git a/packages/react-vis/src/parallel-coordinates/index.js b/packages/react-vis/src/parallel-coordinates/index.js
@@ -23,21 +23,21 @@ import PropTypes from 'prop-types';
 import {scaleLinear} from 'd3-scale';
 import {format} from 'd3-format';
 
-import {AnimationPropType} from 'animation';
-import XYPlot from 'plot/xy-plot';
-import {DISCRETE_COLOR_RANGE} from 'theme';
+import {AnimationPropType} from '~/animation';
+import XYPlot from '~/plot/xy-plot';
+import {DISCRETE_COLOR_RANGE} from '~/theme';
 import {
   MarginPropType,
   getInnerDimensions,
   DEFAULT_MARGINS
-} from 'utils/chart-utils';
-import {getCombinedClassName} from 'utils/styling-utils';
-import LineSeries from 'plot/series/line-series';
-import LineMarkSeries from 'plot/series/line-mark-series';
-import LabelSeries from 'plot/series/label-series';
-import DecorativeAxis from 'plot/axis/decorative-axis';
+} from '~/utils/chart-utils';
+import {getCombinedClassName} from '~/utils/styling-utils';
+import LineSeries from '~/plot/series/line-series';
+import LineMarkSeries from '~/plot/series/line-mark-series';
+import LabelSeries from '~/plot/series/label-series';
+import DecorativeAxis from '~/plot/axis/decorative-axis';
 
-import Highlight from 'plot/highlight';
+import Highlight from '~/plot/highlight';
 
 const predefinedClassName = 'rv-parallel-coordinates-chart';
 const DEFAULT_FORMAT = format('.2r');

diff --git a/packages/react-vis/src/plot/axis/axis-line.js b/packages/react-vis/src/plot/axis/axis-line.js
@@ -22,7 +22,7 @@ import React from 'react';
 
 import PropTypes from 'prop-types';
 
-import {ORIENTATION} from 'utils/axis-utils';
+import {ORIENTATION} from '~/utils/axis-utils';
 
 const {LEFT, RIGHT, TOP, BOTTOM} = ORIENTATION;
 

diff --git a/packages/react-vis/src/plot/axis/axis-ticks.js b/packages/react-vis/src/plot/axis/axis-ticks.js
@@ -22,8 +22,8 @@ import React from 'react';
 
 import PropTypes from 'prop-types';
 
-import {ORIENTATION, getTickValues} from 'utils/axis-utils';
-import {getAttributeScale} from 'utils/scales-utils';
+import {ORIENTATION, getTickValues} from '~/utils/axis-utils';
+import {getAttributeScale} from '~/utils/scales-utils';
 
 const {LEFT, RIGHT, TOP, BOTTOM} = ORIENTATION;
 

diff --git a/packages/react-vis/src/plot/axis/axis-title.js b/packages/react-vis/src/plot/axis/axis-title.js
@@ -22,7 +22,7 @@ import React from 'react';
 
 import PropTypes from 'prop-types';
 
-import {ORIENTATION} from 'utils/axis-utils';
+import {ORIENTATION} from '~/utils/axis-utils';
 
 // Assuming that 16px = 1em
 const ADJUSTMENT_FOR_TEXT_SIZE = 16;

diff --git a/packages/react-vis/src/plot/axis/axis.js b/packages/react-vis/src/plot/axis/axis.js
@@ -21,10 +21,10 @@
 import React, {PureComponent} from 'react';
 import PropTypes from 'prop-types';
 
-import Animation from 'animation';
-import {ORIENTATION, getTicksTotalFromSize} from 'utils/axis-utils';
-import {getAttributeScale} from 'utils/scales-utils';
-import {getCombinedClassName} from 'utils/styling-utils';
+import Animation from '~/animation';
+import {ORIENTATION, getTicksTotalFromSize} from '~/utils/axis-utils';
+import {getAttributeScale} from '~/utils/scales-utils';
+import {getCombinedClassName} from '~/utils/styling-utils';
 
 import AxisLine from './axis-line';
 import AxisTicks from './axis-ticks';

diff --git a/packages/react-vis/src/plot/axis/decorative-axis-ticks.js b/packages/react-vis/src/plot/axis/decorative-axis-ticks.js
@@ -19,7 +19,7 @@
 // THE SOFTWARE.
 
 import React from 'react';
-import {generatePoints, getAxisAngle} from 'utils/axis-utils';
+import {generatePoints, getAxisAngle} from '~/utils/axis-utils';
 
 /**
  * Generate the actual polygons to be plotted

diff --git a/packages/react-vis/src/plot/axis/decorative-axis.js b/packages/react-vis/src/plot/axis/decorative-axis.js
@@ -22,10 +22,10 @@ import React from 'react';
 import {format} from 'd3-format';
 import PropTypes from 'prop-types';
 
-import AbstractSeries from 'plot/series/abstract-series';
+import AbstractSeries from '~/plot/series/abstract-series';
 import DecorativeAxisTicks from './decorative-axis-ticks';
-import Animation from 'animation';
-import {getCombinedClassName} from 'utils/styling-utils';
+import Animation from '~/animation';
+import {getCombinedClassName} from '~/utils/styling-utils';
 
 const predefinedClassName = 'rv-xy-manipulable-axis rv-xy-plot__axis';
 

diff --git a/packages/react-vis/src/plot/axis/x-axis.js b/packages/react-vis/src/plot/axis/x-axis.js
@@ -22,7 +22,7 @@ import React from 'react';
 
 import PropTypes from 'prop-types';
 
-import {ORIENTATION} from 'utils/axis-utils';
+import {ORIENTATION} from '~/utils/axis-utils';
 
 import Axis from './axis';
 

diff --git a/packages/react-vis/src/plot/axis/y-axis.js b/packages/react-vis/src/plot/axis/y-axis.js
@@ -22,7 +22,7 @@ import React from 'react';
 
 import PropTypes from 'prop-types';
 
-import {ORIENTATION} from 'utils/axis-utils';
+import {ORIENTATION} from '~/utils/axis-utils';
 
 import Axis from './axis';