Skip to content

Commit

Permalink
Merge pull request #1317 from uber/yarn-workspaces
Browse files Browse the repository at this point in the history
Merge Yarn workspaces + Mordernization
  • Loading branch information
Xiot authored May 25, 2020
2 parents 0e08421 + af173c2 commit 08f0562
Show file tree
Hide file tree
Showing 330 changed files with 15,274 additions and 49,898 deletions.
43 changes: 28 additions & 15 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,27 +1,40 @@
{
"env": {
"es6": true,
"browser": true
},
"extends": [
"uber-es2015",
"uber-jsx",
"eslint:recommended",
"plugin:react/recommended",
"prettier",
"prettier/react"
],
"parser": "babel-eslint",
"plugins": [
"react",
"prettier",
"babel",
"no-only-tests"
],
"ignorePatterns": [
"node_modules",
"bundle.js",
"**/dist/",
"**/es/"
],
"settings":{
"react":{
"version": "detect"
}
},
"env": {
"es6": true,
"browser": true
},
"rules": {
"consistent-return": 0,
"max-len": [1, 110, 4],
"max-params": ["error", 6],
"object-curly-spacing": 0,
"babel/object-curly-spacing": 2,
"no-only-tests/no-only-tests": 2
},
"parser": "babel-eslint",
"plugins": [
"react",
"babel",
"prettier",
"no-only-tests"
]
"no-only-tests/no-only-tests": 2,
"react/prop-types": "off",
"prettier/prettier": "warn"
}
}
6 changes: 4 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@ yarn-error.log*
.DS_Store
.idea/
public/
.vscode/

showcase/bundle.js
showcase/bundle.css
bundle.js
bundle.css
packages/showcase/app.css

/index.html
2 changes: 1 addition & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
"bracketSpacing": false,
"jsxBracketSameLine": false,
"semi": true,
"parser": "babylon"
"parser": "babel"
}
5 changes: 2 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
language: node_js
node_js:
- '6'
- '7'
- '8'
- '9'
- '10'
script:
- npm run lint
- cd packages/react-vis
- npm run cover
after_success:
- npm install -g coveralls
Expand Down
49 changes: 49 additions & 0 deletions babel.config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
{
"babelrcRoots": [
".",
"./packages/*"
],
"env": {
"production": {
"presets": [
"@babel/preset-env",
"@babel/preset-react"
],
"plugins": [
"@babel/plugin-proposal-class-properties",
"@babel/plugin-proposal-export-default-from",
"@babel/plugin-proposal-optional-chaining",
"@babel/plugin-proposal-nullish-coalescing-operator"
]
},
"development": {
"presets": [
"@babel/preset-env",
"@babel/preset-react"
],
"plugins": [
"@babel/plugin-proposal-class-properties",
"@babel/plugin-proposal-export-default-from",
"@babel/plugin-proposal-optional-chaining",
"@babel/plugin-proposal-nullish-coalescing-operator"
]
},
"es": {
"presets": [
[
"@babel/preset-env",
{
"modules": false
}
],
"@babel/preset-react"
],
"plugins": [
"@babel/plugin-proposal-class-properties",
"@babel/plugin-proposal-export-default-from",
"@babel/plugin-proposal-optional-chaining",
"@babel/plugin-proposal-nullish-coalescing-operator"
]
}
}
}
Loading

0 comments on commit 08f0562

Please sign in to comment.