Skip to content
This repository has been archived by the owner on Dec 10, 2021. It is now read-only.

Commit

Permalink
Merge branch 'master' into hack2021/adhoc-columns
Browse files Browse the repository at this point in the history
  • Loading branch information
villebro committed Sep 6, 2021
2 parents 9690da9 + 779b942 commit 60af284
Show file tree
Hide file tree
Showing 33 changed files with 139 additions and 130 deletions.
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"plugins/*"
],
"useWorkspaces": true,
"version": "0.18.1",
"version": "0.18.2",
"ignoreChanges": [
"**/*.md",
"**/*.spec.tsx?",
Expand Down
6 changes: 3 additions & 3 deletions packages/superset-ui-chart-controls/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@superset-ui/chart-controls",
"version": "0.18.0",
"version": "0.18.2",
"description": "Superset UI control-utils",
"sideEffects": false,
"main": "lib/index.js",
Expand All @@ -27,12 +27,12 @@
},
"dependencies": {
"@react-icons/all-files": "^4.1.0",
"@superset-ui/core": "0.18.0",
"@superset-ui/core": "0.18.2",
"lodash": "^4.17.15",
"prop-types": "^15.7.2"
},
"peerDependencies": {
"@emotion/react": "^11.1.5",
"@emotion/react": "^11.4.1",
"@types/react": "*",
"antd": "^4.9.4",
"react": "^16.13.1"
Expand Down
9 changes: 5 additions & 4 deletions packages/superset-ui-core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@superset-ui/core",
"version": "0.18.0",
"version": "0.18.2",
"description": "Superset UI core",
"sideEffects": false,
"main": "lib/index.js",
Expand All @@ -26,13 +26,13 @@
"access": "public"
},
"devDependencies": {
"@emotion/styled": "^11.3.0",
"@types/fetch-mock": "^7.3.3",
"fetch-mock": "^6.5.2",
"jest-mock-console": "^1.0.0"
},
"dependencies": {
"@babel/runtime": "^7.1.2",
"@emotion/styled": "^11.3.0",
"@types/d3-format": "^1.3.0",
"@types/d3-interpolate": "^1.3.1",
"@types/d3-scale": "^2.1.1",
Expand Down Expand Up @@ -60,8 +60,9 @@
"whatwg-fetch": "^3.0.0"
},
"peerDependencies": {
"@emotion/cache": "^11.1.3",
"@emotion/react": "^11.1.5",
"@emotion/cache": "^11.4.0",
"@emotion/react": "^11.4.1",
"@emotion/styled": "^11.3.0",
"@types/react": "*",
"@types/react-loadable": "*",
"react": "^16.13.1",
Expand Down
55 changes: 28 additions & 27 deletions packages/superset-ui-demo/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@superset-ui/demo",
"version": "0.18.1",
"version": "0.18.2",
"description": "Storybook for Superset UI ✨",
"private": true,
"main": "index.js",
Expand Down Expand Up @@ -31,8 +31,9 @@
"homepage": "https://github.com/apache-superset/superset-ui#readme",
"dependencies": {
"@data-ui/event-flow": "^0.0.84",
"@emotion/cache": "^11.1.3",
"@emotion/react": "^11.1.5",
"@emotion/cache": "^11.4.0",
"@emotion/react": "^11.4.1",
"@emotion/styled": "^11.3.0",
"@react-icons/all-files": "^4.1.0",
"@storybook/addon-actions": "^5.3.18",
"@storybook/addon-info": "^5.3.18",
Expand All @@ -42,31 +43,31 @@
"@storybook/preset-typescript": "^3.0.0",
"@storybook/react": "^5.3.18",
"@superset-ui/core": "file:../superset-ui-core/src",
"@superset-ui/legacy-plugin-chart-calendar": "0.18.0",
"@superset-ui/legacy-plugin-chart-chord": "0.18.0",
"@superset-ui/legacy-plugin-chart-country-map": "0.18.1",
"@superset-ui/legacy-plugin-chart-event-flow": "0.18.0",
"@superset-ui/legacy-plugin-chart-force-directed": "0.18.0",
"@superset-ui/legacy-plugin-chart-heatmap": "0.18.0",
"@superset-ui/legacy-plugin-chart-histogram": "0.18.0",
"@superset-ui/legacy-plugin-chart-horizon": "0.18.0",
"@superset-ui/legacy-plugin-chart-map-box": "0.18.0",
"@superset-ui/legacy-plugin-chart-paired-t-test": "0.18.0",
"@superset-ui/legacy-plugin-chart-parallel-coordinates": "0.18.0",
"@superset-ui/legacy-plugin-chart-partition": "0.18.0",
"@superset-ui/legacy-plugin-chart-pivot-table": "0.18.0",
"@superset-ui/legacy-plugin-chart-rose": "0.18.0",
"@superset-ui/legacy-plugin-chart-sankey": "0.18.0",
"@superset-ui/legacy-plugin-chart-sankey-loop": "0.18.0",
"@superset-ui/legacy-plugin-chart-sunburst": "0.18.0",
"@superset-ui/legacy-plugin-chart-time-table": "0.18.0",
"@superset-ui/legacy-plugin-chart-treemap": "0.18.0",
"@superset-ui/legacy-plugin-chart-calendar": "0.18.2",
"@superset-ui/legacy-plugin-chart-chord": "0.18.2",
"@superset-ui/legacy-plugin-chart-country-map": "0.18.2",
"@superset-ui/legacy-plugin-chart-event-flow": "0.18.2",
"@superset-ui/legacy-plugin-chart-force-directed": "0.18.2",
"@superset-ui/legacy-plugin-chart-heatmap": "0.18.2",
"@superset-ui/legacy-plugin-chart-histogram": "0.18.2",
"@superset-ui/legacy-plugin-chart-horizon": "0.18.2",
"@superset-ui/legacy-plugin-chart-map-box": "0.18.2",
"@superset-ui/legacy-plugin-chart-paired-t-test": "0.18.2",
"@superset-ui/legacy-plugin-chart-parallel-coordinates": "0.18.2",
"@superset-ui/legacy-plugin-chart-partition": "0.18.2",
"@superset-ui/legacy-plugin-chart-pivot-table": "0.18.2",
"@superset-ui/legacy-plugin-chart-rose": "0.18.2",
"@superset-ui/legacy-plugin-chart-sankey": "0.18.2",
"@superset-ui/legacy-plugin-chart-sankey-loop": "0.18.2",
"@superset-ui/legacy-plugin-chart-sunburst": "0.18.2",
"@superset-ui/legacy-plugin-chart-time-table": "0.18.2",
"@superset-ui/legacy-plugin-chart-treemap": "0.18.2",
"@superset-ui/legacy-plugin-chart-word-cloud": "^0.11.15",
"@superset-ui/legacy-plugin-chart-world-map": "0.18.0",
"@superset-ui/legacy-preset-chart-big-number": "0.18.1",
"@superset-ui/plugin-chart-echarts": "0.18.1",
"@superset-ui/plugin-chart-table": "0.18.0",
"@superset-ui/plugin-chart-word-cloud": "0.18.0",
"@superset-ui/legacy-plugin-chart-world-map": "0.18.2",
"@superset-ui/legacy-preset-chart-big-number": "0.18.2",
"@superset-ui/plugin-chart-echarts": "0.18.2",
"@superset-ui/plugin-chart-table": "0.18.2",
"@superset-ui/plugin-chart-word-cloud": "0.18.2",
"@types/react-loadable": "^5.5.3",
"@types/react-resizable": "^1.7.2",
"@types/storybook__react": "5.2.1",
Expand Down
6 changes: 3 additions & 3 deletions plugins/legacy-plugin-chart-calendar/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@superset-ui/legacy-plugin-chart-calendar",
"version": "0.18.0",
"version": "0.18.2",
"description": "Superset Legacy Chart - Calendar Heatmap",
"sideEffects": [
"*.css"
Expand Down Expand Up @@ -28,8 +28,8 @@
"access": "public"
},
"dependencies": {
"@superset-ui/chart-controls": "0.18.0",
"@superset-ui/core": "0.18.0",
"@superset-ui/chart-controls": "0.18.2",
"@superset-ui/core": "0.18.2",
"d3-array": "^2.0.3",
"d3-selection": "^1.4.0",
"d3-tip": "^0.9.1",
Expand Down
6 changes: 3 additions & 3 deletions plugins/legacy-plugin-chart-chord/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@superset-ui/legacy-plugin-chart-chord",
"version": "0.18.0",
"version": "0.18.2",
"description": "Superset Legacy Chart - Chord Diagram",
"sideEffects": [
"*.css"
Expand Down Expand Up @@ -28,8 +28,8 @@
"access": "public"
},
"dependencies": {
"@superset-ui/chart-controls": "0.18.0",
"@superset-ui/core": "0.18.0",
"@superset-ui/chart-controls": "0.18.2",
"@superset-ui/core": "0.18.2",
"d3": "^3.5.17",
"prop-types": "^15.6.2",
"react": "^16.13.1"
Expand Down
6 changes: 3 additions & 3 deletions plugins/legacy-plugin-chart-country-map/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@superset-ui/legacy-plugin-chart-country-map",
"version": "0.18.1",
"version": "0.18.2",
"description": "Superset Legacy Chart - Country Map",
"sideEffects": [
"*.css"
Expand Down Expand Up @@ -28,8 +28,8 @@
"access": "public"
},
"dependencies": {
"@superset-ui/chart-controls": "0.18.0",
"@superset-ui/core": "0.18.0",
"@superset-ui/chart-controls": "0.18.2",
"@superset-ui/core": "0.18.2",
"d3": "^3.5.17",
"d3-array": "^2.0.3",
"prop-types": "^15.6.2"
Expand Down
6 changes: 3 additions & 3 deletions plugins/legacy-plugin-chart-event-flow/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@superset-ui/legacy-plugin-chart-event-flow",
"version": "0.18.0",
"version": "0.18.2",
"description": "Superset Legacy Chart - Event Flow",
"sideEffects": [
"*.css"
Expand Down Expand Up @@ -29,8 +29,8 @@
},
"dependencies": {
"@data-ui/event-flow": "^0.0.84",
"@superset-ui/chart-controls": "0.18.0",
"@superset-ui/core": "0.18.0",
"@superset-ui/chart-controls": "0.18.2",
"@superset-ui/core": "0.18.2",
"prop-types": "^15.6.2"
},
"peerDependencies": {
Expand Down
6 changes: 3 additions & 3 deletions plugins/legacy-plugin-chart-force-directed/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@superset-ui/legacy-plugin-chart-force-directed",
"version": "0.18.0",
"version": "0.18.2",
"description": "Superset Legacy Chart - Force-directed Graph",
"sideEffects": [
"*.css"
Expand Down Expand Up @@ -28,8 +28,8 @@
"access": "public"
},
"dependencies": {
"@superset-ui/chart-controls": "0.18.0",
"@superset-ui/core": "0.18.0",
"@superset-ui/chart-controls": "0.18.2",
"@superset-ui/core": "0.18.2",
"d3": "^3.5.17",
"prop-types": "^15.7.2"
},
Expand Down
6 changes: 3 additions & 3 deletions plugins/legacy-plugin-chart-heatmap/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@superset-ui/legacy-plugin-chart-heatmap",
"version": "0.18.0",
"version": "0.18.2",
"description": "Superset Legacy Chart - Heatmap",
"sideEffects": [
"*.css"
Expand Down Expand Up @@ -28,8 +28,8 @@
"access": "public"
},
"dependencies": {
"@superset-ui/chart-controls": "0.18.0",
"@superset-ui/core": "0.18.0",
"@superset-ui/chart-controls": "0.18.2",
"@superset-ui/core": "0.18.2",
"d3": "^3.5.17",
"d3-svg-legend": "^1.x",
"d3-tip": "^0.9.1",
Expand Down
6 changes: 3 additions & 3 deletions plugins/legacy-plugin-chart-histogram/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@superset-ui/legacy-plugin-chart-histogram",
"version": "0.18.0",
"version": "0.18.2",
"description": "Superset Legacy Chart - Histogram",
"sideEffects": [
"*.css"
Expand Down Expand Up @@ -30,8 +30,8 @@
"dependencies": {
"@data-ui/histogram": "^0.0.84",
"@data-ui/theme": "^0.0.84",
"@superset-ui/chart-controls": "0.18.0",
"@superset-ui/core": "0.18.0",
"@superset-ui/chart-controls": "0.18.2",
"@superset-ui/core": "0.18.2",
"@vx/legend": "^0.0.198",
"@vx/responsive": "^0.0.199",
"@vx/scale": "^0.0.197",
Expand Down
6 changes: 3 additions & 3 deletions plugins/legacy-plugin-chart-horizon/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@superset-ui/legacy-plugin-chart-horizon",
"version": "0.18.0",
"version": "0.18.2",
"description": "Superset Legacy Chart - Horizon",
"sideEffects": [
"*.css"
Expand Down Expand Up @@ -28,8 +28,8 @@
"access": "public"
},
"dependencies": {
"@superset-ui/chart-controls": "0.18.0",
"@superset-ui/core": "0.18.0",
"@superset-ui/chart-controls": "0.18.2",
"@superset-ui/core": "0.18.2",
"d3-array": "^2.0.3",
"d3-scale": "^3.0.1",
"prop-types": "^15.6.2"
Expand Down
6 changes: 3 additions & 3 deletions plugins/legacy-plugin-chart-map-box/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@superset-ui/legacy-plugin-chart-map-box",
"version": "0.18.0",
"version": "0.18.2",
"description": "Superset Legacy Chart - MapBox",
"sideEffects": [
"*.css"
Expand Down Expand Up @@ -28,8 +28,8 @@
"access": "public"
},
"dependencies": {
"@superset-ui/chart-controls": "0.18.0",
"@superset-ui/core": "0.18.0",
"@superset-ui/chart-controls": "0.18.2",
"@superset-ui/core": "0.18.2",
"immutable": "^3.8.2",
"mapbox-gl": "^0.53.0",
"prop-types": "^15.6.2",
Expand Down
6 changes: 3 additions & 3 deletions plugins/legacy-plugin-chart-paired-t-test/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@superset-ui/legacy-plugin-chart-paired-t-test",
"version": "0.18.0",
"version": "0.18.2",
"description": "Superset Legacy Chart - Paired T Test",
"sideEffects": [
"*.css"
Expand Down Expand Up @@ -28,8 +28,8 @@
"access": "public"
},
"dependencies": {
"@superset-ui/chart-controls": "0.18.0",
"@superset-ui/core": "0.18.0",
"@superset-ui/chart-controls": "0.18.2",
"@superset-ui/core": "0.18.2",
"distributions": "^1.0.0",
"prop-types": "^15.6.2",
"reactable": "^1.1.0"
Expand Down
6 changes: 3 additions & 3 deletions plugins/legacy-plugin-chart-parallel-coordinates/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@superset-ui/legacy-plugin-chart-parallel-coordinates",
"version": "0.18.0",
"version": "0.18.2",
"description": "Superset Legacy Chart - Parallel Coordinates",
"sideEffects": [
"*.css"
Expand Down Expand Up @@ -28,8 +28,8 @@
"access": "public"
},
"dependencies": {
"@superset-ui/chart-controls": "0.18.0",
"@superset-ui/core": "0.18.0",
"@superset-ui/chart-controls": "0.18.2",
"@superset-ui/core": "0.18.2",
"d3": "^3.5.17",
"prop-types": "^15.7.2"
},
Expand Down
6 changes: 3 additions & 3 deletions plugins/legacy-plugin-chart-partition/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@superset-ui/legacy-plugin-chart-partition",
"version": "0.18.0",
"version": "0.18.2",
"description": "Superset Legacy Chart - Partition",
"sideEffects": [
"*.css"
Expand Down Expand Up @@ -28,8 +28,8 @@
"access": "public"
},
"dependencies": {
"@superset-ui/chart-controls": "0.18.0",
"@superset-ui/core": "0.18.0",
"@superset-ui/chart-controls": "0.18.2",
"@superset-ui/core": "0.18.2",
"d3": "^3.5.17",
"d3-hierarchy": "^1.1.8",
"prop-types": "^15.6.2"
Expand Down
6 changes: 3 additions & 3 deletions plugins/legacy-plugin-chart-pivot-table/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@superset-ui/legacy-plugin-chart-pivot-table",
"version": "0.18.0",
"version": "0.18.2",
"description": "Superset Legacy Chart - Pivot Table",
"sideEffects": [
"*.css"
Expand Down Expand Up @@ -28,8 +28,8 @@
"access": "public"
},
"dependencies": {
"@superset-ui/chart-controls": "0.18.0",
"@superset-ui/core": "0.18.0",
"@superset-ui/chart-controls": "0.18.2",
"@superset-ui/core": "0.18.2",
"d3": "^3.5.17",
"datatables.net-bs": "^1.10.15",
"prop-types": "^15.6.2"
Expand Down
Loading

0 comments on commit 60af284

Please sign in to comment.