Skip to content

Commit

Permalink
[xy-chart] use babel instead of webpack to support deep imports
Browse files Browse the repository at this point in the history
  • Loading branch information
williaster committed Dec 8, 2017
1 parent 2a72bc7 commit 8114223
Show file tree
Hide file tree
Showing 20 changed files with 94 additions and 41 deletions.
10 changes: 5 additions & 5 deletions packages/xy-chart/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"description": "A package of charts with standard x- and y- axes. https://williaster.github.io/data-ui",
"main": "build/index.js",
"scripts": {
"build": "webpack -p",
"dev": "webpack --progress --colors --watch",
"build": "babel src/ -d build/",
"dev": "babel src/ -d build/ --watch",
"prepublish": "npm run build",
"test": "jest --colors --verbose --coverage"
},
Expand Down Expand Up @@ -42,7 +42,8 @@
"prop-types": "^15.5.10"
},
"devDependencies": {
"babel-core": "^6.24.1",
"babel-cli": "^6.26.0",
"babel-core": "^6.26.0",
"babel-jest": "^20.0.3",
"babel-loader": "^6.4.1",
"babel-plugin-syntax-jsx": "^6.18.0",
Expand All @@ -52,8 +53,7 @@
"jest": "^20.0.3",
"react": "^16.0.0",
"react-dom": "^16.0.0",
"react-test-renderer": "^16.0.0",
"webpack": "^2.4.1"
"react-test-renderer": "^16.0.0"
},
"peerDependencies": {
"react": "^15.0.0-0 || ^16.0.0-0",
Expand Down
2 changes: 1 addition & 1 deletion packages/xy-chart/src/chart/XYChart.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ import PropTypes from 'prop-types';

import Grid from '@vx/grid/build/grids/Grid';
import Group from '@vx/group/build/Group';
import WithTooltip, { withTooltipPropTypes } from '@data-ui/shared/build/enhancer/WithTooltip';

import collectVoronoiData from '../utils/collectVoronoiData';
import findClosestDatums from '../utils/findClosestDatums';
import shallowCompareObjectEntries from '../utils/shallowCompareObjectEntries';
import Voronoi from './Voronoi';
import WithTooltip, { withTooltipPropTypes } from '../enhancer/WithTooltip';

import {
componentName,
Expand Down
1 change: 1 addition & 0 deletions packages/xy-chart/src/enhancer/ParentSize.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default } from '@vx/responsive/build/components/ParentSize';
1 change: 1 addition & 0 deletions packages/xy-chart/src/enhancer/WithTooltip.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default, withTooltipPropTypes } from '@data-ui/shared/build/enhancer/WithTooltip';
1 change: 1 addition & 0 deletions packages/xy-chart/src/enhancer/withParentSize.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default } from '@vx/responsive/build/enhancers/withParentSize';
1 change: 1 addition & 0 deletions packages/xy-chart/src/enhancer/withScreenSize.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default } from '@vx/responsive/build/enhancers/withScreenSize';
14 changes: 8 additions & 6 deletions packages/xy-chart/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,17 @@ export { default as StackedAreaSeries } from './series/StackedAreaSeries';
export { default as StackedBarSeries } from './series/StackedBarSeries';
export { default as BoxPlotSeries } from './series/BoxPlotSeries';
export { default as ViolinPlotSeries } from './series/ViolinPlotSeries';
export { computeStats } from '@vx/stats';
export { default as computeStats } from './utils/computeStats';

export { default as HorizontalReferenceLine } from './annotation/HorizontalReferenceLine';
export { default as CrossHair } from './chart/CrossHair';
export { default as WithTooltip, withTooltipPropTypes } from '@data-ui/shared/build/enhancer/WithTooltip';

