Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `.github/dependabot.yml`: Upstream made changes while we have dropped this file. Keep the file deleted. - `.prettierignore`: Upstream made changes at the end of the file, where we had our extra lines. Just moved our extra lines back at the end. - `app/serializers/initial_state_serializer.rb`: Upstream code style changes. Applied them. - `app/services/backup_service.rb`: Upstream code style changes. Applied them.
This commit is contained in:
24
package.json
24
package.json
@@ -15,8 +15,8 @@
|
||||
"test:lint:js": "eslint --ext=js . --cache --report-unused-disable-directives",
|
||||
"test:lint:sass": "stylelint \"**/*.{css,scss}\" && prettier --check \"**/*.{css,scss}\"",
|
||||
"test:jest": "cross-env NODE_ENV=test jest",
|
||||
"format": "prettier --write \"**/*.{json,yml}\"",
|
||||
"format-check": "prettier --check \"**/*.{json,yml}\""
|
||||
"format": "prettier --write .",
|
||||
"format-check": "prettier --check ."
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
@@ -39,7 +39,7 @@
|
||||
"atrament": "0.2.4",
|
||||
"arrow-key-navigation": "^1.2.0",
|
||||
"autoprefixer": "^9.8.8",
|
||||
"axios": "^1.3.2",
|
||||
"axios": "^1.3.3",
|
||||
"babel-loader": "^8.3.0",
|
||||
"babel-plugin-lodash": "^3.3.4",
|
||||
"babel-plugin-preval": "^5.1.0",
|
||||
@@ -117,7 +117,7 @@
|
||||
"requestidlecallback": "^0.3.0",
|
||||
"reselect": "^4.1.7",
|
||||
"rimraf": "^4.1.2",
|
||||
"sass": "^1.58.0",
|
||||
"sass": "^1.58.2",
|
||||
"sass-loader": "^10.2.0",
|
||||
"stacktrace-js": "^2.0.2",
|
||||
"stringz": "^2.1.0",
|
||||
@@ -130,7 +130,7 @@
|
||||
"uuid": "^8.3.1",
|
||||
"webpack": "^4.46.0",
|
||||
"webpack-assets-manifest": "^4.0.6",
|
||||
"webpack-bundle-analyzer": "^4.7.0",
|
||||
"webpack-bundle-analyzer": "^4.8.0",
|
||||
"webpack-cli": "^3.3.12",
|
||||
"webpack-merge": "^5.8.0",
|
||||
"wicg-inert": "^3.1.2",
|
||||
@@ -140,29 +140,29 @@
|
||||
"workbox-strategies": "^6.5.4",
|
||||
"workbox-webpack-plugin": "^6.5.4",
|
||||
"workbox-window": "^6.5.4",
|
||||
"ws": "^8.12.0"
|
||||
"ws": "^8.12.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@babel/eslint-parser": "^7.19.1",
|
||||
"@testing-library/jest-dom": "^5.16.5",
|
||||
"@testing-library/react": "^12.1.5",
|
||||
"babel-jest": "^29.4.1",
|
||||
"babel-jest": "^29.4.3",
|
||||
"eslint": "^8.33.0",
|
||||
"eslint-plugin-import": "~2.27.5",
|
||||
"eslint-plugin-jsx-a11y": "~6.7.1",
|
||||
"eslint-plugin-promise": "~6.1.1",
|
||||
"eslint-plugin-react": "~7.32.2",
|
||||
"jest": "^29.4.1",
|
||||
"jest-environment-jsdom": "^29.4.1",
|
||||
"jest": "^29.4.3",
|
||||
"jest-environment-jsdom": "^29.4.3",
|
||||
"postcss-scss": "^4.0.6",
|
||||
"prettier": "^2.8.3",
|
||||
"prettier": "^2.8.4",
|
||||
"raf": "^3.4.1",
|
||||
"react-intl-translations-manager": "^5.0.3",
|
||||
"react-test-renderer": "^16.14.0",
|
||||
"stylelint": "^15.1.0",
|
||||
"stylelint-config-standard-scss": "^7.0.0",
|
||||
"stylelint-config-standard-scss": "^7.0.1",
|
||||
"webpack-dev-server": "^3.11.3",
|
||||
"yargs": "^17.6.2"
|
||||
"yargs": "^17.7.0"
|
||||
},
|
||||
"resolutions": {
|
||||
"kind-of": "^6.0.3"
|
||||
|
||||
Reference in New Issue
Block a user