diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-03-16 23:12:59 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2023-03-16 23:12:59 +0100 |
| commit | 193250556cb4e6b1b3e2f9bd1ac023b290176fd4 (patch) | |
| tree | 3bd6148ff028b8fe089cae9d805a7e587eaeec11 /package.json | |
| parent | f5daa20f2a90098c9d689c5ec9d95ce9887b3a33 (diff) | |
| parent | 681dcd3fa35e886a21853ca829ff1be7f220e83a (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `README.md`: Upstream changed their README, we have our own. Kept ours. - `app/helpers/application_helper.rb`: Minor code style fix upstream, on a line that is different in glitch-soc due to the different theming system. Applied the code style fix to our own code. - `app/views/settings/preferences/appearance/show.html.haml`: Code style fix on a line next to lines exclusive to glitch-soc. Applied upstream changes. - `yarn.lock`: Upstream updated a dependency textually close to a glitch-soc-only dependency. Updated the dependency like upstream did.
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 016a99d2b..e2bbdc217 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ }, "private": true, "dependencies": { - "@babel/core": "^7.21.0", + "@babel/core": "^7.21.3", "@babel/plugin-proposal-decorators": "^7.21.0", "@babel/plugin-transform-react-inline-elements": "^7.21.0", "@babel/plugin-transform-runtime": "^7.21.0", @@ -38,7 +38,7 @@ "array-includes": "^3.1.6", "atrament": "0.2.4", "arrow-key-navigation": "^1.2.0", - "autoprefixer": "^10.4.13", + "autoprefixer": "^10.4.14", "axios": "^1.3.4", "babel-loader": "^8.3.0", "babel-plugin-lodash": "^3.3.4", @@ -67,7 +67,7 @@ "glob": "^8.1.0", "history": "^4.10.1", "http-link-header": "^1.1.0", - "immutable": "^4.2.4", + "immutable": "^4.3.0", "imports-loader": "^1.2.0", "intl": "^1.2.5", "intl-messageformat": "^2.2.0", @@ -118,7 +118,7 @@ "requestidlecallback": "^0.3.0", "reselect": "^4.1.7", "rimraf": "^4.1.2", - "sass": "^1.58.3", + "sass": "^1.59.3", "sass-loader": "^10.2.0", "stacktrace-js": "^2.0.2", "stringz": "^2.1.0", @@ -144,11 +144,11 @@ "ws": "^8.12.1" }, "devDependencies": { - "@babel/eslint-parser": "^7.19.1", + "@babel/eslint-parser": "^7.21.3", "@testing-library/jest-dom": "^5.16.5", "@testing-library/react": "^12.1.5", "babel-jest": "^29.5.0", - "eslint": "^8.35.0", + "eslint": "^8.36.0", "eslint-plugin-import": "~2.27.5", "eslint-plugin-jsx-a11y": "~6.7.1", "eslint-plugin-promise": "~6.1.1", |