Skip to content
This repository has been archived by the owner on Jun 25, 2020. It is now read-only.

fix: broken build due to file rename in vega-lite #37

Merged
merged 2 commits into from
Apr 1, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/superset-ui-preset-chart-xy/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"prop-types": "^15.6.2",
"reselect": "^4.0.0",
"vega": "^5.2.0",
"vega-lite": "^3.0.0-rc15"
"vega-lite": "^3.1.0"
},
"peerDependencies": {
"@superset-ui/chart": "^0.10.2",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { CSSProperties, PureComponent } from 'react';
import { scaleOrdinal } from '@vx/scale';
import { LegendOrdinal, LegendItem, LegendLabel } from '@vx/legend';
import { Value } from 'vega-lite/build/src/fielddef';
import { Value } from 'vega-lite/build/src/channeldef';
import AbstractEncoder from '../encodeable/AbstractEncoder';
import { Dataset } from '../encodeable/types/Data';
import { ObjectWithKeysFromAndValueType } from '../encodeable/types/Base';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Value } from 'vega-lite/build/src/fielddef';
import { Value } from 'vega-lite/build/src/channeldef';
import { ObjectWithKeysFromAndValueType } from './types/Base';
import { ChannelOptions, EncodingFromChannelsAndOutputs, ChannelType } from './types/Channel';
import { FullSpec, BaseOptions, PartialSpec } from './types/Specification';
import { isFieldDef } from './types/FieldDef';
import { isFieldDef } from './types/ChannelDef';
import ChannelEncoder from './ChannelEncoder';

export default abstract class AbstractEncoder<
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/* eslint-disable no-magic-numbers */
import { CSSProperties } from 'react';
import { Value } from 'vega-lite/build/src/fielddef';
import { Value } from 'vega-lite/build/src/channeldef';
import { getTextDimension } from '@superset-ui/dimension';
import { CategoricalColorScale } from '@superset-ui/color';
import { extractFormatFromTypeAndFormat } from './parsers/extractFormat';
import { CoreAxis, LabelOverlapStrategy } from './types/Axis';
import { PositionFieldDef, ChannelDef } from './types/FieldDef';
import { PositionFieldDef, ChannelDef } from './types/ChannelDef';
import ChannelEncoder from './ChannelEncoder';
import { DEFAULT_LABEL_ANGLE } from '../utils/constants';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Value } from 'vega-lite/build/src/fielddef';
import { Value } from 'vega-lite/build/src/channeldef';
import { extractFormatFromChannelDef } from './parsers/extractFormat';
import extractScale, { ScaleAgent } from './parsers/extractScale';
import extractGetter from './parsers/extractGetter';
Expand All @@ -11,7 +11,7 @@ import {
isValueDef,
isFieldDef,
isNonValueDef,
} from './types/FieldDef';
} from './types/ChannelDef';
import isEnabled from './utils/isEnabled';
import isDisabled from './utils/isDisabled';
import identity from './utils/identity';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { getNumberFormatter } from '@superset-ui/number-format';
import { getTimeFormatter } from '@superset-ui/time-format';
import { Type } from 'vega-lite/build/src/type';
import { isTypedFieldDef, ChannelDef } from '../types/FieldDef';
import { isTypedFieldDef, ChannelDef } from '../types/ChannelDef';

const fallbackFormatter = (v: any) => `${v}`;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { get } from 'lodash/fp';
import { isValueDef, ChannelDef } from '../types/FieldDef';
import { isValueDef, ChannelDef } from '../types/ChannelDef';
import identity from '../utils/identity';

export default function extractGetter(definition: ChannelDef) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ import {
scalePoint,
scaleBand,
} from 'd3-scale';
import { Value } from 'vega-lite/build/src/fielddef';
import { Value } from 'vega-lite/build/src/channeldef';
import { Type } from 'vega-lite/build/src/type';
import { ScaleType } from 'vega-lite/build/src/scale';
import { isNonValueDef, ChannelDef } from '../types/FieldDef';
import { isNonValueDef, ChannelDef } from '../types/ChannelDef';
import isDisabled from '../utils/isDisabled';
import { ChannelType } from '../types/Channel';
import { Scale } from '../types/Scale';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Value } from 'vega-lite/build/src/fielddef';
import { XFieldDef, YFieldDef, ChannelDef, MarkPropChannelDef, TextChannelDef } from './FieldDef';
import { Value } from 'vega-lite/build/src/channeldef';
import { XFieldDef, YFieldDef, ChannelDef, MarkPropChannelDef, TextChannelDef } from './ChannelDef';
import { ObjectWithKeysFromAndValueType } from './Base';

// eslint-disable-next-line import/prefer-default-export
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// eslint-disable no-unused-vars
import { ValueDef, Value } from 'vega-lite/build/src/fielddef';
import { ValueDef, Value } from 'vega-lite/build/src/channeldef';
import { Type } from 'vega-lite/build/src/type';
import { TimeFormatter } from '@superset-ui/time-format';
import { NumberFormatter } from '@superset-ui/number-format';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Value } from 'vega-lite/build/src/fielddef';
import { Value } from 'vega-lite/build/src/channeldef';
import { DateTime } from 'vega-lite/build/src/datetime';
import { SchemeParams, ScaleType } from 'vega-lite/build/src/scale';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { AxisOrient } from 'vega';
import createTickComponent from './createTickComponent';
import ChartFrame from '../components/ChartFrame';
import ChannelEncoder from '../encodeable/ChannelEncoder';
import { XFieldDef, YFieldDef } from '../encodeable/types/FieldDef';
import { XFieldDef, YFieldDef } from '../encodeable/types/ChannelDef';
import { PlainObject } from '../encodeable/types/Data';
import { DEFAULT_LABEL_ANGLE } from './constants';

Expand Down