Merge remote-tracking branch 'glitch/main'

1 files changed, 14 insertions, 12 deletions

diff --git a/package.json b/package.json
index f0f41c140..6e23e9c74 100644
--- a/package.json
+++ b/package.json
@@ -13,10 +13,10 @@
     "test": "${npm_execpath} run test:lint:js && ${npm_execpath} run test:jest",
     "test:lint": "${npm_execpath} run test:lint:js && ${npm_execpath} run test:lint:sass",
     "test:lint:js": "eslint --ext=js . --cache",
-    "test:lint:sass": "sass-lint -v",
+    "test:lint:sass": "stylelint '**/*.scss'",
     "test:jest": "cross-env NODE_ENV=test jest",
-    "format": "prettier --write '**/*.{json,yml}",
-    "format-check": "prettier --write '**/*.{json,yml}"
+    "format": "prettier --write '**/*.{json,yml}'",
+    "format-check": "prettier --write '**/*.{json,yml}'"
   },
   "repository": {
     "type": "git",
@@ -24,13 +24,13 @@
   },
   "private": true,
   "dependencies": {
-    "@babel/core": "^7.18.0",
-    "@babel/plugin-proposal-decorators": "^7.17.12",
+    "@babel/core": "^7.18.2",
+    "@babel/plugin-proposal-decorators": "^7.18.2",
     "@babel/plugin-transform-react-inline-elements": "^7.16.7",
     "@babel/plugin-transform-runtime": "^7.18.2",
     "@babel/preset-env": "^7.18.2",
     "@babel/preset-react": "^7.17.12",
-    "@babel/runtime": "^7.18.0",
+    "@babel/runtime": "^7.18.3",
     "@gamestdio/websocket": "^0.3.2",
     "@github/webauthn-json": "^0.5.7",
     "@rails/ujs": "^6.1.6",
@@ -45,7 +45,6 @@
     "babel-plugin-preval": "^5.1.0",
     "babel-plugin-react-intl": "^6.2.0",
     "babel-plugin-transform-react-remove-prop-types": "^0.4.24",
-    "babel-runtime": "^6.26.0",
     "blurhash": "^1.1.5",
     "classnames": "^2.3.1",
     "color-blend": "^3.0.1",
@@ -87,6 +86,7 @@
     "offline-plugin": "^5.0.7",
     "path-complete-extname": "^1.0.0",
     "pg": "^8.5.0",
+    "postcss": "^8.4.14",
     "postcss-loader": "^3.0.0",
     "postcss-object-fit-images": "^1.1.2",
     "promise.prototype.finally": "^3.1.3",
@@ -109,7 +109,7 @@
     "react-select": "^5.3.2",
     "react-sparklines": "^1.7.0",
     "react-swipeable-views": "^0.14.0",
-    "react-textarea-autosize": "^8.3.3",
+    "react-textarea-autosize": "^8.3.4",
     "react-toggle": "^4.1.2",
     "redis": "^4.0.6 <4.1.0",
     "redux": "^4.2.0",
@@ -120,7 +120,7 @@
     "requestidlecallback": "^0.3.0",
     "reselect": "^4.1.5",
     "rimraf": "^3.0.2",
-    "sass": "^1.51.0",
+    "sass": "^1.52.1",
     "sass-loader": "^10.2.0",
     "stacktrace-js": "^2.0.2",
     "stringz": "^2.1.0",
@@ -140,22 +140,24 @@
     "ws": "^8.6.0"
   },
   "devDependencies": {
+    "@babel/eslint-parser": "^7.18.2",
     "@testing-library/jest-dom": "^5.16.4",
     "@testing-library/react": "^12.1.5",
-    "babel-eslint": "^10.1.0",
     "babel-jest": "^28.1.0",
     "eslint": "^7.32.0",
     "eslint-plugin-import": "~2.26.0",
     "eslint-plugin-jsx-a11y": "~6.5.1",
     "eslint-plugin-promise": "~6.0.0",
-    "eslint-plugin-react": "~7.29.4",
+    "eslint-plugin-react": "~7.30.0",
     "jest": "^28.1.0",
     "jest-environment-jsdom": "^28.1.0",
+    "postcss-scss": "^4.0.4",
     "prettier": "^2.6.2",
     "raf": "^3.4.1",
     "react-intl-translations-manager": "^5.0.3",
     "react-test-renderer": "^16.14.0",
-    "sass-lint": "^1.13.1",
+    "stylelint": "^14.8.5",
+    "stylelint-config-standard-scss": "^4.0.0",
     "webpack-dev-server": "^3.11.3",
     "yargs": "^17.5.1"
   },