refactor: move superset-ui/style to core

README.md

@@ -23,12 +23,8 @@ Current master: https://superset-ui.now.sh/
 | [@superset-ui/superset-ui](https://github.com/apache-superset/superset-ui/tree/master/packages/superset-ui-superset-ui)               | [![Version](https://img.shields.io/npm/v/@superset-ui/superset-ui.svg?style=flat-square)](https://img.shields.io/npm/v/@superset-ui/superset-ui.svg?style=flat-square)               |
 | [@superset-ui/chart](https://github.com/apache-superset/superset-ui/tree/master/packages/superset-ui-chart)                           | [![Version](https://img.shields.io/npm/v/@superset-ui/chart.svg?style=flat-square)](https://img.shields.io/npm/v/@superset-ui/chart.svg?style=flat-square)                           |
 | [@superset-ui/chart-composition](https://github.com/apache-superset/superset-ui/tree/master/packages/superset-ui-chart-composition)   | [![Version](https://img.shields.io/npm/v/@superset-ui/chart-composition.svg?style=flat-square)](https://img.shields.io/npm/v/@superset-ui/chart-composition.svg?style=flat-square)   |
-| [@superset-ui/color](https://github.com/apache-superset/superset-ui/tree/master/packages/superset-ui-color)                           | [![Version](https://img.shields.io/npm/v/@superset-ui/color.svg?style=flat-square)](https://img.shields.io/npm/v/@superset-ui/color.svg?style=flat-square)                           |
 | [@superset-ui/core](https://github.com/apache-superset/superset-ui/tree/master/packages/superset-ui-core)                             | [![Version](https://img.shields.io/npm/v/@superset-ui/core.svg?style=flat-square)](https://img.shields.io/npm/v/@superset-ui/core.svg?style=flat-square)                             |
 | [@superset-ui/generator-superset](https://github.com/apache-superset/superset-ui/tree/master/packages/superset-ui-generator-superset) | [![Version](https://img.shields.io/npm/v/@superset-ui/generator-superset.svg?style=flat-square)](https://img.shields.io/npm/v/@superset-ui/generator-superset.svg?style=flat-square) |
-| [@superset-ui/number-format](https://github.com/apache-superset/superset-ui/tree/master/packages/superset-ui-number-format)           | [![Version](https://img.shields.io/npm/v/@superset-ui/number-format.svg?style=flat-square)](https://img.shields.io/npm/v/@superset-ui/number-format.svg?style=flat-square)           |
-| [@superset-ui/style](https://github.com/apache-superset/superset-ui/tree/master/packages/superset-ui-style)                           | [![Version](https://img.shields.io/npm/v/@superset-ui/style.svg?style=flat-square)](https://img.shields.io/npm/v/@superset-ui/style.svg?style=flat-square)                           |
-| [@superset-ui/time-format](https://github.com/apache-superset/superset-ui/tree/master/packages/superset-ui-time-format)               | [![Version](https://img.shields.io/npm/v/@superset-ui/time-format.svg?style=flat-square)](https://img.shields.io/npm/v/@superset-ui/time-format.svg?style=flat-square)               |
 
 ### Chart plugin packages
 

packages/generator-superset/generators/plugin-chart/templates/package.erb

@@ -29,8 +29,7 @@
     "@superset-ui/chart": "^0.14.1",
     "@superset-ui/core": "^0.15.0",
     "@superset-ui/chart-controls": "^0.14.0",
-    "@superset-ui/validator": "^0.14.1",
-    "@superset-ui/style": "^0.14.0",
+    "@superset-ui/validator": "^0.14.1"
   },
   "peerDependencies": {
     "react": "^16.13.1"

packages/generator-superset/generators/plugin-chart/templates/src/MyChart.erb

@@ -17,7 +17,7 @@
  * under the License.
  */
 import React, { <%if (componentType == 'class') { %>PureComponent<% } %><%if (componentType == 'function') { %>useEffect<% } %>, createRef } from 'react';
-import styled, { supersetTheme } from '@superset-ui/style';
+import { styled, supersetTheme } from '@superset-ui/core';
 
 interface <%= packageLabel %>StylesProps {
   height: number;
@@ -41,8 +41,8 @@ export type <%= packageLabel %>Props = {
 // For docs, visit https://emotion.sh/docs/styled
 
 // Theming variables are provided for your use via a ThemeProvider
-// imported from @superset-ui/style. For variables available, please visit
-// https://github.com/apache-superset/superset-ui/blob/master/packages/superset-ui-style/src/index.ts
+// imported from @superset-ui/core. For variables available, please visit
+// https://github.com/apache-superset/superset-ui/blob/master/packages/superset-ui-core/src/style/index.ts
 
 const Styles = styled.div<<%= packageLabel %>StylesProps>`
   background-color: ${({ theme }) => theme.colors.secondary.light2};

packages/superset-ui-chart-controls/package.json

@@ -34,7 +34,6 @@
   "dependencies": {
     "@types/react-bootstrap": "0.32.21",
     "@superset-ui/core": "^0.15.0",
-    "@superset-ui/style": "^0.14.0",
     "@superset-ui/validator": "^0.14.0",
     "lodash": "^4.17.15",
     "prop-types": "^15.7.2",

packages/superset-ui-chart-controls/src/components/CertifiedIconWithTooltip.tsx

@@ -17,8 +17,7 @@
  * under the License.
  */
 import React from 'react';
-import { t } from '@superset-ui/core';
-import { supersetTheme } from '@superset-ui/style';
+import { t, supersetTheme } from '@superset-ui/core';
 import { Tooltip, OverlayTrigger } from 'react-bootstrap';
 import { kebabCase } from 'lodash';
 

packages/superset-ui-chart-controls/src/components/MetricOption.tsx

@@ -16,9 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/* eslint-disable camelcase */
 import React from 'react';
-import styled from '@superset-ui/style';
+import { styled } from '@superset-ui/core';
 import InfoTooltipWithTrigger from './InfoTooltipWithTrigger';
 import { ColumnTypeLabel } from './ColumnTypeLabel';
 import CertifiedIconWithTooltip from './CertifiedIconWithTooltip';

packages/superset-ui-chart-controls/src/components/RadioButtonControl.tsx

@@ -17,7 +17,7 @@
  * under the License.
  */
 import React, { ReactText, ReactNode, MouseEvent, useCallback } from 'react';
-import styled from '@superset-ui/style';
+import { styled } from '@superset-ui/core';
 import { InfoTooltipWithTrigger } from './InfoTooltipWithTrigger';
 
 export interface RadioButtonOption {

packages/superset-ui-chart-controls/tsconfig.json

@@ -18,9 +18,6 @@
     {
       "path": "../superset-ui-core"
     },
-    {
-      "path": "../superset-ui-style"
-    },
     {
       "path": "../superset-ui-validator"
     }

packages/superset-ui-core/package.json

@@ -32,6 +32,8 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.1.2",
+    "@emotion/core": "^10.0.28",
+    "@emotion/styled": "^10.0.27",
     "@types/d3-format": "^1.3.0",
     "@types/lodash": "^4.14.149",
     "@types/d3-time": "^1.0.9",
@@ -43,6 +45,7 @@
     "d3-format": "^1.3.2",
     "d3-time": "^1.0.10",
     "d3-time-format": "^2.2.0",
+    "emotion-theming": "^10.0.27",
     "jed": "^1.1.1",
     "lodash": "^4.17.11",
     "fetch-retry": "^4.0.1",

packages/superset-ui-core/src/index.ts

@@ -26,3 +26,4 @@ export * from './number-format';
 export * from './time-format';
 export * from './dimension';
 export * from './color';
+export * from './style';

packages/superset-ui-style/test/index.test.ts → packages/superset-ui-core/test/style/index.test.ts

@@ -1,4 +1,4 @@
-import styled, { supersetTheme, SupersetThemeProps } from '../src';
+import { styled, supersetTheme, SupersetThemeProps } from '@superset-ui/core/src/style';
 
 describe('@superset-ui/style package', () => {
   it('exports a theme', () => {

packages/superset-ui-demo/.storybook/themeDecorator.js

@@ -1,6 +1,6 @@
 // themeDecorator.js
 import React from "react"
-import { supersetTheme, ThemeProvider } from '@superset-ui/style';
+import { supersetTheme, ThemeProvider } from '@superset-ui/core';
 
 const ThemeDecorator = storyFn => (
   <ThemeProvider theme={supersetTheme}>{storyFn()}</ThemeProvider>

packages/superset-ui-demo/storybook/shared/components/ResizableChartDemo.tsx

@@ -1,5 +1,5 @@
-import styled from '@superset-ui/style';
 import React, { useState, ReactNode } from 'react';
+import { styled } from '@superset-ui/core';
 import { DecoratorFunction } from '@storybook/addons';
 import ResizablePanel, { Size } from './ResizablePanel';
 

packages/superset-ui-demo/storybook/stories/superset-ui-style/ThemeStories.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { supersetTheme } from '@superset-ui/style/src/';
+import { supersetTheme } from '@superset-ui/core';
 
 export default {
   title: 'Core Packages|@superset-ui/style',

plugins/legacy-plugin-chart-calendar/package.json

@@ -37,7 +37,6 @@
     "@superset-ui/chart": "^0.14.0",
     "@superset-ui/chart-controls": "^0.14.0",
     "@superset-ui/core": "^0.15.0",
-    "@superset-ui/style": "^0.14.0",
     "@superset-ui/validator": "^0.14.0",
     "react": "^16.13.1"
   }

plugins/legacy-plugin-chart-calendar/src/ReactCalendar.jsx

@@ -19,7 +19,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { reactify } from '@superset-ui/chart';
-import styled from '@superset-ui/style';
+import { styled } from '@superset-ui/core';
 import Component from './Calendar';
 
 const ReactComponent = reactify(Component);

plugins/legacy-plugin-chart-calendar/tsconfig.json

@@ -24,9 +24,6 @@
     {
       "path": "../../packages/superset-ui-core"
     },
-    {
-      "path": "../../packages/superset-ui-style"
-    },
     {
       "path": "../../packages/superset-ui-validator"
     }

plugins/legacy-plugin-chart-chord/package.json

@@ -28,7 +28,6 @@
     "access": "public"
   },
   "dependencies": {
-    "@superset-ui/style": "0.14.20",
     "@superset-ui/core": "^0.15.0",
     "@superset-ui/chart": "^0.14.0",
     "@superset-ui/validator": "^0.14.0",

plugins/legacy-plugin-chart-chord/src/ReactChord.jsx

@@ -18,7 +18,7 @@
  */
 import React from 'react';
 import { reactify } from '@superset-ui/chart';
-import styled from '@superset-ui/style';
+import { styled } from '@superset-ui/core';
 import PropTypes from 'prop-types';
 import Component from './Chord';
 

plugins/legacy-plugin-chart-chord/tsconfig.json

@@ -15,9 +15,6 @@
     "../../types/**/*"
   ],
   "references": [
-    {
-      "path": "../../packages/superset-ui-style"
-    },
     {
       "path": "../../packages/superset-ui-core"
     },

plugins/legacy-plugin-chart-force-directed/package.json

@@ -31,7 +31,6 @@
     "@superset-ui/chart": "^0.14.0",
     "@superset-ui/chart-controls": "^0.14.0",
     "@superset-ui/core": "^0.15.0",
-    "@superset-ui/style": "^0.14.3",
     "d3": "^3.5.17",
     "prop-types": "^15.7.2"
   },

plugins/legacy-plugin-chart-force-directed/src/ReactForceDirected.jsx

@@ -18,7 +18,7 @@
  */
 import React from 'react';
 import { reactify } from '@superset-ui/chart';
-import styled from '@superset-ui/style';
+import { styled } from '@superset-ui/core';
 import PropTypes from 'prop-types';
 import Component from './ForceDirected';
 

plugins/legacy-plugin-chart-force-directed/tsconfig.json

@@ -23,9 +23,6 @@
     },
     {
       "path": "../../packages/superset-ui-core"
-    },
-    {
-      "path": "../../packages/superset-ui-style"
     }
   ]
 }

plugins/legacy-plugin-chart-histogram/package.json

@@ -33,7 +33,6 @@
     "@superset-ui/chart": "^0.14.0",
     "@superset-ui/chart-controls": "^0.14.0",
     "@superset-ui/core": "^0.15.0",
-    "@superset-ui/style": "^0.14.0",
     "@superset-ui/validator": "^0.14.0",
     "@vx/legend": "^0.0.198",
     "@vx/responsive": "^0.0.197",

plugins/legacy-plugin-chart-histogram/src/Histogram.jsx

@@ -23,8 +23,7 @@ import { Histogram, BarSeries, XAxis, YAxis } from '@data-ui/histogram';
 import { chartTheme } from '@data-ui/theme';
 import { LegendOrdinal } from '@vx/legend';
 import { scaleOrdinal } from '@vx/scale';
-import styled from '@superset-ui/style';
-import { CategoricalColorNamespace } from '@superset-ui/core';
+import { CategoricalColorNamespace, styled } from '@superset-ui/core';
 import WithLegend from './WithLegend';
 
 const propTypes = {

plugins/legacy-plugin-chart-histogram/tsconfig.json

@@ -24,9 +24,6 @@
     {
       "path": "../../packages/superset-ui-core"
     },
-    {
-      "path": "../../packages/superset-ui-style"
-    },
     {
       "path": "../../packages/superset-ui-validator"
     }

plugins/legacy-plugin-chart-parallel-coordinates/package.json

@@ -30,7 +30,6 @@
   "dependencies": {
     "@superset-ui/chart": "^0.14.0",
     "@superset-ui/core": "^0.15.0",
-    "@superset-ui/style": "^0.14.3",
     "d3": "^3.5.17",
     "prop-types": "^15.7.2"
   },

plugins/legacy-plugin-chart-parallel-coordinates/src/ReactParallelCoordinates.jsx

@@ -17,7 +17,7 @@
  * under the License.
  */
 import React from 'react';
-import styled from '@superset-ui/style';
+import { styled } from '@superset-ui/core';
 import { reactify } from '@superset-ui/chart';
 import PropTypes from 'prop-types';
 import Component from './ParallelCoordinates';

plugins/legacy-plugin-chart-parallel-coordinates/tsconfig.json

@@ -20,9 +20,6 @@
     },
     {
       "path": "../../packages/superset-ui-core"
-    },
-    {
-      "path": "../../packages/superset-ui-style"
     }
   ]
 }

plugins/legacy-plugin-chart-sankey/package.json

@@ -30,7 +30,6 @@
   "dependencies": {
     "@superset-ui/chart": "^0.14.0",
     "@superset-ui/core": "^0.15.0",
-    "@superset-ui/style": "^0.14.3",
     "prop-types": "^15.6.2",
     "d3": "^3.5.17",
     "d3-sankey": "^0.4.2"