chore(deps): Upgrade dependencies (#363)

.vscode/settings.json

@@ -13,7 +13,7 @@
   "jest.jestCommandLine": "yarn jest",
   "jestrunner.jestCommand": "yarn jest",
   "jestrunner.enableYarnPnpSupport": true,
-  "jestrunner.yarnPnpCommand": "yarn-4.0.0-rc.39.cjs",
+  "jestrunner.yarnPnpCommand": "yarn-4.0.0-rc.40.cjs",
   "files.associations": {
     ".terraformrc": "terraform"
   },

.yarnrc.yml

@@ -9,4 +9,4 @@ packageExtensions:
 
 pnpEnableEsmLoader: true
 
-yarnPath: .yarn/releases/yarn-4.0.0-rc.39.cjs
+yarnPath: .yarn/releases/yarn-4.0.0-rc.40.cjs

README.md

@@ -94,8 +94,8 @@ $ yarn api:build
 $ yarn api:deploy --env=prod
 
 # Build and deploy the web front-end to Cloudflare Workers (CDN)
-$ yarn web:build
-$ yarn web:deploy --env=prod
+$ yarn app:build
+$ yarn app:deploy --env=prod
 
 # Migrate the target database to the latest version
 $ yarn db:migrate --env=prod

api/README.md

@@ -36,7 +36,6 @@ assistance.
 ├── graphql.ts                  # GraphQL API schema
 ├── index.ts                    # Node.js / Express server
 ├── package.json                # Node.js dependencies
-├── rollup.config.js            # Rollup bundler configuration
 ├── schema.graphql              # GraphQL schema (auto-generated)
 └── tsconfig.json               # TypeScript configuration
 ```

api/package.json

@@ -38,10 +38,10 @@
     "jose": "^4.13.1",
     "knex": "^2.4.2",
     "lodash-es": "^4.17.21",
-    "lru-cache": "^7.18.1",
+    "lru-cache": "^7.18.3",
     "minimist": "^1.2.8",
     "nanoid": "^4.0.1",
-    "pg": "^8.9.0",
+    "pg": "^8.10.0",
     "pretty-error": "^4.0.0",
     "simple-oauth2": "^5.0.0",
     "slugify": "^1.6.5",
@@ -50,7 +50,7 @@
     "validator-fluent": "^0.4.2"
   },
   "devDependencies": {
-    "@jest/types": "^29.4.3",
+    "@jest/types": "^29.5.0",
     "@types/cookie": "^0.5.1",
     "@types/express": "^4.17.17",
     "@types/gm": "^1.25.0",

app/README.md

@@ -27,8 +27,8 @@ Web application project built with TypeScript, React, and Relay.
 ## Getting Started
 
 ```bash
-$ yarn web:relay [--watch]      # Compile GraphQL fragments
-$ yarn web:start                # Launch the app using Vite dev server
+$ yarn app:relay [--watch]      # Compile GraphQL fragments
+$ yarn app:start                # Launch the app using Vite dev server
 ```
 
 The app must become available on [`http://localhost:5173/`](http://localhost:5173/).
@@ -40,22 +40,22 @@ for the target deployment environment (`test`, `prod`) are up-to-date. Push the
 required secrets to Cloudflare Workers environment, for example:
 
 ```
-$ yarn web:cf secret put GOOGLE_CLOUD_CREDENTIALS
+$ yarn edge:cf secret put GOOGLE_CLOUD_CREDENTIALS
 ```
 
 Finally, build and deploy the app by running:
 
 ```
-$ yarn web:build
-$ yarn web:deploy [--env #0] [--version #0]
+$ yarn app:build
+$ yarn app:deploy [--env #0] [--version #0]
 ```
 
 Where `--env` is the target deployment environment, e.g. `--env=test` (default).
 
 Once the app was deployed, you can access Cloudflare Workers logs via:
 
 ```
-$ yarn web:cf tail [--env #0] [--version #0]
+$ yarn edge:cf tail [--env #0] [--version #0]
 ```
 
-For the full list of Cloudflare CLI options run `yarn web:cf --help`.
+For the full list of Cloudflare CLI options run `yarn edge:cf --help`.

app/package.json

@@ -20,11 +20,11 @@
     "@emotion/react": "^11.10.6",
     "@emotion/styled": "^11.10.6",
     "@mui/icons-material": "^5.11.11",
-    "@mui/lab": "^5.0.0-alpha.121",
-    "@mui/material": "^5.11.11",
+    "@mui/lab": "^5.0.0-alpha.122",
+    "@mui/material": "^5.11.12",
     "firebase": "^9.17.2",
     "localforage": "^1.10.0",
-    "notistack": "^2.0.8",
+    "notistack": "^3.0.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-relay": "14.1.0",
@@ -34,7 +34,7 @@
   },
   "devDependencies": {
     "@emotion/babel-plugin": "^11.10.6",
-    "@jest/types": "^29.4.3",
+    "@jest/types": "^29.5.0",
     "@types/node": "^18.14.6",
     "@types/react": "^18.0.28",
     "@types/react-dom": "^18.0.11",

app/routes/auth/Login.tsx

@@ -1,3 +1,6 @@
+/* SPDX-FileCopyrightText: 2014-present Kriasoft */
+/* SPDX-License-Identifier: MIT */
+
 import {
   Alert,
   Button,
@@ -138,7 +141,11 @@ export default function Login(props: Props): JSX.Element {
       />
 
       <Button
-        sx={{ backgroundColor: "white", order: isSignUp ? undefined : -2 }}
+        sx={{
+          backgroundColor: (theme) =>
+            theme.palette.mode === "light" ? "white" : undefined,
+          order: isSignUp ? undefined : -2,
+        }}
         color="inherit"
         type="submit"
         variant="outlined"
@@ -151,7 +158,11 @@ export default function Login(props: Props): JSX.Element {
       />
 
       <Button
-        sx={{ backgroundColor: "white", order: isSignUp ? undefined : -2 }}
+        sx={{
+          backgroundColor: (theme) =>
+            theme.palette.mode === "light" ? "white" : undefined,
+          order: isSignUp ? undefined : -2,
+        }}
         color="inherit"
         type="submit"
         variant="outlined"
@@ -164,13 +175,17 @@ export default function Login(props: Props): JSX.Element {
       />
 
       <Button
-        sx={{ backgroundColor: "white", order: isSignUp ? undefined : -2 }}
+        sx={{
+          backgroundColor: (theme) =>
+            theme.palette.mode === "light" ? "white" : undefined,
+          order: isSignUp ? undefined : -2,
+        }}
         color="inherit"
         type="submit"
         variant="outlined"
         size="large"
         children="Continue as anonymous"
-        startIcon={<AuthIcon variant="anonymous" />}
+        startIcon={<AuthIcon color="inherit" variant="anonymous" />}
         onClick={handleSignIn}
         data-method="anonymous"
         fullWidth

db/package.json

@@ -25,7 +25,7 @@
     "@babel/node": "^7.20.7",
     "@babel/register": "^7.21.0",
     "@faker-js/faker": "^7.6.0",
-    "@jest/types": "^29.4.3",
+    "@jest/types": "^29.5.0",
     "@types/cross-spawn": "^6.0.2",
     "@types/lodash": "^4.14.191",
     "@types/minimist": "^1.2.2",
@@ -42,7 +42,7 @@
     "nanoid": "^4.0.1",
     "nanospinner": "^1.1.0",
     "ora": "^6.1.2",
-    "pg": "^8.9.0",
+    "pg": "^8.10.0",
     "prettier": "^2.8.4",
     "ts-import": "^4.0.0-beta.10",
     "ts-node": "^10.9.1",

edge/package.json

@@ -8,17 +8,18 @@
     "test": "vitest",
     "coverage": "vitest run --coverage",
     "deploy": "node ../scripts/wrangler.js publish",
-    "wrangler": "node ../scripts/wrangler.js"
+    "wrangler": "node ../scripts/wrangler.js",
+    "edge:cf": "node ../scripts/wrangler.js"
   },
   "dependencies": {
     "@hono/zod-validator": "^0.0.6",
     "hono": "^3.0.3",
     "jose": "^4.13.1",
     "web-auth-library": "^1.0.3",
-    "zod": "^3.21.0"
+    "zod": "^3.21.4"
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20230228.0",
+    "@cloudflare/workers-types": "^4.20230307.0",
     "@types/node": "^18.14.6",
     "toml": "^3.0.0",
     "typescript": "^4.9.5",

package.json

@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "private": true,
   "type": "module",
-  "packageManager": "[email protected].39",
+  "packageManager": "[email protected].40",
   "workspaces": [
     "api",
     "app",
@@ -39,37 +39,33 @@
     "@emotion/babel-plugin": "^11.10.6",
     "@emotion/eslint-plugin": "^11.10.0",
     "@emotion/react": "^11.10.6",
-    "@typescript-eslint/eslint-plugin": "^5.54.0",
-    "@typescript-eslint/parser": "^5.54.0",
-    "babel-jest": "^29.4.3",
+    "@typescript-eslint/eslint-plugin": "^5.54.1",
+    "@typescript-eslint/parser": "^5.54.1",
+    "babel-jest": "^29.5.0",
     "babel-plugin-import": "^1.13.6",
     "babel-plugin-relay": "^14.1.0",
     "babel-plugin-replace-import-extension": "^1.1.3",
-    "chalk": "^5.2.0",
-    "cross-spawn": "^7.0.3",
-    "dotenv": "^16.0.3",
     "envars": "^0.4.0",
     "eslint": "^8.35.0",
-    "eslint-config-prettier": "^8.6.0",
+    "eslint-config-prettier": "^8.7.0",
     "eslint-import-resolver-typescript": "^3.5.3",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-jsx-a11y": "^6.7.1",
     "eslint-plugin-react": "^7.32.2",
     "eslint-plugin-react-hooks": "^4.6.0",
-    "graphql-config": "^4.4.1",
+    "graphql-config": "^4.5.0",
     "husky": "^8.0.3",
-    "inquirer": "^9.1.4",
-    "jest": "^29.4.3",
+    "jest": "^29.5.0",
     "minimist": "^1.2.8",
     "prettier": "^2.8.4",
     "react": "^18.2.0",
     "relay-config": "^12.0.1",
     "typescript": "^4.9.5",
-    "wrangler": "^2.12.0",
+    "wrangler": "^2.12.1",
     "zx": "^7.2.0"
   },
   "devDependencies": {
-    "@jest/types": "^29.4.3",
+    "@jest/types": "^29.5.0",
     "@types/babel__core": "^7.20.0",
     "@types/cross-spawn": "^6.0.2",
     "@types/inquirer": "^9.0.3",
@@ -78,9 +74,8 @@
     "@types/node": "^18.14.6"
   },
   "resolutions": {
-    "@rollup/plugin-commonjs@npm:^22.0.0": "^21.1.0",
     "chalk@npm:^5.2.0": "^4.1.2",
-    "ora@npm:^6.1.0": "^5.4.1"
+    "ora@npm:^6.1.2": "^5.4.1"
   },
   "envars": {
     "cwd": "./env"

scripts/package.json

@@ -19,17 +19,19 @@
     "@types/cross-spawn": "^6.0.2",
     "api": "workspace:*",
     "cross-spawn": "^7.0.3",
+    "dotenv": "^16.0.3",
     "envars": "^0.4.0",
     "execa": "^7.0.0",
     "globby": "^13.1.3",
     "got": "^12.6.0",
+    "inquirer": "^9.1.4",
     "lodash-es": "^4.17.21",
     "minimist": "^1.2.8",
     "ora": "^6.1.2",
     "toml": "^3.0.0",
     "ts-node": "^10.9.1",
     "typescript": "^4.9.5",
-    "wrangler": "^2.12.0",
+    "wrangler": "^2.12.1",
     "zx": "^7.2.0"
   },
   "envars": {

scripts/setup.js

@@ -157,13 +157,15 @@ const questions = [
 async function done(answers) {
   // Remove this script
   if (answers.clean) {
-    fs.unlinkSync("./setup.js");
+    fs.unlinkSync("./scripts/setup.js");
     let text = fs.readFileSync("./package.json", "utf8");
     text = text.replace(/\n\s+"setup": ".*?\n/s, "\n");
     fs.writeFileSync("./package.json", text, "utf8");
-    spawn.sync("yarn", ["remove", "inquirer", "cross-spawn", "dotenv"], {
-      stdio: "inherit",
-    });
+    spawn.sync(
+      "yarn",
+      ["workspace", "scripts", "remove", "inquirer", "dotenv"],
+      { stdio: "inherit" },
+    );
   }
 
   if (answers.setup) {
@@ -193,7 +195,7 @@ async function done(answers) {
   console.log(`  `);
   console.log(`  $ yarn db:reset`);
   console.log(`  $ yarn api:start`);
-  console.log(`  $ yarn web:start`);
+  console.log(`  $ yarn app:start`);
   console.log(`  `);
 }