Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade dependencies #115

Merged
merged 25 commits into from May 21, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 8 additions & 6 deletions .eslintrc.json
Expand Up @@ -5,7 +5,11 @@
"es6": true,
"jest": true
},
"extends": ["eslint:recommended", "plugin:react/recommended"],
"extends": [
"plugin:prettier/recommended",
"plugin:react/recommended",
"prettier"
],
"settings": {
"react": {
"version": "16.0"
Expand All @@ -20,12 +24,10 @@
"ecmaVersion": 2019,
"sourceType": "module"
},
"plugins": ["react"],
"plugins": ["react", "prettier"],
"rules": {
"indent": ["error", 2],
"linebreak-style": ["error", "unix"],
"quotes": ["error", "double"],
"semi": ["error", "never"],
"prettier/prettier": "error",

"react/prop-types": 0,
"react/display-name": 0
}
Expand Down
20 changes: 11 additions & 9 deletions package.json
Expand Up @@ -22,13 +22,15 @@
"enzyme": "^3.3.0",
"enzyme-adapter-react-16": "^1.1.1",
"eslint": "^5.4.0",
"eslint-config-prettier": "^3.0.1",
"eslint-plugin-prettier": "^2.6.2",
"eslint-plugin-react": "^7.11.1",
"file-loader": "^1.1.11",
"file-loader": "^2.0.0",
"identity-obj-proxy": "^3.0.0",
"immutable": "^3.8.2",
"jest": "^23.2.0",
"jest-localstorage-mock": "^2.2.0",
"jest-styled-components": "^5.0.1",
"jest-styled-components": "^6.1.1",
"jsdoc": "^3.5.5",
"jsdoc-to-markdown": "^4.0.1",
"prettier": "^1.14.2",
Expand All @@ -37,7 +39,7 @@
"react-router-dom": "^4.2.2",
"react-test-renderer": "^16.4.1",
"size-limit": "^0.19.0",
"style-loader": "^0.21.0",
"style-loader": "^0.22.1",
"typeface-rajdhani": "^0.0.54",
"typeface-yanone-kaffeesatz": "^0.0.54",
"url-loader": "^1.0.1",
Expand All @@ -57,9 +59,9 @@
"docs": "jsdoc2md src/*.js > docs/README.md; jsdoc2md src/components/**/*.js > docs/COMPONENTS.md; jsdoc2md src/plugins/*.js > docs/PLUGINS.md; jsdoc2md src/utils/*.js > docs/UTILS.md",
"size": "size-limit",
"test": "jest",
"lint": "eslint ./src/.",
"lint:fix": "eslint --fix ./src/.",
"lint:prettier": "prettier --write src/**/*.js"
"prettier": "prettier --write \"src/**/*.js\"",
"lint": "eslint \"src/**/*.js\"",
"lint:fix": "eslint --fix \"src/**/*.js\""
},
"dependencies": {
"@roast-cms/react-button-beans": "^1.1.3",
Expand All @@ -71,12 +73,12 @@
"localforage-getitems": "^1.4.1",
"lodash": "^4.17.4",
"positions": "^1.6.1",
"slate": "^0.34.2",
"slate": "^0.36.0",
"slate-auto-replace": "^0.9.0",
"slate-drop-or-paste-images": "^0.8.1",
"slate-html-serializer": "^0.6.0",
"slate-react": "^0.13.0",
"styled-components": "^3.2.3",
"slate-react": "^0.14.0",
"styled-components": "^3.4.5",
"uuid": "^3.1.0",
"valid-data-url": "^0.1.6"
},
Expand Down