Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `.github/dependabot.yml`: Upstream modified it, but we deleted it in glitch-soc. Keep it deleted.
This commit is contained in:
13
package.json
13
package.json
@@ -14,7 +14,9 @@
|
||||
"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:jest": "cross-env NODE_ENV=test jest"
|
||||
"test:jest": "cross-env NODE_ENV=test jest",
|
||||
"format": "prettier --write '**/*.{json,yml}",
|
||||
"format-check": "prettier --write '**/*.{json,yml}"
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
@@ -61,13 +63,13 @@
|
||||
},
|
||||
"private": true,
|
||||
"dependencies": {
|
||||
"@babel/core": "^7.17.7",
|
||||
"@babel/plugin-proposal-decorators": "^7.17.2",
|
||||
"@babel/core": "^7.17.8",
|
||||
"@babel/plugin-proposal-decorators": "^7.17.8",
|
||||
"@babel/plugin-transform-react-inline-elements": "^7.16.7",
|
||||
"@babel/plugin-transform-runtime": "^7.17.0",
|
||||
"@babel/preset-env": "^7.16.11",
|
||||
"@babel/preset-react": "^7.16.7",
|
||||
"@babel/runtime": "^7.17.7",
|
||||
"@babel/runtime": "^7.17.8",
|
||||
"@gamestdio/websocket": "^0.3.2",
|
||||
"@github/webauthn-json": "^0.5.7",
|
||||
"@rails/ujs": "^6.1.5",
|
||||
@@ -183,8 +185,9 @@
|
||||
"eslint-plugin-import": "~2.25.4",
|
||||
"eslint-plugin-jsx-a11y": "~6.5.1",
|
||||
"eslint-plugin-promise": "~6.0.0",
|
||||
"eslint-plugin-react": "~7.29.3",
|
||||
"eslint-plugin-react": "~7.29.4",
|
||||
"jest": "^27.5.1",
|
||||
"prettier": "^2.6.0",
|
||||
"raf": "^3.4.1",
|
||||
"react-intl-translations-manager": "^5.0.3",
|
||||
"react-test-renderer": "^16.14.0",
|
||||
|
||||
Reference in New Issue
Block a user