You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by ru...@apache.org on 2021/04/28 06:19:42 UTC
[superset] branch emotion-from-superset-ui-core created (now
f7e99e6)
This is an automated email from the ASF dual-hosted git repository.
rusackas pushed a change to branch emotion-from-superset-ui-core
in repository https://gitbox.apache.org/repos/asf/superset.git.
at f7e99e6 chore: puling createCache from superset-ui/core
This branch includes the following new commits:
new f566a8d chore: bumping superset-ui/core package
new 6d2cfca chore: restricting use of @emotion/core imports
new d0e9b84 chore: switching @emotion/core imports to @superset-ui/core
new 5f6faca chore: nixing emotion packages from superset direct use
new f7e99e6 chore: puling createCache from superset-ui/core
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[superset] 02/05: chore: restricting use of @emotion/core imports
Posted by ru...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rusackas pushed a commit to branch emotion-from-superset-ui-core
in repository https://gitbox.apache.org/repos/asf/superset.git
commit 6d2cfca10cdd4f77bef5e50a30f27507d0503d43
Author: Evan Rusackas <ev...@preset.io>
AuthorDate: Tue Apr 27 23:02:04 2021 -0700
chore: restricting use of @emotion/core imports
---
superset-frontend/.eslintrc.js | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/superset-frontend/.eslintrc.js b/superset-frontend/.eslintrc.js
index 5b79778..ccdb723 100644
--- a/superset-frontend/.eslintrc.js
+++ b/superset-frontend/.eslintrc.js
@@ -116,6 +116,11 @@ module.exports = {
message:
'Please import Ant components from the index of common/components',
},
+ {
+ name: '@emotion/core',
+ message:
+ 'Please import Emotion components from @superset-ui/core',
+ },
],
},
],
[superset] 04/05: chore: nixing emotion packages from superset
direct use
Posted by ru...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rusackas pushed a commit to branch emotion-from-superset-ui-core
in repository https://gitbox.apache.org/repos/asf/superset.git
commit 5f6facad5191686f4ff87b3bf41e5562298ba575
Author: Evan Rusackas <ev...@preset.io>
AuthorDate: Tue Apr 27 23:17:33 2021 -0700
chore: nixing emotion packages from superset direct use
---
superset-frontend/package-lock.json | 2 --
superset-frontend/package.json | 2 --
2 files changed, 4 deletions(-)
diff --git a/superset-frontend/package-lock.json b/superset-frontend/package-lock.json
index 67478e0..037ae01 100644
--- a/superset-frontend/package-lock.json
+++ b/superset-frontend/package-lock.json
@@ -12,8 +12,6 @@
"@ant-design/icons": "^4.2.2",
"@babel/runtime-corejs3": "^7.12.5",
"@data-ui/sparkline": "^0.0.84",
- "@emotion/cache": "^11.1.3",
- "@emotion/core": "^10.0.39",
"@superset-ui/chart-controls": "^0.17.36",
"@superset-ui/core": "^0.17.32",
"@superset-ui/legacy-plugin-chart-calendar": "^0.17.36",
diff --git a/superset-frontend/package.json b/superset-frontend/package.json
index 6ea4967..086dd91 100644
--- a/superset-frontend/package.json
+++ b/superset-frontend/package.json
@@ -64,8 +64,6 @@
"@ant-design/icons": "^4.2.2",
"@babel/runtime-corejs3": "^7.12.5",
"@data-ui/sparkline": "^0.0.84",
- "@emotion/cache": "^11.1.3",
- "@emotion/core": "^10.0.39",
"@superset-ui/chart-controls": "^0.17.36",
"@superset-ui/core": "^0.17.32",
"@superset-ui/legacy-plugin-chart-calendar": "^0.17.36",
[superset] 05/05: chore: puling createCache from superset-ui/core
Posted by ru...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rusackas pushed a commit to branch emotion-from-superset-ui-core
in repository https://gitbox.apache.org/repos/asf/superset.git
commit f7e99e6315446ab7c48cc0c59d4f8f6cff40f4a4
Author: Evan Rusackas <ev...@preset.io>
AuthorDate: Tue Apr 27 23:17:48 2021 -0700
chore: puling createCache from superset-ui/core
---
superset-frontend/src/views/menu.tsx | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/superset-frontend/src/views/menu.tsx b/superset-frontend/src/views/menu.tsx
index f58574c..9f1ed55 100644
--- a/superset-frontend/src/views/menu.tsx
+++ b/superset-frontend/src/views/menu.tsx
@@ -21,8 +21,7 @@
// eg, backend rendered views
import React from 'react';
import ReactDOM from 'react-dom';
-import createCache from '@emotion/cache';
-import { ThemeProvider, CacheProvider } from '@superset-ui/core';
+import { ThemeProvider, CacheProvider, createCache } from '@superset-ui/core';
import Menu from 'src/components/Menu/Menu';
import { theme } from 'src/preamble';
[superset] 01/05: chore: bumping superset-ui/core package
Posted by ru...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rusackas pushed a commit to branch emotion-from-superset-ui-core
in repository https://gitbox.apache.org/repos/asf/superset.git
commit f566a8d6d6b31dfb81737fada9a205fa6a4131c3
Author: Evan Rusackas <ev...@preset.io>
AuthorDate: Tue Apr 27 23:01:41 2021 -0700
chore: bumping superset-ui/core package
---
superset-frontend/package-lock.json | 2 +-
superset-frontend/package.json | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/superset-frontend/package-lock.json b/superset-frontend/package-lock.json
index 5270aa8..67478e0 100644
--- a/superset-frontend/package-lock.json
+++ b/superset-frontend/package-lock.json
@@ -13,7 +13,7 @@
"@babel/runtime-corejs3": "^7.12.5",
"@data-ui/sparkline": "^0.0.84",
"@emotion/cache": "^11.1.3",
- "@emotion/core": "^10.0.35",
+ "@emotion/core": "^10.0.39",
"@superset-ui/chart-controls": "^0.17.36",
"@superset-ui/core": "^0.17.32",
"@superset-ui/legacy-plugin-chart-calendar": "^0.17.36",
diff --git a/superset-frontend/package.json b/superset-frontend/package.json
index f551bde..6ea4967 100644
--- a/superset-frontend/package.json
+++ b/superset-frontend/package.json
@@ -65,7 +65,7 @@
"@babel/runtime-corejs3": "^7.12.5",
"@data-ui/sparkline": "^0.0.84",
"@emotion/cache": "^11.1.3",
- "@emotion/core": "^10.0.35",
+ "@emotion/core": "^10.0.39",
"@superset-ui/chart-controls": "^0.17.36",
"@superset-ui/core": "^0.17.32",
"@superset-ui/legacy-plugin-chart-calendar": "^0.17.36",
[superset] 03/05: chore: switching @emotion/core imports to
@superset-ui/core
Posted by ru...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rusackas pushed a commit to branch emotion-from-superset-ui-core
in repository https://gitbox.apache.org/repos/asf/superset.git
commit d0e9b844ee91a5fb8d0c0546ce8fbdfd98559bbe
Author: Evan Rusackas <ev...@preset.io>
AuthorDate: Tue Apr 27 23:02:47 2021 -0700
chore: switching @emotion/core imports to @superset-ui/core
---
superset-frontend/src/SqlLab/components/ColumnElement.tsx | 3 +--
superset-frontend/src/components/Modal/Modal.tsx | 3 +--
superset-frontend/src/components/Select/styles.tsx | 8 ++++++--
.../src/dashboard/components/FiltersBadge/DetailsPanel/index.tsx | 3 +--
superset-frontend/src/explore/components/ExploreViewContainer.jsx | 3 +--
.../controls/DateFilterControl/components/DateFunctionTooltip.tsx | 3 +--
.../explore/components/controls/FixedOrMetricControl/index.jsx | 3 +--
superset-frontend/src/views/menu.tsx | 3 +--
8 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/superset-frontend/src/SqlLab/components/ColumnElement.tsx b/superset-frontend/src/SqlLab/components/ColumnElement.tsx
index 85c2af0..ae479de 100644
--- a/superset-frontend/src/SqlLab/components/ColumnElement.tsx
+++ b/superset-frontend/src/SqlLab/components/ColumnElement.tsx
@@ -18,8 +18,7 @@
*/
import React from 'react';
import PropTypes from 'prop-types';
-import { ClassNames } from '@emotion/core';
-import { styled, useTheme } from '@superset-ui/core';
+import { styled, useTheme, ClassNames } from '@superset-ui/core';
import { Tooltip } from 'src/components/Tooltip';
diff --git a/superset-frontend/src/components/Modal/Modal.tsx b/superset-frontend/src/components/Modal/Modal.tsx
index 3ab5a93..e99838a 100644
--- a/superset-frontend/src/components/Modal/Modal.tsx
+++ b/superset-frontend/src/components/Modal/Modal.tsx
@@ -18,10 +18,9 @@
*/
import React from 'react';
import { isNil } from 'lodash';
-import { styled, SupersetThemeProps, t } from '@superset-ui/core';
+import { styled, SupersetThemeProps, t, css } from '@superset-ui/core';
import { Modal as BaseModal } from 'src/common/components';
import Button from 'src/components/Button';
-import { css } from '@emotion/core';
interface ModalProps {
className?: string;
diff --git a/superset-frontend/src/components/Select/styles.tsx b/superset-frontend/src/components/Select/styles.tsx
index b0f22b9..7920391 100644
--- a/superset-frontend/src/components/Select/styles.tsx
+++ b/superset-frontend/src/components/Select/styles.tsx
@@ -17,8 +17,12 @@
* under the License.
*/
import React, { CSSProperties, ComponentType, ReactNode } from 'react';
-import { css, SerializedStyles, ClassNames } from '@emotion/core';
-import { SupersetTheme } from '@superset-ui/core';
+import {
+ SupersetTheme,
+ css,
+ SerializedStyles,
+ ClassNames,
+} from '@superset-ui/core';
import {
Styles,
Theme,
diff --git a/superset-frontend/src/dashboard/components/FiltersBadge/DetailsPanel/index.tsx b/superset-frontend/src/dashboard/components/FiltersBadge/DetailsPanel/index.tsx
index 10d5071..6a74741 100644
--- a/superset-frontend/src/dashboard/components/FiltersBadge/DetailsPanel/index.tsx
+++ b/superset-frontend/src/dashboard/components/FiltersBadge/DetailsPanel/index.tsx
@@ -17,7 +17,7 @@
* under the License.
*/
import React, { useState } from 'react';
-import { t, useTheme, css } from '@superset-ui/core';
+import { t, useTheme, css, Global } from '@superset-ui/core';
import {
MinusCircleFilled,
CheckCircleFilled,
@@ -25,7 +25,6 @@ import {
} from '@ant-design/icons';
import Popover from 'src/components/Popover';
import Collapse from 'src/components/Collapse';
-import { Global } from '@emotion/core';
import Icon from 'src/components/Icon';
import {
Indent,
diff --git a/superset-frontend/src/explore/components/ExploreViewContainer.jsx b/superset-frontend/src/explore/components/ExploreViewContainer.jsx
index 195f227..0115200 100644
--- a/superset-frontend/src/explore/components/ExploreViewContainer.jsx
+++ b/superset-frontend/src/explore/components/ExploreViewContainer.jsx
@@ -21,12 +21,11 @@ import React, { useEffect, useMemo, useState } from 'react';
import PropTypes from 'prop-types';
import { bindActionCreators } from 'redux';
import { connect } from 'react-redux';
-import { styled, t, supersetTheme, css } from '@superset-ui/core';
+import { styled, t, supersetTheme, css, Global } from '@superset-ui/core';
import { debounce } from 'lodash';
import { Resizable } from 're-resizable';
import { useDynamicPluginContext } from 'src/components/DynamicPlugins';
-import { Global } from '@emotion/core';
import { Tooltip } from 'src/components/Tooltip';
import { usePrevious } from 'src/common/hooks/usePrevious';
import Icon from 'src/components/Icon';
diff --git a/superset-frontend/src/explore/components/controls/DateFilterControl/components/DateFunctionTooltip.tsx b/superset-frontend/src/explore/components/controls/DateFilterControl/components/DateFunctionTooltip.tsx
index 381b031..9018f0c 100644
--- a/superset-frontend/src/explore/components/controls/DateFilterControl/components/DateFunctionTooltip.tsx
+++ b/superset-frontend/src/explore/components/controls/DateFilterControl/components/DateFunctionTooltip.tsx
@@ -17,10 +17,9 @@
* under the License.
*/
import React from 'react';
-import { useTheme, t } from '@superset-ui/core';
+import { ClassNames, useTheme, t } from '@superset-ui/core';
import { Tooltip } from 'src/components/Tooltip';
-import { ClassNames } from '@emotion/core';
const TIME_PICKER_HELPER = (
<>
diff --git a/superset-frontend/src/explore/components/controls/FixedOrMetricControl/index.jsx b/superset-frontend/src/explore/components/controls/FixedOrMetricControl/index.jsx
index fc88e7b..c059881 100644
--- a/superset-frontend/src/explore/components/controls/FixedOrMetricControl/index.jsx
+++ b/superset-frontend/src/explore/components/controls/FixedOrMetricControl/index.jsx
@@ -18,8 +18,7 @@
*/
import React from 'react';
import PropTypes from 'prop-types';
-import { css } from '@emotion/core';
-import { t } from '@superset-ui/core';
+import { t, css } from '@superset-ui/core';
import Label from 'src/components/Label';
import Collapse from 'src/components/Collapse';
import TextControl from 'src/explore/components/controls/TextControl';
diff --git a/superset-frontend/src/views/menu.tsx b/superset-frontend/src/views/menu.tsx
index 7cee632..f58574c 100644
--- a/superset-frontend/src/views/menu.tsx
+++ b/superset-frontend/src/views/menu.tsx
@@ -21,9 +21,8 @@
// eg, backend rendered views
import React from 'react';
import ReactDOM from 'react-dom';
-import { CacheProvider } from '@emotion/core';
import createCache from '@emotion/cache';
-import { ThemeProvider } from '@superset-ui/core';
+import { ThemeProvider, CacheProvider } from '@superset-ui/core';
import Menu from 'src/components/Menu/Menu';
import { theme } from 'src/preamble';