Skip to content

Commit

Permalink
feat(plugin-chart-scatter): #3 tries to fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
kaihenzler committed Dec 7, 2021
1 parent a4d4cf6 commit 36ceea8
Show file tree
Hide file tree
Showing 11 changed files with 113 additions and 32 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/scatter-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
with:
node-version: 14
registry-url: https://registry.npmjs.org/
- run: yarn
- run: npm install
- run: npm run build
- run: npm run test
- run: cd plugins/plugin-chart-scatter && npm publish
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/table-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
with:
node-version: 14
registry-url: https://registry.npmjs.org/
- run: yarn
- run: npm install
- run: npm run build
- run: npm run test
- run: cd plugins/plugin-chart-table-extended && npm publish
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"lerna": "3.2.1",
"npmClient": "yarn",
"npmClient": "npm",
"packages": [
"packages/*",
"plugins/*"
Expand Down
8 changes: 7 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@
"release": "yarn build && lerna publish",
"list-changed-packages": "lerna changed",
"manual-release": "lerna publish --force-publish && yarn postrelease",
"clean-npm-lock": "rm -rf package-lock.json ./{packages,plugins}/*/package-lock.json"
"clean-npm-lock": "rm -rf package-lock.json ./{packages,plugins}/*/package-lock.json",
"postinstall": "run-p install:*",
"install:plugin-chart-scatter": "cd plugins/plugin-chart-scatter && npm install",
"install:plugin-chart-table-extended": "cd plugins/plugin-chart-table-extended && npm install"
},
"repository": "https://github.com/w11k/superset-chart-plugins.git",
"keywords": [
Expand Down Expand Up @@ -146,5 +149,8 @@
"*.{js,jsx,ts,tsx,json,md}": [
"prettier --write"
]
},
"devDependencies": {
"npm-run-all": "^4.1.5"
}
}
28 changes: 8 additions & 20 deletions plugins/plugin-chart-scatter/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion plugins/plugin-chart-scatter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"access": "public"
},
"dependencies": {
"@emotion/react": "^11.7.0",
"@superset-ui/chart-controls": "^0.18.25",
"@superset-ui/core": "^0.18.25",
"@superset-ui/plugin-chart-echarts": "^0.18.25",
Expand All @@ -41,7 +42,6 @@
"react-dom": "^16.13.0"
},
"devDependencies": {
"@emotion/react": "^11.7.0",
"@types/jest": "^26.0.0",
"jest": "^26.0.1"
}
Expand Down
2 changes: 1 addition & 1 deletion plugins/plugin-chart-scatter/src/Scatter/transformProps.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import {
getRegressionTransform,
scaleNumberToBubbleSize,
} from './transforms';
import { defaultGrid } from '../../node_modules/@superset-ui/plugin-chart-echarts/lib/defaults';
import { defaultGrid } from '../defaults';
import {
DEFAULT_FORM_DATA,
EchartsScatterChartProps,
Expand Down
88 changes: 88 additions & 0 deletions plugins/plugin-chart-table-extended/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions plugins/plugin-chart-table-extended/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"access": "public"
},
"dependencies": {
"@emotion/react": "^11.7.0",
"@react-icons/all-files": "^4.1.0",
"@superset-ui/chart-controls": "0.18.13",
"@superset-ui/core": "0.18.13",
Expand Down
8 changes: 3 additions & 5 deletions scripts/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,16 +74,14 @@ function getPackages(packagePattern, tsOnly = false) {
.filter(x => !META_PACKAGES.has(x)),
),
];
if (packages.length === 0) {
throw new Error('No matching packages');
}
return `@w11k/${packages.length > 1 ? `{${packages.join(',')}}` : packages[0]}`;

return '@w11k/*';
}

let scope = getPackages(glob);

if (shouldLint) {
run(`yarn lint --fix {packages,plugins}/${scope}/{src,test}`);
run(`npm run lint --fix {packages,plugins}/${scope}/{src,test}`);
}

if (shouldCleanup) {
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.options.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"skipLibCheck": true,
"emitDeclarationOnly": true,
"resolveJsonModule": true,
"types": ["@emotion/react/types/css-prop", "jest", "jsdom"],
"types": ["jest", "jsdom"],
"typeRoots": [
"./node_modules/@types"
]
Expand Down

0 comments on commit 36ceea8

Please sign in to comment.