Skip to content

Commit 7e6a73a

Browse files
authored
chore: upgrade to vite 7 (@Miodec) (#7051)
1 parent cd8ebd1 commit 7e6a73a

File tree

13 files changed

+1793
-1643
lines changed

13 files changed

+1793
-1643
lines changed

backend/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
"@types/lodash": "4.14.178",
7676
"@types/mjml": "4.7.4",
7777
"@types/mustache": "4.2.2",
78-
"@types/node": "20.14.11",
78+
"@types/node": "24.9.1",
7979
"@types/nodemailer": "6.4.15",
8080
"@types/object-hash": "3.0.6",
8181
"@types/readline-sync": "1.4.8",
@@ -84,7 +84,7 @@
8484
"@types/swagger-stats": "0.95.11",
8585
"@types/ua-parser-js": "0.7.36",
8686
"@types/uuid": "10.0.0",
87-
"@vitest/coverage-v8": "3.2.4",
87+
"@vitest/coverage-v8": "4.0.4",
8888
"concurrently": "8.2.2",
8989
"eslint": "8.57.1",
9090
"eslint-watch": "8.0.0",
@@ -95,6 +95,6 @@
9595
"testcontainers": "11.4.0",
9696
"tsx": "4.16.2",
9797
"typescript": "5.5.4",
98-
"vitest": "3.2.4"
98+
"vitest": "4.0.4"
9999
}
100100
}