export { LinearGradient } from '@vx/gradient';
export { PatternLines, PatternCircles, PatternWaves, PatternHexagons } from '@vx/pattern';
export { withScreenSize, withParentSize, ParentSize } from '@vx/responsive';
export { default as LinearGradient } from './style/LinearGradient';
export { PatternLines, PatternCircles, PatternWaves, PatternHexagons } from './style/Pattern';
export { default as withScreenSize } from './enhancer/withScreenSize';
export { default as withParentSize } from './enhancer/withParentSize';
export { default as ParentSize } from './enhancer/ParentSize';

export { default as WithTooltip, withTooltipPropTypes } from './enhancer/WithTooltip';
export { default as withTheme } from './enhancer/withTheme';
export { chartTheme as theme } from '@data-ui/theme';
export { default as theme } from './style/chartTheme';
1 change: 1 addition & 0 deletions packages/xy-chart/src/style/LinearGradient.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default } from '@vx/gradient/build/gradients/LinearGradient';
1 change: 1 addition & 0 deletions packages/xy-chart/src/style/Pattern.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { PatternLines, PatternCircles, PatternWaves, PatternHexagons } from '@vx/pattern';
1 change: 1 addition & 0 deletions packages/xy-chart/src/style/chartTheme.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { chartTheme as default } from '@data-ui/theme';
1 change: 1 addition & 0 deletions packages/xy-chart/src/utils/computeStats.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { computeStats as default } from '@vx/stats';
7 changes: 7 additions & 0 deletions packages/xy-chart/test/enhancer/ParentSize.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { ParentSize } from '../../src';

describe('ParentSize', () => {
test('it should be defined', () => {
expect(ParentSize).toBeDefined();
});
});
11 changes: 11 additions & 0 deletions packages/xy-chart/test/enhancer/WithTooltip.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import { WithTooltip, withTooltipPropTypes } from '../../src';

describe('WithTooltip', () => {
test('it should be defined', () => {
expect(WithTooltip).toBeDefined();
});

test('withTooltipPropTypes should be defined', () => {
expect(withTooltipPropTypes).toBeDefined();
});
});
7 changes: 7 additions & 0 deletions packages/xy-chart/test/enhancer/withParentSize.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { withParentSize } from '../../src';

describe('withParentSize', () => {
test('it should be defined', () => {
expect(withParentSize).toBeDefined();
});
});
7 changes: 7 additions & 0 deletions packages/xy-chart/test/enhancer/withScreenSize.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { withScreenSize } from '../../src';

describe('withScreenSize', () => {
test('it should be defined', () => {
expect(withScreenSize).toBeDefined();
});
});
7 changes: 7 additions & 0 deletions packages/xy-chart/test/style/LinearGradient.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { LinearGradient } from '../../src';

describe('LinearGradient', () => {
test('it should be defined', () => {
expect(LinearGradient).toBeDefined();
});
});
19 changes: 19 additions & 0 deletions packages/xy-chart/test/style/Pattern.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import { PatternLines, PatternCircles, PatternWaves, PatternHexagons } from '../../src';

describe('Pattern', () => {
test('PatternLines should be defined', () => {
expect(PatternLines).toBeDefined();
});

test('PatternCircles should be defined', () => {
expect(PatternCircles).toBeDefined();
});

test('PatternWaves should be defined', () => {
expect(PatternWaves).toBeDefined();
});

test('PatternHexagons should be defined', () => {
expect(PatternHexagons).toBeDefined();
});
});
7 changes: 7 additions & 0 deletions packages/xy-chart/test/style/chartTheme.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { theme } from '../../src';

describe('theme', () => {
test('it should be defined', () => {
expect(theme).toBeDefined();
});
});
7 changes: 7 additions & 0 deletions packages/xy-chart/test/utils/computeStats.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { computeStats } from '../../src';

describe('computeStats', () => {
test('it should be defined', () => {
expect(computeStats).toBeDefined();
});
});
29 changes: 0 additions & 29 deletions packages/xy-chart/webpack.config.js

This file was deleted.

0 comments on commit 8114223

Please sign in to comment.