From afed1a0818b56fe96c276c75d3dfbdf61e5644ee Mon Sep 17 00:00:00 2001
From: Krist Wongsuphasawat <krist.wongz@gmail.com>
Date: Mon, 27 Apr 2020 14:57:10 -0700
Subject: [PATCH] feat(preset-chart-xy): migrate from plugins repo (#377)

* chore: move chart-xy and word-cloud

* fix: babel settings

* fix: remove file

* docs: update storybook code

* docs: word cloud storybook working

* chore: move files back

* fix: ts issues

* fix: import path

* fix: all storybook thingy

* fix: add query storybook back

* fix: address comments

* fix: sorting
---
 .../superset-ui/.gitignore                    |   1 -
 .../superset-ui/babel.config.js               |  24 +++
 .../superset-ui/package.json                  |  17 ++-
 .../superset-ui-demo/.storybook/preview.js    |  11 +-
 .../shared/components/createQueryStory.tsx    |  74 +++++++++
 .../plugin-chart-word-cloud/Stories.tsx       | 135 +++++++++++++++++
 .../plugins/plugin-chart-word-cloud/data.ts}  |   0
 .../preset-chart-xy/BoxPlot/Stories.tsx}      |  13 +-
 .../preset-chart-xy/BoxPlot/constants.ts      |   0
 .../plugins}/preset-chart-xy/BoxPlot/data.ts  |   0
 .../preset-chart-xy/BoxPlot/stories/Basic.tsx |  90 +++++++++++
 .../BoxPlot/stories/Legacy.tsx                |  21 +++
 .../plugins/preset-chart-xy/Line/Stories.tsx  |  18 +++
 .../preset-chart-xy/Line/constants.ts         |   0
 .../preset-chart-xy/Line/data/data.js         |   0
 .../preset-chart-xy/Line/data/data2.js        |   0
 .../preset-chart-xy/Line/data/legacyData.js   |   0
 .../preset-chart-xy/Line/stories/basic.tsx    |  53 +++++++
 .../preset-chart-xy/Line/stories/flush.tsx    | 117 +++++++++++++++
 .../preset-chart-xy/Line/stories/legacy.tsx   |  67 +++++++++
 .../preset-chart-xy/Line/stories/missing.tsx  |  56 +++++++
 .../preset-chart-xy/Line/stories/query.tsx    |  64 ++++++++
 .../Line/stories/timeShift.tsx                |  78 ++++++++++
 .../preset-chart-xy/ScatterPlot/Stories.tsx   |  15 ++
 .../preset-chart-xy/ScatterPlot/constants.ts  |   0
 .../preset-chart-xy/ScatterPlot/data/data.ts} |   0
 .../ScatterPlot/data/legacyData.ts}           |   0
 .../ScatterPlot/stories/basic.tsx             |  48 ++++++
 .../ScatterPlot/stories/bubble.tsx            |  56 +++++++
 .../ScatterPlot/stories/legacy.tsx            |  39 +++++
 .../plugin-chart-word-cloud}/README.md        |   0
 .../plugin-chart-word-cloud}/package.json     |   0
 .../src/buildQuery.ts                         |   0
 .../src/chart/Encoder.ts                      |   0
 .../src/chart/WordCloud.tsx                   |  10 +-
 .../src/images/thumbnail.png                  | Bin
 .../src/images/thumbnailLarge.png             | Bin
 .../plugin-chart-word-cloud}/src/index.ts     |   0
 .../src/legacy/index.ts                       |   0
 .../src/legacy/transformProps.ts              |   0
 .../src/legacy/types.ts                       |   0
 .../src/transformProps.ts                     |   0
 .../plugin-chart-word-cloud}/src/types.ts     |   0
 .../test/buildQuery.test.ts                   |   0
 .../test/legacy/transformProps.test.ts        |   0
 .../types/external.d.ts                       |   0
 .../preset-chart-xy}/README.md                |   0
 .../preset-chart-xy}/package.json             |   0
 .../src/BoxPlot/createMetadata.ts             |   0
 .../src/BoxPlot/images/thumbnail.png          | Bin
 .../preset-chart-xy}/src/BoxPlot/index.ts     |   0
 .../src/BoxPlot/legacy/index.ts               |   0
 .../src/BoxPlot/legacy/transformProps.ts      |   2 +-
 .../src/BoxPlot/transformProps.ts             |   0
 .../src/Line/ChartFormData.ts                 |   0
 .../preset-chart-xy}/src/Line/buildQuery.ts   |   0
 .../src/Line/createMetadata.ts                |   0
 .../src/Line/images/thumbnail.png             | Bin
 .../src/Line/images/thumbnailLarge.png        | Bin
 .../preset-chart-xy}/src/Line/index.ts        |   0
 .../preset-chart-xy}/src/Line/legacy/index.ts |   0
 .../src/Line/legacy/transformProps.ts         |   0
 .../src/Line/transformProps.ts                |   0
 .../src/ScatterPlot/createMetadata.ts         |   0
 .../src/ScatterPlot/images/thumbnail.png      | Bin
 .../preset-chart-xy}/src/ScatterPlot/index.ts |   0
 .../src/ScatterPlot/legacy/index.ts           |   0
 .../src/ScatterPlot/legacy/transformProps.ts  |   0
 .../src/ScatterPlot/transformProps.ts         |   0
 .../src/components/BoxPlot/BoxPlot.tsx        |   0
 .../BoxPlot/DefaultTooltipRenderer.tsx        |   2 +-
 .../src/components/BoxPlot/Encoder.ts         |   0
 .../src/components/BoxPlot/types.ts           |   0
 .../Line/DefaultLegendItemMarkRenderer.tsx    |   0
 .../Line/DefaultTooltipRenderer.tsx           |   0
 .../src/components/Line/Encoder.ts            |   0
 .../src/components/Line/Line.tsx              |   0
 .../ScatterPlot/DefaultTooltipRenderer.tsx    |   0
 .../src/components/ScatterPlot/Encoder.ts     |   0
 .../components/ScatterPlot/ScatterPlot.tsx    |   0
 .../src/components/legend/DefaultLegend.tsx   |   0
 .../components/legend/DefaultLegendGroup.tsx  |   0
 .../components/legend/DefaultLegendItem.tsx   |   0
 .../components/legend/createRenderLegend.tsx  |   0
 .../src/components/legend/types.ts            |   0
 .../preset-chart-xy}/src/index.ts             |   0
 .../src/utils/XYChartLayout.tsx               |   0
 .../src/utils/computeAxisLayout.ts            |   0
 .../utils/convertScaleToDataUIScaleShape.ts   |   0
 .../src/utils/createMarginSelector.tsx        |   0
 .../src/utils/createTickComponent.tsx         |   0
 .../src/utils/createTickLabelProps.ts         |   0
 .../src/utils/createXYChartLayoutWithTheme.ts |   0
 .../preset-chart-xy}/test/index.test.ts       |   0
 .../types/@data-ui/theme/index.d.ts           |   0
 .../types/@data-ui/xy-chart/index.d.ts        |   0
 .../preset-chart-xy}/types/external.d.ts      |   0
 .../shared/components/createQueryStory.tsx    |  82 ----------
 .../plugin-chart-word-cloud/Stories.tsx       | 141 ------------------
 .../stories/plugin-chart-word-cloud/index.js  |  10 --
 .../preset-chart-xy/BoxPlot/stories/Basic.tsx |  99 ------------
 .../BoxPlot/stories/Legacy.tsx                |  28 ----
 .../stories/preset-chart-xy/Line/index.ts     |  22 ---
 .../preset-chart-xy/Line/stories/basic.tsx    |  68 ---------
 .../preset-chart-xy/Line/stories/flush.tsx    | 129 ----------------
 .../preset-chart-xy/Line/stories/legacy.tsx   |  71 ---------
 .../preset-chart-xy/Line/stories/missing.tsx  |  61 --------
 .../preset-chart-xy/Line/stories/query.tsx    |  69 ---------
 .../Line/stories/timeShift.tsx                |  85 -----------
 .../preset-chart-xy/ScatterPlot/index.ts      |  15 --
 .../ScatterPlot/stories/basic.jsx             |  54 -------
 .../ScatterPlot/stories/bubble.jsx            |  62 --------
 .../ScatterPlot/stories/legacy.tsx            |  46 ------
 .../superset-ui/yarn.lock                     | 130 ++++++++++++----
 114 files changed, 1086 insertions(+), 1097 deletions(-)
 create mode 100644 superset-frontend/temporary_superset_ui/superset-ui/babel.config.js
 create mode 100644 superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/shared/components/createQueryStory.tsx
 create mode 100644 superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/plugin-chart-word-cloud/Stories.tsx
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-plugins-demo/storybook/stories/plugin-chart-word-cloud/data.js => packages/superset-ui-demo/storybook/stories/plugins/plugin-chart-word-cloud/data.ts} (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/BoxPlot/index.ts => packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/BoxPlot/Stories.tsx} (53%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-plugins-demo/storybook/stories => packages/superset-ui-demo/storybook/stories/plugins}/preset-chart-xy/BoxPlot/constants.ts (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-plugins-demo/storybook/stories => packages/superset-ui-demo/storybook/stories/plugins}/preset-chart-xy/BoxPlot/data.ts (100%)
 create mode 100644 superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/BoxPlot/stories/Basic.tsx
 create mode 100644 superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/BoxPlot/stories/Legacy.tsx
 create mode 100644 superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/Line/Stories.tsx
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-plugins-demo/storybook/stories => packages/superset-ui-demo/storybook/stories/plugins}/preset-chart-xy/Line/constants.ts (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-plugins-demo/storybook/stories => packages/superset-ui-demo/storybook/stories/plugins}/preset-chart-xy/Line/data/data.js (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-plugins-demo/storybook/stories => packages/superset-ui-demo/storybook/stories/plugins}/preset-chart-xy/Line/data/data2.js (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-plugins-demo/storybook/stories => packages/superset-ui-demo/storybook/stories/plugins}/preset-chart-xy/Line/data/legacyData.js (100%)
 create mode 100644 superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/Line/stories/basic.tsx
 create mode 100644 superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/Line/stories/flush.tsx
 create mode 100644 superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/Line/stories/legacy.tsx
 create mode 100644 superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/Line/stories/missing.tsx
 create mode 100644 superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/Line/stories/query.tsx
 create mode 100644 superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/Line/stories/timeShift.tsx
 create mode 100644 superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/ScatterPlot/Stories.tsx
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-plugins-demo/storybook/stories => packages/superset-ui-demo/storybook/stories/plugins}/preset-chart-xy/ScatterPlot/constants.ts (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/ScatterPlot/data/data.js => packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/ScatterPlot/data/data.ts} (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/ScatterPlot/data/legacyData.js => packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/ScatterPlot/data/legacyData.ts} (100%)
 create mode 100644 superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/ScatterPlot/stories/basic.tsx
 create mode 100644 superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/ScatterPlot/stories/bubble.tsx
 create mode 100644 superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/ScatterPlot/stories/legacy.tsx
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-plugin-chart-word-cloud => plugins/plugin-chart-word-cloud}/README.md (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-plugin-chart-word-cloud => plugins/plugin-chart-word-cloud}/package.json (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-plugin-chart-word-cloud => plugins/plugin-chart-word-cloud}/src/buildQuery.ts (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-plugin-chart-word-cloud => plugins/plugin-chart-word-cloud}/src/chart/Encoder.ts (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-plugin-chart-word-cloud => plugins/plugin-chart-word-cloud}/src/chart/WordCloud.tsx (92%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-plugin-chart-word-cloud => plugins/plugin-chart-word-cloud}/src/images/thumbnail.png (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-plugin-chart-word-cloud => plugins/plugin-chart-word-cloud}/src/images/thumbnailLarge.png (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-plugin-chart-word-cloud => plugins/plugin-chart-word-cloud}/src/index.ts (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-plugin-chart-word-cloud => plugins/plugin-chart-word-cloud}/src/legacy/index.ts (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-plugin-chart-word-cloud => plugins/plugin-chart-word-cloud}/src/legacy/transformProps.ts (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-plugin-chart-word-cloud => plugins/plugin-chart-word-cloud}/src/legacy/types.ts (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-plugin-chart-word-cloud => plugins/plugin-chart-word-cloud}/src/transformProps.ts (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-plugin-chart-word-cloud => plugins/plugin-chart-word-cloud}/src/types.ts (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-plugin-chart-word-cloud => plugins/plugin-chart-word-cloud}/test/buildQuery.test.ts (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-plugin-chart-word-cloud => plugins/plugin-chart-word-cloud}/test/legacy/transformProps.test.ts (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-plugin-chart-word-cloud => plugins/plugin-chart-word-cloud}/types/external.d.ts (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-preset-chart-xy => plugins/preset-chart-xy}/README.md (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-preset-chart-xy => plugins/preset-chart-xy}/package.json (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-preset-chart-xy => plugins/preset-chart-xy}/src/BoxPlot/createMetadata.ts (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-preset-chart-xy => plugins/preset-chart-xy}/src/BoxPlot/images/thumbnail.png (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-preset-chart-xy => plugins/preset-chart-xy}/src/BoxPlot/index.ts (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-preset-chart-xy => plugins/preset-chart-xy}/src/BoxPlot/legacy/index.ts (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-preset-chart-xy => plugins/preset-chart-xy}/src/BoxPlot/legacy/transformProps.ts (97%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-preset-chart-xy => plugins/preset-chart-xy}/src/BoxPlot/transformProps.ts (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-preset-chart-xy => plugins/preset-chart-xy}/src/Line/ChartFormData.ts (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-preset-chart-xy => plugins/preset-chart-xy}/src/Line/buildQuery.ts (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-preset-chart-xy => plugins/preset-chart-xy}/src/Line/createMetadata.ts (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-preset-chart-xy => plugins/preset-chart-xy}/src/Line/images/thumbnail.png (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-preset-chart-xy => plugins/preset-chart-xy}/src/Line/images/thumbnailLarge.png (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-preset-chart-xy => plugins/preset-chart-xy}/src/Line/index.ts (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-preset-chart-xy => plugins/preset-chart-xy}/src/Line/legacy/index.ts (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-preset-chart-xy => plugins/preset-chart-xy}/src/Line/legacy/transformProps.ts (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-preset-chart-xy => plugins/preset-chart-xy}/src/Line/transformProps.ts (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-preset-chart-xy => plugins/preset-chart-xy}/src/ScatterPlot/createMetadata.ts (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-preset-chart-xy => plugins/preset-chart-xy}/src/ScatterPlot/images/thumbnail.png (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-preset-chart-xy => plugins/preset-chart-xy}/src/ScatterPlot/index.ts (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-preset-chart-xy => plugins/preset-chart-xy}/src/ScatterPlot/legacy/index.ts (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-preset-chart-xy => plugins/preset-chart-xy}/src/ScatterPlot/legacy/transformProps.ts (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-preset-chart-xy => plugins/preset-chart-xy}/src/ScatterPlot/transformProps.ts (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-preset-chart-xy => plugins/preset-chart-xy}/src/components/BoxPlot/BoxPlot.tsx (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-preset-chart-xy => plugins/preset-chart-xy}/src/components/BoxPlot/DefaultTooltipRenderer.tsx (95%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-preset-chart-xy => plugins/preset-chart-xy}/src/components/BoxPlot/Encoder.ts (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-preset-chart-xy => plugins/preset-chart-xy}/src/components/BoxPlot/types.ts (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-preset-chart-xy => plugins/preset-chart-xy}/src/components/Line/DefaultLegendItemMarkRenderer.tsx (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-preset-chart-xy => plugins/preset-chart-xy}/src/components/Line/DefaultTooltipRenderer.tsx (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-preset-chart-xy => plugins/preset-chart-xy}/src/components/Line/Encoder.ts (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-preset-chart-xy => plugins/preset-chart-xy}/src/components/Line/Line.tsx (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-preset-chart-xy => plugins/preset-chart-xy}/src/components/ScatterPlot/DefaultTooltipRenderer.tsx (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-preset-chart-xy => plugins/preset-chart-xy}/src/components/ScatterPlot/Encoder.ts (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-preset-chart-xy => plugins/preset-chart-xy}/src/components/ScatterPlot/ScatterPlot.tsx (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-preset-chart-xy => plugins/preset-chart-xy}/src/components/legend/DefaultLegend.tsx (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-preset-chart-xy => plugins/preset-chart-xy}/src/components/legend/DefaultLegendGroup.tsx (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-preset-chart-xy => plugins/preset-chart-xy}/src/components/legend/DefaultLegendItem.tsx (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-preset-chart-xy => plugins/preset-chart-xy}/src/components/legend/createRenderLegend.tsx (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-preset-chart-xy => plugins/preset-chart-xy}/src/components/legend/types.ts (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-preset-chart-xy => plugins/preset-chart-xy}/src/index.ts (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-preset-chart-xy => plugins/preset-chart-xy}/src/utils/XYChartLayout.tsx (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-preset-chart-xy => plugins/preset-chart-xy}/src/utils/computeAxisLayout.ts (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-preset-chart-xy => plugins/preset-chart-xy}/src/utils/convertScaleToDataUIScaleShape.ts (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-preset-chart-xy => plugins/preset-chart-xy}/src/utils/createMarginSelector.tsx (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-preset-chart-xy => plugins/preset-chart-xy}/src/utils/createTickComponent.tsx (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-preset-chart-xy => plugins/preset-chart-xy}/src/utils/createTickLabelProps.ts (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-preset-chart-xy => plugins/preset-chart-xy}/src/utils/createXYChartLayoutWithTheme.ts (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-preset-chart-xy => plugins/preset-chart-xy}/test/index.test.ts (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-preset-chart-xy => plugins/preset-chart-xy}/types/@data-ui/theme/index.d.ts (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-preset-chart-xy => plugins/preset-chart-xy}/types/@data-ui/xy-chart/index.d.ts (100%)
 rename superset-frontend/temporary_superset_ui/superset-ui/{temporary-plugins/superset-ui-preset-chart-xy => plugins/preset-chart-xy}/types/external.d.ts (100%)
 delete mode 100644 superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/shared/components/createQueryStory.tsx
 delete mode 100644 superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/plugin-chart-word-cloud/Stories.tsx
 delete mode 100644 superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/plugin-chart-word-cloud/index.js
 delete mode 100644 superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/BoxPlot/stories/Basic.tsx
 delete mode 100644 superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/BoxPlot/stories/Legacy.tsx
 delete mode 100644 superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/index.ts
 delete mode 100644 superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/basic.tsx
 delete mode 100644 superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/flush.tsx
 delete mode 100644 superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/legacy.tsx
 delete mode 100644 superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/missing.tsx
 delete mode 100644 superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/query.tsx
 delete mode 100644 superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/timeShift.tsx
 delete mode 100644 superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/ScatterPlot/index.ts
 delete mode 100644 superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/ScatterPlot/stories/basic.jsx
 delete mode 100644 superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/ScatterPlot/stories/bubble.jsx
 delete mode 100644 superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/ScatterPlot/stories/legacy.tsx