frontend/__tests__/utils/date-and-time.spec.ts

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ describe("date-and-time", () => {
3434
it.for(testCases)(`$locale`, ({ locale, firstDayOfWeek }) => {
3535
//GIVEN
3636
languageMock.mockReturnValue(locale);
37-
localeMock.mockImplementationOnce(
38-
() => ({ weekInfo: { firstDay: firstDayOfWeek } } as any)
39-
);
37+
localeMock.mockImplementation(function (this: any) {
38+
return { weekInfo: { firstDay: firstDayOfWeek } } as any;
39+
});
4040

4141
//WHEN/THEN
4242
expect(DateAndTime.getFirstDayOfTheWeek()).toEqual(firstDayOfWeek);
@@ -46,18 +46,18 @@ describe("date-and-time", () => {
4646
describe("with getWeekInfo", () => {
4747
it("with getWeekInfo on monday", () => {
4848
languageMock.mockReturnValue("en-US");
49-
localeMock.mockImplementationOnce(
50-
() => ({ getWeekInfo: () => ({ firstDay: 1 }) } as any)
51-
);
49+
localeMock.mockImplementationOnce(function (this: any) {
50+
return { getWeekInfo: () => ({ firstDay: 1 }) } as any;
51+
});
5252

5353
//WHEN/THEN
5454
expect(DateAndTime.getFirstDayOfTheWeek()).toEqual(1);
5555
});
5656
it("with getWeekInfo on sunday", () => {
5757
languageMock.mockReturnValue("en-US");
58-
localeMock.mockImplementationOnce(
59-
() => ({ getWeekInfo: () => ({ firstDay: 7 }) } as any)
60-
);
58+
localeMock.mockImplementationOnce(function (this: any) {
59+
return { getWeekInfo: () => ({ firstDay: 7 }) } as any;
60+
});
6161

6262
//WHEN/THEN
6363
expect(DateAndTime.getFirstDayOfTheWeek()).toEqual(0);
@@ -66,7 +66,9 @@ describe("date-and-time", () => {
6666

6767
describe("without weekInfo (firefox)", () => {
6868
beforeEach(() => {
69-
localeMock.mockImplementationOnce(() => ({} as any));
69+
localeMock.mockImplementation(function (this: any) {
70+
return {} as any;
71+
});
7072
});
7173

7274
it.for(testCases)(

frontend/package.json

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@
4141
"@types/damerau-levenshtein": "1.0.0",
4242
"@types/howler": "2.2.7",
4343
"@types/jquery": "3.5.14",
44-
"@types/node": "20.14.11",
44+
"@types/node": "24.9.1",
4545
"@types/object-hash": "3.0.6",
4646
"@types/subset-font": "1.4.3",
4747
"@types/throttle-debounce": "5.0.2",
48-
"@vitest/coverage-v8": "3.2.4",
48+
"@vitest/coverage-v8": "4.0.4",
4949
"autoprefixer": "10.4.20",
5050
"concurrently": "8.2.2",
5151
"dotenv": "16.4.5",
@@ -64,16 +64,15 @@
6464
"tsx": "4.16.2",
6565
"typescript": "5.5.4",
6666
"unplugin-inject-preload": "3.0.0",
67-
"vite": "6.3.6",
68-
"vite-bundle-visualizer": "1.0.1",
69-
"vite-plugin-checker": "0.7.2",
67+
"vite": "7.1.12",
68+
"vite-bundle-visualizer": "1.2.1",
69+
"vite-plugin-checker": "0.11.0",
7070
"vite-plugin-filter-replace": "0.1.14",
7171
"vite-plugin-html-inject": "1.1.2",
72-
"vite-plugin-inspect": "11.0.0",
72+
"vite-plugin-inspect": "11.3.3",
7373
"vite-plugin-minify": "2.1.0",
74-
"vite-plugin-oxlint": "1.3.1",
75-
"vite-plugin-pwa": "1.0.0",
76-
"vitest": "3.2.4"
74+
"vite-plugin-pwa": "1.1.0",
75+
"vitest": "4.0.4"
7776
},
7877
"dependencies": {
7978
"@date-fns/utc": "1.2.0",

frontend/src/ts/firebase.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,15 @@ export async function init(callback: ReadyCallback): Promise<void> {
5454
try {
5555
let firebaseConfig: FirebaseOptions | null;
5656

57-
const constants = import.meta.glob("./constants/*.ts");
57+
const constants = import.meta.glob("./constants/firebase-config*.ts");
5858
const loader = constants["./constants/firebase-config.ts"];
5959
if (loader) {
6060
firebaseConfig = ((await loader()) as { firebaseConfig: FirebaseOptions })
6161
.firebaseConfig;
6262
} else {
63-
throw new Error("No firebase config found.");
63+
throw new Error(
64+
"No config file found. Make sure frontend/src/ts/constants/firebase-config.ts exists"
65+
);
6466
}
6567

6668
readyCallback = callback;
@@ -79,12 +81,11 @@ export async function init(callback: ReadyCallback): Promise<void> {
7981
} catch (e) {
8082
app = undefined;
8183
Auth = undefined;
82-
console.error("Authentication failed to initialize", e);
84+
console.error("Firebase failed to initialize", e);
8385
await callback(false, null);
8486
if (isDevEnvironment()) {
8587
Notifications.addPSA(
86-
createErrorMessage(e, "Authentication uninitialized") +
87-
" Check your firebase-config.ts",
88+
createErrorMessage(e, "Firebase uninitialized"),
8889
0,
8990
undefined,
9091
false

frontend/src/ts/utils/misc.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@ export function isPasswordStrong(password: string): boolean {
514514
export function htmlToText(html: string): string {
515515
const el = document.createElement("div");
516516
el.innerHTML = html;
517-
return (el.textContent as string) || el.innerText || "";
517+
return el.textContent || el.innerText || "";
518518
}
519519

520520
export function loadCSS(href: string, prepend = false): void {

frontend/vite.config.dev.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
11
import { checker } from "vite-plugin-checker";
2-
import oxlintPlugin from "vite-plugin-oxlint";
32
import Inspect from "vite-plugin-inspect";
43
import path from "node:path";
54
import { getFontsConig } from "./vite.config";
65

76
/** @type {import("vite").UserConfig} */
87
export default {
98
plugins: [
10-
oxlintPlugin({
11-
configFile: path.resolve(__dirname, "./.oxlintrc.json"),
12-
}),
139
checker({
1410
typescript: {
1511
tsconfigPath: path.resolve(__dirname, "./tsconfig.json"),
1612
},
13+
oxlint: true,
1714
eslint: {
1815
lintCommand: `eslint "${path.resolve(__dirname, "./src/ts/**/*.ts")}"`,
16+
watchPath: path.resolve(__dirname, "./src/"),
1917
},
2018
overlay: {
2119
initialIsOpen: false,

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
"@commitlint/cli": "17.7.1",
6868
"@commitlint/config-conventional": "19.2.2",
6969
"@monkeytype/release": "workspace:*",
70-
"@vitest/coverage-v8": "3.2.4",
70+
"@vitest/coverage-v8": "4.0.4",
7171
"conventional-changelog": "6.0.0",
7272
"eslint": "8.57.1",
7373
"husky": "8.0.1",
@@ -77,7 +77,7 @@
7777
"oxlint": "1.15.0",
7878
"prettier": "2.8.8",
7979
"turbo": "2.5.6",
80-
"vitest": "3.2.4"
80+
"vitest": "4.0.4"
8181
},
8282
"lint-staged": {
8383
"*.{json,scss,css,html}": [

packages/contracts/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"oxlint": "1.15.0",
2828
"tsup": "8.4.0",
2929
"typescript": "5.5.4",
30-
"vitest": "3.2.4"
30+
"vitest": "4.0.4"
3131
},
3232
"exports": {
3333
".": {

packages/eslint-config/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
"name": "@monkeytype/eslint-config",
33
"private": true,
44
"devDependencies": {
5-
"@typescript-eslint/eslint-plugin": "8.41.0",
6-
"@typescript-eslint/parser": "8.2.0",
5+
"@typescript-eslint/eslint-plugin": "8.46.2",
6+
"@typescript-eslint/parser": "8.46.2",
77
"eslint-config-prettier": "9.1.0",
88
"eslint-import-resolver-typescript": "3.6.1",
99
"eslint-plugin-import": "2.29.0",

packages/funbox/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"oxlint": "1.15.0",
2121
"tsup": "8.4.0",
2222
"typescript": "5.5.4",
23-
"vitest": "3.2.4"
23+
"vitest": "4.0.4"
2424
},
2525
"dependencies": {
2626
"@monkeytype/schemas": "workspace:*",

0 commit comments

Comments
 (0)