Skip to content

Commit

Permalink
chore(deps): Upgrade dependencies (#389)
Browse files Browse the repository at this point in the history
  • Loading branch information
koistya authored Feb 4, 2024
1 parent 5ffb9af commit c935960
Show file tree
Hide file tree
Showing 15 changed files with 997 additions and 1,969 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@ jobs:
- run: yarn tsc --build

# Setup test database
- run: yarn db:migrate
- run: yarn db:seed
- run: yarn db migrate --seed

- run: echo "$GCP_SA_KEY" | base64 --decode > "$GOOGLE_APPLICATION_CREDENTIALS"
env:
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/push_main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@ jobs:
- run: yarn workspace api build

# Deploy
# - run: yarn db:migrate --env=test
# - run: yarn db:seed --env=test
# - run: yarn db migrate --seed --env=test
# - run: yarn workspace api deploy --env=test
# env:
# GOOGLE_APPLICATION_CREDENTIALS: ${{ github.workspace }}/gcp-key.json
Expand Down
2 changes: 1 addition & 1 deletion .yarn/sdks/prettier/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "prettier",
"version": "3.2.4-sdk",
"version": "3.2.5-sdk",
"main": "./index.cjs",
"type": "commonjs",
"bin": "./bin/prettier.cjs"
Expand Down
12 changes: 4 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
<a href="https://twitter.com/koistya"><img src="https://img.shields.io/twitter/follow/koistya.svg?style=social&label=Follow&maxAge=3600" height="20"></a>
</h1>

High-performance GraphQL API server and React front-end.
High-performance GraphQL API server, database dev tools, and React front-end.

## Features

- [Monorepo](https://yarnpkg.com/features/workspaces) project structure powered by [Yarn](https://yarnpkg.com/) with [PnP](https://yarnpkg.com/features/pnp).
- [GraphQL API](https://graphql.org/) powered by [GraphQL Yoga](https://the-guild.dev/graphql/yoga-server) and [Pothos GraphQL](https://pothos-graphql.dev/).
- [GraphQL API](https://graphql.org/) powered by [GraphQL Yoga](https://the-guild.dev/graphql/yoga-server), [Pothos GraphQL](https://pothos-graphql.dev/), and [μWebSockets](https://github.com/uNetworking/uWebSockets.js).
- Authentication and authorization powered by [Google Identity Platform](https://cloud.google.com/identity-platform).
- Database tooling — seed files, migrations, [Knex.js](https://knexjs.org/) REPL shell, etc.
- Front-end boilerplate pre-configured with [TypeScript](https://www.typescriptlang.org/), [Vite](https://vitejs.dev/), [React](https://beta.reactjs.org/), and [Joy UI](https://mui.com/joy-ui/getting-started/).
Expand All @@ -33,7 +33,7 @@ Be sure to join our [Discord channel](https://discord.com/invite/bSsv7XM) for as

`├──`[`.github`](.github) — GitHub configuration including CI/CD workflows.<br>
`├──`[`.vscode`](.vscode) — VSCode settings including code snippets, recommended extensions etc.<br>
`├──`[`app`](./app) — front-end application ([Vite](https://vitejs.dev/), [Vitest](https://vitest.dev/), [React](https://reactjs.org/)).<br>
`├──`[`app`](./app) — front-end application ([Vite](https://vitejs.dev/), [Vitest](https://vitest.dev/), [React](https://reactjs.org/), [Joy UI](https://mui.com/joy-ui/getting-started/templates/)).<br>
`├──`[`db`](./db) — database schema, seeds, and migrations ([PostgreSQL](https://www.postgresql.org/)).<br>
`├──`[`infra`](./infra) — cloud infrastructure configuration ([Terraform](https://www.terraform.io/)).<br>
`├──`[`scripts`](./scripts) — automation scripts shared across the project.<br>
Expand Down Expand Up @@ -99,11 +99,7 @@ $ yarn dlx @yarnpkg/sdks vscode # Update VSCode settings

## How to Contribute

Anyone and everyone is welcome to [contribute](.github/CONTRIBUTING.md). Start
by checking out the list of [open issues](https://github.com/kriasoft/graphql-starter-kit/issues)
marked [help wanted](https://github.com/kriasoft/graphql-starter-kit/issues?q=label:"help+wanted").
However, if you decide to get involved, please take a moment to review the
[guidelines](.github/CONTRIBUTING.md).
We welcome contributions through pull requests and issues on our GitHub repository. Feel free to also start a conversation on our [Discord server](https://discord.com/invite/PkRad23) to discuss potential contributions or seek guidance.

## License

Expand Down
30 changes: 15 additions & 15 deletions app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,35 +16,35 @@
"app:deploy": "yarn workspace app deploy"
},
"dependencies": {
"@babel/runtime": "^7.23.8",
"@babel/runtime": "^7.23.9",
"@emotion/react": "^11.11.3",
"@emotion/styled": "^11.11.0",
"@mui/base": "^5.0.0-beta.32",
"@mui/icons-material": "^5.15.5",
"@mui/joy": "^5.0.0-beta.23",
"@mui/lab": "^5.0.0-alpha.161",
"@mui/material": "^5.15.5",
"firebase": "^10.7.2",
"jotai": "^2.6.2",
"jotai-effect": "^0.3.2",
"@mui/base": "^5.0.0-beta.34",
"@mui/icons-material": "^5.15.7",
"@mui/joy": "^5.0.0-beta.25",
"@mui/lab": "^5.0.0-alpha.163",
"@mui/material": "^5.15.7",
"firebase": "^10.8.0",
"jotai": "^2.6.4",
"jotai-effect": "^0.5.0",
"localforage": "^1.10.0",
"notistack": "^3.0.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-router-dom": "^6.21.3"
"react-router-dom": "^6.22.0"
},
"devDependencies": {
"@babel/core": "^7.23.7",
"@babel/core": "^7.23.9",
"@emotion/babel-plugin": "^11.11.0",
"@rollup/plugin-graphql": "^2.0.4",
"@types/node": "^20.11.5",
"@types/react": "^18.2.48",
"@types/node": "^20.11.16",
"@types/react": "^18.2.52",
"@types/react-dom": "^18.2.18",
"@vitejs/plugin-react": "^4.2.1",
"envars": "^1.0.2",
"happy-dom": "^13.2.0",
"happy-dom": "^13.3.8",
"typescript": "~5.3.3",
"vite": "~5.0.12",
"vitest": "~1.2.1"
"vitest": "~1.2.2"
}
}
4 changes: 2 additions & 2 deletions app/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
"outDir": "../.cache/typescript-app",
"module": "ESNext",
"moduleResolution": "Bundler",
"noEmit": true,
"noEmit": true
},
"include": ["**/*.ts", "**/*.d.ts", "**/*.tsx", "**/*.json"],
"exclude": ["dist/**/*", "vite.config.ts"],
"references": [{ "path": "./tsconfig.node.json" }],
"references": [{ "path": "./tsconfig.node.json" }]
}
10 changes: 5 additions & 5 deletions db/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
"devDependencies": {
"@google-cloud/cloud-sql-connector": "^1.2.2",
"@googleapis/identitytoolkit": "^8.0.0",
"@types/node": "^20.11.5",
"@types/node": "^20.11.16",
"chalk": "^5.3.0",
"commander": "^11.1.0",
"dotenv": "^16.3.2",
"commander": "^12.0.0",
"dotenv": "^16.4.1",
"execa": "^8.0.1",
"kanel": "^3.8.2",
"kanel-zod": "^1.3.2",
"kanel": "^3.8.7",
"kanel-zod": "^1.3.3",
"knex": "^3.1.0",
"ora": "^8.0.1",
"pg": "^8.11.3",
Expand Down
4 changes: 2 additions & 2 deletions db/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"lib": ["ESNext"],
"noEmit": true,
"outDir": "../.cache/ts-db",
"types": ["node"],
"types": ["node"]
},
"include": ["**/*.ts", "**/*.cjs", "**/*.js", "**/*.json"],
"exclude": ["dist/**/*"],
"exclude": ["dist/**/*"]
}
16 changes: 8 additions & 8 deletions infra/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Terraform Cloud Project

This folder contains the Terraform configurations for our project's infrastructure, managed through Terraform Cloud. The infrastructure is divided into multiple workspaces to handle different environments and shared resources.
This folder contains the Terraform configurations for our project's infrastructure, managed through [Terraform Cloud](https://developer.hashicorp.com/terraform/cloud-docs). The infrastructure is divided into multiple workspaces to handle different environments and shared resources.

## Directory Structure

Expand All @@ -18,12 +18,12 @@ The repository is organized into the following directories, each corresponding t

### Prerequisites

- Terraform
- Access to the Terraform Cloud workspace
- [Terraform CLI](https://developer.hashicorp.com/terraform/install)
- Access to the [Terraform Cloud](https://app.terraform.io/) workspace

### Setting Up Workspaces in Terraform Cloud

1. Log in to Terraform Cloud.
1. Log in to [Terraform Cloud](https://app.terraform.io/).
2. Create a workspace for each directory/environment.
3. Link each workspace to the corresponding directory in this repository.
4. Save Terraform API token to the `../.terraformrc` file.
Expand All @@ -42,13 +42,13 @@ Ensure that you are working in the correct workspace to avoid misconfigurations.

Please follow our contribution guidelines for making changes or adding new configurations. Ensure you test configurations in the test and preview environments before applying them to production.

## Support

For any issues or questions related to this Terraform setup, please contact [@koistya](https://github.com/koistya) on our [Discord server](https://discord.com/invite/bSsv7XM).

### References

- https://learn.hashicorp.com/terraform
- https://cloud.google.com/docs/terraform/best-practices-for-terraform
- https://cloud.google.com/iam/docs/workload-identity-federation-with-deployment-pipelines
- https://registry.terraform.io/providers/hashicorp/google/latest/docs/guides/provider_reference.html

## Support

For any issues or questions related to this Terraform setup, please contact [@koistya](https://github.com/koistya) on our [Discord server](https://discord.com/invite/bSsv7XM).
20 changes: 9 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,15 @@
"test": "pnpify vitest",
"tf": "node --no-warnings ./scripts/tf.js",
"g:lint": "yarn lint \"$INIT_CWD\"",
"db": "tsx ./db/cli.ts",
"psql": "yarn db:psql",
"repl": "yarn db:repl"
"db": "tsx ./db/cli.ts"
},
"devDependencies": {
"@emotion/babel-plugin": "^11.11.0",
"@emotion/eslint-plugin": "^11.11.0",
"@emotion/react": "^11.11.3",
"@types/node": "^20.11.5",
"@typescript-eslint/eslint-plugin": "^6.19.0",
"@typescript-eslint/parser": "^6.19.0",
"@types/node": "^20.11.16",
"@typescript-eslint/eslint-plugin": "^6.20.0",
"@typescript-eslint/parser": "^6.20.0",
"@yarnpkg/pnpify": "^4.0.1",
"envars": "^1.0.2",
"eslint": "^8.56.0",
Expand All @@ -41,15 +39,15 @@
"eslint-plugin-react-hooks": "^4.6.0",
"graphql": "^16.8.1",
"graphql-config": "^5.0.3",
"happy-dom": "^13.2.0",
"husky": "^8.0.3",
"prettier": "^3.2.4",
"happy-dom": "^13.3.8",
"husky": "^9.0.10",
"prettier": "^3.2.5",
"react": "^18.2.0",
"relay-config": "^12.0.1",
"tsx": "~4.7.0",
"typescript": "~5.3.3",
"vitest": "~1.2.1",
"wrangler": "^3.23.0",
"vitest": "~1.2.2",
"wrangler": "^3.26.0",
"zx": "^7.2.3"
},
"resolutions": {
Expand Down
12 changes: 6 additions & 6 deletions scripts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,20 @@
"gh:delete-deployment": "node --no-warnings ./github.js delete-deployment"
},
"dependencies": {
"@babel/core": "^7.23.7",
"@babel/core": "^7.23.9",
"@babel/register": "^7.23.7",
"@google-cloud/secret-manager": "~5.0.1",
"@google-cloud/storage": "^7.7.0",
"@octokit/rest": "^20.0.2",
"@types/cross-spawn": "^6.0.6",
"@types/node": "^20.11.5",
"@types/node": "^20.11.16",
"cross-spawn": "^7.0.3",
"dotenv": "^16.3.2",
"dotenv": "^16.4.1",
"envars": "^1.0.2",
"execa": "^8.0.1",
"globby": "^14.0.0",
"got": "^14.0.0",
"inquirer": "^9.2.12",
"got": "^14.2.0",
"inquirer": "^9.2.14",
"lodash-es": "^4.17.21",
"minimist": "^1.2.8",
"ora": "^8.0.1",
Expand All @@ -41,7 +41,7 @@
"ts-node": "^10.9.2",
"typescript": "~5.3.3",
"vite": "~5.0.12",
"wrangler": "^3.23.0",
"wrangler": "^3.26.0",
"zx": "^7.2.3"
},
"envars": {
Expand Down
26 changes: 13 additions & 13 deletions server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,50 +18,50 @@
"@pothos/core": "^3.41.0",
"@sendgrid/mail": "^8.1.0",
"dataloader": "^2.2.2",
"date-fns": "^3.3.0",
"date-fns": "^3.3.1",
"date-fns-tz": "^2.0.0",
"db": "workspace:*",
"envalid": "^8.0.0",
"google-auth-library": "^9.4.2",
"got": "^14.0.0",
"google-auth-library": "^9.6.2",
"got": "^14.2.0",
"graphql": "^16.8.1",
"graphql-relay": "^0.10.0",
"graphql-yoga": "^5.1.1",
"knex": "^3.1.0",
"lodash-es": "^4.17.21",
"nanoid": "^5.0.4",
"nanoid": "^5.0.5",
"pg": "^8.11.3",
"quick-lru": "^7.0.0",
"slugify": "^1.6.6",
"source-map-support": "^0.5.21",
"uWebSockets.js": "https://github.com/uNetworking/uWebSockets.js#v20.40.0",
"uWebSockets.js": "https://github.com/uNetworking/uWebSockets.js#v20.41.0",
"zod": "^3.22.4"
},
"bundledDependencies": [
"db"
],
"devDependencies": {
"@google-cloud/cloud-sql-connector": "^1.2.2",
"@graphql-codegen/cli": "5.0.1",
"@graphql-codegen/cli": "5.0.0",
"@originjs/vite-plugin-commonjs": "^1.0.3",
"@types/lodash-es": "^4.17.12",
"@types/node": "^20.11.5",
"@types/pg": "^8.10.9",
"@types/node": "^20.11.16",
"@types/pg": "^8.11.0",
"@types/source-map-support": "^0.5.10",
"@types/supertest": "^6.0.2",
"chalk": "^5.3.0",
"envars": "^1.0.2",
"execa": "^8.0.1",
"get-port": "^7.0.0",
"happy-dom": "^13.2.0",
"happy-dom": "^13.3.8",
"scripts": "workspace:*",
"supertest": "^6.3.4",
"type-fest": "^4.9.0",
"type-fest": "^4.10.2",
"typescript": "~5.3.3",
"vite": "~5.0.12",
"vite-node": "1.2.1",
"vite-node": "1.2.2",
"vite-plugin-node": "^3.1.0",
"vite-plugin-static-copy": "^1.0.0",
"vitest": "~1.2.1"
"vite-plugin-static-copy": "^1.0.1",
"vitest": "~1.2.2"
}
}
4 changes: 2 additions & 2 deletions server/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"lib": ["ESNext"],
"outDir": "../.cache/ts-server",
"types": ["vite/client"],
"noEmit": true,
"noEmit": true
},
"include": ["**/*.ts", "**/*.cjs", "**/*.js", "**/*.json", "../db/types"],
"exclude": ["dist/**/*"],
"exclude": ["dist/**/*"]
}
4 changes: 2 additions & 2 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"references": [
{ "path": "./app" },
{ "path": "./db" },
{ "path": "./server" },
],
{ "path": "./server" }
]
}
Loading

0 comments on commit c935960

Please sign in to comment.