diff options
author | Thibaut Girka <thib@sitedethib.com> | 2020-06-30 23:00:20 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2020-06-30 23:00:20 +0200 |
commit | 9c3b9d5ab91874f5bd9b7225c402816676065f00 (patch) | |
tree | 4d1389cc00bcc59f85a6d42c1a49b5c1d50f3b3c /package.json | |
parent | 10ede3eb27c5de5d4e3a283e333af2a54da6177d (diff) | |
parent | 65506bac3f3fe233b5b7b3241020bd74eb5c9259 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `.env.production.sample`: Upstream deleted it, I decided to keep it. - `package.json`: Upstream updated a dependency textually too close to wavesurfer.js which has been deleted from upstream but is kept in glitch-soc for now.
Diffstat (limited to 'package.json')
-rw-r--r-- | package.json | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/package.json b/package.json index 583524c2e..e1c289388 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ "@babel/plugin-proposal-class-properties": "^7.8.3", "@babel/plugin-proposal-decorators": "^7.10.3", "@babel/plugin-transform-react-inline-elements": "^7.10.1", - "@babel/plugin-transform-runtime": "^7.10.1", + "@babel/plugin-transform-runtime": "^7.10.3", "@babel/preset-env": "^7.10.2", "@babel/preset-react": "^7.10.1", "@babel/runtime": "^7.8.4", @@ -144,7 +144,7 @@ "react-select": "^3.1.0", "react-sparklines": "^1.7.0", "react-swipeable-views": "^0.13.9", - "react-textarea-autosize": "^8.0.1", + "react-textarea-autosize": "^8.1.1", "react-toggle": "^4.1.1", "redis": "^3.0.2", "redux": "^4.0.5", @@ -163,20 +163,20 @@ "tesseract.js": "^2.1.1", "throng": "^4.0.0", "tiny-queue": "^0.2.1", - "uuid": "^8.1.0", + "uuid": "^8.2.0", "wavesurfer.js": "^3.3.3", "webpack": "^4.43.0", "webpack-assets-manifest": "^3.1.1", "webpack-bundle-analyzer": "^3.8.0", - "webpack-cli": "^3.3.11", + "webpack-cli": "^3.3.12", "webpack-merge": "^4.2.1", "wicg-inert": "^3.0.3" }, "devDependencies": { + "@testing-library/jest-dom": "^5.11.0", + "@testing-library/react": "^10.4.3", "babel-eslint": "^10.1.0", "babel-jest": "^25.2.4", - "enzyme": "^3.11.0", - "enzyme-adapter-react-16": "^1.15.2", "eslint": "^6.8.0", "eslint-plugin-import": "~2.21.2", "eslint-plugin-jsx-a11y": "~6.3.1", |