Matrix/synapse-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into amp.chat

Browse Source 
Change-Id: Iac4e56401aab3f7f39b623b617990ec1952f8cd0
This commit is contained in:
Michael Albert
2020-04-20 16:57:23 +02:00
parent 7aec6f9369 b7f009e559
commit e9c3901b68
12 changed files with 1541 additions and 1131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
package.json
View File

@@ -10,14 +10,14 @@
},
"devDependencies": {
"@testing-library/jest-dom": "^5.1.1",
"@testing-library/react": "^9.4.0",
"@testing-library/user-event": "^8.1.0",
"@testing-library/react": "^10.0.2",
"@testing-library/user-event": "^10.0.1",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.2",
"eslint": "^6.8.0",
"eslint-config-prettier": "^6.10.0",
"eslint-config-prettier": "^6.10.1",
"eslint-plugin-prettier": "^3.1.2",
"prettier": "^1.19.1"
"prettier": "^2.0.0"
},
"dependencies": {
"@progress/kendo-drawing": "^1.6.0",
@@ -25,10 +25,10 @@
"prop-types": "^15.7.2",
"qrcode.react": "^1.0.0",
"ra-language-german": "^2.1.2",
"react": "^16.12.0",
"react-admin": "^3.4",
"react-dom": "^16.12.0",
"react-scripts": "^3.3.0"
"react": "^16.13.1",
"react-admin": "^3.4.0",
"react-dom": "^16.13.1",
"react-scripts": "^3.4.1"
},
"scripts": {
"start": "react-scripts start",
@@ -36,7 +36,7 @@
"fix:other": "yarn prettier --write",
"fix:code": "yarn test:lint --fix",
"fix": "yarn fix:code && yarn fix:other",
"prettier": "prettier \"**/*.{json,md,scss,yaml,yml}\"",
"prettier": "prettier \"**/*.{js,jsx,json,md,scss,yaml,yml}\"",
"test:code": "react-scripts test",
"test:lint": "eslint --ignore-path .gitignore --ext .js,.jsx .",
"test:style": "yarn prettier --list-different",