From d1d76c9c683f9fd29b45ef18129e7512aafdb95c Mon Sep 17 00:00:00 2001 From: Jesse Yang Date: Mon, 9 Mar 2020 10:46:36 -0700 Subject: [PATCH] fix: address PR#392 comments --- .../test/ReactDataTable.test.tsx | 2 +- .../test/{test_data.ts => testData.ts} | 9 +++++++-- scripts/build.js | 14 +++++++++----- 3 files changed, 17 insertions(+), 8 deletions(-) rename packages/superset-ui-legacy-plugin-chart-table/test/{test_data.ts => testData.ts} (95%) diff --git a/packages/superset-ui-legacy-plugin-chart-table/test/ReactDataTable.test.tsx b/packages/superset-ui-legacy-plugin-chart-table/test/ReactDataTable.test.tsx index ce5c90d3c..3a21e2d4e 100644 --- a/packages/superset-ui-legacy-plugin-chart-table/test/ReactDataTable.test.tsx +++ b/packages/superset-ui-legacy-plugin-chart-table/test/ReactDataTable.test.tsx @@ -20,7 +20,7 @@ import React from 'react'; import { mount } from 'enzyme'; import ReactDataTable from '../src/ReactDataTable'; import transformProps from '../src/transformProps'; -import * as testData from './test_data'; +import testData from './testData'; describe('legacy-table', () => { // Can test more prop transformation here. Not needed for now. diff --git a/packages/superset-ui-legacy-plugin-chart-table/test/test_data.ts b/packages/superset-ui-legacy-plugin-chart-table/test/testData.ts similarity index 95% rename from packages/superset-ui-legacy-plugin-chart-table/test/test_data.ts rename to packages/superset-ui-legacy-plugin-chart-table/test/testData.ts index e51d66880..fabb82d20 100644 --- a/packages/superset-ui-legacy-plugin-chart-table/test/test_data.ts +++ b/packages/superset-ui-legacy-plugin-chart-table/test/testData.ts @@ -55,7 +55,7 @@ const basicChartProps = { /** * Basic data input */ -export const basic: ChartProps = { +const basic: ChartProps = { ...basicChartProps, queryData: { data: { @@ -81,7 +81,7 @@ export const basic: ChartProps = { * - verbose map * - metric columns */ -export const advanced: ChartProps = { +const advanced: ChartProps = { ...basic, datasource: { columnFormats: {}, @@ -101,3 +101,8 @@ export const advanced: ChartProps = { }, }, }; + +export default { + basic, + advanced, +}; diff --git a/scripts/build.js b/scripts/build.js index 284babd23..0326d0f71 100644 --- a/scripts/build.js +++ b/scripts/build.js @@ -4,6 +4,7 @@ const { spawnSync, spawn } = require('child_process'); const glob = process.argv[2]; +const extraArgs = process.argv.slice(2); process.env.PATH = `./node_modules/.bin:${process.env.PATH}`; @@ -18,11 +19,14 @@ const run = (cmd) => { }; if (glob) { - run(`nimbus eslint packages/${glob}/{src,test}`); - run(`nimbus prettier --check --workspaces=\"@superset-ui/${glob}"`); - run(`nimbus babel --clean --workspaces=\"@superset-ui/${glob}"`); - run(`nimbus babel --clean --workspaces=\"@superset-ui/${glob}" --esm`); - run(`nimbus typescript --build --workspaces=\"@superset-ui/${glob}"`); + run(`nimbus prettier packages/${glob}/{src,test}/**/*.{js,jsx,ts,tsx,css}"`); + // lint is slow, so not turning it on by default + if (extraArgs.includes('--lint')) { + run(`nimbus eslint packages/${glob}/{src,test}`); + } + run(`nimbus babel --clean --workspaces="@superset-ui/${glob}"`); + run(`nimbus babel --clean --workspaces="@superset-ui/${glob}" --esm`); + run(`nimbus typescript --build --workspaces="@superset-ui/${glob}"`); require('./buildAssets'); } else { run('yarn build');