diff --git a/superset-frontend/temporary_superset_ui/superset-ui/.gitignore b/superset-frontend/temporary_superset_ui/superset-ui/.gitignore
index 90ccbfe416bc..7538951132de 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/.gitignore
+++ b/superset-frontend/temporary_superset_ui/superset-ui/.gitignore
@@ -39,7 +39,6 @@ test-changelog.md
 .eslintrc.js
 .flowconfig
 .prettierignore
-babel.config.js
 jest.config.js
 prettier.config.js
 tsconfig.eslint.json
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/babel.config.js b/superset-frontend/temporary_superset_ui/superset-ui/babel.config.js
new file mode 100644
index 000000000000..4bc657061b43
--- /dev/null
+++ b/superset-frontend/temporary_superset_ui/superset-ui/babel.config.js
@@ -0,0 +1,24 @@
+// eslint-disable-next-line no-undef, import/no-extraneous-dependencies
+const { getConfig } = require('@airbnb/config-babel');
+
+const config = getConfig({
+  library: true,
+  react: true,
+  next: true,
+  node: process.env.NODE_ENV === 'test',
+  typescript: true,
+  env: {
+    targets: false,
+  },
+});
+
+if (process.env.NODE_ENV !== 'test') {
+  config.presets[0][1].modules = false;
+}
+
+// Override to allow transpile es modules inside vega-lite
+config.ignore = config.ignore.filter(item => item !== 'node_modules/');
+config.ignore.push('node_modules/(?!(vega-lite|lodash-es))');
+
+// eslint-disable-next-line no-undef
+module.exports = config;
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/package.json b/superset-frontend/temporary_superset_ui/superset-ui/package.json
index 41364f316caf..fa649f763c39 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/package.json
+++ b/superset-frontend/temporary_superset_ui/superset-ui/package.json
@@ -6,8 +6,8 @@
   "scripts": {
     "build": "yarn babel && yarn type && yarn build:assets",
     "babel": "yarn babel:cjs && yarn babel:esm",
-    "babel:cjs": "nimbus babel --clean --workspaces=\"@superset-ui/!(demo|generator-superset)\"",
-    "babel:esm": "nimbus babel --clean --workspaces=\"@superset-ui/!(demo|generator-superset)\" --esm",
+    "babel:cjs": "nimbus babel --clean --workspaces=\"@superset-ui/!(demo|generator-superset)\" --config-file=../../babel.config.js",
+    "babel:esm": "nimbus babel --clean --workspaces=\"@superset-ui/!(demo|generator-superset)\" --esm --config-file=../../babel.config.js",
     "build:assets": "node ./scripts/buildAssets.js",
     "demo": "cd packages/superset-ui-demo && yarn demo:build",
     "demo:clean": "cd packages/superset-ui-demo && yarn demo:clean",
@@ -94,7 +94,7 @@
   ],
   "nimbus": {
     "drivers": [
-      "babel",
+      { "driver": "babel", "strategy": "none" },
       "eslint",
       "jest",
       "prettier",
@@ -114,10 +114,10 @@
       },
       "coverageThreshold": {
         "global": {
-          "branches": 25,
-          "functions": 25,
-          "lines": 25,
-          "statements": 25
+          "branches": 5,
+          "functions": 5,
+          "lines": 5,
+          "statements": 5
         }
       },
       "moduleNameMapper": {
@@ -128,6 +128,9 @@
       "setupFilesAfterEnv": [
         "@airbnb/config-jest/enzyme"
       ],
+      "transformIgnorePatterns": [
+        "node_modules/(?!(vega-lite|lodash-es))"
+      ],
       "testPathIgnorePatterns": [
         "packages/generator-superset/generators"
       ],
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/.storybook/preview.js b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/.storybook/preview.js
index f46a497c1633..4613f1f24b1d 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/.storybook/preview.js
+++ b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/.storybook/preview.js
@@ -28,7 +28,16 @@ addParameters({
     sortStoriesByKind: false,
     url: '#',
     storySort: (a, b) => {
-      return a[1].kind === b[1].kind ? 0 : a[1].id.localeCompare(b[1].id, undefined, { numeric: true });
+      if (a[1].kind === b[1].kind ) {
+        return 0;
+      }
+      if (a[1].id.startsWith('core-packages') && !b[1].id.startsWith('core-packages')) {
+        return -1;
+      }
+      if (!a[1].id.startsWith('core-packages') && b[1].id.startsWith('core-packages')) {
+        return 1;
+      }
+      return a[1].id.localeCompare(b[1].id, undefined, { numeric: true });
     },
   },
 });
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/shared/components/createQueryStory.tsx b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/shared/components/createQueryStory.tsx
new file mode 100644
index 000000000000..484c2489e5a2
--- /dev/null
+++ b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/shared/components/createQueryStory.tsx
@@ -0,0 +1,74 @@
+import React from 'react';
+import { text, select } from '@storybook/addon-knobs';
+import { SuperChart, ChartDataProvider } from '@superset-ui/chart';
+import { SupersetClient } from '@superset-ui/connection';
+import Expandable from './Expandable';
+import VerifyCORS, { renderError } from './VerifyCORS';
+
+export default function createQueryStory({
+  choices,
+}: {
+  choices: {
+    [key: string]: {
+      chartType: string;
+      formData: {
+        [key: string]: any;
+      };
+    };
+  };
+}) {
+  const keys = Object.keys(choices);
+
+  return () => {
+    const host = text('Set Superset App host for CORS request', 'localhost:8088');
+    const mode = select('Choose mode:', keys, keys[0]);
+    const { formData: presetFormData, chartType } = choices[mode];
+    const width = text('Vis width', '400');
+    const height = text('Vis height', '400');
+    const formData = text('Override formData', JSON.stringify(presetFormData, null, 2));
+
+    return (
+      <div style={{ margin: 16 }}>
+        <VerifyCORS host={host}>
+          {() => (
+            <ChartDataProvider
+              client={SupersetClient}
+              formData={JSON.parse(formData.replace(/&quot;/g, '"'))}
+            >
+              {({ loading, payload, error }) => {
+                if (loading) return <div>Loading!</div>;
+
+                if (error) return renderError(error);
+
+                if (payload)
+                  return (
+                    <>
+                      <SuperChart
+                        chartType={chartType}
+                        width={width}
+                        height={height}
+                        formData={payload.formData}
+                        // @TODO fix typing
+                        // all vis's now expect objects but api/v1/ returns an array
+                        queryData={
+                          Array.isArray(payload.queryData)
+                            ? payload.queryData[0]
+                            : payload.queryData
+                        }
+                      />
+                      <br />
+                      <Expandable expandableWhat="payload">
+                        <pre style={{ fontSize: 11 }}>{JSON.stringify(payload, null, 2)}</pre>
+                      </Expandable>
+                    </>
+                  );
+
+                return null;
+              }}
+            </ChartDataProvider>
+          )}
+        </VerifyCORS>
+      </div>
+    );
+  };
+}
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/plugin-chart-word-cloud/Stories.tsx b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/plugin-chart-word-cloud/Stories.tsx
new file mode 100644
index 000000000000..c6b4a1492c5e
--- /dev/null
+++ b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/plugin-chart-word-cloud/Stories.tsx
@@ -0,0 +1,135 @@
+import React from 'react';
+import { SuperChart } from '@superset-ui/chart';
+import { select, withKnobs } from '@storybook/addon-knobs';
+import WordCloudChartPlugin from '@superset-ui/plugin-chart-word-cloud';
+import LegacyWordCloudChartPlugin from '@superset-ui/plugin-chart-word-cloud/esm/legacy';
+import data from './data';
+
+new WordCloudChartPlugin().configure({ key: 'word-cloud2' }).register();
+new LegacyWordCloudChartPlugin().configure({ key: 'legacy-word-cloud2' }).register();
+
+export default {
+  title: 'Chart Plugins|plugin-chart-word-cloud',
+  decorators: [withKnobs],
+};
+
+export const basic = () => (
+  <SuperChart
+    chartType="word-cloud2"
+    width={400}
+    height={400}
+    queryData={{ data }}
+    formData={{
+      encoding: {
+        color: {
+          value: '#0097e6',
+        },
+        fontSize: {
+          field: 'sum__num',
+          scale: {
+            range: [0, 70],
+            zero: true,
+          },
+          type: 'quantitative',
+        },
+        text: {
+          field: 'name',
+        },
+      },
+      metric: 'sum__num',
+      rotation: select('Rotation', ['square', 'flat', 'random'], 'flat'),
+      series: 'name',
+    }}
+  />
+);
+
+export const encodesColorByWordLength = () => (
+  <SuperChart
+    chartType="word-cloud2"
+    width={400}
+    height={400}
+    queryData={{ data }}
+    formData={{
+      encoding: {
+        color: {
+          field: 'name.length',
+          scale: {
+            range: ['#fbc531', '#c23616'],
+            type: 'linear',
+            zero: false,
+          },
+          type: 'quantitative',
+        },
+        fontSize: {
+          field: 'sum__num',
+          scale: {
+            range: [0, 70],
+            zero: true,
+          },
+          type: 'quantitative',
+        },
+        text: {
+          field: 'name',
+        },
+      },
+      metric: 'sum__num',
+      rotation: select('Rotation', ['square', 'flat', 'random'], 'flat'),
+      series: 'name',
+    }}
+  />
+);
+
+export const encodesFontByFirstLetter = () => (
+  <SuperChart
+    chartType="word-cloud2"
+    width={400}
+    height={400}
+    queryData={{ data }}
+    formData={{
+      encoding: {
+        color: {
+          value: '#8c7ae6',
+        },
+        fontFamily: {
+          field: 'name[0]',
+          scale: {
+            range: ['Helvetica', 'Monaco'],
+            type: 'ordinal',
+          },
+          type: 'nominal',
+        },
+        fontSize: {
+          field: 'sum__num',
+          scale: {
+            range: [0, 70],
+            zero: true,
+          },
+          type: 'quantitative',
+        },
+        text: {
+          field: 'name',
+        },
+      },
+      metric: 'sum__num',
+      rotation: select('Rotation', ['square', 'flat', 'random'], 'flat'),
+      series: 'name',
+    }}
+  />
+);
+
+export const legacyShim = () => (
+  <SuperChart
+    chartType="legacy-word-cloud2"
+    width={400}
+    height={400}
+    queryData={{ data }}
+    formData={{
+      colorScheme: 'd3Category10',
+      metric: 'sum__num',
+      rotation: select('Rotation', ['square', 'flat', 'random'], 'flat'),
+      series: 'name',
+      sizeFrom: '10',
+      sizeTo: '70',
+    }}
+  />
+);
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/plugin-chart-word-cloud/data.js b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/plugin-chart-word-cloud/data.ts
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/plugin-chart-word-cloud/data.js
rename to superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/plugin-chart-word-cloud/data.ts
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/BoxPlot/index.ts b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/BoxPlot/Stories.tsx
similarity index 53%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/BoxPlot/index.ts
rename to superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/BoxPlot/Stories.tsx
index d7fafb4ec7ab..d7ddb867e618 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/BoxPlot/index.ts
+++ b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/BoxPlot/Stories.tsx
@@ -1,14 +1,11 @@
-import {
-  BoxPlotChartPlugin,
-  LegacyBoxPlotChartPlugin,
-} from '../../../../../superset-ui-preset-chart-xy';
-import Stories from './stories/Basic';
-import LegacyStories from './stories/Legacy';
+import { BoxPlotChartPlugin, LegacyBoxPlotChartPlugin } from '@superset-ui/preset-chart-xy';
 import { BOX_PLOT_PLUGIN_LEGACY_TYPE, BOX_PLOT_PLUGIN_TYPE } from './constants';
-
 new LegacyBoxPlotChartPlugin().configure({ key: BOX_PLOT_PLUGIN_LEGACY_TYPE }).register();
 new BoxPlotChartPlugin().configure({ key: BOX_PLOT_PLUGIN_TYPE }).register();
 
 export default {
-  examples: [...Stories, ...LegacyStories],
+  title: 'Chart Plugins|preset-chart-xy/BoxPlot',
 };
+
+export { basic, horizontal } from './stories/Basic';
+export { legacy } from './stories/Legacy';
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/BoxPlot/constants.ts b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/BoxPlot/constants.ts
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/BoxPlot/constants.ts
rename to superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/BoxPlot/constants.ts
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/BoxPlot/data.ts b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/BoxPlot/data.ts
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/BoxPlot/data.ts
rename to superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/BoxPlot/data.ts
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/BoxPlot/stories/Basic.tsx b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/BoxPlot/stories/Basic.tsx
new file mode 100644
index 000000000000..dbc0c41ef1e8
--- /dev/null
+++ b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/BoxPlot/stories/Basic.tsx
@@ -0,0 +1,90 @@
+/* eslint-disable no-magic-numbers, sort-keys */
+import React from 'react';
+import { SuperChart } from '@superset-ui/chart';
+import data from '../data';
+
+export const basic = () => (
+  <SuperChart
+    chartType="v2-box-plot"
+    width={400}
+    height={400}
+    queryData={{ data }}
+    formData={{
+      encoding: {
+        x: {
+          type: 'nominal',
+          field: 'label',
+          scale: {
+            type: 'band',
+            paddingInner: 0.15,
+            paddingOuter: 0.3,
+          },
+          axis: {
+            label: 'Region',
+          },
+        },
+        y: {
+          field: 'value',
+          type: 'quantitative',
+          scale: {
+            type: 'linear',
+          },
+          axis: {
+            label: 'Population',
+            numTicks: 5,
+          },
+        },
+        color: {
+          type: 'nominal',
+          field: 'label',
+          scale: {
+            scheme: 'd3Category10',
+          },
+        },
+      },
+    }}
+  />
+);
+
+export const horizontal = () => (
+  <SuperChart
+    chartType="v2-box-plot"
+    width={400}
+    height={400}
+    queryData={{ data }}
+    formData={{
+      encoding: {
+        y: {
+          type: 'nominal',
+          field: 'label',
+          scale: {
+            type: 'band',
+            paddingInner: 0.15,
+            paddingOuter: 0.3,
+          },
+          axis: {
+            label: 'Region',
+          },
+        },
+        x: {
+          field: 'value',
+          type: 'quantitative',
+          scale: {
+            type: 'linear',
+          },
+          axis: {
+            label: 'Population',
+            numTicks: 5,
+          },
+        },
+        color: {
+          type: 'nominal',
+          field: 'label',
+          scale: {
+            scheme: 'd3Category10',
+          },
+        },
+      },
+    }}
+  />
+);
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/BoxPlot/stories/Legacy.tsx b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/BoxPlot/stories/Legacy.tsx
new file mode 100644
index 000000000000..3cb79a974b2f
--- /dev/null
+++ b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/BoxPlot/stories/Legacy.tsx
@@ -0,0 +1,21 @@
+import React from 'react';
+import { SuperChart } from '@superset-ui/chart';
+import data from '../data';
+import dummyDatasource from '../../../../../shared/dummyDatasource';
+
+export const legacy = () => (
+  <SuperChart
+    chartType="v2-box-plot/legacy"
+    width={400}
+    height={400}
+    datasource={dummyDatasource}
+    queryData={{ data }}
+    formData={{
+      colorScheme: 'd3Category10',
+      groupby: ['region'],
+      metrics: ['sum__SP_POP_TOTL'],
+      vizType: 'box_plot',
+      whiskerOptions: 'Min/max (no outliers)',
+    }}
+  />
+);
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/Line/Stories.tsx b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/Line/Stories.tsx
new file mode 100644
index 000000000000..524e8e1430ed
--- /dev/null
+++ b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/Line/Stories.tsx
@@ -0,0 +1,18 @@
+import { LineChartPlugin, LegacyLineChartPlugin } from '@superset-ui/preset-chart-xy';
+import { LINE_PLUGIN_TYPE, LINE_PLUGIN_LEGACY_TYPE } from './constants';
+import { withKnobs } from '@storybook/addon-knobs';
+
+new LegacyLineChartPlugin().configure({ key: LINE_PLUGIN_LEGACY_TYPE }).register();
+new LineChartPlugin().configure({ key: LINE_PLUGIN_TYPE }).register();
+
+export default {
+  title: 'Chart Plugins|preset-chart-xy/Line',
+  decorators: [withKnobs],
+};
+
+export { default as basic } from './stories/basic';
+export { default as withLabelFlush } from './stories/flush';
+export { default as withMissingData } from './stories/missing';
+export { default as legacyShim } from './stories/legacy';
+export { default as withTimeShift } from './stories/timeShift';
+export { default as query } from './stories/query';
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/constants.ts b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/Line/constants.ts
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/constants.ts
rename to superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/Line/constants.ts
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/data/data.js b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/Line/data/data.js
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/data/data.js
rename to superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/Line/data/data.js
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/data/data2.js b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/Line/data/data2.js
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/data/data2.js
rename to superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/Line/data/data2.js
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/data/legacyData.js b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/Line/data/legacyData.js
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/data/legacyData.js
rename to superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/Line/data/legacyData.js
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/Line/stories/basic.tsx b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/Line/stories/basic.tsx
new file mode 100644
index 000000000000..9ea879eb3c02
--- /dev/null
+++ b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/Line/stories/basic.tsx
@@ -0,0 +1,53 @@
+import React from 'react';
+import { SuperChart } from '@superset-ui/chart';
+import { radios } from '@storybook/addon-knobs';
+import data from '../data/data';
+import { LINE_PLUGIN_TYPE } from '../constants';
+import dummyDatasource from '../../../../../shared/dummyDatasource';
+
+export default () => (
+  <SuperChart
+    key="line1"
+    chartType={LINE_PLUGIN_TYPE}
+    datasource={dummyDatasource}
+    formData={{
+      encoding: {
+        x: {
+          field: 'x',
+          type: 'temporal',
+          format: '%Y-%m',
+          scale: {
+            type: 'time',
+          },
+          axis: {
+            orient: radios('x.axis.orient', { top: 'top', bottom: 'bottom' }, 'bottom'),
+            title: radios('x.axis.title', { enable: 'Time', disable: '', '': undefined }, 'Time'),
+          },
+        },
+        y: {
+          field: 'y',
+          type: 'quantitative',
+          scale: {
+            type: 'linear',
+          },
+          axis: {
+            orient: radios(
+              'y.axis.orient',
+              { left: 'left', right: 'right', '': undefined },
+              'left',
+            ),
+            title: radios('y.axis.title', { enable: 'Score', disable: '', '': undefined }, 'Score'),
+          },
+        },
+        stroke: {
+          field: 'name',
+          type: 'nominal',
+          legend: true,
+        },
+      },
+    }}
+    height={400}
+    queryData={{ data }}
+    width={400}
+  />
+);
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/Line/stories/flush.tsx b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/Line/stories/flush.tsx
new file mode 100644
index 000000000000..bf293e66b274
--- /dev/null
+++ b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/Line/stories/flush.tsx
@@ -0,0 +1,117 @@
+import React from 'react';
+import { SuperChart } from '@superset-ui/chart';
+import { radios } from '@storybook/addon-knobs';
+import rawData from '../data/data';
+import { LINE_PLUGIN_TYPE } from '../constants';
+import dummyDatasource from '../../../../../shared/dummyDatasource';
+
+const MIN_TIME = new Date(Date.UTC(1980, 0, 1)).getTime();
+const MAX_TIME = new Date(Date.UTC(2000, 1, 1)).getTime();
+const data = rawData.filter(({ x }) => x >= MIN_TIME && x <= MAX_TIME);
+
+export default () => (
+  <>
+    <SuperChart
+      key="line1"
+      chartType={LINE_PLUGIN_TYPE}
+      width={400}
+      height={200}
+      datasource={dummyDatasource}
+      queryData={{ data }}
+      formData={{
+        encoding: {
+          x: {
+            field: 'x',
+            type: 'temporal',
+            format: '%Y',
+            scale: {
+              type: 'utc',
+            },
+            axis: {
+              tickCount: 6,
+              orient: radios('x.axis.orient', { top: 'top', bottom: 'bottom' }, 'bottom'),
+              title: radios('x.axis.title', { enable: 'Time', disable: '', '': undefined }, 'Time'),
+            },
+          },
+          y: {
+            field: 'y',
+            type: 'quantitative',
+            scale: {
+              type: 'linear',
+            },
+            axis: {
+              tickCount: 3,
+              orient: radios(
+                'y.axis.orient',
+                { left: 'left', right: 'right', '': undefined },
+                'left',
+              ),
+              title: radios(
+                'y.axis.title',
+                { enable: 'Score', disable: '', '': undefined },
+                'Score',
+              ),
+            },
+          },
+          stroke: {
+            field: 'name',
+            type: 'nominal',
+            legend: true,
+          },
+        },
+      }}
+    />
+    ,
+    <SuperChart
+      key="line2"
+      chartType={LINE_PLUGIN_TYPE}
+      width={400}
+      height={200}
+      datasource={dummyDatasource}
+      queryData={{ data }}
+      formData={{
+        encoding: {
+          x: {
+            field: 'x',
+            type: 'temporal',
+            format: '%Y',
+            scale: {
+              type: 'utc',
+            },
+            axis: {
+              labelFlush: 5,
+              tickCount: 6,
+              orient: radios('x.axis.orient', { top: 'top', bottom: 'bottom' }, 'bottom'),
+              title: radios('x.axis.title', { enable: 'Time', disable: '', '': undefined }, 'Time'),
+            },
+          },
+          y: {
+            field: 'y',
+            type: 'quantitative',
+            scale: {
+              type: 'linear',
+            },
+            axis: {
+              tickCount: 3,
+              orient: radios(
+                'y.axis.orient',
+                { left: 'left', right: 'right', '': undefined },
+                'left',
+              ),
+              title: radios(
+                'y.axis.title',
+                { enable: 'Score', disable: '', '': undefined },
+                'Score',
+              ),
+            },
+          },
+          stroke: {
+            field: 'name',
+            type: 'nominal',
+            legend: true,
+          },
+        },
+      }}
+    />
+  </>
+);
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/Line/stories/legacy.tsx b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/Line/stories/legacy.tsx
new file mode 100644
index 000000000000..080bf0263e81
--- /dev/null
+++ b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/Line/stories/legacy.tsx
@@ -0,0 +1,67 @@
+import React from 'react';
+import { SuperChart } from '@superset-ui/chart';
+import data from '../data/legacyData';
+import { LINE_PLUGIN_LEGACY_TYPE } from '../constants';
+import dummyDatasource from '../../../../../shared/dummyDatasource';
+
+export default () => (
+  <>
+    <SuperChart
+      key="line1"
+      chartType={LINE_PLUGIN_LEGACY_TYPE}
+      width={400}
+      height={400}
+      datasource={dummyDatasource}
+      queryData={{ data }}
+      formData={{
+        bottomMargin: 'auto',
+        colorScheme: 'd3Category10',
+        leftMargin: 'auto',
+        lineInterpolation: 'linear',
+        richTooltip: true,
+        showBrush: 'auto',
+        showLegend: true,
+        showMarkers: false,
+        vizType: 'line',
+        xAxisFormat: '%Y',
+        xAxisLabel: '',
+        xAxisShowminmax: false,
+        xTicksLayout: 'auto',
+        yAxisBounds: [null, null],
+        yAxisFormat: '',
+        yAxisLabel: '',
+        yAxisShowminmax: false,
+        yLogScale: false,
+      }}
+    />
+    ,
+    <SuperChart
+      key="line2"
+      chartType={LINE_PLUGIN_LEGACY_TYPE}
+      width={400}
+      height={400}
+      datasource={dummyDatasource}
+      queryData={{ data }}
+      formData={{
+        bottomMargin: 'auto',
+        colorScheme: 'd3Category10',
+        leftMargin: 'auto',
+        lineInterpolation: 'linear',
+        richTooltip: true,
+        showBrush: 'auto',
+        showLegend: true,
+        showMarkers: false,
+        vizType: 'line',
+        xAxisFormat: '%Y-%m',
+        xAxisLabel: '',
+        xAxisShowminmax: false,
+        xTicksLayout: 'auto',
+        yAxisBounds: [null, null],
+        yAxisFormat: '',
+        yAxisLabel: '',
+        yAxisShowminmax: false,
+        yLogScale: false,
+      }}
+    />
+  </>
+);
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/Line/stories/missing.tsx b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/Line/stories/missing.tsx
new file mode 100644
index 000000000000..93c710e68ada
--- /dev/null
+++ b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/Line/stories/missing.tsx
@@ -0,0 +1,56 @@
+import React from 'react';
+import { SuperChart } from '@superset-ui/chart';
+import data from '../data/data';
+import { LINE_PLUGIN_TYPE } from '../constants';
+import dummyDatasource from '../../../../../shared/dummyDatasource';
+
+const missingData = data.map(({ y, ...rest }) => ({
+  ...rest,
+  y: Math.random() < 0.25 ? null : y,
+}));
+
+const missing = () => (
+  <SuperChart
+    key="line1"
+    chartType={LINE_PLUGIN_TYPE}
+    width={400}
+    height={400}
+    datasource={dummyDatasource}
+    queryData={{ data: missingData }}
+    formData={{
+      encoding: {
+        x: {
+          field: 'x',
+          type: 'temporal',
+          format: '%Y',
+          scale: {
+            type: 'time',
+          },
+          axis: {
+            orient: 'bottom',
+            title: 'Time',
+          },
+        },
+        y: {
+          field: 'y',
+          type: 'quantitative',
+          scale: {
+            type: 'linear',
+          },
+          axis: {
+            orient: 'left',
+            title: 'Score',
+          },
+        },
+        stroke: {
+          field: 'name',
+          type: 'nominal',
+          scale: {},
+          legend: true,
+        },
+      },
+    }}
+  />
+);
+
+export default missing;
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/Line/stories/query.tsx b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/Line/stories/query.tsx
new file mode 100644
index 000000000000..9c61c1de974f
--- /dev/null
+++ b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/Line/stories/query.tsx
@@ -0,0 +1,64 @@
+import { LINE_PLUGIN_TYPE, LINE_PLUGIN_LEGACY_TYPE } from '../constants';
+import createQueryStory from '../../../../../shared/components/createQueryStory';
+
+export default createQueryStory({
+  choices: {
+    'Line Chart - Legacy API': {
+      chartType: LINE_PLUGIN_LEGACY_TYPE,
+      formData: {
+        datasource: '3__table',
+        viz_type: 'line',
+        url_params: {},
+        granularity_sqla: 'ds',
+        time_grain_sqla: 'P1D',
+        time_range: '100 years ago : now',
+        metrics: ['sum__num'],
+        adhoc_filters: [],
+        groupby: [],
+        limit: 25,
+        row_limit: 50000,
+      },
+    },
+    'Line Chart - /api/v1/query': {
+      chartType: LINE_PLUGIN_TYPE,
+      formData: {
+        viz_type: LINE_PLUGIN_TYPE,
+        datasource: '3__table',
+        granularity_sqla: 'ds',
+        time_grain_sqla: 'P1D',
+        time_range: '100 years ago : now',
+        metrics: ['sum__num'],
+        limit: 25,
+        row_limit: 50000,
+        encoding: {
+          x: {
+            field: '__timestamp',
+            type: 'temporal',
+            format: '%Y',
+            scale: {
+              type: 'time',
+            },
+            axis: {
+              title: 'Time',
+            },
+          },
+          y: {
+            field: 'sum__num',
+            type: 'quantitative',
+            scale: {
+              type: 'linear',
+            },
+            axis: {
+              title: 'Number of Babies',
+            },
+          },
+          stroke: {
+            field: 'gender',
+            type: 'nominal',
+            legend: true,
+          },
+        },
+      },
+    },
+  },
+});
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/Line/stories/timeShift.tsx b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/Line/stories/timeShift.tsx
new file mode 100644
index 000000000000..58ae659b3310
--- /dev/null
+++ b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/Line/stories/timeShift.tsx
@@ -0,0 +1,78 @@
+import React from 'react';
+import { SuperChart } from '@superset-ui/chart';
+import data from '../data/data2';
+import { LINE_PLUGIN_TYPE } from '../constants';
+import dummyDatasource from '../../../../../shared/dummyDatasource';
+
+export default () => (
+  <SuperChart
+    key="line1"
+    chartType={LINE_PLUGIN_TYPE}
+    width={400}
+    height={400}
+    datasource={dummyDatasource}
+    queryData={{ data }}
+    formData={{
+      encoding: {
+        x: {
+          field: 'x',
+          type: 'temporal',
+          format: '%Y',
+          scale: {
+            type: 'time',
+          },
+          axis: {
+            orient: 'bottom',
+            title: 'Time',
+          },
+        },
+        y: {
+          field: 'y',
+          type: 'quantitative',
+          scale: {
+            type: 'linear',
+          },
+          axis: {
+            orient: 'left',
+            title: 'Score',
+          },
+        },
+        stroke: {
+          value: '#1abc9c',
+          type: 'nominal',
+          scale: false,
+        },
+        fill: {
+          field: 'snapshot',
+          type: 'nominal',
+          scale: {
+            type: 'ordinal',
+            domain: ['Current', 'Last year'],
+            range: [true, false],
+          },
+          legend: false,
+        },
+        strokeDasharray: {
+          field: 'snapshot',
+          type: 'nominal',
+          scale: {
+            type: 'ordinal',
+            domain: ['Current', 'Last year'],
+            range: [null, '4 4'],
+          },
+          legend: false,
+        },
+        strokeWidth: {
+          field: 'snapshot',
+          type: 'nominal',
+          scale: {
+            type: 'ordinal',
+            domain: ['Current', 'Last year'],
+            range: [3, 1.5],
+          },
+          legend: false,
+        },
+      },
+    }}
+  />
+);
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/ScatterPlot/Stories.tsx b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/ScatterPlot/Stories.tsx
new file mode 100644
index 000000000000..a404cbf26b82
--- /dev/null
+++ b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/ScatterPlot/Stories.tsx
@@ -0,0 +1,15 @@
+import { ScatterPlotChartPlugin, LegacyScatterPlotChartPlugin } from '@superset-ui/preset-chart-xy';
+import { SCATTER_PLOT_PLUGIN_TYPE, SCATTER_PLOT_PLUGIN_LEGACY_TYPE } from './constants';
+import { withKnobs } from '@storybook/addon-knobs';
+
+new LegacyScatterPlotChartPlugin().configure({ key: SCATTER_PLOT_PLUGIN_LEGACY_TYPE }).register();
+new ScatterPlotChartPlugin().configure({ key: SCATTER_PLOT_PLUGIN_TYPE }).register();
+
+export default {
+  title: 'Chart Plugins|preset-chart-xy/ScatterPlot',
+  decorators: [withKnobs],
+};
+
+export { default as basic } from './stories/basic';
+export { default as bubble } from './stories/bubble';
+export { default as legacy } from './stories/legacy';
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/ScatterPlot/constants.ts b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/ScatterPlot/constants.ts
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/ScatterPlot/constants.ts
rename to superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/ScatterPlot/constants.ts
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/ScatterPlot/data/data.js b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/ScatterPlot/data/data.ts
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/ScatterPlot/data/data.js
rename to superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/ScatterPlot/data/data.ts
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/ScatterPlot/data/legacyData.js b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/ScatterPlot/data/legacyData.ts
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/ScatterPlot/data/legacyData.js
rename to superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/ScatterPlot/data/legacyData.ts
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/ScatterPlot/stories/basic.tsx b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/ScatterPlot/stories/basic.tsx
new file mode 100644
index 000000000000..c267987d168f
--- /dev/null
+++ b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/ScatterPlot/stories/basic.tsx
@@ -0,0 +1,48 @@
+/* eslint-disable no-magic-numbers, sort-keys */
+import * as React from 'react';
+import { SuperChart } from '@superset-ui/chart';
+import { radios } from '@storybook/addon-knobs';
+import data from '../data/data';
+import { SCATTER_PLOT_PLUGIN_TYPE } from '../constants';
+import dummyDatasource from '../../../../../shared/dummyDatasource';
+
+export default () => (
+  <SuperChart
+    key="scatter-plot1"
+    chartType={SCATTER_PLOT_PLUGIN_TYPE}
+    width={400}
+    height={400}
+    datasource={dummyDatasource}
+    queryData={{ data }}
+    formData={{
+      encoding: {
+        x: {
+          field: 'sum__SP_RUR_TOTL_ZS',
+          type: 'quantitative',
+          scale: {
+            type: 'linear',
+          },
+          axis: {
+            orient: radios('x.axis.orient', { top: 'top', bottom: 'bottom' }, 'bottom'),
+          },
+        },
+        y: {
+          field: 'sum__SP_DYN_LE00_IN',
+          type: 'quantitative',
+          scale: {
+            type: 'linear',
+          },
+          axis: {
+            orient: radios('y.axis.orient', { left: 'left', right: 'right' }, 'left'),
+          },
+        },
+        fill: {
+          field: 'region',
+          type: 'nominal',
+          legend: true,
+        },
+        group: [{ field: 'country_name', title: 'Country' }],
+      },
+    }}
+  />
+);
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/ScatterPlot/stories/bubble.tsx b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/ScatterPlot/stories/bubble.tsx
new file mode 100644
index 000000000000..5b40ea0e3683
--- /dev/null
+++ b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/ScatterPlot/stories/bubble.tsx
@@ -0,0 +1,56 @@
+/* eslint-disable no-magic-numbers, sort-keys */
+import * as React from 'react';
+import { SuperChart } from '@superset-ui/chart';
+import { radios } from '@storybook/addon-knobs';
+import dummyDatasource from '../../../../../shared/dummyDatasource';
+import data from '../data/data';
+import { SCATTER_PLOT_PLUGIN_TYPE } from '../constants';
+
+export default () => (
+  <SuperChart
+    key="scatter-plot1"
+    chartType={SCATTER_PLOT_PLUGIN_TYPE}
+    width={400}
+    height={400}
+    datasource={dummyDatasource}
+    queryData={{ data }}
+    formData={{
+      encoding: {
+        x: {
+          field: 'sum__SP_RUR_TOTL_ZS',
+          type: 'quantitative',
+          scale: {
+            type: 'linear',
+          },
+          axis: {
+            orient: radios('x.axis.orient', { top: 'top', bottom: 'bottom' }, 'bottom'),
+          },
+        },
+        y: {
+          field: 'sum__SP_DYN_LE00_IN',
+          type: 'quantitative',
+          scale: {
+            type: 'linear',
+          },
+          axis: {
+            orient: radios('y.axis.orient', { left: 'left', right: 'right' }, 'left'),
+          },
+        },
+        size: {
+          field: 'sum__SP_POP_TOTL',
+          type: 'quantitative',
+          scale: {
+            type: 'linear',
+            range: [0, 30],
+          },
+        },
+        fill: {
+          field: 'region',
+          type: 'nominal',
+          legend: true,
+        },
+        group: [{ field: 'country_name', title: 'Country' }],
+      },
+    }}
+  />
+);
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/ScatterPlot/stories/legacy.tsx b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/ScatterPlot/stories/legacy.tsx
new file mode 100644
index 000000000000..a9b9322ddfda
--- /dev/null
+++ b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-demo/storybook/stories/plugins/preset-chart-xy/ScatterPlot/stories/legacy.tsx
@@ -0,0 +1,39 @@
+import * as React from 'react';
+import { SuperChart } from '@superset-ui/chart';
+import data from '../data/legacyData';
+import { SCATTER_PLOT_PLUGIN_LEGACY_TYPE } from '../constants';
+import dummyDatasource from '../../../../../shared/dummyDatasource';
+
+export default () => (
+  <SuperChart
+    key="scatter-plot1"
+    chartType={SCATTER_PLOT_PLUGIN_LEGACY_TYPE}
+    width={400}
+    height={400}
+    datasource={dummyDatasource}
+    queryData={{ data }}
+    formData={{
+      annotationData: {},
+      bottomMargin: 'auto',
+      colorScheme: 'd3Category10',
+      entity: 'country_name',
+      leftMargin: 'auto',
+      maxBubbleSize: '50',
+      series: 'region',
+      showLegend: true,
+      size: 'sum__SP_POP_TOTL',
+      vizType: 'bubble',
+      x: 'sum__SP_RUR_TOTL_ZS',
+      xAxisFormat: '.3s',
+      xAxisLabel: 'x-axis label test',
+      xAxisShowminmax: false,
+      xLogScale: false,
+      xTicksLayout: 'auto',
+      y: 'sum__SP_DYN_LE00_IN',
+      yAxisFormat: '.3s',
+      yAxisLabel: '',
+      yAxisShowminmax: false,
+      yLogScale: false,
+    }}
+  />
+);
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugin-chart-word-cloud/README.md b/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-word-cloud/README.md
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugin-chart-word-cloud/README.md
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-word-cloud/README.md
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugin-chart-word-cloud/package.json b/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-word-cloud/package.json
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugin-chart-word-cloud/package.json
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-word-cloud/package.json
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugin-chart-word-cloud/src/buildQuery.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-word-cloud/src/buildQuery.ts
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugin-chart-word-cloud/src/buildQuery.ts
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-word-cloud/src/buildQuery.ts
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugin-chart-word-cloud/src/chart/Encoder.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-word-cloud/src/chart/Encoder.ts
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugin-chart-word-cloud/src/chart/Encoder.ts
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-word-cloud/src/chart/Encoder.ts
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugin-chart-word-cloud/src/chart/WordCloud.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-word-cloud/src/chart/WordCloud.tsx
similarity index 92%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugin-chart-word-cloud/src/chart/WordCloud.tsx
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-word-cloud/src/chart/WordCloud.tsx
index bf9e135bef3e..40759723a0b0 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugin-chart-word-cloud/src/chart/WordCloud.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-word-cloud/src/chart/WordCloud.tsx
@@ -39,7 +39,9 @@ export default class WordCloud extends React.PureComponent<
   WordCloudProps & typeof defaultProps,
   State
 > {
-  isMounted: boolean = false;
+  // Cannot name it isMounted because of conflict
+  // with React's component function name
+  isComponentMounted: boolean = false;
 
   state: State = {
     words: [],
@@ -50,7 +52,7 @@ export default class WordCloud extends React.PureComponent<
   static defaultProps = defaultProps;
 
   componentDidMount() {
-    this.isMounted = true;
+    this.isComponentMounted = true;
     this.update();
   }
 
@@ -69,11 +71,11 @@ export default class WordCloud extends React.PureComponent<
   }
 
   componentWillUnmount() {
-    this.isMounted = false;
+    this.isComponentMounted = false;
   }
 
   setWords = (words: Word[]) => {
-    if (this.isMounted) {
+    if (this.isComponentMounted) {
       this.setState({ words });
     }
   };
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugin-chart-word-cloud/src/images/thumbnail.png b/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-word-cloud/src/images/thumbnail.png
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugin-chart-word-cloud/src/images/thumbnail.png
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-word-cloud/src/images/thumbnail.png
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugin-chart-word-cloud/src/images/thumbnailLarge.png b/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-word-cloud/src/images/thumbnailLarge.png
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugin-chart-word-cloud/src/images/thumbnailLarge.png
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-word-cloud/src/images/thumbnailLarge.png
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugin-chart-word-cloud/src/index.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-word-cloud/src/index.ts
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugin-chart-word-cloud/src/index.ts
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-word-cloud/src/index.ts
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugin-chart-word-cloud/src/legacy/index.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-word-cloud/src/legacy/index.ts
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugin-chart-word-cloud/src/legacy/index.ts
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-word-cloud/src/legacy/index.ts
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugin-chart-word-cloud/src/legacy/transformProps.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-word-cloud/src/legacy/transformProps.ts
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugin-chart-word-cloud/src/legacy/transformProps.ts
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-word-cloud/src/legacy/transformProps.ts
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugin-chart-word-cloud/src/legacy/types.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-word-cloud/src/legacy/types.ts
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugin-chart-word-cloud/src/legacy/types.ts
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-word-cloud/src/legacy/types.ts
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugin-chart-word-cloud/src/transformProps.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-word-cloud/src/transformProps.ts
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugin-chart-word-cloud/src/transformProps.ts
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-word-cloud/src/transformProps.ts
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugin-chart-word-cloud/src/types.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-word-cloud/src/types.ts
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugin-chart-word-cloud/src/types.ts
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-word-cloud/src/types.ts
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugin-chart-word-cloud/test/buildQuery.test.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-word-cloud/test/buildQuery.test.ts
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugin-chart-word-cloud/test/buildQuery.test.ts
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-word-cloud/test/buildQuery.test.ts
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugin-chart-word-cloud/test/legacy/transformProps.test.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-word-cloud/test/legacy/transformProps.test.ts
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugin-chart-word-cloud/test/legacy/transformProps.test.ts
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-word-cloud/test/legacy/transformProps.test.ts
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugin-chart-word-cloud/types/external.d.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-word-cloud/types/external.d.ts
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugin-chart-word-cloud/types/external.d.ts
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-word-cloud/types/external.d.ts
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/README.md b/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/README.md
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/README.md
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/README.md
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/package.json b/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/package.json
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/package.json
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/package.json
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/BoxPlot/createMetadata.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/BoxPlot/createMetadata.ts
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/BoxPlot/createMetadata.ts
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/BoxPlot/createMetadata.ts
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/BoxPlot/images/thumbnail.png b/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/BoxPlot/images/thumbnail.png
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/BoxPlot/images/thumbnail.png
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/BoxPlot/images/thumbnail.png
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/BoxPlot/index.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/BoxPlot/index.ts
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/BoxPlot/index.ts
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/BoxPlot/index.ts
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/BoxPlot/legacy/index.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/BoxPlot/legacy/index.ts
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/BoxPlot/legacy/index.ts
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/BoxPlot/legacy/index.ts
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/BoxPlot/legacy/transformProps.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/BoxPlot/legacy/transformProps.ts
similarity index 97%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/BoxPlot/legacy/transformProps.ts
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/BoxPlot/legacy/transformProps.ts
index 2b2275568d1e..df8d4a474761 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/BoxPlot/legacy/transformProps.ts
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/BoxPlot/legacy/transformProps.ts
@@ -20,7 +20,7 @@ import { ChartProps } from '@superset-ui/chart';
 import { RawBoxPlotDataRow, BoxPlotDataRow } from '../../components/BoxPlot/types';
 
 export default function transformProps(chartProps: ChartProps) {
-  const { width, height, datasource = {}, formData, queryData } = chartProps;
+  const { width, height, datasource, formData, queryData } = chartProps;
   const { verboseMap = {} } = datasource;
   const { colorScheme, groupby, metrics } = formData;
 
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/BoxPlot/transformProps.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/BoxPlot/transformProps.ts
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/BoxPlot/transformProps.ts
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/BoxPlot/transformProps.ts
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/Line/ChartFormData.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/Line/ChartFormData.ts
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/Line/ChartFormData.ts
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/Line/ChartFormData.ts
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/Line/buildQuery.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/Line/buildQuery.ts
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/Line/buildQuery.ts
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/Line/buildQuery.ts
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/Line/createMetadata.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/Line/createMetadata.ts
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/Line/createMetadata.ts
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/Line/createMetadata.ts
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/Line/images/thumbnail.png b/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/Line/images/thumbnail.png
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/Line/images/thumbnail.png
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/Line/images/thumbnail.png
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/Line/images/thumbnailLarge.png b/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/Line/images/thumbnailLarge.png
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/Line/images/thumbnailLarge.png
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/Line/images/thumbnailLarge.png
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/Line/index.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/Line/index.ts
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/Line/index.ts
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/Line/index.ts
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/Line/legacy/index.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/Line/legacy/index.ts
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/Line/legacy/index.ts
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/Line/legacy/index.ts
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/Line/legacy/transformProps.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/Line/legacy/transformProps.ts
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/Line/legacy/transformProps.ts
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/Line/legacy/transformProps.ts
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/Line/transformProps.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/Line/transformProps.ts
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/Line/transformProps.ts
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/Line/transformProps.ts
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/ScatterPlot/createMetadata.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/ScatterPlot/createMetadata.ts
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/ScatterPlot/createMetadata.ts
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/ScatterPlot/createMetadata.ts
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/ScatterPlot/images/thumbnail.png b/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/ScatterPlot/images/thumbnail.png
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/ScatterPlot/images/thumbnail.png
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/ScatterPlot/images/thumbnail.png
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/ScatterPlot/index.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/ScatterPlot/index.ts
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/ScatterPlot/index.ts
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/ScatterPlot/index.ts
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/ScatterPlot/legacy/index.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/ScatterPlot/legacy/index.ts
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/ScatterPlot/legacy/index.ts
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/ScatterPlot/legacy/index.ts
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/ScatterPlot/legacy/transformProps.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/ScatterPlot/legacy/transformProps.ts
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/ScatterPlot/legacy/transformProps.ts
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/ScatterPlot/legacy/transformProps.ts
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/ScatterPlot/transformProps.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/ScatterPlot/transformProps.ts
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/ScatterPlot/transformProps.ts
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/ScatterPlot/transformProps.ts
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/components/BoxPlot/BoxPlot.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/components/BoxPlot/BoxPlot.tsx
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/components/BoxPlot/BoxPlot.tsx
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/components/BoxPlot/BoxPlot.tsx
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/components/BoxPlot/DefaultTooltipRenderer.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/components/BoxPlot/DefaultTooltipRenderer.tsx
similarity index 95%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/components/BoxPlot/DefaultTooltipRenderer.tsx
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/components/BoxPlot/DefaultTooltipRenderer.tsx
index 3970f5a59e7c..526f2e2b0638 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/components/BoxPlot/DefaultTooltipRenderer.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/components/BoxPlot/DefaultTooltipRenderer.tsx
@@ -18,7 +18,7 @@ export default function DefaultTooltipRenderer({
 
   const { formatValue } = channels.y;
 
-  const data = [];
+  const data: { key: string; valueColumn: number | string }[] = [];
   if (isDefined(min)) {
     data.push({ key: 'Min', valueColumn: formatValue(min) });
   }
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/components/BoxPlot/Encoder.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/components/BoxPlot/Encoder.ts
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/components/BoxPlot/Encoder.ts
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/components/BoxPlot/Encoder.ts
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/components/BoxPlot/types.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/components/BoxPlot/types.ts
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/components/BoxPlot/types.ts
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/components/BoxPlot/types.ts
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/components/Line/DefaultLegendItemMarkRenderer.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/components/Line/DefaultLegendItemMarkRenderer.tsx
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/components/Line/DefaultLegendItemMarkRenderer.tsx
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/components/Line/DefaultLegendItemMarkRenderer.tsx
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/components/Line/DefaultTooltipRenderer.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/components/Line/DefaultTooltipRenderer.tsx
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/components/Line/DefaultTooltipRenderer.tsx
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/components/Line/DefaultTooltipRenderer.tsx
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/components/Line/Encoder.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/components/Line/Encoder.ts
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/components/Line/Encoder.ts
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/components/Line/Encoder.ts
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/components/Line/Line.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/components/Line/Line.tsx
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/components/Line/Line.tsx
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/components/Line/Line.tsx
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/components/ScatterPlot/DefaultTooltipRenderer.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/components/ScatterPlot/DefaultTooltipRenderer.tsx
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/components/ScatterPlot/DefaultTooltipRenderer.tsx
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/components/ScatterPlot/DefaultTooltipRenderer.tsx
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/components/ScatterPlot/Encoder.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/components/ScatterPlot/Encoder.ts
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/components/ScatterPlot/Encoder.ts
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/components/ScatterPlot/Encoder.ts
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/components/ScatterPlot/ScatterPlot.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/components/ScatterPlot/ScatterPlot.tsx
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/components/ScatterPlot/ScatterPlot.tsx
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/components/ScatterPlot/ScatterPlot.tsx
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/components/legend/DefaultLegend.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/components/legend/DefaultLegend.tsx
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/components/legend/DefaultLegend.tsx
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/components/legend/DefaultLegend.tsx
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/components/legend/DefaultLegendGroup.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/components/legend/DefaultLegendGroup.tsx
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/components/legend/DefaultLegendGroup.tsx
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/components/legend/DefaultLegendGroup.tsx
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/components/legend/DefaultLegendItem.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/components/legend/DefaultLegendItem.tsx
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/components/legend/DefaultLegendItem.tsx
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/components/legend/DefaultLegendItem.tsx
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/components/legend/createRenderLegend.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/components/legend/createRenderLegend.tsx
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/components/legend/createRenderLegend.tsx
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/components/legend/createRenderLegend.tsx
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/components/legend/types.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/components/legend/types.ts
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/components/legend/types.ts
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/components/legend/types.ts
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/index.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/index.ts
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/index.ts
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/index.ts
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/utils/XYChartLayout.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/utils/XYChartLayout.tsx
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/utils/XYChartLayout.tsx
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/utils/XYChartLayout.tsx
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/utils/computeAxisLayout.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/utils/computeAxisLayout.ts
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/utils/computeAxisLayout.ts
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/utils/computeAxisLayout.ts
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/utils/convertScaleToDataUIScaleShape.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/utils/convertScaleToDataUIScaleShape.ts
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/utils/convertScaleToDataUIScaleShape.ts
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/utils/convertScaleToDataUIScaleShape.ts
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/utils/createMarginSelector.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/utils/createMarginSelector.tsx
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/utils/createMarginSelector.tsx
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/utils/createMarginSelector.tsx
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/utils/createTickComponent.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/utils/createTickComponent.tsx
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/utils/createTickComponent.tsx
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/utils/createTickComponent.tsx
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/utils/createTickLabelProps.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/utils/createTickLabelProps.ts
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/utils/createTickLabelProps.ts
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/utils/createTickLabelProps.ts
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/utils/createXYChartLayoutWithTheme.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/utils/createXYChartLayoutWithTheme.ts
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/src/utils/createXYChartLayoutWithTheme.ts
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/utils/createXYChartLayoutWithTheme.ts
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/test/index.test.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/test/index.test.ts
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/test/index.test.ts
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/test/index.test.ts
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/types/@data-ui/theme/index.d.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/types/@data-ui/theme/index.d.ts
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/types/@data-ui/theme/index.d.ts
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/types/@data-ui/theme/index.d.ts
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/types/@data-ui/xy-chart/index.d.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/types/@data-ui/xy-chart/index.d.ts
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/types/@data-ui/xy-chart/index.d.ts
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/types/@data-ui/xy-chart/index.d.ts
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/types/external.d.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/types/external.d.ts
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-preset-chart-xy/types/external.d.ts
rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/types/external.d.ts
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/shared/components/createQueryStory.tsx b/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/shared/components/createQueryStory.tsx
deleted file mode 100644
index eb2bdccf84b2..000000000000
--- a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/shared/components/createQueryStory.tsx
+++ /dev/null
@@ -1,82 +0,0 @@
-import React from 'react';
-import { text, select } from '@storybook/addon-knobs';
-import { SuperChart, ChartDataProvider } from '@superset-ui/chart';
-import { SupersetClient } from '@superset-ui/connection';
-import Expandable from './Expandable';
-import VerifyCORS, { renderError } from './VerifyCORS';
-
-export default function createQueryStory({
-  choices,
-  storyName = 'Queries',
-  storyPath = '',
-}: {
-  choices: {
-    [key: string]: {
-      chartType: string;
-      formData: {
-        [key: string]: any;
-      };
-    };
-  };
-  storyName: string;
-  storyPath: string;
-}) {
-  const keys = Object.keys(choices);
-
-  return {
-    renderStory: () => {
-      const host = text('Set Superset App host for CORS request', 'localhost:8088');
-      const mode = select('Choose mode:', keys, keys[0]);
-      const { formData: presetFormData, chartType } = choices[mode];
-      const width = text('Vis width', '400');
-      const height = text('Vis height', '400');
-      const formData = text('Override formData', JSON.stringify(presetFormData, null, 2));
-
-      return (
-        <div style={{ margin: 16 }}>
-          <VerifyCORS host={host}>
-            {() => (
-              <ChartDataProvider
-                client={SupersetClient}
-                formData={JSON.parse(formData.replace(/&quot;/g, '"'))}
-              >
-                {({ loading, payload, error }) => {
-                  if (loading) return <div>Loading!</div>;
-
-                  if (error) return renderError(error);
-
-                  if (payload)
-                    return (
-                      <>
-                        <SuperChart
-                          chartType={chartType}
-                          width={width}
-                          height={height}
-                          formData={payload.formData}
-                          // @TODO fix typing
-                          // all vis's now expect objects but api/v1/ returns an array
-                          queryData={
-                            Array.isArray(payload.queryData)
-                              ? payload.queryData[0]
-                              : payload.queryData
-                          }
-                        />
-                        <br />
-                        <Expandable expandableWhat="payload">
-                          <pre style={{ fontSize: 11 }}>{JSON.stringify(payload, null, 2)}</pre>
-                        </Expandable>
-                      </>
-                    );
-
-                  return null;
-                }}
-              </ChartDataProvider>
-            )}
-          </VerifyCORS>
-        </div>
-      );
-    },
-    storyName,
-    storyPath,
-  };
-}
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/plugin-chart-word-cloud/Stories.tsx b/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/plugin-chart-word-cloud/Stories.tsx
deleted file mode 100644
index c0abd83cb43f..000000000000
--- a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/plugin-chart-word-cloud/Stories.tsx
+++ /dev/null
@@ -1,141 +0,0 @@
-/* eslint-disable no-magic-numbers */
-import React from 'react';
-import { SuperChart } from '@superset-ui/chart';
-import { select } from '@storybook/addon-knobs';
-import data from './data';
-
-export default [
-  {
-    renderStory: () => (
-      <SuperChart
-        chartType="word-cloud2"
-        width={400}
-        height={400}
-        queryData={{ data }}
-        formData={{
-          encoding: {
-            color: {
-              value: '#0097e6',
-            },
-            fontSize: {
-              field: 'sum__num',
-              scale: {
-                range: [0, 70],
-                zero: true,
-              },
-              type: 'quantitative',
-            },
-            text: {
-              field: 'name',
-            },
-          },
-          metric: 'sum__num',
-          rotation: select('Rotation', ['square', 'flat', 'random'], 'flat'),
-          series: 'name',
-        }}
-      />
-    ),
-    storyName: 'Basic',
-    storyPath: 'plugin-chart-word-cloud|WordCloudChartPlugin',
-  },
-  {
-    renderStory: () => (
-      <SuperChart
-        chartType="word-cloud2"
-        width={400}
-        height={400}
-        queryData={{ data }}
-        formData={{
-          encoding: {
-            color: {
-              field: 'name.length',
-              scale: {
-                range: ['#fbc531', '#c23616'],
-                type: 'linear',
-                zero: false,
-              },
-              type: 'quantitative',
-            },
-            fontSize: {
-              field: 'sum__num',
-              scale: {
-                range: [0, 70],
-                zero: true,
-              },
-              type: 'quantitative',
-            },
-            text: {
-              field: 'name',
-            },
-          },
-          metric: 'sum__num',
-          rotation: select('Rotation', ['square', 'flat', 'random'], 'flat'),
-          series: 'name',
-        }}
-      />
-    ),
-    storyName: 'encodes color by word length',
-    storyPath: 'plugin-chart-word-cloud|WordCloudChartPlugin',
-  },
-  {
-    renderStory: () => (
-      <SuperChart
-        chartType="word-cloud2"
-        width={400}
-        height={400}
-        queryData={{ data }}
-        formData={{
-          encoding: {
-            color: {
-              value: '#8c7ae6',
-            },
-            fontFamily: {
-              field: 'name[0]',
-              scale: {
-                range: ['Helvetica', 'Monaco'],
-                type: 'ordinal',
-              },
-              type: 'nominal',
-            },
-            fontSize: {
-              field: 'sum__num',
-              scale: {
-                range: [0, 70],
-                zero: true,
-              },
-              type: 'quantitative',
-            },
-            text: {
-              field: 'name',
-            },
-          },
-          metric: 'sum__num',
-          rotation: select('Rotation', ['square', 'flat', 'random'], 'flat'),
-          series: 'name',
-        }}
-      />
-    ),
-    storyName: 'encodes font family by first letter',
-    storyPath: 'plugin-chart-word-cloud|WordCloudChartPlugin',
-  },
-  {
-    renderStory: () => (
-      <SuperChart
-        chartType="legacy-word-cloud2"
-        width={400}
-        height={400}
-        queryData={{ data }}
-        formData={{
-          colorScheme: 'd3Category10',
-          metric: 'sum__num',
-          rotation: select('Rotation', ['square', 'flat', 'random'], 'flat'),
-          series: 'name',
-          sizeFrom: '10',
-          sizeTo: '70',
-        }}
-      />
-    ),
-    storyName: 'Legacy',
-    storyPath: 'plugin-chart-word-cloud|WordCloudChartPlugin',
-  },
-];
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/plugin-chart-word-cloud/index.js b/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/plugin-chart-word-cloud/index.js
deleted file mode 100644
index dd87ab281d9b..000000000000
--- a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/plugin-chart-word-cloud/index.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import WordCloudChartPlugin from '../../../../superset-ui-plugin-chart-word-cloud/src';
-import LegacyWordCloudChartPlugin from '../../../../superset-ui-plugin-chart-word-cloud/esm/legacy';
-import Stories from './Stories';
-
-new WordCloudChartPlugin().configure({ key: 'word-cloud2' }).register();
-new LegacyWordCloudChartPlugin().configure({ key: 'legacy-word-cloud2' }).register();
-
-export default {
-  examples: [...Stories],
-};
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/BoxPlot/stories/Basic.tsx b/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/BoxPlot/stories/Basic.tsx
deleted file mode 100644
index 27a18c8ec276..000000000000
--- a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/BoxPlot/stories/Basic.tsx
+++ /dev/null
@@ -1,99 +0,0 @@
-/* eslint-disable no-magic-numbers, sort-keys */
-import React from 'react';
-import { SuperChart } from '@superset-ui/chart';
-import data from '../data';
-
-export default [
-  {
-    renderStory: () => (
-      <SuperChart
-        chartType="v2-box-plot"
-        width={400}
-        height={400}
-        queryData={{ data }}
-        formData={{
-          encoding: {
-            x: {
-              type: 'nominal',
-              field: 'label',
-              scale: {
-                type: 'band',
-                paddingInner: 0.15,
-                paddingOuter: 0.3,
-              },
-              axis: {
-                label: 'Region',
-              },
-            },
-            y: {
-              field: 'value',
-              type: 'quantitative',
-              scale: {
-                type: 'linear',
-              },
-              axis: {
-                label: 'Population',
-                numTicks: 5,
-              },
-            },
-            color: {
-              type: 'nominal',
-              field: 'label',
-              scale: {
-                scheme: 'd3Category10',
-              },
-            },
-          },
-        }}
-      />
-    ),
-    storyName: 'Basic',
-    storyPath: 'preset-chart-xy|BoxPlotChartPlugin',
-  },
-  {
-    renderStory: () => (
-      <SuperChart
-        chartType="v2-box-plot"
-        width={400}
-        height={400}
-        queryData={{ data }}
-        formData={{
-          encoding: {
-            y: {
-              type: 'nominal',
-              field: 'label',
-              scale: {
-                type: 'band',
-                paddingInner: 0.15,
-                paddingOuter: 0.3,
-              },
-              axis: {
-                label: 'Region',
-              },
-            },
-            x: {
-              field: 'value',
-              type: 'quantitative',
-              scale: {
-                type: 'linear',
-              },
-              axis: {
-                label: 'Population',
-                numTicks: 5,
-              },
-            },
-            color: {
-              type: 'nominal',
-              field: 'label',
-              scale: {
-                scheme: 'd3Category10',
-              },
-            },
-          },
-        }}
-      />
-    ),
-    storyName: 'Horizontal',
-    storyPath: 'preset-chart-xy|BoxPlotChartPlugin',
-  },
-];
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/BoxPlot/stories/Legacy.tsx b/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/BoxPlot/stories/Legacy.tsx
deleted file mode 100644
index 32dde5415cd7..000000000000
--- a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/BoxPlot/stories/Legacy.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-/* eslint-disable no-magic-numbers, sort-keys */
-import React from 'react';
-import { SuperChart } from '@superset-ui/chart';
-import data from '../data';
-import dummyDatasource from '../../../../shared/dummyDatasource';
-
-export default [
-  {
-    renderStory: () => (
-      <SuperChart
-        chartType="v2-box-plot/legacy"
-        width={400}
-        height={400}
-        datasource={dummyDatasource}
-        queryData={{ data }}
-        formData={{
-          colorScheme: 'd3Category10',
-          groupby: ['region'],
-          metrics: ['sum__SP_POP_TOTL'],
-          vizType: 'box_plot',
-          whiskerOptions: 'Min/max (no outliers)',
-        }}
-      />
-    ),
-    storyName: 'Use Legacy API shim',
-    storyPath: 'preset-chart-xy|BoxPlotChartPlugin',
-  },
-];
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/index.ts b/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/index.ts
deleted file mode 100644
index b0990fb48f8e..000000000000
--- a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/index.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { LineChartPlugin, LegacyLineChartPlugin } from '../../../../../superset-ui-preset-chart-xy';
-import BasicStories from './stories/basic';
-import FlushStories from './stories/flush';
-import QueryStories from './stories/query';
-import LegacyStories from './stories/legacy';
-import MissingStories from './stories/missing';
-import TimeShiftStories from './stories/timeShift';
-import { LINE_PLUGIN_TYPE, LINE_PLUGIN_LEGACY_TYPE } from './constants';
-
-new LegacyLineChartPlugin().configure({ key: LINE_PLUGIN_LEGACY_TYPE }).register();
-new LineChartPlugin().configure({ key: LINE_PLUGIN_TYPE }).register();
-
-export default {
-  examples: [
-    ...BasicStories,
-    ...FlushStories,
-    ...MissingStories,
-    ...TimeShiftStories,
-    ...LegacyStories,
-    ...QueryStories,
-  ],
-};
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/basic.tsx b/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/basic.tsx
deleted file mode 100644
index fdc5f3003e24..000000000000
--- a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/basic.tsx
+++ /dev/null
@@ -1,68 +0,0 @@
-/* eslint-disable no-magic-numbers, sort-keys */
-import * as React from 'react';
-import { SuperChart } from '@superset-ui/chart';
-import { radios } from '@storybook/addon-knobs';
-import data from '../data/data';
-import { LINE_PLUGIN_TYPE } from '../constants';
-import dummyDatasource from '../../../../shared/dummyDatasource';
-
-export default [
-  {
-    renderStory: () => [
-      <SuperChart
-        key="line1"
-        chartType={LINE_PLUGIN_TYPE}
-        datasource={dummyDatasource}
-        formData={{
-          encoding: {
-            x: {
-              field: 'x',
-              type: 'temporal',
-              format: '%Y-%m',
-              scale: {
-                type: 'time',
-              },
-              axis: {
-                orient: radios('x.axis.orient', { top: 'top', bottom: 'bottom' }, 'bottom'),
-                title: radios(
-                  'x.axis.title',
-                  { enable: 'Time', disable: '', '': undefined },
-                  'Time',
-                ),
-              },
-            },
-            y: {
-              field: 'y',
-              type: 'quantitative',
-              scale: {
-                type: 'linear',
-              },
-              axis: {
-                orient: radios(
-                  'y.axis.orient',
-                  { left: 'left', right: 'right', '': undefined },
-                  'left',
-                ),
-                title: radios(
-                  'y.axis.title',
-                  { enable: 'Score', disable: '', '': undefined },
-                  'Score',
-                ),
-              },
-            },
-            stroke: {
-              field: 'name',
-              type: 'nominal',
-              legend: true,
-            },
-          },
-        }}
-        height={400}
-        queryData={{ data }}
-        width={400}
-      />,
-    ],
-    storyName: 'Basic',
-    storyPath: 'preset-chart-xy|LineChartPlugin',
-  },
-];
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/flush.tsx b/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/flush.tsx
deleted file mode 100644
index 8696d65815a9..000000000000
--- a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/flush.tsx
+++ /dev/null
@@ -1,129 +0,0 @@
-/* eslint-disable no-magic-numbers, sort-keys */
-import * as React from 'react';
-import { SuperChart } from '@superset-ui/chart';
-import { radios } from '@storybook/addon-knobs';
-import rawData from '../data/data';
-import { LINE_PLUGIN_TYPE } from '../constants';
-import dummyDatasource from '../../../../shared/dummyDatasource';
-
-const MIN_TIME = new Date(Date.UTC(1980, 0, 1)).getTime();
-const MAX_TIME = new Date(Date.UTC(2000, 1, 1)).getTime();
-const data = rawData.filter(({ x }) => x >= MIN_TIME && x <= MAX_TIME);
-
-export default [
-  {
-    renderStory: () => [
-      <SuperChart
-        key="line1"
-        chartType={LINE_PLUGIN_TYPE}
-        width={400}
-        height={200}
-        datasource={dummyDatasource}
-        queryData={{ data }}
-        formData={{
-          encoding: {
-            x: {
-              field: 'x',
-              type: 'temporal',
-              format: '%Y',
-              scale: {
-                type: 'utc',
-              },
-              axis: {
-                tickCount: 6,
-                orient: radios('x.axis.orient', { top: 'top', bottom: 'bottom' }, 'bottom'),
-                title: radios(
-                  'x.axis.title',
-                  { enable: 'Time', disable: '', '': undefined },
-                  'Time',
-                ),
-              },
-            },
-            y: {
-              field: 'y',
-              type: 'quantitative',
-              scale: {
-                type: 'linear',
-              },
-              axis: {
-                tickCount: 3,
-                orient: radios(
-                  'y.axis.orient',
-                  { left: 'left', right: 'right', '': undefined },
-                  'left',
-                ),
-                title: radios(
-                  'y.axis.title',
-                  { enable: 'Score', disable: '', '': undefined },
-                  'Score',
-                ),
-              },
-            },
-            stroke: {
-              field: 'name',
-              type: 'nominal',
-              legend: true,
-            },
-          },
-        }}
-      />,
-      <SuperChart
-        key="line2"
-        chartType={LINE_PLUGIN_TYPE}
-        width={400}
-        height={200}
-        datasource={dummyDatasource}
-        queryData={{ data }}
-        formData={{
-          encoding: {
-            x: {
-              field: 'x',
-              type: 'temporal',
-              format: '%Y',
-              scale: {
-                type: 'utc',
-              },
-              axis: {
-                labelFlush: 5,
-                tickCount: 6,
-                orient: radios('x.axis.orient', { top: 'top', bottom: 'bottom' }, 'bottom'),
-                title: radios(
-                  'x.axis.title',
-                  { enable: 'Time', disable: '', '': undefined },
-                  'Time',
-                ),
-              },
-            },
-            y: {
-              field: 'y',
-              type: 'quantitative',
-              scale: {
-                type: 'linear',
-              },
-              axis: {
-                tickCount: 3,
-                orient: radios(
-                  'y.axis.orient',
-                  { left: 'left', right: 'right', '': undefined },
-                  'left',
-                ),
-                title: radios(
-                  'y.axis.title',
-                  { enable: 'Score', disable: '', '': undefined },
-                  'Score',
-                ),
-              },
-            },
-            stroke: {
-              field: 'name',
-              type: 'nominal',
-              legend: true,
-            },
-          },
-        }}
-      />,
-    ],
-    storyName: 'with labelFlush',
-    storyPath: 'preset-chart-xy|LineChartPlugin',
-  },
-];
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/legacy.tsx b/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/legacy.tsx
deleted file mode 100644
index 48aedcfa8f78..000000000000
--- a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/legacy.tsx
+++ /dev/null
@@ -1,71 +0,0 @@
-/* eslint-disable no-magic-numbers */
-import * as React from 'react';
-import { SuperChart } from '@superset-ui/chart';
-import data from '../data/legacyData';
-import { LINE_PLUGIN_LEGACY_TYPE } from '../constants';
-import dummyDatasource from '../../../../shared/dummyDatasource';
-
-export default [
-  {
-    renderStory: () => [
-      <SuperChart
-        key="line1"
-        chartType={LINE_PLUGIN_LEGACY_TYPE}
-        width={400}
-        height={400}
-        datasource={dummyDatasource}
-        queryData={{ data }}
-        formData={{
-          bottomMargin: 'auto',
-          colorScheme: 'd3Category10',
-          leftMargin: 'auto',
-          lineInterpolation: 'linear',
-          richTooltip: true,
-          showBrush: 'auto',
-          showLegend: true,
-          showMarkers: false,
-          vizType: 'line',
-          xAxisFormat: '%Y',
-          xAxisLabel: '',
-          xAxisShowminmax: false,
-          xTicksLayout: 'auto',
-          yAxisBounds: [null, null],
-          yAxisFormat: '',
-          yAxisLabel: '',
-          yAxisShowminmax: false,
-          yLogScale: false,
-        }}
-      />,
-      <SuperChart
-        key="line2"
-        chartType={LINE_PLUGIN_LEGACY_TYPE}
-        width={400}
-        height={400}
-        datasource={dummyDatasource}
-        queryData={{ data }}
-        formData={{
-          bottomMargin: 'auto',
-          colorScheme: 'd3Category10',
-          leftMargin: 'auto',
-          lineInterpolation: 'linear',
-          richTooltip: true,
-          showBrush: 'auto',
-          showLegend: true,
-          showMarkers: false,
-          vizType: 'line',
-          xAxisFormat: '%Y-%m',
-          xAxisLabel: '',
-          xAxisShowminmax: false,
-          xTicksLayout: 'auto',
-          yAxisBounds: [null, null],
-          yAxisFormat: '',
-          yAxisLabel: '',
-          yAxisShowminmax: false,
-          yLogScale: false,
-        }}
-      />,
-    ],
-    storyName: 'Use Legacy API shim',
-    storyPath: 'preset-chart-xy|LineChartPlugin',
-  },
-];
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/missing.tsx b/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/missing.tsx
deleted file mode 100644
index 007b39f9de47..000000000000
--- a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/missing.tsx
+++ /dev/null
@@ -1,61 +0,0 @@
-/* eslint-disable no-magic-numbers, sort-keys */
-import * as React from 'react';
-import { SuperChart } from '@superset-ui/chart';
-import data from '../data/data';
-import { LINE_PLUGIN_TYPE } from '../constants';
-import dummyDatasource from '../../../../shared/dummyDatasource';
-
-const missingData = data.map(({ y, ...rest }) => ({
-  ...rest,
-  y: Math.random() < 0.25 ? null : y,
-}));
-
-export default [
-  {
-    renderStory: () => [
-      <SuperChart
-        key="line1"
-        chartType={LINE_PLUGIN_TYPE}
-        width={400}
-        height={400}
-        datasource={dummyDatasource}
-        queryData={{ data: missingData }}
-        formData={{
-          encoding: {
-            x: {
-              field: 'x',
-              type: 'temporal',
-              format: '%Y',
-              scale: {
-                type: 'time',
-              },
-              axis: {
-                orient: 'bottom',
-                title: 'Time',
-              },
-            },
-            y: {
-              field: 'y',
-              type: 'quantitative',
-              scale: {
-                type: 'linear',
-              },
-              axis: {
-                orient: 'left',
-                title: 'Score',
-              },
-            },
-            stroke: {
-              field: 'name',
-              type: 'nominal',
-              scale: {},
-              legend: true,
-            },
-          },
-        }}
-      />,
-    ],
-    storyName: 'with missing data',
-    storyPath: 'preset-chart-xy|LineChartPlugin',
-  },
-];
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/query.tsx b/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/query.tsx
deleted file mode 100644
index f073fce8b6db..000000000000
--- a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/query.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-/* eslint-disable sort-keys */
-import { LINE_PLUGIN_TYPE, LINE_PLUGIN_LEGACY_TYPE } from '../constants';
-import createQueryStory from '../../../../shared/components/createQueryStory';
-
-export default [
-  createQueryStory({
-    choices: {
-      'Line Chart - Legacy API': {
-        chartType: LINE_PLUGIN_LEGACY_TYPE,
-        formData: {
-          datasource: '3__table',
-          viz_type: 'line',
-          url_params: {},
-          granularity_sqla: 'ds',
-          time_grain_sqla: 'P1D',
-          time_range: '100 years ago : now',
-          metrics: ['sum__num'],
-          adhoc_filters: [],
-          groupby: [],
-          limit: 25,
-          row_limit: 50000,
-        },
-      },
-      'Line Chart - /api/v1/query': {
-        chartType: LINE_PLUGIN_TYPE,
-        formData: {
-          viz_type: LINE_PLUGIN_TYPE,
-          datasource: '3__table',
-          granularity_sqla: 'ds',
-          time_grain_sqla: 'P1D',
-          time_range: '100 years ago : now',
-          metrics: ['sum__num'],
-          limit: 25,
-          row_limit: 50000,
-          encoding: {
-            x: {
-              field: '__timestamp',
-              type: 'temporal',
-              format: '%Y',
-              scale: {
-                type: 'time',
-              },
-              axis: {
-                title: 'Time',
-              },
-            },
-            y: {
-              field: 'sum__num',
-              type: 'quantitative',
-              scale: {
-                type: 'linear',
-              },
-              axis: {
-                title: 'Number of Babies',
-              },
-            },
-            stroke: {
-              field: 'gender',
-              type: 'nominal',
-              legend: true,
-            },
-          },
-        },
-      },
-    },
-    storyName: 'Queries',
-    storyPath: 'preset-chart-xy|LineChartPlugin',
-  }),
-];
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/timeShift.tsx b/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/timeShift.tsx
deleted file mode 100644
index e39f5eea9fe8..000000000000
--- a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/stories/timeShift.tsx
+++ /dev/null
@@ -1,85 +0,0 @@
-/* eslint-disable no-magic-numbers, sort-keys */
-import * as React from 'react';
-import { SuperChart } from '@superset-ui/chart';
-import data from '../data/data2';
-import { LINE_PLUGIN_TYPE } from '../constants';
-import dummyDatasource from '../../../../shared/dummyDatasource';
-
-export default [
-  {
-    renderStory: () => [
-      <SuperChart
-        key="line1"
-        chartType={LINE_PLUGIN_TYPE}
-        width={400}
-        height={400}
-        datasource={dummyDatasource}
-        queryData={{ data }}
-        formData={{
-          encoding: {
-            x: {
-              field: 'x',
-              type: 'temporal',
-              format: '%Y',
-              scale: {
-                type: 'time',
-              },
-              axis: {
-                orient: 'bottom',
-                title: 'Time',
-              },
-            },
-            y: {
-              field: 'y',
-              type: 'quantitative',
-              scale: {
-                type: 'linear',
-              },
-              axis: {
-                orient: 'left',
-                title: 'Score',
-              },
-            },
-            stroke: {
-              value: '#1abc9c',
-              type: 'nominal',
-              scale: false,
-            },
-            fill: {
-              field: 'snapshot',
-              type: 'nominal',
-              scale: {
-                type: 'ordinal',
-                domain: ['Current', 'Last year'],
-                range: [true, false],
-              },
-              legend: false,
-            },
-            strokeDasharray: {
-              field: 'snapshot',
-              type: 'nominal',
-              scale: {
-                type: 'ordinal',
-                domain: ['Current', 'Last year'],
-                range: [null, '4 4'],
-              },
-              legend: false,
-            },
-            strokeWidth: {
-              field: 'snapshot',
-              type: 'nominal',
-              scale: {
-                type: 'ordinal',
-                domain: ['Current', 'Last year'],
-                range: [3, 1.5],
-              },
-              legend: false,
-            },
-          },
-        }}
-      />,
-    ],
-    storyName: 'with time shift',
-    storyPath: 'preset-chart-xy|LineChartPlugin',
-  },
-];
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/ScatterPlot/index.ts b/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/ScatterPlot/index.ts
deleted file mode 100644
index 75206dd3c824..000000000000
--- a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/ScatterPlot/index.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import {
-  ScatterPlotChartPlugin,
-  LegacyScatterPlotChartPlugin,
-} from '../../../../../superset-ui-preset-chart-xy';
-import BasicStories from './stories/basic';
-import BubbleStories from './stories/bubble';
-import LegacyStories from './stories/legacy';
-import { SCATTER_PLOT_PLUGIN_TYPE, SCATTER_PLOT_PLUGIN_LEGACY_TYPE } from './constants';
-
-new LegacyScatterPlotChartPlugin().configure({ key: SCATTER_PLOT_PLUGIN_LEGACY_TYPE }).register();
-new ScatterPlotChartPlugin().configure({ key: SCATTER_PLOT_PLUGIN_TYPE }).register();
-
-export default {
-  examples: [...BasicStories, ...BubbleStories, ...LegacyStories],
-};
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/ScatterPlot/stories/basic.jsx b/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/ScatterPlot/stories/basic.jsx
deleted file mode 100644
index 82cf0c69a62c..000000000000
--- a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/ScatterPlot/stories/basic.jsx
+++ /dev/null
@@ -1,54 +0,0 @@
-/* eslint-disable no-magic-numbers, sort-keys */
-import * as React from 'react';
-import { SuperChart } from '@superset-ui/chart';
-import { radios } from '@storybook/addon-knobs';
-import data from '../data/data';
-import { SCATTER_PLOT_PLUGIN_TYPE } from '../constants';
-import dummyDatasource from '../../../../shared/dummyDatasource';
-
-export default [
-  {
-    renderStory: () => [
-      <SuperChart
-        key="scatter-plot1"
-        chartType={SCATTER_PLOT_PLUGIN_TYPE}
-        width={400}
-        height={400}
-        datasource={dummyDatasource}
-        queryData={{ data }}
-        formData={{
-          encoding: {
-            x: {
-              field: 'sum__SP_RUR_TOTL_ZS',
-              type: 'quantitative',
-              scale: {
-                type: 'linear',
-              },
-              axis: {
-                orient: radios('x.axis.orient', ['top', 'bottom'], 'bottom'),
-              },
-            },
-            y: {
-              field: 'sum__SP_DYN_LE00_IN',
-              type: 'quantitative',
-              scale: {
-                type: 'linear',
-              },
-              axis: {
-                orient: radios('y.axis.orient', ['left', 'right'], 'left'),
-              },
-            },
-            fill: {
-              field: 'region',
-              type: 'nominal',
-              legend: true,
-            },
-            group: [{ field: 'country_name', title: 'Country' }],
-          },
-        }}
-      />,
-    ],
-    storyName: 'Basic',
-    storyPath: 'preset-chart-xy|ScatterPlotPlugin',
-  },
-];
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/ScatterPlot/stories/bubble.jsx b/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/ScatterPlot/stories/bubble.jsx
deleted file mode 100644
index 021af637e7cf..000000000000
--- a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/ScatterPlot/stories/bubble.jsx
+++ /dev/null
@@ -1,62 +0,0 @@
-/* eslint-disable no-magic-numbers, sort-keys */
-import * as React from 'react';
-import { SuperChart } from '@superset-ui/chart';
-import { radios } from '@storybook/addon-knobs';
-import dummyDatasource from '../../../../shared/dummyDatasource';
-import data from '../data/data';
-import { SCATTER_PLOT_PLUGIN_TYPE } from '../constants';
-
-export default [
-  {
-    renderStory: () => [
-      <SuperChart
-        key="scatter-plot1"
-        chartType={SCATTER_PLOT_PLUGIN_TYPE}
-        width={400}
-        height={400}
-        datasource={dummyDatasource}
-        queryData={{ data }}
-        formData={{
-          encoding: {
-            x: {
-              field: 'sum__SP_RUR_TOTL_ZS',
-              type: 'quantitative',
-              scale: {
-                type: 'linear',
-              },
-              axis: {
-                orient: radios('x.axis.orient', ['top', 'bottom'], 'bottom'),
-              },
-            },
-            y: {
-              field: 'sum__SP_DYN_LE00_IN',
-              type: 'quantitative',
-              scale: {
-                type: 'linear',
-              },
-              axis: {
-                orient: radios('y.axis.orient', ['left', 'right'], 'left'),
-              },
-            },
-            size: {
-              field: 'sum__SP_POP_TOTL',
-              type: 'quantitative',
-              scale: {
-                type: 'linear',
-                range: [0, 30],
-              },
-            },
-            fill: {
-              field: 'region',
-              type: 'nominal',
-              legend: true,
-            },
-            group: [{ field: 'country_name', title: 'Country' }],
-          },
-        }}
-      />,
-    ],
-    storyName: 'Bubble',
-    storyPath: 'preset-chart-xy|ScatterPlotPlugin',
-  },
-];
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/ScatterPlot/stories/legacy.tsx b/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/ScatterPlot/stories/legacy.tsx
deleted file mode 100644
index 7b90ed46e154..000000000000
--- a/superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/ScatterPlot/stories/legacy.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-/* eslint-disable no-magic-numbers */
-import * as React from 'react';
-import { SuperChart } from '@superset-ui/chart';
-import data from '../data/legacyData';
-import { SCATTER_PLOT_PLUGIN_LEGACY_TYPE } from '../constants';
-import dummyDatasource from '../../../../shared/dummyDatasource';
-
-export default [
-  {
-    renderStory: () => [
-      <SuperChart
-        key="scatter-plot1"
-        chartType={SCATTER_PLOT_PLUGIN_LEGACY_TYPE}
-        width={400}
-        height={400}
-        datasource={dummyDatasource}
-        queryData={{ data }}
-        formData={{
-          annotationData: {},
-          bottomMargin: 'auto',
-          colorScheme: 'd3Category10',
-          entity: 'country_name',
-          leftMargin: 'auto',
-          maxBubbleSize: '50',
-          series: 'region',
-          showLegend: true,
-          size: 'sum__SP_POP_TOTL',
-          vizType: 'bubble',
-          x: 'sum__SP_RUR_TOTL_ZS',
-          xAxisFormat: '.3s',
-          xAxisLabel: 'x-axis label test',
-          xAxisShowminmax: false,
-          xLogScale: false,
-          xTicksLayout: 'auto',
-          y: 'sum__SP_DYN_LE00_IN',
-          yAxisFormat: '.3s',
-          yAxisLabel: '',
-          yAxisShowminmax: false,
-          yLogScale: false,
-        }}
-      />,
-    ],
-    storyName: 'Use Legacy API shim',
-    storyPath: 'preset-chart-xy|ScatterPlotPlugin',
-  },
-];
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/yarn.lock b/superset-frontend/temporary_superset_ui/superset-ui/yarn.lock
index fee87fda46ce..ce9f407240c1 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/yarn.lock
+++ b/superset-frontend/temporary_superset_ui/superset-ui/yarn.lock
@@ -3238,18 +3238,6 @@
     d3-cloud "^1.2.1"
     prop-types "^15.6.2"
 
-"@superset-ui/plugin-chart-word-cloud@^0.11.15":
-  version "0.11.15"
-  resolved "https://registry.yarnpkg.com/@superset-ui/plugin-chart-word-cloud/-/plugin-chart-word-cloud-0.11.15.tgz#4863916a98b31e1953d08bcd4466e336af8aaca5"
-  integrity sha512-UteiSGbAWrAVCtxb/3hNZEuMuSXWvhfjk0AjDJi2HzlyxsJprh15CQqe3esIj/vFxcNIBtkgS8TjuKfn9vJztQ==
-  dependencies:
-    "@types/d3-cloud" "^1.2.1"
-    "@types/d3-scale" "^2.0.2"
-    "@types/react" "^16.3.0"
-    d3-cloud "^1.2.5"
-    d3-scale "^3.0.1"
-    encodable "^0.2.0"
-
 "@svgr/babel-plugin-add-jsx-attribute@^4.2.0":
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-4.2.0.tgz#dadcb6218503532d6884b210e7f3c502caaa44b1"
@@ -3447,6 +3435,11 @@
   dependencies:
     "@types/d3-color" "*"
 
+"@types/d3-path@*", "@types/d3-path@^1.0.8":
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/@types/d3-path/-/d3-path-1.0.8.tgz#48e6945a8ff43ee0a1ce85c8cfa2337de85c7c79"
+  integrity sha512-AZGHWslq/oApTAHu9+yH/Bnk63y9oFOMROtqPAtxl5uB6qm1x2lueWdVEjsjjV3Qc2+QfuzKIwIR5MvVBakfzA==
+
 "@types/d3-scale@^2.0.2", "@types/d3-scale@^2.1.1":
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/@types/d3-scale/-/d3-scale-2.2.0.tgz#e5987a2857365823eb26ed5eb21bc566c4dcf1c0"
@@ -3454,6 +3447,13 @@
   dependencies:
     "@types/d3-time" "*"
 
+"@types/d3-shape@^1.3.1":
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/@types/d3-shape/-/d3-shape-1.3.2.tgz#a41d9d6b10d02e221696b240caf0b5d0f5a588ec"
+  integrity sha512-LtD8EaNYCaBRzHzaAiIPrfcL3DdIysc81dkGlQvv7WQP3+YXV7b0JJTtR1U3bzeRieS603KF4wUo+ZkJVenh8w==
+  dependencies:
+    "@types/d3-path" "*"
+
 "@types/d3-time-format@^2.1.0":
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/@types/d3-time-format/-/d3-time-format-2.1.1.tgz#dd2c79ec4575f1355484ab6b10407824668eba42"
@@ -3587,14 +3587,7 @@
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.4.tgz#38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339"
   integrity sha512-8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA==
 
-"@types/lodash-es@^4.17.3":
-  version "4.17.3"
-  resolved "https://registry.yarnpkg.com/@types/lodash-es/-/lodash-es-4.17.3.tgz#87eb0b3673b076b8ee655f1890260a136af09a2d"
-  integrity sha512-iHI0i7ZAL1qepz1Y7f3EKg/zUMDwDfTzitx+AlHhJJvXwenP682ZyGbgPSc5Ej3eEAKVbNWKFuwOadCj5vBbYQ==
-  dependencies:
-    "@types/lodash" "*"
-
-"@types/lodash@*", "@types/lodash@^4.14.146", "@types/lodash@^4.14.149":
+"@types/lodash@^4.14.146", "@types/lodash@^4.14.149":
   version "4.14.149"
   resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.149.tgz#1342d63d948c6062838fbf961012f74d4e638440"
   integrity sha512-ijGqzZt/b7BfzcK9vTrS6MFljQRPn5BFWOx8oE0GYxribu6uV+aA9zZuXI1zc/etK9E8nrgdoF2+LgUw7+9tJQ==
@@ -3854,6 +3847,20 @@
     classnames "^2.2.5"
     prop-types "^15.6.0"
 
+"@vx/axis@^0.0.195":
+  version "0.0.195"
+  resolved "https://registry.yarnpkg.com/@vx/axis/-/axis-0.0.195.tgz#97178112a6284e8022f0effdd39da59ea5eb80a1"
+  integrity sha512-oGbZ83tOfefJRkxQW8WGMmvt48Y7O3VzrWPC0mG+2xcfGzg5m04H6w7GvcqfEkOtgvyAXEDhiKJ3i6hH6QixsA==
+  dependencies:
+    "@types/classnames" "^2.2.9"
+    "@types/react" "*"
+    "@vx/group" "0.0.195"
+    "@vx/point" "0.0.195"
+    "@vx/shape" "0.0.195"
+    "@vx/text" "0.0.195"
+    classnames "^2.2.5"
+    prop-types "^15.6.0"
+
 "@vx/bounds@0.0.165":
   version "0.0.165"
   resolved "https://registry.yarnpkg.com/@vx/bounds/-/bounds-0.0.165.tgz#75f107a6deb58223c6878db5053382eff3174567"
@@ -3873,6 +3880,14 @@
   dependencies:
     d3-shape "^1.0.6"
 
+"@vx/curve@0.0.195":
+  version "0.0.195"
+  resolved "https://registry.yarnpkg.com/@vx/curve/-/curve-0.0.195.tgz#86cf9ff09f7b22a9d22130f6a4ef9a4969417fec"
+  integrity sha512-fQXvd1530ou/K5v6fzH/RWy8HjXCKKScmtk9DfSdp/wkhm5u+1jkoe6r53PLAdJhUnMI6U8OsiVlaLF8nADuMw==
+  dependencies:
+    "@types/d3-shape" "^1.3.1"
+    d3-shape "^1.0.6"
+
 "@vx/event@^0.0.165":
   version "0.0.165"
   resolved "https://registry.yarnpkg.com/@vx/event/-/event-0.0.165.tgz#675d89fdfdc08d0c99c36ff1a381ea50fccfba2e"
@@ -3949,6 +3964,16 @@
     classnames "^2.2.5"
     prop-types "^15.6.2"
 
+"@vx/group@0.0.195":
+  version "0.0.195"
+  resolved "https://registry.yarnpkg.com/@vx/group/-/group-0.0.195.tgz#5236948af1d1fb83e02a63db5a7e82f4442f901e"
+  integrity sha512-XzbCIb2dVR3b51gbiG+gfc8J/H7IaepQ7mQEOKKXnb4gP66kYU/Rtr7WTZzLD3uwsBDXjJaa2y16arnMmhUlNQ==
+  dependencies:
+    "@types/classnames" "^2.2.9"
+    "@types/react" "*"
+    classnames "^2.2.5"
+    prop-types "^15.6.2"
+
 "@vx/legend@^0.0.194":
   version "0.0.194"
   resolved "https://registry.yarnpkg.com/@vx/legend/-/legend-0.0.194.tgz#4037296663a0fbaaaab0fce71ee79fd343e9a5ae"
@@ -3961,6 +3986,18 @@
     classnames "^2.2.5"
     prop-types "^15.5.10"
 
+"@vx/legend@^0.0.195":
+  version "0.0.195"
+  resolved "https://registry.yarnpkg.com/@vx/legend/-/legend-0.0.195.tgz#a34d8cf599e71156bebd3fc8b9a918ebe96f4055"
+  integrity sha512-EduXqrgU+JlJAQlA723nXsAvT81EAEscw3cl3/E4m4d8LCHnudLIX3AMG0AD9gxY/4pJclkYFU9MQP3TfoTVag==
+  dependencies:
+    "@types/classnames" "^2.2.9"
+    "@types/d3-scale" "^2.1.1"
+    "@types/react" "*"
+    "@vx/group" "0.0.195"
+    classnames "^2.2.5"
+    prop-types "^15.5.10"
+
 "@vx/pattern@^0.0.165":
   version "0.0.165"
   resolved "https://registry.yarnpkg.com/@vx/pattern/-/pattern-0.0.165.tgz#0d317cb9a13205e35691f702442739ff0256711d"
@@ -3982,6 +4019,11 @@
   resolved "https://registry.yarnpkg.com/@vx/point/-/point-0.0.165.tgz#7ebde5da3d86954fe31a56f923f31550f0b4b867"
   integrity sha512-spoHilhjcWNgccrSzBUPw+PXV81tYxeyEWBkgr35aGVU4m7YT86Ywvfemwp7AVVGPn+XJHrhB0ujAhDoyqFPoA==
 
+"@vx/point@0.0.195":
+  version "0.0.195"
+  resolved "https://registry.yarnpkg.com/@vx/point/-/point-0.0.195.tgz#03d272e6e2d640ee7ba7d7097a93f00a339163ea"
+  integrity sha512-2m16lfs4v8BwjWMhGNDC4lBBOwaimRL4BapFTS1UQWYSV12y0KlsJGD17fPdR6X9RzYWJTnOL/yaQuGCBa9AdQ==
+
 "@vx/responsive@^0.0.192":
   version "0.0.192"
   resolved "https://registry.yarnpkg.com/@vx/responsive/-/responsive-0.0.192.tgz#721d032bec38b9e3ff5fde2e4d5d8ee5a81cc517"
@@ -4063,6 +4105,22 @@
     d3-shape "^1.2.0"
     prop-types "^15.5.10"
 
+"@vx/shape@0.0.195":
+  version "0.0.195"
+  resolved "https://registry.yarnpkg.com/@vx/shape/-/shape-0.0.195.tgz#3557aefa6f6e3f5f9650983ac5af8d758deb2d30"
+  integrity sha512-14I1E0t25hWx4/NCVj6cggm7ewD5a5UDMndXmcpUkV/wx/4SYkXhQ7uDdbAuYNcb/dh0wsFh8vmqmMJxm7DA/w==
+  dependencies:
+    "@types/classnames" "^2.2.9"
+    "@types/d3-path" "^1.0.8"
+    "@types/d3-shape" "^1.3.1"
+    "@types/react" "*"
+    "@vx/curve" "0.0.195"
+    "@vx/group" "0.0.195"
+    classnames "^2.2.5"
+    d3-path "^1.0.5"
+    d3-shape "^1.2.0"
+    prop-types "^15.5.10"
+
 "@vx/shape@^0.0.165":
   version "0.0.165"
   resolved "https://registry.yarnpkg.com/@vx/shape/-/shape-0.0.165.tgz#3424121f45d83dd8e7ba62b6adf8b0aea2fb9cf8"
@@ -4120,6 +4178,19 @@
     prop-types "^15.6.2"
     reduce-css-calc "^1.3.0"
 
+"@vx/text@0.0.195":
+  version "0.0.195"
+  resolved "https://registry.yarnpkg.com/@vx/text/-/text-0.0.195.tgz#8c9851c79bad72532b115b08d4dcca3ab8a2fc6e"
+  integrity sha512-yp/d9r3JKMD3sz+f5n/RZfZRPre2wOdiz45JiDQNM3v/thnEjeRZzQ2vDi5j0h2H5/TjTCARj7iCD9ON6vJ49Q==
+  dependencies:
+    "@types/classnames" "^2.2.9"
+    "@types/lodash" "^4.14.146"
+    "@types/react" "*"
+    classnames "^2.2.5"
+    lodash "^4.17.15"
+    prop-types "^15.7.2"
+    reduce-css-calc "^1.3.0"
+
 "@vx/text@^0.0.192":
   version "0.0.192"
   resolved "https://registry.yarnpkg.com/@vx/text/-/text-0.0.192.tgz#cb71261e003c9d951d242ec43049cff2c4509302"
@@ -6856,7 +6927,7 @@ cssstyle@^2.0.0:
   dependencies:
     cssom "~0.3.6"
 
-csstype@^2.2.0, csstype@^2.5.7, csstype@^2.6.4, csstype@^2.6.7:
+csstype@^2.2.0, csstype@^2.5.7, csstype@^2.6.3, csstype@^2.6.4, csstype@^2.6.7:
   version "2.6.10"
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.10.tgz#e63af50e66d7c266edb6b32909cfd0aabe03928b"
   integrity sha512-D34BqZU4cIlMCY93rZHbrq9pjTAQJ3U8S8rfBqjwHxkGPThWFjzZDQpgMJY0QViLxth6ZKYiwFBo14RdN44U/w==
@@ -7768,21 +7839,21 @@ emotion-theming@^10.0.19:
     "@emotion/weak-memoize" "0.2.5"
     hoist-non-react-statics "^3.3.0"
 
-encodable@^0.2.0:
-  version "0.2.6"
-  resolved "https://registry.yarnpkg.com/encodable/-/encodable-0.2.6.tgz#5ecb7097764fc88fb6640fa284b73a5f141b2f5b"
-  integrity sha512-HQEaLGm6e/Z+u5zOh9/7DfDpn8FeMbmSVsgA6lbBuIE+SKd7og5Z6aELvK3HCkL/G8V6XBKwawqNG+qsB7GAew==
+encodable@^0.3.3, encodable@^0.3.4:
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/encodable/-/encodable-0.3.4.tgz#9fd441a725719d9fa6cda6e53fbbcb0dc2d5d411"
+  integrity sha512-X+luRWWaosvOwNqYkTvLNexrie0CzEM0bnZydmL74T47B/uU6/F+GZuAMwumg2HrXQ8Uc3D0AKiDatFO/33Q8A==
   dependencies:
     "@types/d3-array" "^2.0.0"
     "@types/d3-interpolate" "^1.3.1"
     "@types/d3-scale" "^2.1.1"
     "@types/d3-time" "^1.0.10"
-    "@types/lodash-es" "^4.17.3"
+    "@types/lodash" "^4.14.149"
     d3-array "^2.3.1"
     d3-interpolate "^1.3.2"
     d3-scale "^3.0.1"
     d3-time "^1.0.11"
-    lodash-es "^4.17.15"
+    lodash "^4.17.15"
     reselect "^4.0.0"
     vega "^5.9.1"
     vega-lite "~4.1.0"
@@ -11608,11 +11679,6 @@ locate-path@^5.0.0:
   dependencies:
     p-locate "^4.1.0"
 
-lodash-es@^4.17.15:
-  version "4.17.15"
-  resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.15.tgz#21bd96839354412f23d7a10340e5eac6ee455d78"
-  integrity sha512-rlrc3yU3+JNOpZ9zj5pQtxnx2THmvRykwL4Xlxoa8I9lHBlVbbyPhgyPMioxVZ4NqyxaVVtaJnzsyOidQIhyyQ==
-
 lodash._reinterpolate@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"