Fixes from rebase to main

mastodon · Jun 1, 2023 · e67de5c · e67de5c
1 parent 5220d36
commit e67de5c
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 27 deletions.
diff --git a/app/javascript/entrypoints/application.js b/app/javascript/entrypoints/application.js
@@ -1,6 +1,6 @@
-import { loadPolyfills } from '../mastodon/polyfills';
-import { loadLocale } from '../mastodon/load_locale';
 import { start } from '../mastodon/common';
+import { loadLocale } from '../mastodon/load_locale';
+import { loadPolyfills } from '../mastodon/polyfills';
 
 import 'styles/application.scss';
 

diff --git a/app/javascript/mastodon/performance.js b/app/javascript/mastodon/performance.js
@@ -3,6 +3,7 @@
 // Open up Chrome Dev Tools, then Timeline, then User Timing to see output.
 
 import * as marky from 'marky';
+
 import { isDevelopment } from './utils/environment';
 
 if (isDevelopment()) {

diff --git a/app/javascript/node_modules/.vitest/results.json b/app/javascript/node_modules/.vitest/results.json
diff --git a/app/javascript/packs/sign_up.js b/app/javascript/packs/sign_up.js
@@ -1,4 +1,3 @@
-import './public-path';
 import axios from 'axios';
 
 import ready from '../mastodon/ready';

diff --git a/package.json b/package.json
@@ -24,7 +24,7 @@
     "postversion": "git push --tags",
     "prepare": "husky install",
     "start": "node ./streaming/index.js",
-    "test": "yarn lint && yarn run typecheck && yarn test:js",
+    "test": "yarn lint && yarn run typecheck && yarn test:js run",
     "test:js": "vitest",
     "typecheck": "tsc --noEmit"
   },
@@ -120,7 +120,6 @@
     "@formatjs/cli": "^6.1.1",
     "@optimize-lodash/rollup-plugin": "^4.0.3",
     "@testing-library/react": "^14.0.0",
-    "@types/babel__core": "^7.20.1",
     "@types/emoji-mart": "^3.0.9",
     "@types/escape-html": "^1.0.2",
     "@types/express": "^4.17.17",
@@ -179,7 +178,7 @@
     "yargs": "^17.7.2"
   },
   "resolutions": {
-    "@types/react": "^16.14.38",
+    "@types/react": "^18.2.7",
     "kind-of": "^6.0.3"
   },
   "optionalDependencies": {

diff --git a/yarn.lock b/yarn.lock
@@ -883,17 +883,6 @@
     "@types/babel__template" "*"
     "@types/babel__traverse" "*"
 
-"@types/babel__core@^7.20.1":
-  version "7.20.1"
-  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.1.tgz#916ecea274b0c776fec721e333e55762d3a9614b"
-  integrity sha512-aACu/U/omhdk15O4Nfb+fHgH/z3QsfQzpnvRZhYhThms83ZnAOZz7zZAWO7mn2yyNQaA4xTO8GLK3uqFU4bYYw==
-  dependencies:
-    "@babel/parser" "^7.20.7"
-    "@babel/types" "^7.20.7"
-    "@types/babel__generator" "*"
-    "@types/babel__template" "*"
-    "@types/babel__traverse" "*"
-
 "@types/babel__generator@*":
   version "7.6.1"
   resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.1.tgz#4901767b397e8711aeb99df8d396d7ba7b7f0e04"
@@ -1256,16 +1245,7 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react@*", "@types/react@16 || 17 || 18", "@types/react@>=16.9.11", "@types/react@^16.14.38":
-  version "16.14.42"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.14.42.tgz#7950af49c07df0ac24098abeec57367ebc662a39"
-  integrity sha512-r6lbqQBJsQ5JJ0fp5I1+F3weosNhk7jOEcKeusIlCDYUK6kCpvIkYCamBNqGyS6WEztYlT8wmAVgblV0HxOFoA==
-  dependencies:
-    "@types/prop-types" "*"
-    "@types/scheduler" "*"
-    csstype "^3.0.2"
-
-"@types/react@^18.2.7":
+"@types/react@*", "@types/react@16 || 17 || 18", "@types/react@>=16.9.11", "@types/react@^18.2.0", "@types/react@^18.2.7":
   version "18.2.7"
   resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.7.tgz#dfb4518042a3117a045b8c222316f83414a783b3"
   integrity sha512-ojrXpSH2XFCmHm7Jy3q44nXDyN54+EYKP2lBhJ2bqfyPj6cIUW/FZW/Csdia34NQgq7KYcAlHi5184m4X88+yw==