Refactor: move some files to @grafana/data (#17952)

* moving to data WIP

* more refactoring

* add missing test

* mock full path

* remove sinon from grafana-ui

packages/grafana-data/package.json

@@ -23,6 +23,7 @@
     "@types/papaparse": "4.5.9",
     "@types/pretty-format": "20.0.1",
     "@types/react": "16.8.16",
+    "@types/sinon": "^7.0.11",
     "awesome-typescript-loader": "^5.2.1",
     "lodash": "^4.17.10",
     "pretty-format": "^24.5.0",
@@ -33,6 +34,7 @@
     "rollup-plugin-terser": "4.0.4",
     "rollup-plugin-typescript2": "0.19.3",
     "rollup-plugin-visualizer": "0.9.2",
+    "sinon": "1.17.6",
     "typescript": "3.4.1"
   },
   "resolutions": {

packages/grafana-data/src/types/index.ts

@@ -1 +1,5 @@
+export * from './data';
+export * from './logs';
 export * from './navModel';
+export * from './time';
+export * from './utils';

packages/grafana-data/src/utils/csv.ts

@@ -4,7 +4,7 @@ import defaults from 'lodash/defaults';
 import isNumber from 'lodash/isNumber';
 
 // Types
-import { DataFrame, Field, FieldType } from '../types/index';
+import { DataFrame, Field, FieldType } from '../types';
 import { guessFieldTypeFromValue } from './processDataFrame';
 
 export enum CSVHeaderStyle {

packages/grafana-data/src/utils/datemath.ts

@@ -1,6 +1,6 @@
 import includes from 'lodash/includes';
 import isDate from 'lodash/isDate';
-import { DateTime, dateTime, toUtc, ISO_8601, isDateTime, DurationUnit } from '../utils/moment_wrapper';
+import { DateTime, dateTime, toUtc, ISO_8601, isDateTime, DurationUnit } from './moment_wrapper';
 import { TimeZone } from '../types';
 
 const units: DurationUnit[] = ['y', 'M', 'w', 'd', 'h', 'm', 's'];

packages/grafana-data/src/utils/fieldReducer.test.ts

@@ -1,4 +1,4 @@
-import { getFieldReducers, ReducerID, reduceField } from './fieldReducer';
+import { getFieldReducers, ReducerID, reduceField } from './index';
 
 import _ from 'lodash';
 

packages/grafana-data/src/utils/index.ts

@@ -1,2 +1,14 @@
 export * from './string';
 export * from './markdown';
+export * from './processDataFrame';
+export * from './csv';
+export * from './fieldReducer';
+export * from './logs';
+export * from './labels';
+export * from './labels';
+export * from './object';
+export * from './fieldCache';
+export * from './moment_wrapper';
+
+// Names are too general to export
+// rangeutils, datemath

packages/grafana-ui/package.json

@@ -57,7 +57,6 @@
     "@types/react-custom-scrollbars": "4.0.5",
     "@types/react-test-renderer": "16.8.1",
     "@types/react-transition-group": "2.0.16",
-    "@types/sinon": "^7.0.11",
     "@types/storybook__addon-actions": "3.4.2",
     "@types/storybook__addon-info": "4.1.1",
     "@types/storybook__addon-knobs": "4.0.4",
@@ -75,7 +74,6 @@
     "rollup-plugin-terser": "4.0.4",
     "rollup-plugin-typescript2": "0.19.3",
     "rollup-plugin-visualizer": "0.9.2",
-    "sinon": "1.17.6",
     "typescript": "3.4.1"
   },
   "resolutions": {

packages/grafana-ui/src/components/BarGauge/BarGauge.tsx

@@ -6,7 +6,8 @@ import tinycolor from 'tinycolor2';
 import { getColorFromHexRgbOrName, getThresholdForValue } from '../../utils';
 
 // Types
-import { DisplayValue, Themeable, TimeSeriesValue, Threshold, VizOrientation } from '../../types';
+import { DisplayValue, Themeable, Threshold, VizOrientation } from '../../types';
+import { TimeSeriesValue } from '@grafana/data';
 
 const MIN_VALUE_HEIGHT = 18;
 const MAX_VALUE_HEIGHT = 50;

packages/grafana-ui/src/components/Graph/Graph.tsx

@@ -4,7 +4,8 @@ import React, { PureComponent } from 'react';
 import uniqBy from 'lodash/uniqBy';
 
 // Types
-import { TimeRange, GraphSeriesXY } from '../../types';
+import { GraphSeriesXY } from '../../types';
+import { TimeRange } from '@grafana/data';
 
 export interface GraphProps {
   series: GraphSeriesXY[];

packages/grafana-ui/src/components/Graph/mockGraphWithLegendData.ts

@@ -1,6 +1,6 @@
 import { GraphWithLegendProps } from './GraphWithLegend';
 import { LegendDisplayMode } from '../Legend/Legend';
-import { dateTime } from '../../utils/moment_wrapper';
+import { dateTime } from '@grafana/data';
 // import { LegendList } from '../Legend/LegendList';
 
 export const mockGraphWithLegendData = ({

packages/grafana-ui/src/components/SingleStatShared/FieldDisplayEditor.tsx

@@ -8,10 +8,8 @@ import { StatsPicker } from '../StatsPicker/StatsPicker';
 
 // Types
 import { FieldDisplayOptions, DEFAULT_FIELD_DISPLAY_VALUES_LIMIT } from '../../utils/fieldDisplay';
-import { Field } from '../../types/data';
 import Select, { SelectOptionItem } from '../Select/Select';
-import { toNumberString, toIntegerOrUndefined } from '@grafana/data';
-import { ReducerID } from '../../utils/fieldReducer';
+import { Field, ReducerID, toNumberString, toIntegerOrUndefined } from '@grafana/data';
 
 const showOptions: Array<SelectOptionItem<boolean>> = [
   {

packages/grafana-ui/src/components/SingleStatShared/FieldPropertiesEditor.tsx

@@ -7,8 +7,7 @@ import { FormLabel } from '../FormLabel/FormLabel';
 import { UnitPicker } from '../UnitPicker/UnitPicker';
 
 // Types
-import { Field } from '../../types/data';
-import { toIntegerOrUndefined } from '@grafana/data';
+import { toIntegerOrUndefined, Field } from '@grafana/data';
 import { SelectOptionItem } from '../Select/Select';
 
 import { VAR_SERIES_NAME, VAR_FIELD_NAME, VAR_CALC, VAR_CELL_PREFIX } from '../../utils/fieldDisplay';

packages/grafana-ui/src/components/SingleStatShared/SingleStatBaseOptions.ts

@@ -3,8 +3,7 @@ import omit from 'lodash/omit';
 
 import { VizOrientation, PanelModel } from '../../types/panel';
 import { FieldDisplayOptions } from '../../utils/fieldDisplay';
-import { Field } from '../../types';
-import { getFieldReducers } from '../../utils/index';
+import { Field, getFieldReducers } from '@grafana/data';
 
 export interface SingleStatBaseOptions {
   fieldOptions: FieldDisplayOptions;

packages/grafana-ui/src/components/StatsPicker/StatsPicker.tsx

@@ -5,7 +5,7 @@ import difference from 'lodash/difference';
 
 import { Select } from '../index';
 
-import { getFieldReducers } from '../../utils/fieldReducer';
+import { getFieldReducers } from '@grafana/data';
 import { SelectOptionItem } from '../Select/Select';
 
 interface Props {

packages/grafana-ui/src/components/Table/Table.story.tsx

@@ -4,7 +4,8 @@ import { Table } from './Table';
 import { getTheme } from '../../themes';
 
 import { migratedTestTable, migratedTestStyles, simpleTable } from './examples';
-import { ScopedVars, DataFrame, GrafanaThemeType } from '../../types/index';
+import { ScopedVars, GrafanaThemeType } from '../../types/index';
+import { DataFrame } from '@grafana/data';
 import { withFullSizeStory } from '../../utils/storybook/withFullSizeStory';
 import { number, boolean } from '@storybook/addon-knobs';
 

packages/grafana-ui/src/components/Table/Table.test.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { readCSV } from '../../utils/csv';
+import { readCSV } from '@grafana/data';
 import { Table, Props } from './Table';
 import { getTheme } from '../../themes/index';
 import { GrafanaThemeType } from '../../types/theme';

packages/grafana-ui/src/components/Table/Table.tsx

@@ -12,7 +12,7 @@ import {
 } from 'react-virtualized';
 import { Themeable } from '../../types/theme';
 
-import { sortDataFrame } from '../../utils/processDataFrame';
+import { stringToJsRegex, DataFrame, sortDataFrame } from '@grafana/data';
 
 import {
   TableCellBuilder,
@@ -21,8 +21,6 @@ import {
   TableCellBuilderOptions,
   simpleCellBuilder,
 } from './TableCellBuilder';
-import { stringToJsRegex } from '@grafana/data';
-import { DataFrame } from '../../types/data';
 import { InterpolateFunction } from '../../types/panel';
 
 export interface Props extends Themeable {

packages/grafana-ui/src/components/Table/TableCellBuilder.tsx

@@ -6,8 +6,7 @@ import { Table, Props } from './Table';
 import { ValueFormatter, getValueFormat, getColorFromHexRgbOrName } from '../../utils/index';
 import { GrafanaTheme } from '../../types/theme';
 import { InterpolateFunction } from '../../types/panel';
-import { Field } from '../../types/data';
-import { dateTime } from '../../utils/moment_wrapper';
+import { Field, dateTime } from '@grafana/data';
 
 export interface TableCellBuilderOptions {
   value: any;

packages/grafana-ui/src/components/Table/TableInputCSV.story.tsx

@@ -3,7 +3,7 @@ import React from 'react';
 import { storiesOf } from '@storybook/react';
 import TableInputCSV from './TableInputCSV';
 import { action } from '@storybook/addon-actions';
-import { DataFrame } from '../../types/data';
+import { DataFrame } from '@grafana/data';
 import { withCenteredStory } from '../../utils/storybook/withCenteredStory';
 
 const TableInputStories = storiesOf('UI/Table/Input', module);

packages/grafana-ui/src/components/Table/TableInputCSV.test.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 
 import renderer from 'react-test-renderer';
 import TableInputCSV from './TableInputCSV';
-import { DataFrame } from '../../types/data';
+import { DataFrame } from '@grafana/data';
 
 describe('TableInputCSV', () => {
   it('renders correctly', () => {

packages/grafana-ui/src/components/Table/TableInputCSV.tsx

@@ -1,7 +1,6 @@
 import React from 'react';
 import debounce from 'lodash/debounce';
-import { DataFrame } from '../../types/data';
-import { CSVConfig, readCSV } from '../../utils/csv';
+import { DataFrame, CSVConfig, readCSV } from '@grafana/data';
 
 interface Props {
   config?: CSVConfig;

packages/grafana-ui/src/components/Table/examples.ts

@@ -1,4 +1,4 @@
-import { DataFrame } from '../../types/data';
+import { DataFrame } from '@grafana/data';
 import { ColumnStyle } from './TableCellBuilder';
 import { getColorDefinitionByName } from '../../utils/namedColorsPalette';
 

packages/grafana-ui/src/components/TimePicker/TimePicker.story.tsx

@@ -5,8 +5,7 @@ import { action } from '@storybook/addon-actions';
 import { TimePicker } from './TimePicker';
 import { UseState } from '../../utils/storybook/UseState';
 import { withRighAlignedStory } from '../../utils/storybook/withRightAlignedStory';
-import { TimeFragment } from '../../types/time';
-import { dateTime } from '../../utils/moment_wrapper';
+import { TimeFragment, dateTime } from '@grafana/data';
 
 const TimePickerStories = storiesOf('UI/TimePicker', module);
 

packages/grafana-ui/src/components/TimePicker/TimePicker.tsx

@@ -8,12 +8,12 @@ import { TimePickerPopover } from './TimePickerPopover';
 import { ClickOutsideWrapper } from '../ClickOutsideWrapper/ClickOutsideWrapper';
 
 // Utils & Services
-import { isDateTime } from '../../utils/moment_wrapper';
-import * as rangeUtil from '../../utils/rangeutil';
+import { isDateTime } from '@grafana/data';
+import * as rangeUtil from '@grafana/data/src/utils/rangeutil';
 import { rawToTimeRange } from './time';
 
 // Types
-import { TimeRange, TimeOption, TimeZone, TIME_FORMAT } from '../../types/time';
+import { TimeRange, TimeOption, TimeZone, TIME_FORMAT } from '@grafana/data';
 import { SelectOptionItem } from '../Select/Select';
 
 export interface Props {

packages/grafana-ui/src/components/TimePicker/TimePickerCalendar.story.tsx

@@ -5,7 +5,7 @@ import { action } from '@storybook/addon-actions';
 import { withCenteredStory } from '../../utils/storybook/withCenteredStory';
 import { TimePickerCalendar } from './TimePickerCalendar';
 import { UseState } from '../../utils/storybook/UseState';
-import { TimeFragment } from '../../types/time';
+import { TimeFragment } from '@grafana/data';
 
 const TimePickerCalendarStories = storiesOf('UI/TimePicker/TimePickerCalendar', module);
 

packages/grafana-ui/src/components/TimePicker/TimePickerCalendar.tsx

@@ -1,7 +1,7 @@
 import React, { PureComponent } from 'react';
 import Calendar from 'react-calendar/dist/entry.nostyle';
-import { TimeFragment, TimeZone, TIME_FORMAT } from '../../types/time';
-import { DateTime, dateTime, toUtc } from '../../utils/moment_wrapper';
+import { TimeFragment, TimeZone, TIME_FORMAT } from '@grafana/data';
+import { DateTime, dateTime, toUtc } from '@grafana/data';
 import { stringToDateTimeType } from './time';
 
 export interface Props {

packages/grafana-ui/src/components/TimePicker/TimePickerInput.tsx

@@ -1,8 +1,7 @@
 import React, { PureComponent, ChangeEvent } from 'react';
-import { TimeFragment, TIME_FORMAT, TimeZone } from '../../types/time';
+import { TimeFragment, TIME_FORMAT, TimeZone, isDateTime } from '@grafana/data';
 import { Input } from '../Input/Input';
 import { stringToDateTimeType, isValidTimeString } from './time';
-import { isDateTime } from '../../utils/moment_wrapper';
 
 export interface Props {
   value: TimeFragment;

packages/grafana-ui/src/components/TimePicker/TimePickerPopover.story.tsx

@@ -5,7 +5,7 @@ import { storiesOf } from '@storybook/react';
 import { withCenteredStory } from '../../utils/storybook/withCenteredStory';
 import { TimePickerPopover } from './TimePickerPopover';
 import { UseState } from '../../utils/storybook/UseState';
-import { dateTime, DateTime } from '../../utils/moment_wrapper';
+import { dateTime, DateTime } from '@grafana/data';
 
 const TimePickerPopoverStories = storiesOf('UI/TimePicker/TimePickerPopover', module);
 

packages/grafana-ui/src/components/TimePicker/TimePickerPopover.tsx

@@ -7,8 +7,7 @@ import { TimePickerInput } from './TimePickerInput';
 import { rawToTimeRange } from './time';
 
 // Types
-import { DateTime } from '../../utils/moment_wrapper';
-import { TimeRange, TimeZone } from '../../types/time';
+import { DateTime, TimeRange, TimeZone } from '@grafana/data';
 
 export interface Props {
   value: TimeRange;

packages/grafana-ui/src/components/TimePicker/time.ts

@@ -1,7 +1,7 @@
-import { TimeRange, TIME_FORMAT, RawTimeRange, TimeZone } from '../../types/time';
-import { describeTimeRange } from '../../utils/rangeutil';
-import * as dateMath from '../../utils/datemath';
-import { isDateTime, dateTime, DateTime, toUtc } from '../../utils/moment_wrapper';
+import { TimeRange, TIME_FORMAT, RawTimeRange, TimeZone } from '@grafana/data';
+import { describeTimeRange } from '@grafana/data/src/utils/rangeutil';
+import * as dateMath from '@grafana/data/src/utils/datemath';
+import { isDateTime, dateTime, DateTime, toUtc } from '@grafana/data';
 
 export const rawToTimeRange = (raw: RawTimeRange, timeZone?: TimeZone): TimeRange => {
   const from = stringToDateTimeType(raw.from, false, timeZone);

packages/grafana-ui/src/types/datasource.ts

@@ -1,9 +1,7 @@
 import { ComponentType, ComponentClass } from 'react';
-import { TimeRange, RawTimeRange } from './time';
+import { TimeRange, RawTimeRange, TableData, TimeSeries, DataFrame, LogRowModel, LoadingState } from '@grafana/data';
 import { PluginMeta, GrafanaPlugin } from './plugin';
-import { TableData, TimeSeries, DataFrame, LoadingState } from './data';
 import { PanelData } from './panel';
-import { LogRowModel } from './logs';
 
 // NOTE: this seems more general than just DataSource
 export interface DataSourcePluginOptionsEditorProps<TOptions> {

packages/grafana-ui/src/types/index.ts

@@ -1,5 +1,3 @@
-export * from './data';
-export * from './time';
 export * from './panel';
 export * from './plugin';
 export * from './app';
@@ -8,6 +6,4 @@ export * from './theme';
 export * from './graph';
 export * from './threshold';
 export * from './input';
-export * from './logs';
 export * from './displayValue';
-export * from './utils';

packages/grafana-ui/src/types/panel.ts

@@ -1,6 +1,5 @@
 import { ComponentClass, ComponentType } from 'react';
-import { LoadingState, DataFrame } from './data';
-import { TimeRange } from './time';
+import { LoadingState, DataFrame, TimeRange } from '@grafana/data';
 import { ScopedVars, DataQueryRequest, DataQueryError, LegacyResponseData } from './datasource';
 import { PluginMeta, GrafanaPlugin } from './plugin';
 

packages/grafana-ui/src/utils/displayValue.ts

@@ -15,9 +15,8 @@ import {
   GrafanaTheme,
   GrafanaThemeType,
   DecimalCount,
-  Field,
 } from '../types';
-import { DateTime, dateTime } from './moment_wrapper';
+import { DateTime, dateTime, Field } from '@grafana/data';
 
 export type DisplayProcessor = (value: any) => DisplayValue;
 

packages/grafana-ui/src/utils/fieldDisplay.test.ts

@@ -1,6 +1,5 @@
 import { getFieldProperties, getFieldDisplayValues, GetFieldDisplayValuesOptions } from './fieldDisplay';
-import { FieldType } from '../types/data';
-import { ReducerID } from './fieldReducer';
+import { FieldType, ReducerID } from '@grafana/data';
 import { GrafanaThemeType } from '../types/theme';
 import { getTheme } from '../themes/index';
 

packages/grafana-ui/src/utils/fieldDisplay.ts

@@ -5,18 +5,14 @@ import {
   ValueMapping,
   Threshold,
   DisplayValue,
-  FieldType,
-  NullValueMode,
   GrafanaTheme,
-  DataFrame,
   InterpolateFunction,
-  Field,
   ScopedVars,
   GraphSeriesValue,
 } from '../types/index';
 import { getDisplayProcessor } from './displayValue';
 import { getFlotPairs } from './flotPairs';
-import { ReducerID, reduceField } from './fieldReducer';
+import { ReducerID, reduceField, FieldType, NullValueMode, DataFrame, Field } from '@grafana/data';
 
 export interface FieldDisplayOptions {
   values?: boolean; // If true show each row value

packages/grafana-ui/src/utils/flotPairs.ts

@@ -1,5 +1,6 @@
 // Types
-import { NullValueMode, GraphSeriesValue, DataFrame } from '../types/index';
+import { GraphSeriesValue } from '../types/index';
+import { NullValueMode, DataFrame } from '@grafana/data';
 
 export interface FlotPairsOptions {
   series: DataFrame;

packages/grafana-ui/src/utils/index.ts

@@ -1,23 +1,11 @@
-export * from './processDataFrame';
 export * from './valueFormats/valueFormats';
 export * from './colors';
 export * from './namedColorsPalette';
 export * from './thresholds';
-export * from './csv';
-export * from './fieldReducer';
 export * from './displayValue';
 export * from './fieldDisplay';
 export * from './deprecationWarning';
-export * from './logs';
-export * from './labels';
-export * from './labels';
 export { getMappedValue } from './valueMappings';
 export * from './validate';
 export { getFlotPairs } from './flotPairs';
-export * from './object';
-export * from './fieldCache';
-export * from './moment_wrapper';
 export * from './slate';
-
-// Names are too general to export
-// rangeutils, datemath

packages/grafana-ui/src/utils/valueFormats/dateTimeFormatters.test.ts

@@ -8,7 +8,7 @@ import {
   toDurationInMilliseconds,
   toDurationInSeconds,
 } from './dateTimeFormatters';
-import { toUtc, dateTime } from '../moment_wrapper';
+import { toUtc, dateTime } from '@grafana/data';
 
 describe('date time formats', () => {
   const epoch = 1505634997920;

packages/grafana-ui/src/utils/valueFormats/dateTimeFormatters.ts

@@ -1,6 +1,6 @@
 import { toFixed, toFixedScaled } from './valueFormats';
 import { DecimalCount } from '../../types';
-import { toUtc, toDuration as duration, dateTime } from '../moment_wrapper';
+import { toUtc, toDuration as duration, dateTime } from '@grafana/data';
 
 interface IntervalsInSeconds {
   [interval: string]: number;

public/app/app.ts

@@ -34,7 +34,7 @@ import { setupAngularRoutes } from 'app/routes/routes';
 
 import 'app/routes/GrafanaCtrl';
 import 'app/features/all';
-import { setLocale } from '@grafana/ui/src/utils/moment_wrapper';
+import { setLocale } from '@grafana/data';
 import { setMarkdownOptions } from '@grafana/data';
 
 // import symlinked extensions

public/app/core/components/Select/DataSourcePicker.tsx

@@ -5,7 +5,7 @@ import React, { PureComponent } from 'react';
 import { Select, SelectOptionItem } from '@grafana/ui';
 
 // Types
-import { DataSourceSelectItem } from '@grafana/ui/src/types';
+import { DataSourceSelectItem } from '@grafana/ui';
 
 export interface Props {
   onChange: (ds: DataSourceSelectItem) => void;

public/app/core/directives/ng_model_on_blur.ts

@@ -1,5 +1,5 @@
 import coreModule from '../core_module';
-import * as rangeUtil from '@grafana/ui/src/utils/rangeutil';
+import * as rangeUtil from '@grafana/data/src/utils/rangeutil';
 
 function ngModelOnBlur() {
   return {

public/app/core/filters/filters.ts

@@ -2,7 +2,7 @@ import _ from 'lodash';
 import angular from 'angular';
 import coreModule from '../core_module';
 import { TemplateSrv } from 'app/features/templating/template_srv';
-import { dateTime } from '@grafana/ui/src/utils/moment_wrapper';
+import { dateTime } from '@grafana/data';
 
 coreModule.filter('stringSort', () => {
   return (input: any) => {

public/app/core/logs_model.ts

@@ -1,8 +1,9 @@
 import _ from 'lodash';
 import ansicolor from 'vendor/ansicolor/ansicolor';
 
+import { colors } from '@grafana/ui';
+
 import {
-  colors,
   TimeSeries,
   Labels,
   LogLevel,
@@ -21,10 +22,10 @@ import {
   LogsParser,
   LogLabelStatsModel,
   LogsDedupStrategy,
-} from '@grafana/ui';
+} from '@grafana/data';
 import { getThemeColor } from 'app/core/utils/colors';
 import { hasAnsiCodes } from 'app/core/utils/text';
-import { dateTime, toUtc } from '@grafana/ui/src/utils/moment_wrapper';
+import { dateTime, toUtc } from '@grafana/data';
 
 export const LogLevelColor = {
   [LogLevel.critical]: colors[7],

public/app/core/specs/logs_model.test.ts

@@ -1,4 +1,4 @@
-import { DataFrame, FieldType, LogsModel, LogsMetaKind, LogsDedupStrategy, LogLevel } from '@grafana/ui';
+import { DataFrame, FieldType, LogsModel, LogsMetaKind, LogsDedupStrategy, LogLevel } from '@grafana/data';
 import {
   dedupLogRows,
   calculateFieldStats,

public/app/core/specs/rangeutil.test.ts

@@ -1,6 +1,6 @@
-import * as rangeUtil from '@grafana/ui/src/utils/rangeutil';
+import * as rangeUtil from '@grafana/data/src/utils/rangeutil';
 import _ from 'lodash';
-import { dateTime } from '@grafana/ui/src/utils/moment_wrapper';
+import { dateTime } from '@grafana/data';
 
 describe('rangeUtil', () => {
   describe('Can get range grouped list of ranges', () => {

public/app/core/table_model.ts

@@ -1,5 +1,5 @@
 import _ from 'lodash';
-import { Column, TableData } from '@grafana/ui';
+import { Column, TableData } from '@grafana/data';
 
 /**
  * Extends the standard Column class with variables that get

public/app/core/utils/explore.test.ts

@@ -12,7 +12,8 @@ import {
 } from './explore';
 import { ExploreUrlState, ExploreMode } from 'app/types/explore';
 import store from 'app/core/store';
-import { DataQueryError, LogsDedupStrategy } from '@grafana/ui';
+import { LogsDedupStrategy } from '@grafana/data';
+import { DataQueryError } from '@grafana/ui';
 
 const DEFAULT_EXPLORE_STATE: ExploreUrlState = {
   datasource: null,

public/app/core/utils/explore.ts

@@ -1,11 +1,10 @@
 // Libraries
 import _ from 'lodash';
 import { from } from 'rxjs';
-import { toUtc } from '@grafana/ui/src/utils/moment_wrapper';
 import { isLive } from '@grafana/ui/src/components/RefreshPicker/RefreshPicker';
 
 // Services & Utils
-import * as dateMath from '@grafana/ui/src/utils/datemath';
+import * as dateMath from '@grafana/data/src/utils/datemath';
 import { renderUrl } from 'app/core/utils/url';
 import kbn from 'app/core/utils/kbn';
 import store from 'app/core/store';
@@ -13,21 +12,24 @@ import { getNextRefIdChar } from './query';
 
 // Types
 import {
-  TimeRange,
-  RawTimeRange,
-  TimeZone,
-  IntervalValues,
   DataQuery,
   DataSourceApi,
-  TimeFragment,
   DataQueryError,
-  LogRowModel,
-  LogsModel,
-  LogsDedupStrategy,
   DataSourceJsonData,
   DataQueryRequest,
   DataStreamObserver,
 } from '@grafana/ui';
+import {
+  toUtc,
+  TimeRange,
+  RawTimeRange,
+  TimeZone,
+  IntervalValues,
+  TimeFragment,
+  LogRowModel,
+  LogsModel,
+  LogsDedupStrategy,
+} from '@grafana/data';
 import {
   ExploreUrlState,
   HistoryItem,

public/app/core/utils/file_export.ts

@@ -1,7 +1,7 @@
 import { isBoolean, isNumber, sortedUniq, sortedIndexOf, unescape as htmlUnescaped } from 'lodash';
 import { saveAs } from 'file-saver';
 import { isNullOrUndefined } from 'util';
-import { dateTime } from '@grafana/ui/src/utils/moment_wrapper';
+import { dateTime } from '@grafana/data';
 
 const DEFAULT_DATETIME_FORMAT = 'YYYY-MM-DDTHH:mm:ssZ';
 const POINT_TIME_INDEX = 1;

public/app/core/utils/timePicker.test.ts

@@ -1,4 +1,4 @@
-import { toUtc, AbsoluteTimeRange } from '@grafana/ui';
+import { toUtc, AbsoluteTimeRange } from '@grafana/data';
 
 import { getShiftedTimeRange, getZoomedTimeRange } from './timePicker';
 

public/app/core/utils/timePicker.ts

@@ -1,4 +1,4 @@
-import { TimeRange, toUtc, AbsoluteTimeRange } from '@grafana/ui';
+import { TimeRange, toUtc, AbsoluteTimeRange } from '@grafana/data';
 
 export const getShiftedTimeRange = (direction: number, origRange: TimeRange): AbsoluteTimeRange => {
   const range = {

public/app/features/admin/AdminEditUserCtrl.ts

@@ -1,5 +1,5 @@
 import _ from 'lodash';
-import { dateTime } from '@grafana/ui';
+import { dateTime } from '@grafana/data';
 import { BackendSrv } from 'app/core/services/backend_srv';
 import { NavModelSrv } from 'app/core/core';
 import { User } from 'app/core/services/context_srv';

public/app/features/alerting/TestRuleResult.tsx

@@ -4,7 +4,7 @@ import appEvents from 'app/core/app_events';
 import { CopyToClipboard } from 'app/core/components/CopyToClipboard/CopyToClipboard';
 import { getBackendSrv } from '@grafana/runtime';
 import { DashboardModel } from '../dashboard/state/DashboardModel';
-import { LoadingPlaceholder } from '@grafana/ui/src';
+import { LoadingPlaceholder } from '@grafana/ui';
 
 export interface Props {
   panelId: number;

public/app/features/alerting/state/reducers.ts

@@ -1,7 +1,7 @@
 import { AlertRuleDTO, AlertRule, AlertRulesState } from 'app/types';
 import { Action, ActionTypes } from './actions';
 import alertDef from './alertDef';
-import { dateTime } from '@grafana/ui/src/utils/moment_wrapper';
+import { dateTime } from '@grafana/data';
 
 export const initialState: AlertRulesState = { items: [], searchQuery: '', isLoading: false };
 

public/app/features/annotations/event_editor.ts

@@ -1,8 +1,8 @@
 import _ from 'lodash';
 import { coreModule } from 'app/core/core';
 import { MetricsPanelCtrl } from 'app/plugins/sdk';
-import { AnnotationEvent } from '@grafana/ui';
-import { dateTime } from '@grafana/ui/src/utils/moment_wrapper';
+import { AnnotationEvent } from '@grafana/data';
+import { dateTime } from '@grafana/data';
 
 export class EventEditorCtrl {
   panelCtrl: MetricsPanelCtrl;

public/app/features/annotations/event_manager.ts

@@ -10,7 +10,7 @@ import {
 } from '@grafana/ui';
 
 import { MetricsPanelCtrl } from 'app/plugins/sdk';
-import { AnnotationEvent } from '@grafana/ui';
+import { AnnotationEvent } from '@grafana/data';
 
 export class EventManager {
   event: AnnotationEvent;

public/app/features/api-keys/ApiKeysPage.tsx

@@ -19,7 +19,7 @@ import { store } from 'app/store/store';
 import kbn from 'app/core/utils/kbn';
 
 // Utils
-import { dateTime, isDateTime } from '@grafana/ui/src/utils/moment_wrapper';
+import { dateTime, isDateTime } from '@grafana/data';
 import { getTimeZone } from 'app/features/profile/state/selectors';
 
 const timeRangeValidationEvents: ValidationEvents = {

public/app/features/dashboard/components/DashNav/DashNavTimeControls.tsx

@@ -1,17 +1,17 @@
 // Libaries
 import React, { Component } from 'react';
-import { toUtc } from '@grafana/ui/src/utils/moment_wrapper';
+import { toUtc } from '@grafana/data';
 
 // Types
 import { DashboardModel } from '../../state';
 import { LocationState } from 'app/types';
-import { TimeRange, TimeOption } from '@grafana/ui';
+import { TimeRange, TimeOption, RawTimeRange } from '@grafana/data';
 
 // State
 import { updateLocation } from 'app/core/actions';
 
 // Components
-import { TimePicker, RefreshPicker, RawTimeRange } from '@grafana/ui';
+import { TimePicker, RefreshPicker } from '@grafana/ui';
 
 // Utils & Services
 import { getTimeSrv, TimeSrv } from 'app/features/dashboard/services/TimeSrv';

public/app/features/dashboard/components/ShareModal/ShareModalCtrl.ts

@@ -1,6 +1,6 @@
 import angular from 'angular';
 import config from 'app/core/config';
-import { dateTime } from '@grafana/ui/src/utils/moment_wrapper';
+import { dateTime } from '@grafana/data';
 import { appendQueryToUrl, toUrlParams } from 'app/core/utils/url';
 
 /** @ngInject */

public/app/features/dashboard/components/VersionHistory/HistoryListCtrl.ts

@@ -4,7 +4,7 @@ import angular from 'angular';
 import locationUtil from 'app/core/utils/location_util';
 import { DashboardModel } from '../../state/DashboardModel';
 import { HistoryListOpts, RevisionsModel, CalculateDiffOptions, HistorySrv } from './HistorySrv';
-import { dateTime, toUtc } from '@grafana/ui/src/utils/moment_wrapper';
+import { dateTime, toUtc } from '@grafana/data';
 
 export class HistoryListCtrl {
   appending: boolean;

public/app/features/dashboard/dashgrid/PanelChrome.tsx

@@ -17,8 +17,8 @@ import config from 'app/core/config';
 
 // Types
 import { DashboardModel, PanelModel } from '../state';
-import { LoadingState, PanelData, PanelPlugin } from '@grafana/ui';
-import { ScopedVars } from '@grafana/ui';
+import { ScopedVars, PanelData, PanelPlugin } from '@grafana/ui';
+import { LoadingState } from '@grafana/data';
 
 const DEFAULT_PLUGIN_ERROR = 'Error in plugin';
 

public/app/features/dashboard/panel_editor/QueriesTab.tsx

@@ -18,7 +18,8 @@ import config from 'app/core/config';
 // Types
 import { PanelModel } from '../state/PanelModel';
 import { DashboardModel } from '../state/DashboardModel';
-import { DataQuery, DataSourceSelectItem, PanelData, LoadingState } from '@grafana/ui/src/types';
+import { DataQuery, DataSourceSelectItem, PanelData } from '@grafana/ui';
+import { LoadingState } from '@grafana/data';
 import { PluginHelp } from 'app/core/components/PluginHelp/PluginHelp';
 import { PanelQueryRunnerFormat } from '../state/PanelQueryRunner';
 import { Unsubscribable } from 'rxjs';

public/app/features/dashboard/panel_editor/QueryEditorRow.test.ts

@@ -1,4 +1,5 @@
-import { PanelData, LoadingState, DataQueryRequest } from '@grafana/ui';
+import { LoadingState } from '@grafana/data';
+import { PanelData, DataQueryRequest } from '@grafana/ui';
 import { filterPanelDataToQuery } from './QueryEditorRow';
 
 function makePretendRequest(requestId: string, subRequests?: DataQueryRequest[]): DataQueryRequest {

public/app/features/dashboard/panel_editor/QueryEditorRow.tsx

@@ -11,7 +11,8 @@ import { getTimeSrv } from 'app/features/dashboard/services/TimeSrv';
 
 // Types
 import { PanelModel } from '../state/PanelModel';
-import { DataQuery, DataSourceApi, TimeRange, PanelData, LoadingState, DataQueryRequest } from '@grafana/ui';
+import { DataQuery, DataSourceApi, PanelData, DataQueryRequest } from '@grafana/ui';
+import { TimeRange, LoadingState } from '@grafana/data';
 import { DashboardModel } from '../state/DashboardModel';
 
 interface Props {

public/app/features/dashboard/panel_editor/QueryOptions.tsx

@@ -2,7 +2,7 @@
 import React, { PureComponent, ChangeEvent, FocusEvent } from 'react';
 
 // Utils
-import { isValidTimeSpan } from '@grafana/ui/src/utils/rangeutil';
+import { isValidTimeSpan } from '@grafana/data/src/utils/rangeutil';
 
 // Components
 import { DataSourceSelectItem, EventsWithValidation, Input, InputStatus, Switch, ValidationEvents } from '@grafana/ui';

public/app/features/dashboard/services/DashboardLoaderSrv.ts

@@ -4,7 +4,7 @@ import moment from 'moment';
 import _ from 'lodash';
 import $ from 'jquery';
 import kbn from 'app/core/utils/kbn';
-import * as dateMath from '@grafana/ui/src/utils/datemath';
+import * as dateMath from '@grafana/data/src/utils/datemath';
 import impressionSrv from 'app/core/services/impression_srv';
 
 export class DashboardLoaderSrv {

public/app/features/dashboard/services/TimeSrv.test.ts

@@ -1,6 +1,6 @@
 import { TimeSrv } from './TimeSrv';
 import { ContextSrvStub } from 'test/specs/helpers';
-import { isDateTime, dateTime } from '@grafana/ui/src/utils/moment_wrapper';
+import { isDateTime, dateTime } from '@grafana/data';
 
 describe('timeSrv', () => {
   const rootScope = {

public/app/features/dashboard/services/TimeSrv.ts

@@ -4,14 +4,14 @@ import _ from 'lodash';
 // Utils
 import kbn from 'app/core/utils/kbn';
 import coreModule from 'app/core/core_module';
-import * as dateMath from '@grafana/ui/src/utils/datemath';
+import * as dateMath from '@grafana/data/src/utils/datemath';
 
 // Types
-import { TimeRange, RawTimeRange, TimeZone } from '@grafana/ui';
+import { TimeRange, RawTimeRange, TimeZone } from '@grafana/data';
 import { ITimeoutService, ILocationService } from 'angular';
 import { ContextSrv } from 'app/core/services/context_srv';
 import { DashboardModel } from '../state/DashboardModel';
-import { toUtc, dateTime, isDateTime } from '@grafana/ui/src/utils/moment_wrapper';
+import { toUtc, dateTime, isDateTime } from '@grafana/data';
 import { getZoomedTimeRange } from 'app/core/utils/timePicker';
 
 export class TimeSrv {

public/app/features/dashboard/state/DashboardModel.ts

@@ -13,10 +13,10 @@ import sortByKeys from 'app/core/utils/sort_by_keys';
 // Types
 import { PanelModel, GridPos } from './PanelModel';
 import { DashboardMigrator } from './DashboardMigrator';
-import { TimeRange, TimeZone } from '@grafana/ui';
+import { TimeRange, TimeZone } from '@grafana/data';
 import { UrlQueryValue } from '@grafana/runtime';
 import { KIOSK_MODE_TV, DashboardMeta } from 'app/types';
-import { toUtc, DateTimeInput, dateTime, isDateTime } from '@grafana/ui/src/utils/moment_wrapper';
+import { toUtc, DateTimeInput, dateTime, isDateTime } from '@grafana/data';
 
 export interface CloneOptions {
   saveVariables?: boolean;

public/app/features/dashboard/state/PanelQueryRunner.test.ts

@@ -1,13 +1,8 @@
 import { PanelQueryRunner } from './PanelQueryRunner';
-import {
-  PanelData,
-  DataQueryRequest,
-  DataStreamObserver,
-  DataStreamState,
-  LoadingState,
-  ScopedVars,
-} from '@grafana/ui/src/types';
-import { dateTime } from '@grafana/ui/src/utils/moment_wrapper';
+import { PanelData, DataQueryRequest, DataStreamObserver, DataStreamState, ScopedVars } from '@grafana/ui';
+
+import { LoadingState } from '@grafana/data';
+import { dateTime } from '@grafana/data';
 
 jest.mock('app/core/services/backend_srv');
 

public/app/features/dashboard/state/PanelQueryRunner.ts

@@ -10,15 +10,9 @@ import templateSrv from 'app/features/templating/template_srv';
 import { PanelQueryState } from './PanelQueryState';
 
 // Types
-import {
-  PanelData,
-  DataQuery,
-  TimeRange,
-  ScopedVars,
-  DataQueryRequest,
-  DataSourceApi,
-  DataSourceJsonData,
-} from '@grafana/ui';
+import { PanelData, DataQuery, ScopedVars, DataQueryRequest, DataSourceApi, DataSourceJsonData } from '@grafana/ui';
+
+import { TimeRange } from '@grafana/data';
 
 export interface QueryRunnerOptions<
   TQuery extends DataQuery = DataQuery,

public/app/features/dashboard/state/PanelQueryState.test.ts

@@ -1,6 +1,7 @@
 import { toDataQueryError, PanelQueryState, getProcessedDataFrame } from './PanelQueryState';
 import { MockDataSourceApi } from 'test/mocks/datasource_srv';
-import { DataQueryResponse, LoadingState } from '@grafana/ui';
+import { LoadingState } from '@grafana/data';
+import { DataQueryResponse } from '@grafana/ui';
 import { getQueryOptions } from 'test/helpers/getQueryOptions';
 
 describe('PanelQueryState', () => {

public/app/features/dashboard/state/PanelQueryState.ts

@@ -4,20 +4,24 @@ import isEqual from 'lodash/isEqual';
 
 // Utils & Services
 import { getBackendSrv } from 'app/core/services/backend_srv';
-import * as dateMath from '@grafana/ui/src/utils/datemath';
-import { guessFieldTypes, toDataFrame, isDataFrame } from '@grafana/ui/src/utils';
+import * as dateMath from '@grafana/data/src/utils/datemath';
+import {
+  guessFieldTypes,
+  LoadingState,
+  toLegacyResponseData,
+  DataFrame,
+  toDataFrame,
+  isDataFrame,
+} from '@grafana/data';
 
 // Types
 import {
   DataSourceApi,
   DataQueryRequest,
   PanelData,
-  LoadingState,
-  toLegacyResponseData,
   DataQueryError,
   DataStreamObserver,
   DataStreamState,
-  DataFrame,
   DataQueryResponseData,
 } from '@grafana/ui';
 

public/app/features/dashboard/utils/panel.test.ts

@@ -1,7 +1,7 @@
-import { TimeRange } from '@grafana/ui';
+import { TimeRange } from '@grafana/data';
 import { applyPanelTimeOverrides } from 'app/features/dashboard/utils/panel';
 import { advanceTo, clear } from 'jest-date-mock';
-import { dateTime, DateTime } from '@grafana/ui/src/utils/moment_wrapper';
+import { dateTime, DateTime } from '@grafana/data';
 
 const dashboardTimeRange: TimeRange = {
   from: dateTime([2019, 1, 11, 12, 0]),

public/app/features/dashboard/utils/panel.ts

@@ -4,12 +4,12 @@ import store from 'app/core/store';
 // Models
 import { DashboardModel } from 'app/features/dashboard/state/DashboardModel';
 import { PanelModel } from 'app/features/dashboard/state/PanelModel';
-import { TimeRange } from '@grafana/ui';
+import { TimeRange } from '@grafana/data';
 
 // Utils
 import { isString as _isString } from 'lodash';
-import * as rangeUtil from '@grafana/ui/src/utils/rangeutil';
-import * as dateMath from '@grafana/ui/src/utils/datemath';
+import * as rangeUtil from '@grafana/data/src/utils/rangeutil';
+import * as dateMath from '@grafana/data/src/utils/datemath';
 import appEvents from 'app/core/app_events';
 import config from 'app/core/config';
 

public/app/features/datasources/DataSourcesList.tsx

@@ -6,7 +6,7 @@ import classNames from 'classnames';
 import DataSourcesListItem from './DataSourcesListItem';
 
 // Types
-import { DataSourceSettings } from '@grafana/ui/src/types';
+import { DataSourceSettings } from '@grafana/ui';
 import { LayoutMode, LayoutModes } from '../../core/components/LayoutSelector/LayoutSelector';
 
 export interface Props {