diff --git a/superset-frontend/package-lock.json b/superset-frontend/package-lock.json
index b0fba179a..5270aa804 100644
--- a/superset-frontend/package-lock.json
+++ b/superset-frontend/package-lock.json
@@ -12,6 +12,7 @@
"@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.35",
"@superset-ui/chart-controls": "^0.17.36",
"@superset-ui/core": "^0.17.32",
@@ -6237,6 +6238,44 @@
}
},
"node_modules/@emotion/cache": {
+ "version": "11.1.3",
+ "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.1.3.tgz",
+ "integrity": "sha512-n4OWinUPJVaP6fXxWZD9OUeQ0lY7DvtmtSuqtRWT0Ofo/sBLCVSgb4/Oa0Q5eFxcwablRKjUXqXtNZVyEwCAuA==",
+ "dependencies": {
+ "@emotion/memoize": "^0.7.4",
+ "@emotion/sheet": "^1.0.0",
+ "@emotion/utils": "^1.0.0",
+ "@emotion/weak-memoize": "^0.2.5",
+ "stylis": "^4.0.3"
+ }
+ },
+ "node_modules/@emotion/cache/node_modules/@emotion/sheet": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.0.1.tgz",
+ "integrity": "sha512-GbIvVMe4U+Zc+929N1V7nW6YYJtidj31lidSmdYcWozwoBIObXBnaJkKNDjZrLm9Nc0BR+ZyHNaRZxqNZbof5g=="
+ },
+ "node_modules/@emotion/cache/node_modules/@emotion/utils": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.0.0.tgz",
+ "integrity": "sha512-mQC2b3XLDs6QCW+pDQDiyO/EdGZYOygE8s5N5rrzjSI4M3IejPE/JPndCBwRT9z982aqQNi6beWs1UeayrQxxA=="
+ },
+ "node_modules/@emotion/core": {
+ "version": "10.1.1",
+ "resolved": "https://registry.npmjs.org/@emotion/core/-/core-10.1.1.tgz",
+ "integrity": "sha512-ZMLG6qpXR8x031NXD8HJqugy/AZSkAuMxxqB46pmAR7ze47MhNJ56cdoX243QPZdGctrdfo+s08yZTiwaUcRKA==",
+ "dependencies": {
+ "@babel/runtime": "^7.5.5",
+ "@emotion/cache": "^10.0.27",
+ "@emotion/css": "^10.0.27",
+ "@emotion/serialize": "^0.11.15",
+ "@emotion/sheet": "0.9.4",
+ "@emotion/utils": "0.11.3"
+ },
+ "peerDependencies": {
+ "react": ">=16.3.0"
+ }
+ },
+ "node_modules/@emotion/core/node_modules/@emotion/cache": {
"version": "10.0.29",
"resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-10.0.29.tgz",
"integrity": "sha512-fU2VtSVlHiF27empSbxi1O2JFdNWZO+2NFHfwO0pxgTep6Xa3uGb+3pVKfLww2l/IBGLNEZl5Xf/++A4wAYDYQ==",
@@ -6247,19 +6286,6 @@
"@emotion/weak-memoize": "0.2.5"
}
},
- "node_modules/@emotion/core": {
- "version": "10.0.35",
- "resolved": "https://registry.npmjs.org/@emotion/core/-/core-10.0.35.tgz",
- "integrity": "sha512-sH++vJCdk025fBlRZSAhkRlSUoqSqgCzYf5fMOmqqi3bM6how+sQpg3hkgJonj8GxXM4WbD7dRO+4tegDB9fUw==",
- "dependencies": {
- "@babel/runtime": "^7.5.5",
- "@emotion/cache": "^10.0.27",
- "@emotion/css": "^10.0.27",
- "@emotion/serialize": "^0.11.15",
- "@emotion/sheet": "0.9.4",
- "@emotion/utils": "0.11.3"
- }
- },
"node_modules/@emotion/css": {
"version": "10.0.27",
"resolved": "https://registry.npmjs.org/@emotion/css/-/css-10.0.27.tgz",
@@ -6319,18 +6345,6 @@
"hoist-non-react-statics": "^3.3.1"
}
},
- "node_modules/@emotion/react/node_modules/@emotion/cache": {
- "version": "11.1.3",
- "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.1.3.tgz",
- "integrity": "sha512-n4OWinUPJVaP6fXxWZD9OUeQ0lY7DvtmtSuqtRWT0Ofo/sBLCVSgb4/Oa0Q5eFxcwablRKjUXqXtNZVyEwCAuA==",
- "dependencies": {
- "@emotion/memoize": "^0.7.4",
- "@emotion/sheet": "^1.0.0",
- "@emotion/utils": "^1.0.0",
- "@emotion/weak-memoize": "^0.2.5",
- "stylis": "^4.0.3"
- }
- },
"node_modules/@emotion/react/node_modules/@emotion/serialize": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.0.1.tgz",
@@ -9887,20 +9901,6 @@
"util-deprecate": "^1.0.2"
}
},
- "node_modules/@storybook/addon-backgrounds/node_modules/@emotion/core": {
- "version": "10.1.1",
- "resolved": "https://registry.npmjs.org/@emotion/core/-/core-10.1.1.tgz",
- "integrity": "sha512-ZMLG6qpXR8x031NXD8HJqugy/AZSkAuMxxqB46pmAR7ze47MhNJ56cdoX243QPZdGctrdfo+s08yZTiwaUcRKA==",
- "dev": true,
- "dependencies": {
- "@babel/runtime": "^7.5.5",
- "@emotion/cache": "^10.0.27",
- "@emotion/css": "^10.0.27",
- "@emotion/serialize": "^0.11.15",
- "@emotion/sheet": "0.9.4",
- "@emotion/utils": "0.11.3"
- }
- },
"node_modules/@storybook/addon-backgrounds/node_modules/@storybook/addons": {
"version": "6.1.20",
"resolved": "https://registry.npmjs.org/@storybook/addons/-/addons-6.1.20.tgz",
@@ -10115,20 +10115,6 @@
"ts-dedent": "^2.0.0"
}
},
- "node_modules/@storybook/addon-controls/node_modules/@emotion/core": {
- "version": "10.1.1",
- "resolved": "https://registry.npmjs.org/@emotion/core/-/core-10.1.1.tgz",
- "integrity": "sha512-ZMLG6qpXR8x031NXD8HJqugy/AZSkAuMxxqB46pmAR7ze47MhNJ56cdoX243QPZdGctrdfo+s08yZTiwaUcRKA==",
- "dev": true,
- "dependencies": {
- "@babel/runtime": "^7.5.5",
- "@emotion/cache": "^10.0.27",
- "@emotion/css": "^10.0.27",
- "@emotion/serialize": "^0.11.15",
- "@emotion/sheet": "0.9.4",
- "@emotion/utils": "0.11.3"
- }
- },
"node_modules/@storybook/addon-controls/node_modules/@storybook/addons": {
"version": "6.1.20",
"resolved": "https://registry.npmjs.org/@storybook/addons/-/addons-6.1.20.tgz",
@@ -10456,20 +10442,6 @@
"to-fast-properties": "^2.0.0"
}
},
- "node_modules/@storybook/addon-docs/node_modules/@emotion/core": {
- "version": "10.1.1",
- "resolved": "https://registry.npmjs.org/@emotion/core/-/core-10.1.1.tgz",
- "integrity": "sha512-ZMLG6qpXR8x031NXD8HJqugy/AZSkAuMxxqB46pmAR7ze47MhNJ56cdoX243QPZdGctrdfo+s08yZTiwaUcRKA==",
- "dev": true,
- "dependencies": {
- "@babel/runtime": "^7.5.5",
- "@emotion/cache": "^10.0.27",
- "@emotion/css": "^10.0.27",
- "@emotion/serialize": "^0.11.15",
- "@emotion/sheet": "0.9.4",
- "@emotion/utils": "0.11.3"
- }
- },
"node_modules/@storybook/addon-docs/node_modules/@storybook/addons": {
"version": "6.1.20",
"resolved": "https://registry.npmjs.org/@storybook/addons/-/addons-6.1.20.tgz",
@@ -10786,20 +10758,6 @@
"ts-dedent": "^2.0.0"
}
},
- "node_modules/@storybook/addon-essentials/node_modules/@emotion/core": {
- "version": "10.1.1",
- "resolved": "https://registry.npmjs.org/@emotion/core/-/core-10.1.1.tgz",
- "integrity": "sha512-ZMLG6qpXR8x031NXD8HJqugy/AZSkAuMxxqB46pmAR7ze47MhNJ56cdoX243QPZdGctrdfo+s08yZTiwaUcRKA==",
- "dev": true,
- "dependencies": {
- "@babel/runtime": "^7.5.5",
- "@emotion/cache": "^10.0.27",
- "@emotion/css": "^10.0.27",
- "@emotion/serialize": "^0.11.15",
- "@emotion/sheet": "0.9.4",
- "@emotion/utils": "0.11.3"
- }
- },
"node_modules/@storybook/addon-essentials/node_modules/@storybook/addon-actions": {
"version": "6.1.20",
"resolved": "https://registry.npmjs.org/@storybook/addon-actions/-/addon-actions-6.1.20.tgz",
@@ -11213,20 +11171,6 @@
"core-js": "^3.0.1"
}
},
- "node_modules/@storybook/addon-toolbars/node_modules/@emotion/core": {
- "version": "10.1.1",
- "resolved": "https://registry.npmjs.org/@emotion/core/-/core-10.1.1.tgz",
- "integrity": "sha512-ZMLG6qpXR8x031NXD8HJqugy/AZSkAuMxxqB46pmAR7ze47MhNJ56cdoX243QPZdGctrdfo+s08yZTiwaUcRKA==",
- "dev": true,
- "dependencies": {
- "@babel/runtime": "^7.5.5",
- "@emotion/cache": "^10.0.27",
- "@emotion/css": "^10.0.27",
- "@emotion/serialize": "^0.11.15",
- "@emotion/sheet": "0.9.4",
- "@emotion/utils": "0.11.3"
- }
- },
"node_modules/@storybook/addon-toolbars/node_modules/@storybook/addons": {
"version": "6.1.20",
"resolved": "https://registry.npmjs.org/@storybook/addons/-/addons-6.1.20.tgz",
@@ -11485,20 +11429,6 @@
"regenerator-runtime": "^0.13.7"
}
},
- "node_modules/@storybook/addon-viewport/node_modules/@emotion/core": {
- "version": "10.1.1",
- "resolved": "https://registry.npmjs.org/@emotion/core/-/core-10.1.1.tgz",
- "integrity": "sha512-ZMLG6qpXR8x031NXD8HJqugy/AZSkAuMxxqB46pmAR7ze47MhNJ56cdoX243QPZdGctrdfo+s08yZTiwaUcRKA==",
- "dev": true,
- "dependencies": {
- "@babel/runtime": "^7.5.5",
- "@emotion/cache": "^10.0.27",
- "@emotion/css": "^10.0.27",
- "@emotion/serialize": "^0.11.15",
- "@emotion/sheet": "0.9.4",
- "@emotion/utils": "0.11.3"
- }
- },
"node_modules/@storybook/addon-viewport/node_modules/@storybook/addons": {
"version": "6.1.20",
"resolved": "https://registry.npmjs.org/@storybook/addons/-/addons-6.1.20.tgz",
@@ -11864,20 +11794,6 @@
"ts-dedent": "^2.0.0"
}
},
- "node_modules/@storybook/components/node_modules/@emotion/core": {
- "version": "10.1.1",
- "resolved": "https://registry.npmjs.org/@emotion/core/-/core-10.1.1.tgz",
- "integrity": "sha512-ZMLG6qpXR8x031NXD8HJqugy/AZSkAuMxxqB46pmAR7ze47MhNJ56cdoX243QPZdGctrdfo+s08yZTiwaUcRKA==",
- "dev": true,
- "dependencies": {
- "@babel/runtime": "^7.5.5",
- "@emotion/cache": "^10.0.27",
- "@emotion/css": "^10.0.27",
- "@emotion/serialize": "^0.11.15",
- "@emotion/sheet": "0.9.4",
- "@emotion/utils": "0.11.3"
- }
- },
"node_modules/@storybook/components/node_modules/@storybook/client-logger": {
"version": "6.1.11",
"resolved": "https://registry.npmjs.org/@storybook/client-logger/-/client-logger-6.1.11.tgz",
@@ -12424,20 +12340,6 @@
"to-fast-properties": "^2.0.0"
}
},
- "node_modules/@storybook/core/node_modules/@emotion/core": {
- "version": "10.1.1",
- "resolved": "https://registry.npmjs.org/@emotion/core/-/core-10.1.1.tgz",
- "integrity": "sha512-ZMLG6qpXR8x031NXD8HJqugy/AZSkAuMxxqB46pmAR7ze47MhNJ56cdoX243QPZdGctrdfo+s08yZTiwaUcRKA==",
- "dev": true,
- "dependencies": {
- "@babel/runtime": "^7.5.5",
- "@emotion/cache": "^10.0.27",
- "@emotion/css": "^10.0.27",
- "@emotion/serialize": "^0.11.15",
- "@emotion/sheet": "0.9.4",
- "@emotion/utils": "0.11.3"
- }
- },
"node_modules/@storybook/core/node_modules/@storybook/addons": {
"version": "6.1.20",
"resolved": "https://registry.npmjs.org/@storybook/addons/-/addons-6.1.20.tgz",
@@ -14857,20 +14759,6 @@
"node": ">=8.0.0"
}
},
- "node_modules/@storybook/react/node_modules/@emotion/core": {
- "version": "10.1.1",
- "resolved": "https://registry.npmjs.org/@emotion/core/-/core-10.1.1.tgz",
- "integrity": "sha512-ZMLG6qpXR8x031NXD8HJqugy/AZSkAuMxxqB46pmAR7ze47MhNJ56cdoX243QPZdGctrdfo+s08yZTiwaUcRKA==",
- "dev": true,
- "dependencies": {
- "@babel/runtime": "^7.5.5",
- "@emotion/cache": "^10.0.27",
- "@emotion/css": "^10.0.27",
- "@emotion/serialize": "^0.11.15",
- "@emotion/sheet": "0.9.4",
- "@emotion/utils": "0.11.3"
- }
- },
"node_modules/@storybook/react/node_modules/@storybook/addons": {
"version": "6.1.20",
"resolved": "https://registry.npmjs.org/@storybook/addons/-/addons-6.1.20.tgz",
@@ -15301,20 +15189,6 @@
"source-map": "^0.7.3"
}
},
- "node_modules/@storybook/source-loader/node_modules/@emotion/core": {
- "version": "10.1.1",
- "resolved": "https://registry.npmjs.org/@emotion/core/-/core-10.1.1.tgz",
- "integrity": "sha512-ZMLG6qpXR8x031NXD8HJqugy/AZSkAuMxxqB46pmAR7ze47MhNJ56cdoX243QPZdGctrdfo+s08yZTiwaUcRKA==",
- "dev": true,
- "dependencies": {
- "@babel/runtime": "^7.5.5",
- "@emotion/cache": "^10.0.27",
- "@emotion/css": "^10.0.27",
- "@emotion/serialize": "^0.11.15",
- "@emotion/sheet": "0.9.4",
- "@emotion/utils": "0.11.3"
- }
- },
"node_modules/@storybook/source-loader/node_modules/@storybook/addons": {
"version": "6.1.20",
"resolved": "https://registry.npmjs.org/@storybook/addons/-/addons-6.1.20.tgz",
@@ -15535,20 +15409,6 @@
"ts-dedent": "^2.0.0"
}
},
- "node_modules/@storybook/theming/node_modules/@emotion/core": {
- "version": "10.1.1",
- "resolved": "https://registry.npmjs.org/@emotion/core/-/core-10.1.1.tgz",
- "integrity": "sha512-ZMLG6qpXR8x031NXD8HJqugy/AZSkAuMxxqB46pmAR7ze47MhNJ56cdoX243QPZdGctrdfo+s08yZTiwaUcRKA==",
- "dev": true,
- "dependencies": {
- "@babel/runtime": "^7.5.5",
- "@emotion/cache": "^10.0.27",
- "@emotion/css": "^10.0.27",
- "@emotion/serialize": "^0.11.15",
- "@emotion/sheet": "0.9.4",
- "@emotion/utils": "0.11.3"
- }
- },
"node_modules/@storybook/theming/node_modules/resolve-from": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
@@ -15596,20 +15456,6 @@
"store2": "^2.7.1"
}
},
- "node_modules/@storybook/ui/node_modules/@emotion/core": {
- "version": "10.1.1",
- "resolved": "https://registry.npmjs.org/@emotion/core/-/core-10.1.1.tgz",
- "integrity": "sha512-ZMLG6qpXR8x031NXD8HJqugy/AZSkAuMxxqB46pmAR7ze47MhNJ56cdoX243QPZdGctrdfo+s08yZTiwaUcRKA==",
- "dev": true,
- "dependencies": {
- "@babel/runtime": "^7.5.5",
- "@emotion/cache": "^10.0.27",
- "@emotion/css": "^10.0.27",
- "@emotion/serialize": "^0.11.15",
- "@emotion/sheet": "0.9.4",
- "@emotion/utils": "0.11.3"
- }
- },
"node_modules/@storybook/ui/node_modules/@storybook/addons": {
"version": "6.1.20",
"resolved": "https://registry.npmjs.org/@storybook/addons/-/addons-6.1.20.tgz",
@@ -48178,6 +48024,17 @@
"sleep-promise": "^8.0.1"
}
},
+ "node_modules/react-select/node_modules/@emotion/cache": {
+ "version": "10.0.29",
+ "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-10.0.29.tgz",
+ "integrity": "sha512-fU2VtSVlHiF27empSbxi1O2JFdNWZO+2NFHfwO0pxgTep6Xa3uGb+3pVKfLww2l/IBGLNEZl5Xf/++A4wAYDYQ==",
+ "dependencies": {
+ "@emotion/sheet": "0.9.4",
+ "@emotion/stylis": "0.8.5",
+ "@emotion/utils": "0.11.3",
+ "@emotion/weak-memoize": "0.2.5"
+ }
+ },
"node_modules/react-select/node_modules/dom-helpers": {
"version": "5.1.4",
"resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.1.4.tgz",
@@ -51376,20 +51233,6 @@
"react": "^16.13.1"
}
},
- "node_modules/storybook-addon-paddings/node_modules/@emotion/core": {
- "version": "10.1.1",
- "resolved": "https://registry.npmjs.org/@emotion/core/-/core-10.1.1.tgz",
- "integrity": "sha512-ZMLG6qpXR8x031NXD8HJqugy/AZSkAuMxxqB46pmAR7ze47MhNJ56cdoX243QPZdGctrdfo+s08yZTiwaUcRKA==",
- "dev": true,
- "dependencies": {
- "@babel/runtime": "^7.5.5",
- "@emotion/cache": "^10.0.27",
- "@emotion/css": "^10.0.27",
- "@emotion/serialize": "^0.11.15",
- "@emotion/sheet": "0.9.4",
- "@emotion/utils": "0.11.3"
- }
- },
"node_modules/storybook-addon-paddings/node_modules/@storybook/addons": {
"version": "6.1.11",
"resolved": "https://registry.npmjs.org/@storybook/addons/-/addons-6.1.11.tgz",
@@ -62997,20 +62840,33 @@
}
},
"@emotion/cache": {
- "version": "10.0.29",
- "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-10.0.29.tgz",
- "integrity": "sha512-fU2VtSVlHiF27empSbxi1O2JFdNWZO+2NFHfwO0pxgTep6Xa3uGb+3pVKfLww2l/IBGLNEZl5Xf/++A4wAYDYQ==",
+ "version": "11.1.3",
+ "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.1.3.tgz",
+ "integrity": "sha512-n4OWinUPJVaP6fXxWZD9OUeQ0lY7DvtmtSuqtRWT0Ofo/sBLCVSgb4/Oa0Q5eFxcwablRKjUXqXtNZVyEwCAuA==",
"requires": {
- "@emotion/sheet": "0.9.4",
- "@emotion/stylis": "0.8.5",
- "@emotion/utils": "0.11.3",
- "@emotion/weak-memoize": "0.2.5"
+ "@emotion/memoize": "^0.7.4",
+ "@emotion/sheet": "^1.0.0",
+ "@emotion/utils": "^1.0.0",
+ "@emotion/weak-memoize": "^0.2.5",
+ "stylis": "^4.0.3"
+ },
+ "dependencies": {
+ "@emotion/sheet": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.0.1.tgz",
+ "integrity": "sha512-GbIvVMe4U+Zc+929N1V7nW6YYJtidj31lidSmdYcWozwoBIObXBnaJkKNDjZrLm9Nc0BR+ZyHNaRZxqNZbof5g=="
+ },
+ "@emotion/utils": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.0.0.tgz",
+ "integrity": "sha512-mQC2b3XLDs6QCW+pDQDiyO/EdGZYOygE8s5N5rrzjSI4M3IejPE/JPndCBwRT9z982aqQNi6beWs1UeayrQxxA=="
+ }
}
},
"@emotion/core": {
- "version": "10.0.35",
- "resolved": "https://registry.npmjs.org/@emotion/core/-/core-10.0.35.tgz",
- "integrity": "sha512-sH++vJCdk025fBlRZSAhkRlSUoqSqgCzYf5fMOmqqi3bM6how+sQpg3hkgJonj8GxXM4WbD7dRO+4tegDB9fUw==",
+ "version": "10.1.1",
+ "resolved": "https://registry.npmjs.org/@emotion/core/-/core-10.1.1.tgz",
+ "integrity": "sha512-ZMLG6qpXR8x031NXD8HJqugy/AZSkAuMxxqB46pmAR7ze47MhNJ56cdoX243QPZdGctrdfo+s08yZTiwaUcRKA==",
"requires": {
"@babel/runtime": "^7.5.5",
"@emotion/cache": "^10.0.27",
@@ -63018,6 +62874,19 @@
"@emotion/serialize": "^0.11.15",
"@emotion/sheet": "0.9.4",
"@emotion/utils": "0.11.3"
+ },
+ "dependencies": {
+ "@emotion/cache": {
+ "version": "10.0.29",
+ "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-10.0.29.tgz",
+ "integrity": "sha512-fU2VtSVlHiF27empSbxi1O2JFdNWZO+2NFHfwO0pxgTep6Xa3uGb+3pVKfLww2l/IBGLNEZl5Xf/++A4wAYDYQ==",
+ "requires": {
+ "@emotion/sheet": "0.9.4",
+ "@emotion/stylis": "0.8.5",
+ "@emotion/utils": "0.11.3",
+ "@emotion/weak-memoize": "0.2.5"
+ }
+ }
}
},
"@emotion/css": {
@@ -63081,18 +62950,6 @@
"hoist-non-react-statics": "^3.3.1"
},
"dependencies": {
- "@emotion/cache": {
- "version": "11.1.3",
- "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.1.3.tgz",
- "integrity": "sha512-n4OWinUPJVaP6fXxWZD9OUeQ0lY7DvtmtSuqtRWT0Ofo/sBLCVSgb4/Oa0Q5eFxcwablRKjUXqXtNZVyEwCAuA==",
- "requires": {
- "@emotion/memoize": "^0.7.4",
- "@emotion/sheet": "^1.0.0",
- "@emotion/utils": "^1.0.0",
- "@emotion/weak-memoize": "^0.2.5",
- "stylis": "^4.0.3"
- }
- },
"@emotion/serialize": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.0.1.tgz",
@@ -66152,20 +66009,6 @@
"util-deprecate": "^1.0.2"
},
"dependencies": {
- "@emotion/core": {
- "version": "10.1.1",
- "resolved": "https://registry.npmjs.org/@emotion/core/-/core-10.1.1.tgz",
- "integrity": "sha512-ZMLG6qpXR8x031NXD8HJqugy/AZSkAuMxxqB46pmAR7ze47MhNJ56cdoX243QPZdGctrdfo+s08yZTiwaUcRKA==",
- "dev": true,
- "requires": {
- "@babel/runtime": "^7.5.5",
- "@emotion/cache": "^10.0.27",
- "@emotion/css": "^10.0.27",
- "@emotion/serialize": "^0.11.15",
- "@emotion/sheet": "0.9.4",
- "@emotion/utils": "0.11.3"
- }
- },
"@storybook/addons": {
"version": "6.1.20",
"resolved": "https://registry.npmjs.org/@storybook/addons/-/addons-6.1.20.tgz",
@@ -66376,20 +66219,6 @@
"ts-dedent": "^2.0.0"
},
"dependencies": {
- "@emotion/core": {
- "version": "10.1.1",
- "resolved": "https://registry.npmjs.org/@emotion/core/-/core-10.1.1.tgz",
- "integrity": "sha512-ZMLG6qpXR8x031NXD8HJqugy/AZSkAuMxxqB46pmAR7ze47MhNJ56cdoX243QPZdGctrdfo+s08yZTiwaUcRKA==",
- "dev": true,
- "requires": {
- "@babel/runtime": "^7.5.5",
- "@emotion/cache": "^10.0.27",
- "@emotion/css": "^10.0.27",
- "@emotion/serialize": "^0.11.15",
- "@emotion/sheet": "0.9.4",
- "@emotion/utils": "0.11.3"
- }
- },
"@storybook/addons": {
"version": "6.1.20",
"resolved": "https://registry.npmjs.org/@storybook/addons/-/addons-6.1.20.tgz",
@@ -66707,20 +66536,6 @@
"to-fast-properties": "^2.0.0"
}
},
- "@emotion/core": {
- "version": "10.1.1",
- "resolved": "https://registry.npmjs.org/@emotion/core/-/core-10.1.1.tgz",
- "integrity": "sha512-ZMLG6qpXR8x031NXD8HJqugy/AZSkAuMxxqB46pmAR7ze47MhNJ56cdoX243QPZdGctrdfo+s08yZTiwaUcRKA==",
- "dev": true,
- "requires": {
- "@babel/runtime": "^7.5.5",
- "@emotion/cache": "^10.0.27",
- "@emotion/css": "^10.0.27",
- "@emotion/serialize": "^0.11.15",
- "@emotion/sheet": "0.9.4",
- "@emotion/utils": "0.11.3"
- }
- },
"@storybook/addons": {
"version": "6.1.20",
"resolved": "https://registry.npmjs.org/@storybook/addons/-/addons-6.1.20.tgz",
@@ -67010,20 +66825,6 @@
"ts-dedent": "^2.0.0"
},
"dependencies": {
- "@emotion/core": {
- "version": "10.1.1",
- "resolved": "https://registry.npmjs.org/@emotion/core/-/core-10.1.1.tgz",
- "integrity": "sha512-ZMLG6qpXR8x031NXD8HJqugy/AZSkAuMxxqB46pmAR7ze47MhNJ56cdoX243QPZdGctrdfo+s08yZTiwaUcRKA==",
- "dev": true,
- "requires": {
- "@babel/runtime": "^7.5.5",
- "@emotion/cache": "^10.0.27",
- "@emotion/css": "^10.0.27",
- "@emotion/serialize": "^0.11.15",
- "@emotion/sheet": "0.9.4",
- "@emotion/utils": "0.11.3"
- }
- },
"@storybook/addon-actions": {
"version": "6.1.20",
"resolved": "https://registry.npmjs.org/@storybook/addon-actions/-/addon-actions-6.1.20.tgz",
@@ -67428,20 +67229,6 @@
"core-js": "^3.0.1"
},
"dependencies": {
- "@emotion/core": {
- "version": "10.1.1",
- "resolved": "https://registry.npmjs.org/@emotion/core/-/core-10.1.1.tgz",
- "integrity": "sha512-ZMLG6qpXR8x031NXD8HJqugy/AZSkAuMxxqB46pmAR7ze47MhNJ56cdoX243QPZdGctrdfo+s08yZTiwaUcRKA==",
- "dev": true,
- "requires": {
- "@babel/runtime": "^7.5.5",
- "@emotion/cache": "^10.0.27",
- "@emotion/css": "^10.0.27",
- "@emotion/serialize": "^0.11.15",
- "@emotion/sheet": "0.9.4",
- "@emotion/utils": "0.11.3"
- }
- },
"@storybook/addons": {
"version": "6.1.20",
"resolved": "https://registry.npmjs.org/@storybook/addons/-/addons-6.1.20.tgz",
@@ -67696,20 +67483,6 @@
"regenerator-runtime": "^0.13.7"
},
"dependencies": {
- "@emotion/core": {
- "version": "10.1.1",
- "resolved": "https://registry.npmjs.org/@emotion/core/-/core-10.1.1.tgz",
- "integrity": "sha512-ZMLG6qpXR8x031NXD8HJqugy/AZSkAuMxxqB46pmAR7ze47MhNJ56cdoX243QPZdGctrdfo+s08yZTiwaUcRKA==",
- "dev": true,
- "requires": {
- "@babel/runtime": "^7.5.5",
- "@emotion/cache": "^10.0.27",
- "@emotion/css": "^10.0.27",
- "@emotion/serialize": "^0.11.15",
- "@emotion/sheet": "0.9.4",
- "@emotion/utils": "0.11.3"
- }
- },
"@storybook/addons": {
"version": "6.1.20",
"resolved": "https://registry.npmjs.org/@storybook/addons/-/addons-6.1.20.tgz",
@@ -68071,20 +67844,6 @@
"ts-dedent": "^2.0.0"
},
"dependencies": {
- "@emotion/core": {
- "version": "10.1.1",
- "resolved": "https://registry.npmjs.org/@emotion/core/-/core-10.1.1.tgz",
- "integrity": "sha512-ZMLG6qpXR8x031NXD8HJqugy/AZSkAuMxxqB46pmAR7ze47MhNJ56cdoX243QPZdGctrdfo+s08yZTiwaUcRKA==",
- "dev": true,
- "requires": {
- "@babel/runtime": "^7.5.5",
- "@emotion/cache": "^10.0.27",
- "@emotion/css": "^10.0.27",
- "@emotion/serialize": "^0.11.15",
- "@emotion/sheet": "0.9.4",
- "@emotion/utils": "0.11.3"
- }
- },
"@storybook/client-logger": {
"version": "6.1.11",
"resolved": "https://registry.npmjs.org/@storybook/client-logger/-/client-logger-6.1.11.tgz",
@@ -68613,20 +68372,6 @@
"to-fast-properties": "^2.0.0"
}
},
- "@emotion/core": {
- "version": "10.1.1",
- "resolved": "https://registry.npmjs.org/@emotion/core/-/core-10.1.1.tgz",
- "integrity": "sha512-ZMLG6qpXR8x031NXD8HJqugy/AZSkAuMxxqB46pmAR7ze47MhNJ56cdoX243QPZdGctrdfo+s08yZTiwaUcRKA==",
- "dev": true,
- "requires": {
- "@babel/runtime": "^7.5.5",
- "@emotion/cache": "^10.0.27",
- "@emotion/css": "^10.0.27",
- "@emotion/serialize": "^0.11.15",
- "@emotion/sheet": "0.9.4",
- "@emotion/utils": "0.11.3"
- }
- },
"@storybook/addons": {
"version": "6.1.20",
"resolved": "https://registry.npmjs.org/@storybook/addons/-/addons-6.1.20.tgz",
@@ -70652,20 +70397,6 @@
"webpack": "^4.44.2"
},
"dependencies": {
- "@emotion/core": {
- "version": "10.1.1",
- "resolved": "https://registry.npmjs.org/@emotion/core/-/core-10.1.1.tgz",
- "integrity": "sha512-ZMLG6qpXR8x031NXD8HJqugy/AZSkAuMxxqB46pmAR7ze47MhNJ56cdoX243QPZdGctrdfo+s08yZTiwaUcRKA==",
- "dev": true,
- "requires": {
- "@babel/runtime": "^7.5.5",
- "@emotion/cache": "^10.0.27",
- "@emotion/css": "^10.0.27",
- "@emotion/serialize": "^0.11.15",
- "@emotion/sheet": "0.9.4",
- "@emotion/utils": "0.11.3"
- }
- },
"@storybook/addons": {
"version": "6.1.20",
"resolved": "https://registry.npmjs.org/@storybook/addons/-/addons-6.1.20.tgz",
@@ -71041,20 +70772,6 @@
"source-map": "^0.7.3"
},
"dependencies": {
- "@emotion/core": {
- "version": "10.1.1",
- "resolved": "https://registry.npmjs.org/@emotion/core/-/core-10.1.1.tgz",
- "integrity": "sha512-ZMLG6qpXR8x031NXD8HJqugy/AZSkAuMxxqB46pmAR7ze47MhNJ56cdoX243QPZdGctrdfo+s08yZTiwaUcRKA==",
- "dev": true,
- "requires": {
- "@babel/runtime": "^7.5.5",
- "@emotion/cache": "^10.0.27",
- "@emotion/css": "^10.0.27",
- "@emotion/serialize": "^0.11.15",
- "@emotion/sheet": "0.9.4",
- "@emotion/utils": "0.11.3"
- }
- },
"@storybook/addons": {
"version": "6.1.20",
"resolved": "https://registry.npmjs.org/@storybook/addons/-/addons-6.1.20.tgz",
@@ -71250,20 +70967,6 @@
"ts-dedent": "^2.0.0"
},
"dependencies": {
- "@emotion/core": {
- "version": "10.1.1",
- "resolved": "https://registry.npmjs.org/@emotion/core/-/core-10.1.1.tgz",
- "integrity": "sha512-ZMLG6qpXR8x031NXD8HJqugy/AZSkAuMxxqB46pmAR7ze47MhNJ56cdoX243QPZdGctrdfo+s08yZTiwaUcRKA==",
- "dev": true,
- "requires": {
- "@babel/runtime": "^7.5.5",
- "@emotion/cache": "^10.0.27",
- "@emotion/css": "^10.0.27",
- "@emotion/serialize": "^0.11.15",
- "@emotion/sheet": "0.9.4",
- "@emotion/utils": "0.11.3"
- }
- },
"resolve-from": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
@@ -71310,20 +71013,6 @@
"store2": "^2.7.1"
},
"dependencies": {
- "@emotion/core": {
- "version": "10.1.1",
- "resolved": "https://registry.npmjs.org/@emotion/core/-/core-10.1.1.tgz",
- "integrity": "sha512-ZMLG6qpXR8x031NXD8HJqugy/AZSkAuMxxqB46pmAR7ze47MhNJ56cdoX243QPZdGctrdfo+s08yZTiwaUcRKA==",
- "dev": true,
- "requires": {
- "@babel/runtime": "^7.5.5",
- "@emotion/cache": "^10.0.27",
- "@emotion/css": "^10.0.27",
- "@emotion/serialize": "^0.11.15",
- "@emotion/sheet": "0.9.4",
- "@emotion/utils": "0.11.3"
- }
- },
"@storybook/addons": {
"version": "6.1.20",
"resolved": "https://registry.npmjs.org/@storybook/addons/-/addons-6.1.20.tgz",
@@ -99101,6 +98790,17 @@
"react-transition-group": "^4.3.0"
},
"dependencies": {
+ "@emotion/cache": {
+ "version": "10.0.29",
+ "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-10.0.29.tgz",
+ "integrity": "sha512-fU2VtSVlHiF27empSbxi1O2JFdNWZO+2NFHfwO0pxgTep6Xa3uGb+3pVKfLww2l/IBGLNEZl5Xf/++A4wAYDYQ==",
+ "requires": {
+ "@emotion/sheet": "0.9.4",
+ "@emotion/stylis": "0.8.5",
+ "@emotion/utils": "0.11.3",
+ "@emotion/weak-memoize": "0.2.5"
+ }
+ },
"dom-helpers": {
"version": "5.1.4",
"resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.1.4.tgz",
@@ -101952,20 +101652,6 @@
"react": "^16.13.1"
},
"dependencies": {
- "@emotion/core": {
- "version": "10.1.1",
- "resolved": "https://registry.npmjs.org/@emotion/core/-/core-10.1.1.tgz",
- "integrity": "sha512-ZMLG6qpXR8x031NXD8HJqugy/AZSkAuMxxqB46pmAR7ze47MhNJ56cdoX243QPZdGctrdfo+s08yZTiwaUcRKA==",
- "dev": true,
- "requires": {
- "@babel/runtime": "^7.5.5",
- "@emotion/cache": "^10.0.27",
- "@emotion/css": "^10.0.27",
- "@emotion/serialize": "^0.11.15",
- "@emotion/sheet": "0.9.4",
- "@emotion/utils": "0.11.3"
- }
- },
"@storybook/addons": {
"version": "6.1.11",
"resolved": "https://registry.npmjs.org/@storybook/addons/-/addons-6.1.11.tgz",
diff --git a/superset-frontend/package.json b/superset-frontend/package.json
index a4c33dc8d..f551bde9d 100644
--- a/superset-frontend/package.json
+++ b/superset-frontend/package.json
@@ -64,6 +64,7 @@
"@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.35",
"@superset-ui/chart-controls": "^0.17.36",
"@superset-ui/core": "^0.17.32",
diff --git a/superset-frontend/src/views/menu.tsx b/superset-frontend/src/views/menu.tsx
index e0eb24fa2..7cee63283 100644
--- a/superset-frontend/src/views/menu.tsx
+++ b/superset-frontend/src/views/menu.tsx
@@ -21,17 +21,28 @@
// 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 Menu from 'src/components/Menu/Menu';
-import { theme } from '../preamble';
+import { theme } from 'src/preamble';
const container = document.getElementById('app');
const bootstrapJson = container?.getAttribute('data-bootstrap') ?? '{}';
const bootstrap = JSON.parse(bootstrapJson);
const menu = { ...bootstrap.common.menu_data };
+
+const emotionCache = createCache({
+ key: 'menu',
+});
+
const app = (
-
-
-
+ // @ts-ignore: emotion types defs are incompatible between core and cache
+
+
+
+
+
);
+
ReactDOM.render(app, document.getElementById('app-menu'));