Skip to content

Commit 83b77c1

Browse files
SmartDev555SmartDev555
authored
chore(deps): Upgrade dependencies (#2045)
1 parent 9566692 commit 83b77c1

File tree

19 files changed

+2140
-1369
lines changed

19 files changed

+2140
-1369
lines changed

‎.github/workflows/pull_request.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,7 @@ jobs:
2626
- run: yarn prettier --check .
2727
- run: yarn lint
2828
- run: yarn tsc --build
29-
30-
# Test
31-
- run: yarn workspace app test
32-
- run: yarn workspace edge test
29+
- run: yarn test
3330

3431
# Compile
3532
- run: yarn build

‎.vscode/settings.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"prettier.prettierPath": ".yarn/sdks/prettier/index.js",
1111
"typescript.tsdk": ".yarn/sdks/typescript/lib",
1212
"typescript.enablePromptUseWorkspaceTsdk": true,
13+
"vitest.commandLine": "yarn vitest",
1314
"files.exclude": {
1415
"**/.cache": true,
1516
"**/.DS_Store": true,

‎.yarn/releases/yarn-4.0.0-rc.42.cjs renamed to ‎.yarn/releases/yarn-4.0.0-rc.45.cjs

Lines changed: 305 additions & 304 deletions
Large diffs are not rendered by default.

‎.yarn/sdks/eslint/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "eslint",
3-
"version": "8.36.0-sdk",
3+
"version": "8.42.0-sdk",
44
"main": "./lib/api.js",
55
"type": "commonjs"
66
}

‎.yarn/sdks/prettier/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "prettier",
3-
"version": "2.8.4-sdk",
3+
"version": "2.8.8-sdk",
44
"main": "./index.js",
55
"type": "commonjs"
66
}

‎.yarn/sdks/typescript/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "typescript",
3-
"version": "5.0.2-sdk",
3+
"version": "5.0.4-sdk",
44
"main": "./lib/typescript.js",
55
"type": "commonjs"
66
}

‎.yarnrc.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ nodeLinker: pnp
55
packageExtensions:
66
"@miniflare/r2@*":
77
dependencies:
8-
"@miniflare/core": ^2.12.1
8+
"@miniflare/core": ^2.14.0
9+
"local-pkg@*":
10+
dependencies:
11+
"happy-dom": ^9.20.3
912

10-
yarnPath: .yarn/releases/yarn-4.0.0-rc.42.cjs
13+
yarnPath: .yarn/releases/yarn-4.0.0-rc.45.cjs

‎app/core/auth.ts

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,48 @@ import {
1212
type SignInOptions,
1313
} from "./firebase.js";
1414

15+
let idTokenPromise: Promise<string | null> | undefined;
16+
let idTokenPromiseResolve:
17+
| ((value: Promise<string> | null) => void)
18+
| undefined;
19+
20+
const unsubscribeIdTokenChanged = auth.onIdTokenChanged((user) => {
21+
if (user) {
22+
idTokenPromise = user.getIdToken();
23+
idTokenPromiseResolve?.(idTokenPromise as Promise<string>);
24+
} else {
25+
idTokenPromise = Promise.resolve(null);
26+
idTokenPromiseResolve?.(null);
27+
}
28+
});
29+
30+
if (import.meta.hot) {
31+
import.meta.hot.dispose(unsubscribeIdTokenChanged);
32+
}
33+
34+
/**
35+
* Returns a JSON Web Token (JWT) used to identify the user. If the user is not
36+
* authenticated, returns `null`. If the token is expired or will expire in the
37+
* next five minutes, refreshes the token and returns a new one.
38+
*/
39+
export async function getIdToken() {
40+
if (!idTokenPromise) {
41+
idTokenPromise = new Promise<string | null>((resolve, reject) => {
42+
const timeout = setTimeout(() => {
43+
reject(new Error("getIdToken() timeout"));
44+
}, 5000);
45+
46+
idTokenPromiseResolve = (value: PromiseLike<string> | null) => {
47+
resolve(value);
48+
clearTimeout(timeout);
49+
idTokenPromiseResolve = undefined;
50+
};
51+
});
52+
}
53+
54+
return await idTokenPromise;
55+
}
56+
1557
export const SignInMethods: SignInMethod[] = [
1658
"google.com",
1759
"apple.com",

‎app/package.json

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,30 +16,31 @@
1616
"app:deploy": "yarn workspace app deploy"
1717
},
1818
"dependencies": {
19-
"@babel/runtime": "^7.21.0",
20-
"@emotion/react": "^11.10.6",
21-
"@emotion/styled": "^11.10.6",
19+
"@babel/runtime": "^7.22.3",
20+
"@emotion/react": "^11.11.0",
21+
"@emotion/styled": "^11.11.0",
2222
"@mui/icons-material": "^5.11.16",
23-
"@mui/lab": "^5.0.0-alpha.128",
24-
"@mui/material": "^5.12.2",
25-
"firebase": "^9.20.0",
23+
"@mui/lab": "^5.0.0-alpha.133",
24+
"@mui/material": "^5.13.4",
25+
"firebase": "^9.22.1",
2626
"localforage": "^1.10.0",
2727
"notistack": "^3.0.1",
2828
"react": "^18.2.0",
2929
"react-dom": "^18.2.0",
30-
"react-router-dom": "^6.10.0",
30+
"react-router-dom": "^6.12.0",
3131
"recoil": "^0.7.7"
3232
},
3333
"devDependencies": {
34-
"@babel/core": "^7.21.4",
35-
"@emotion/babel-plugin": "^11.10.6",
36-
"@types/node": "^18.16.1",
37-
"@types/react": "^18.2.0",
38-
"@types/react-dom": "^18.2.1",
34+
"@babel/core": "^7.22.1",
35+
"@emotion/babel-plugin": "^11.11.0",
36+
"@types/node": "^18.16.16",
37+
"@types/react": "^18.2.8",
38+
"@types/react-dom": "^18.2.4",
3939
"@vitejs/plugin-react": "^4.0.0",
4040
"envars": "^0.4.0",
41-
"typescript": "^5.0.4",
42-
"vite": "^4.3.3",
43-
"vitest": "^0.30.1"
41+
"happy-dom": "^9.20.3",
42+
"typescript": "~5.0.4",
43+
"vite": "^4.3.9",
44+
"vitest": "^0.32.0"
4445
}
4546
}

