Skip to content

Commit

Permalink
Merge pull request #24 from openimis/develop
Browse files Browse the repository at this point in the history
v1.3
  • Loading branch information
edarchis authored Oct 28, 2021
2 parents f560cdd + 985756a commit 1f09a61
Show file tree
Hide file tree
Showing 31 changed files with 1,413 additions and 1,296 deletions.
2 changes: 0 additions & 2 deletions .prettierrc

This file was deleted.

6 changes: 6 additions & 0 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"trailingComma": "all",
"printWidth": 120,
"quoteProps": "preserve",
"arrowParens": "always"
}
27 changes: 14 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@openimis/fe-admin",
"version": "1.2.1",
"version": "1.3.0",
"license": "AGPL-3.0-only",
"description": "openIMIS Frontend Admin reference module",
"repository": "openimis/openimis-fe-admin_js",
Expand All @@ -12,7 +12,8 @@
},
"scripts": {
"build": "rollup -c",
"start": "rollup -c -w"
"start": "rollup -c -w",
"format": "prettier src -w"
},
"peerDependency": {
"react-intl": "^5.8.1"
Expand All @@ -31,12 +32,21 @@
"@rollup/plugin-node-resolve": "^7.1.3",
"@rollup/plugin-url": "^5.0.0",
"moment": "^2.25.3",
"prettier": "^2.3.2",
"prop-types": "^15.7.2",
"react-autosuggest": "^10.0.2",
"react-router-dom": "^5.2.0",
"redux": "^4.0.5",
"redux-api-middleware": "^3.2.1",
"rollup": "^2.10.0"
"rollup": "^2.10.0",
"babel-eslint": "^10.1.0",
"eslint": "^7.27.0",
"eslint-config-airbnb": "^18.2.1",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-import": "^2.23.3",
"eslint-plugin-jsx-a11y": "^6.4.1",
"eslint-plugin-prettier": "^3.4.0",
"eslint-plugin-react": "^7.23.2"
},
"files": [
"dist"
Expand All @@ -48,15 +58,6 @@
]
},
"dependencies": {
"babel-eslint": "^10.1.0",
"eslint": "^7.27.0",
"eslint-config-airbnb": "^18.2.1",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-import": "^2.23.3",
"eslint-plugin-jsx-a11y": "^6.4.1",
"eslint-plugin-prettier": "^3.4.0",
"eslint-plugin-react": "^7.23.2",
"prettier-eslint": "^12.0.0",
"prettier-eslint-cli": "^5.0.1"
"@material-ui/lab": "^4.0.0-alpha.60"
}
}
Loading

0 comments on commit 1f09a61

Please sign in to comment.