From 230608de810b0ce0f77e44423fbfe3c32210b821 Mon Sep 17 00:00:00 2001 From: Chris Williams Date: Fri, 22 Mar 2019 13:39:46 -0700 Subject: [PATCH 1/3] fix(chart): import types from package, not monorepo --- packages/superset-ui-chart/src/components/ChartDataProvider.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/superset-ui-chart/src/components/ChartDataProvider.tsx b/packages/superset-ui-chart/src/components/ChartDataProvider.tsx index 7d91b23907..9b77a33148 100644 --- a/packages/superset-ui-chart/src/components/ChartDataProvider.tsx +++ b/packages/superset-ui-chart/src/components/ChartDataProvider.tsx @@ -1,6 +1,6 @@ /* eslint react/sort-comp: 'off' */ import React, { ReactNode } from 'react'; -import { SupersetClientInterface, RequestConfig } from '../../../superset-ui-connection/src/types'; +import { SupersetClientInterface, RequestConfig } from '@superset-ui/connection/lib/types'; import ChartClient, { SliceIdAndOrFormData } from '../clients/ChartClient'; import { ChartFormData } from '../types/ChartFormData'; From bbbbdb2c4d90f82c738ad97f7a41b16a3cd77d5f Mon Sep 17 00:00:00 2001 From: Chris Williams Date: Fri, 22 Mar 2019 13:41:01 -0700 Subject: [PATCH 2/3] build: ensure fresh directories on build --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 4050654040..0c5d8c6f41 100644 --- a/package.json +++ b/package.json @@ -6,8 +6,8 @@ "scripts": { "bootstrap": "lerna bootstrap", "build": "yarn run build:cjs && yarn run build:esm && yarn run type:dts && yarn run build:assets", - "build:cjs": "NODE_ENV=production beemo babel --extensions=\".js,.jsx,.ts,.tsx\" ./src --out-dir lib/ --minify --workspaces=\"@superset-ui/!(demo|generator-superset)\"", - "build:esm": "NODE_ENV=production beemo babel --extensions=\".js,.jsx,.ts,.tsx\" ./src --out-dir esm/ --esm --minify --workspaces=\"@superset-ui/!(demo|generator-superset)\"", + "build:cjs": "NODE_ENV=production beemo babel --extensions=\".js,.jsx,.ts,.tsx\" ./src --out-dir lib/ --delete-dir-on-start --minify --workspaces=\"@superset-ui/!(demo|generator-superset)\"", + "build:esm": "NODE_ENV=production beemo babel --extensions=\".js,.jsx,.ts,.tsx\" ./src --out-dir esm/ --delete-dir-on-start --esm --minify --workspaces=\"@superset-ui/!(demo|generator-superset)\"", "build:assets": "node ./scripts/buildAssets.js", "commit": "git-cz", "type": "NODE_ENV=production beemo typescript --workspaces=\"@superset-ui/!(generator-superset)\" --noEmit", From 4fd0d7e875709f5f6e2dd24cf082cdaade617e87 Mon Sep 17 00:00:00 2001 From: Chris Williams Date: Fri, 22 Mar 2019 14:09:20 -0700 Subject: [PATCH 3/3] fix(chart): nix type deep import --- packages/superset-ui-chart/src/components/ChartDataProvider.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/superset-ui-chart/src/components/ChartDataProvider.tsx b/packages/superset-ui-chart/src/components/ChartDataProvider.tsx index 9b77a33148..9831de7506 100644 --- a/packages/superset-ui-chart/src/components/ChartDataProvider.tsx +++ b/packages/superset-ui-chart/src/components/ChartDataProvider.tsx @@ -1,6 +1,6 @@ /* eslint react/sort-comp: 'off' */ import React, { ReactNode } from 'react'; -import { SupersetClientInterface, RequestConfig } from '@superset-ui/connection/lib/types'; +import { SupersetClientInterface, RequestConfig } from '@superset-ui/connection'; import ChartClient, { SliceIdAndOrFormData } from '../clients/ChartClient'; import { ChartFormData } from '../types/ChartFormData';