diff options
author | Claire <claire.github-309c@sitedethib.com> | 2021-01-06 18:08:06 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2021-01-06 18:08:06 +0100 |
commit | 90528f43bc988bac8c8280e917531f7505027570 (patch) | |
tree | 6143b81902af21aff93a1dc40b2a2eff3593735b /package.json | |
parent | 225c934a1b66e2fcbedbda7936666c1ca3c9a04b (diff) | |
parent | 69763b6385250902fdb329d030457159976f70ed (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `config/webpack/configuration.js`: Upstream updated the `js-yaml` dependency, which changed how to call it. Those changes conflicted because that code is pretty different in glitch-soc which has to deal with its more complex theming system. Proceeded to the same compatibility changes in glitch-soc's code. - `package.json` and `yarn.lock`: Not really a conflict, just glitch-soc-specific dependencies textually too close to some dependencies updated upstream.
Diffstat (limited to 'package.json')
-rw-r--r-- | package.json | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/package.json b/package.json index 3497f2e0c..caf9a99b6 100644 --- a/package.json +++ b/package.json @@ -60,24 +60,24 @@ }, "private": true, "dependencies": { - "@babel/core": "^7.12.7", + "@babel/core": "^7.12.10", "@babel/plugin-proposal-class-properties": "^7.8.3", - "@babel/plugin-proposal-decorators": "^7.12.1", + "@babel/plugin-proposal-decorators": "^7.12.12", "@babel/plugin-transform-react-inline-elements": "^7.12.1", - "@babel/plugin-transform-runtime": "^7.12.1", - "@babel/preset-env": "^7.12.7", - "@babel/preset-react": "^7.12.7", + "@babel/plugin-transform-runtime": "^7.12.10", + "@babel/preset-env": "^7.12.11", + "@babel/preset-react": "^7.12.10", "@babel/runtime": "^7.12.5", "@clusterws/cws": "^3.0.0", "@gamestdio/websocket": "^0.3.2", "@github/webauthn-json": "^0.5.7", - "@rails/ujs": "^6.0.3", - "array-includes": "^3.1.1", + "@rails/ujs": "^6.1.0", + "array-includes": "^3.1.2", "atrament": "0.2.4", "arrow-key-navigation": "^1.2.0", "autoprefixer": "^9.8.6", - "axios": "^0.21.0", - "babel-loader": "^8.2.1", + "axios": "^0.21.1", + "babel-loader": "^8.2.2", "babel-plugin-lodash": "^3.3.4", "babel-plugin-preval": "^5.0.0", "babel-plugin-react-intl": "^6.2.0", @@ -85,12 +85,12 @@ "babel-runtime": "^6.26.0", "blurhash": "^1.1.3", "classnames": "^2.2.5", - "color-blend": "^3.0.0", + "color-blend": "^3.0.1", "compression-webpack-plugin": "^6.1.1", - "cross-env": "^7.0.2", + "cross-env": "^7.0.3", "css-loader": "^5.0.1", "cssnano": "^4.1.10", - "detect-passive-events": "^2.0.1", + "detect-passive-events": "^2.0.2", "dotenv": "^8.2.0", "emoji-mart": "Gargron/emoji-mart#build", "es6-symbol": "^3.1.3", @@ -105,21 +105,21 @@ "http-link-header": "^1.0.3", "immutable": "^3.8.2", "imports-loader": "^1.2.0", - "intersection-observer": "^0.11.0", + "intersection-observer": "^0.12.0", "intl": "^1.2.5", "intl-messageformat": "^2.2.0", "intl-relativeformat": "^6.4.3", - "is-nan": "^1.3.0", - "js-yaml": "^3.13.1", + "is-nan": "^1.3.2", + "js-yaml": "^4.0.0", "lodash": "^4.17.19", "mark-loader": "^0.1.6", "marky": "^1.2.1", - "mini-css-extract-plugin": "^1.3.1", + "mini-css-extract-plugin": "^1.3.3", "mkdirp": "^1.0.4", "npmlog": "^4.1.2", "object-assign": "^4.1.1", "object-fit-images": "^3.2.3", - "object.values": "^1.1.1", + "object.values": "^1.1.2", "offline-plugin": "^5.0.7", "path-complete-extname": "^1.0.0", "pg": "^6.4.0", @@ -137,12 +137,12 @@ "react-masonry-infinite": "^1.2.2", "react-motion": "^0.5.2", "react-notification": "^6.8.5", - "react-overlays": "^0.9.2", + "react-overlays": "^0.9.3", "react-redux": "^7.2.2", "react-redux-loading-bar": "^4.0.8", "react-router-dom": "^4.1.1", "react-router-scroll-4": "^1.0.0-beta.1", - "react-select": "^3.1.0", + "react-select": "^3.1.1", "react-sparklines": "^1.7.0", "react-swipeable-views": "^0.13.9", "react-textarea-autosize": "^8.3.0", @@ -156,7 +156,7 @@ "requestidlecallback": "^0.3.0", "reselect": "^4.0.0", "rimraf": "^3.0.2", - "sass": "^1.29.0", + "sass": "^1.32.0", "sass-loader": "^10.1.0", "stacktrace-js": "^2.0.2", "stringz": "^2.1.0", @@ -168,28 +168,28 @@ "uuid": "^8.3.1", "webpack": "^4.44.2", "webpack-assets-manifest": "^3.1.1", - "webpack-bundle-analyzer": "^4.1.0", + "webpack-bundle-analyzer": "^4.3.0", "webpack-cli": "^3.3.12", - "webpack-merge": "^5.4.0", + "webpack-merge": "^5.7.3", "wicg-inert": "^3.1.0" }, "devDependencies": { - "@testing-library/jest-dom": "^5.11.6", + "@testing-library/jest-dom": "^5.11.8", "@testing-library/react": "^11.2.2", "babel-eslint": "^10.1.0", "babel-jest": "^26.6.3", - "eslint": "^7.14.0", + "eslint": "^7.17.0", "eslint-plugin-import": "~2.22.1", "eslint-plugin-jsx-a11y": "~6.4.1", "eslint-plugin-promise": "~4.2.1", - "eslint-plugin-react": "~7.21.5", + "eslint-plugin-react": "~7.22.0", "jest": "^26.6.3", "raf": "^3.4.1", "react-intl-translations-manager": "^5.0.3", "react-test-renderer": "^16.14.0", "sass-lint": "^1.13.1", - "webpack-dev-server": "^3.11.0", - "yargs": "^16.1.1" + "webpack-dev-server": "^3.11.1", + "yargs": "^16.2.0" }, "resolutions": { "kind-of": "^6.0.3" |