‎app/theme/index.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,9 @@ export function useToggleTheme(name?: PaletteMode) {
9494
);
9595
}
9696

97+
/**
98+
* This component makes the `theme` available down the React tree.
99+
*/
97100
export function ThemeProvider(props: {
98101
children: React.ReactNode;
99102
}): JSX.Element {

‎app/vite.config.ts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,18 @@
33

44
import react from "@vitejs/plugin-react";
55
import envars from "envars";
6+
import { resolve } from "node:path";
67
import { URL } from "node:url";
7-
import { defineConfig } from "vitest/config";
8+
import { defineProject } from "vitest/config";
89
import { Config, EnvName } from "./core/config.js";
910

1011
// The list of supported environments
1112
const envNames: EnvName[] = ["prod", "test", "local"];
1213

1314
// Bootstrap client-side configuration from environment variables
1415
const configs = envNames.map((envName): [EnvName, Config] => {
15-
const env = envars.config({ env: envName, cwd: "../env" });
16+
const envDir = resolve(__dirname, "../env");
17+
const env = envars.config({ env: envName, cwd: envDir });
1618
return [
1719
envName,
1820
{
@@ -41,7 +43,7 @@ process.env.VITE_CONFIG = JSON.stringify(Object.fromEntries(configs));
4143
* Vite configuration
4244
* https://vitejs.dev/config/
4345
*/
44-
export default defineConfig({
46+
export default defineProject({
4547
cacheDir: `../.cache/vite-app`,
4648

4749
build: {
@@ -75,8 +77,7 @@ export default defineConfig({
7577
},
7678

7779
test: {
78-
cache: {
79-
dir: "../.cache/vitest-app",
80-
},
80+
...{ cache: { dir: "../.cache/vitest" } },
81+
environment: "happy-dom",
8182
},
8283
});

‎edge/package.json

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,29 @@
77
"build": "vite build",
88
"test": "vitest",
99
"coverage": "vitest run --coverage",
10-
"deploy": "node ../scripts/wrangler.js publish",
11-
"wrangler": "node ../scripts/wrangler.js"
10+
"deploy": "node ../scripts/wrangler.js deploy",
11+
"wrangler": "node ../scripts/wrangler.js",
12+
"edge:cf": "node ../scripts/wrangler.js",
13+
"edge:tsc": "tsc",
14+
"edge:test": "vitest",
15+
"edge:build": "vite build",
16+
"edge:deploy": "node ../scripts/wrangler.js deploy"
1217
},
1318
"dependencies": {
14-
"@hono/zod-validator": "^0.1.2",
15-
"hono": "^3.1.6",
16-
"jose": "^4.14.3",
19+
"@hono/zod-validator": "^0.1.3",
20+
"hono": "^3.2.4",
21+
"jose": "^4.14.4",
1722
"web-auth-library": "^1.0.3",
1823
"zod": "^3.21.4"
1924
},
2025
"devDependencies": {
21-
"@cloudflare/workers-types": "^4.20230404.0",
22-
"@types/node": "^18.16.1",
26+
"@cloudflare/workers-types": "^4.20230518.0",
27+
"@types/node": "^18.16.16",
28+
"happy-dom": "^9.20.3",
2329
"toml": "^3.0.0",
24-
"typescript": "^5.0.4",
25-
"vite": "^4.3.3",
26-
"vitest": "^0.30.1",
27-
"vitest-environment-miniflare": "^2.13.0"
30+
"typescript": "~5.0.4",
31+
"vite": "^4.3.9",
32+
"vitest": "^0.32.0",
33+
"vitest-environment-miniflare": "^2.14.0"
2834
}
2935
}

‎edge/vite.config.ts

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
/* SPDX-License-Identifier: MIT */
33

44
import { resolve } from "node:path";
5-
import { defineConfig } from "vitest/config";
5+
import { defineProject } from "vitest/config";
66
import { getCloudflareBindings } from "../scripts/utils.js";
77

8-
export default defineConfig({
8+
export default defineProject({
99
cacheDir: "../.cache/vite-edge",
1010

1111
// Production build configuration
@@ -30,16 +30,14 @@ export default defineConfig({
3030
// Unit testing configuration
3131
// https://vitest.dev/config/
3232
test: {
33-
cache: {
34-
dir: "../.cache/vitest-edge",
35-
},
33+
...{ cache: { dir: resolve(__dirname, "../.cache/vitest") } },
3634
deps: {
37-
registerNodeLoader: true,
35+
// ...{ registerNodeLoader: true },
3836
external: ["__STATIC_CONTENT_MANIFEST"],
3937
},
4038
environment: "miniflare",
4139
environmentOptions: {
42-
bindings: getCloudflareBindings(),
40+
bindings: getCloudflareBindings(resolve(__dirname, "wrangler.toml")),
4341
},
4442
},
4543
});

‎package.json

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "root",
33
"version": "0.0.0",
44
"private": true,
5-
"packageManager": "[email protected].42",
5+
"packageManager": "[email protected].45",
66
"type": "module",
77
"workspaces": [
88
"app",
@@ -14,28 +14,32 @@
1414
"update-schema": "node ./scripts/update-schema.js",
1515
"start": "node --experimental-vm-modules ./scripts/start.js",
1616
"lint": "eslint --cache --report-unused-disable-directives .",
17-
"test": "yarn workspaces foreach -ti run test",
17+
"test": "vitest",
1818
"build": "yarn workspaces foreach -ti run build",
1919
"deploy": "yarn workspace edge deploy"
2020
},
2121
"devDependencies": {
22-
"@emotion/eslint-plugin": "^11.10.0",
23-
"@types/eslint": "^8.37.0",
24-
"@typescript-eslint/eslint-plugin": "^5.59.1",
25-
"@typescript-eslint/parser": "^5.59.1",
26-
"eslint": "^8.39.0",
22+
"@emotion/babel-plugin": "^11.11.0",
23+
"@emotion/eslint-plugin": "^11.11.0",
24+
"@types/eslint": "^8.40.0",
25+
"@typescript-eslint/eslint-plugin": "^5.59.9",
26+
"@typescript-eslint/parser": "^5.59.9",
27+
"eslint": "^8.42.0",
2728
"eslint-config-prettier": "^8.8.0",
2829
"eslint-import-resolver-typescript": "^3.5.5",
2930
"eslint-plugin-import": "^2.27.5",
3031
"eslint-plugin-jsx-a11y": "^6.7.1",
3132
"eslint-plugin-react": "^7.32.2",
3233
"eslint-plugin-react-hooks": "^4.6.0",
3334
"graphql": "^16.6.0",
35+
"happy-dom": "^9.20.3",
3436
"husky": "^8.0.3",
3537
"prettier": "^2.8.8",
3638
"react": "^18.2.0",
3739
"relay-config": "^12.0.1",
38-
"typescript": "^5.0.4"
40+
"typescript": "~5.0.4",
41+
"vite": "^4.3.9",
42+
"vitest": "^0.32.0"
3943
},
4044
"prettier": {
4145
"printWidth": 80,

‎scripts/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
"dependencies": {
77
"envars": "^0.4.0",
88
"execa": "^7.1.1",
9-
"get-port": "^6.1.2",
10-
"got": "^12.6.0",
9+
"get-port": "^7.0.0",
10+
"got": "^13.0.0",
1111
"graphql": "^16.6.0",
1212
"lodash-es": "^4.17.21",
13-
"miniflare": "^2.13.0",
13+
"miniflare": "^2.14.0",
1414
"prettier": "^2.8.8",
1515
"toml": "^3.0.0",
16-
"vite": "^4.3.3",
17-
"wrangler": "^2.17.0",
18-
"zx": "^7.2.1"
16+
"vite": "^4.3.9",
17+
"wrangler": "^3.1.0",
18+
"zx": "^7.2.2"
1919
}
2020
}

‎tsconfig.base.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
/* Modules */
2828
"module": "ESNext", /* Specify what module code is generated. */
2929
// "rootDir": "./", /* Specify the root folder within your source files. */
30-
"moduleResolution": "nodenext", /* Specify how TypeScript looks up a file from a given module specifier. */
30+
"moduleResolution": "bundler", /* Specify how TypeScript looks up a file from a given module specifier. */
3131
// "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */
3232
// "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */
3333
// "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */

‎vitest.config.ts

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
/* SPDX-FileCopyrightText: 2014-present Kriasoft */
2+
/* SPDX-License-Identifier: MIT */
3+
4+
import { defineConfig } from "vitest/config";
5+
6+
/**
7+
* Vitest configuration.
8+
*
9+
* @see https://vitest.dev/config/
10+
*/
11+
export default defineConfig({
12+
test: {
13+
cache: {
14+
dir: "./.cache/vitest",
15+
},
16+
},
17+
});

0 commit comments

Comments
 (0)