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

Commit

Permalink
Revert "build: try to merge superset-ui-plugins"
Browse files Browse the repository at this point in the history
This reverts commit 8231266.
  • Loading branch information
ktmud committed Apr 1, 2020
1 parent 39d983a commit 6be7b2f
Show file tree
Hide file tree
Showing 91 changed files with 3,346 additions and 30,167 deletions.
6 changes: 3 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ lib/
public/
node_modules/
tmp/
_gh-pages/

# Custom
*.map
Expand All @@ -44,11 +43,12 @@ jest.config.js
prettier.config.js
tsconfig.eslint.json
tsconfig.json
!demo/tsconfig.json
tsconfig.options.json
*.tsbuildinfo
webpack.config.js

# Ignore npm lock files, always use yarn.loock instead
# Lock files, libs should not have lock files
npm-shrinkwrap.json
package-lock.json
# disable to provide more stability for the ci builds
# yarn.lock
8 changes: 8 additions & 0 deletions docs/storybook.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,14 @@ You can demo your changes by running the storybook demo locally with the followi
```sh
yarn install
yarn build
cd packages/superset-ui-demo
yarn storybook:run
```

Alternatively, you can demo your changes by using the following command while in
`packages/superset-ui-demo`:

```sh
yarn storybook
```

Expand Down
3 changes: 1 addition & 2 deletions lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
"lerna": "3.2.1",
"npmClient": "yarn",
"packages": [
"packages/*",
"plugins/*"
"packages/*"
],
"useWorkspaces": true,
"version": "0.12.12"
Expand Down
54 changes: 13 additions & 41 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,7 @@
"babel:cjs": "nimbus babel --clean --workspaces=\"@superset-ui/!(demo|generator-superset)\"",
"babel:esm": "nimbus babel --clean --workspaces=\"@superset-ui/!(demo|generator-superset)\" --esm",
"build:assets": "node ./scripts/buildAssets.js",
"demo": "cd packages/demo && yarn demo:build",
"storybook": "cd packages/demo && yarn storybook",
"sb": "yarn storybook",
"clean": "rm -rf ./{packages,plugins}/**/{lib,esm}",
"clean": "rm -rf ./packages/**/{lib,esm}",
"commit": "superset-commit",
"changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 10",
"format": "yarn prettier --write",
Expand Down Expand Up @@ -45,12 +42,12 @@
],
"license": "Apache-2.0",
"devDependencies": {
"@airbnb/config-babel": "^3.1.0",
"@airbnb/config-eslint": "^3.1.0",
"@airbnb/config-jest": "^3.0.1",
"@airbnb/config-prettier": "^3.1.0",
"@airbnb/config-typescript": "^3.0.1",
"@airbnb/nimbus": "^3.1.1",
"@airbnb/config-babel": "^2.1.3",
"@airbnb/config-eslint": "^2.1.3",
"@airbnb/config-jest": "^2.1.3",
"@airbnb/config-prettier": "^2.0.4",
"@airbnb/config-typescript": "^2.1.2",
"@airbnb/nimbus": "^2.1.3",
"@superset-ui/commit-config": "^0.0.9",
"@types/enzyme": "^3.10.3",
"@types/jest": "^25.1.1",
Expand All @@ -62,22 +59,20 @@
"fast-glob": "^3.0.1",
"fs-extra": "^8.0.1",
"husky": "^4.2.1",
"identity-obj-proxy": "^3.0.0",
"jest-mock-console": "^1.0.0",
"lerna": "^3.15.0",
"lint-staged": "^10.0.3",
"react": "^16.9.0",
"react-test-renderer": "^16.9.0",
"react-dom": "^16.9.0",
"react-test-renderer": "^16.9.0"
"react": "^16.9.0"
},
"engines": {
"node": ">=10.10.0",
"npm": ">=6.8.0",
"yarn": ">=1.13.0"
},
"workspaces": [
"./packages/*",
"./plugins/*"
"./packages/*"
],
"browserslist": [
"last 3 chrome versions",
Expand Down Expand Up @@ -105,10 +100,6 @@
"globals": {
"caches": true
},
"moduleNameMapper": {
"\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/__mocks__/fileMock.js",
"\\.(css|less)$": "identity-obj-proxy"
},
"timers": "real",
"setupFilesAfterEnv": [
"@airbnb/config-jest/enzyme"
Expand All @@ -128,13 +119,7 @@
}
]
},
"prettier": {
"arrowParens": "avoid"
},
"eslint": {
"rules": {
"arrow-parens": ["warn", "as-needed"]
},
"overrides": [
{
"files": "./packages/generator-superset/**/*.test.{js,jsx,ts,tsx}",
Expand All @@ -156,27 +141,14 @@
"files": "*.{js,jsx,ts,tsx}",
"rules": {
"react/jsx-no-literals": "off",
"@typescript-eslint/no-explicit-any": [
"warn",
{
"fixToUnknown": false
}
]
}
},
{
"files": "./scripts/*",
"env": {
"node": true
"@typescript-eslint/no-explicit-any": ["warn", { "fixToUnknown": false }]
}
}
]
},
"typescript": {
"compilerOptions": {
"emitDeclarationOnly": true,
"composite": true,
"resolveJsonModule": true
"emitDeclarationOnly": true
}
}
},
Expand All @@ -187,7 +159,7 @@
}
},
"lint-staged": {
"./{packages,plugins}/*/{src,test,storybook}/**/*.{js,jsx,ts,tsx,json,md}": [
"./packages/*/{src,test,storybook}/**/*.{js,jsx,ts,tsx,json,md}": [
"yarn prettier --write",
"git add"
]
Expand Down
48 changes: 0 additions & 48 deletions packages/demo/.storybook/main.js

This file was deleted.

24 changes: 0 additions & 24 deletions packages/demo/.storybook/storybook.css

This file was deleted.

This file was deleted.

Loading

0 comments on commit 6be7b2f

Please sign in to comment.