Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Commit

Permalink
fix: update d2-style and fix but in radio button css (#338)
Browse files Browse the repository at this point in the history
* fix: update d2-style and fix but in radio button css

* chore: hold back react/react-dom

* fix: use d2-style 4.1.0

* fix: set eslint parser to babel-eslint again
  • Loading branch information
varl authored Jul 15, 2019
1 parent f9a6218 commit 29cf886
Show file tree
Hide file tree
Showing 8 changed files with 410 additions and 310 deletions.
12 changes: 10 additions & 2 deletions .dependabot/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ update_configs:
- package_manager: "javascript"
directory: "/"
update_schedule: "live"
default_assignees:
- "@dhis2/front-end"
version_requirement_updates: "increase_versions"
ignored_updates:
# ui-core supports 16.3 of react, so ignore all updates
- match:
Expand All @@ -14,3 +13,12 @@ update_configs:
- match:
dependency_name: "react-dom"
version_requirement: ">=16.4.x"
- package_manager: "java:maven"
directory: "/"
update_schedule: "monthly"
- package_manager: "docker"
directory: "/"
update_schedule: "weekly"
- package_manager: "submodules"
directory: "/"
update_schedule: "weekly"
39 changes: 2 additions & 37 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,41 +1,6 @@
const SEVERITY = 2
const { config } = require('@dhis2/cli-style')

module.exports = {
root: true,

extends: 'react-app',

parser: 'babel-eslint',

env: {
browser: true,
node: true,
jest: true,
},

parserOptions: {
// latest standard is ok, eq. to 9
ecmaVersion: 2018,
ecmaFeatures: {
jsx: true,
modules: true,
},
},

rules: {
'max-params': [
SEVERITY,
{
max: 3,
},
],
'prefer-const': [
SEVERITY,
{
destructuring: 'any',
ignoreReadBeforeAssign: false,
},
],
'no-mixed-spaces-and-tabs': [SEVERITY],
},
extends: [config.eslint],
}
4 changes: 4 additions & 0 deletions .github/semantic.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
titleOnly: true
commitsOnly: false
titleAndCommits: false
allowMergeCommits: false
6 changes: 6 additions & 0 deletions .huskyrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
module.exports = {
hooks: {
'commit-msg': 'd2-style commit check',
'pre-commit': 'd2-style validate',
},
}
19 changes: 3 additions & 16 deletions .prettierrc.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,5 @@
const { config } = require('@dhis2/cli-style')

module.exports = {
printWidth: 80,
tabWidth: 4,
useTabs: false,
semi: false,
singleQuote: true,
trailingComma: 'es5',
bracketSpacing: true,
jsxBracketSameLine: false,
jsxSingleQuote: false,
arrowParens: 'avoid',
rangeStart: 0,
rangeEnd: Infinity,
proseWrap: 'preserve',
requirePragma: false,
insertPragma: false,
endOfLine: 'lf',
...require(config.prettier),
}
16 changes: 1 addition & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,6 @@
"start-storybook": "start-storybook --port 5000 -s ./stories/info",
"start": "yarn start-storybook"
},
"husky": {
"hooks": {
"commit-msg": "d2-style commit check",
"pre-commit": "d2-style js apply"
}
},
"devDependencies": {
"@babel/cli": "^7.5.0",
"@babel/core": "^7.5.4",
Expand All @@ -35,21 +29,13 @@
"@babel/plugin-transform-react-constant-elements": "^7.5.0",
"@babel/preset-env": "^7.5.4",
"@babel/preset-react": "^7.0.0",
"@dhis2/cli-style": "^3.3.4",
"@dhis2/cli-style": "4.1.0",
"@storybook/addon-notes": "^5.1.9",
"@storybook/addons": "^5.1.8",
"@storybook/components": "^5.1.7",
"@storybook/react": "^5.1.9",
"babel-eslint": "10.x",
"babel-loader": "^8.0.6",
"eslint": "5.x",
"eslint-config-react-app": "^4.0.1",
"eslint-plugin-flowtype": "2.x",
"eslint-plugin-import": "2.x",
"eslint-plugin-jsx-a11y": "6.x",
"eslint-plugin-react": "7.x",
"eslint-plugin-react-hooks": "1.6.1",
"husky": "^3.0.0",
"react": "16.3",
"react-dev-utils": "^9.0.1",
"react-dom": "16.3",
Expand Down
2 changes: 1 addition & 1 deletion src/Radio/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const icons = css.resolve`
}
.focus {
fill: ${colors.grey800}
fill: ${colors.grey800};
}
.checked {
Expand Down
Loading

0 comments on commit 29cf886

Please sign in to comment.