Skip to content

Commit

Permalink
Merge branch 'main' into justin/memoize-apollo-client
Browse files Browse the repository at this point in the history
  • Loading branch information
justinadkins authored Oct 17, 2024
2 parents 605fcc3 + 74e785d commit fc43540
Show file tree
Hide file tree
Showing 194 changed files with 50,912 additions and 1,619 deletions.
5 changes: 5 additions & 0 deletions .changesets/11639.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
- fix(web) type NonSuspenseCallQueryResult... (#11639) by @richard-stafflink

The result you get back as `queryResult` is now properly typed. Typically the
type will be something like `FindPostById`, i.e. the first type that is passed
to `CellSuccessProps` (instead of just being `any`).
7 changes: 7 additions & 0 deletions .changesets/11645.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
- fix(crwa): Better handling of installing to . (#11645) by @Tobbe

When installing to `cwd`:

- Print "the current directory" instead of "."
- Skip the output of `cd` (which would move you to your home directory, which
most likely is not what you want)
3 changes: 3 additions & 0 deletions .changesets/11651.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- fix(crwa): Add missing quotes to seed example (#11651) by @Tobbe

Just un-commenting the example seed code now gives you valid code to seed your database with
9 changes: 9 additions & 0 deletions .changesets/11653.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
- fix(jobs): Fixes creating worker with deleteSuccessfulJobs config setting in JobManager (#11653) by @dthyresson

According to the Job documentation, the JobManager's `deleteSuccessfulJobs ` can be used to decide if one wants successfully completed jobs from being deleted from the `BackgroundJobs` table.

Keeping job run history around is useful for reporting purposes, such s hoe many jobs run over time, how many fails, how many successes, etc.

However, the `deleteSuccessfulJobs` was not being correctly passed to the worker in `createWorker` so the worker always used the default value -- true -- and always deleted the job run record regardless of configuration.

This PR fixes this issue by setting the config value when creating the worker.
3 changes: 3 additions & 0 deletions .changesets/11691.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- Await and properly kill dev api-server (#11691) by @callingmedic911

Sometime the api-server doesn't get killed in time before the new instance is started. This change makes sure that we wait for the process. If it's not killed within 2 seconds with SIGTERM, we send a SIGKILL to it.
3 changes: 3 additions & 0 deletions .changesets/11693.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- Fix build with TS alias without basePath (#11693) by @callingmedic911

It fixes the build process for a project with TypeScript path alias. It uses root directory as the fallback if there's no baseUrl in `tsconfig.json`.
2 changes: 1 addition & 1 deletion .github/actions/check_changesets/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "check_changesets",
"private": true,
"dependencies": {
"@actions/core": "1.10.1",
"@actions/core": "1.11.1",
"@actions/exec": "1.1.1",
"@actions/github": "6.0.0"
},
Expand Down
23 changes: 7 additions & 16 deletions .github/actions/check_changesets/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ __metadata:
version: 8
cacheKey: 10c0

"@actions/core@npm:1.10.1":
version: 1.10.1
resolution: "@actions/core@npm:1.10.1"
"@actions/core@npm:1.11.1":
version: 1.11.1
resolution: "@actions/core@npm:1.11.1"
dependencies:
"@actions/exec": "npm:^1.1.1"
"@actions/http-client": "npm:^2.0.1"
uuid: "npm:^8.3.2"
checksum: 10c0/7a61446697a23dcad3545cf0634dedbdedf20ae9a0ee6ee977554589a15deb4a93593ee48a41258933d58ce0778f446b0d2c162b60750956fb75e0b9560fb832
checksum: 10c0/9aa30b397d8d0dbc74e69fe46b23fb105cab989beb420c57eacbfc51c6804abe8da0f46973ca9f639d532ea4c096d0f4d37da0223fbe94f304fa3c5f53537c30
languageName: node
linkType: hard

"@actions/exec@npm:1.1.1":
"@actions/exec@npm:1.1.1, @actions/exec@npm:^1.1.1":
version: 1.1.1
resolution: "@actions/exec@npm:1.1.1"
dependencies:
Expand Down Expand Up @@ -175,7 +175,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "check_changesets@workspace:."
dependencies:
"@actions/core": "npm:1.10.1"
"@actions/core": "npm:1.11.1"
"@actions/exec": "npm:1.1.1"
"@actions/github": "npm:6.0.0"
languageName: unknown
Expand Down Expand Up @@ -220,15 +220,6 @@ __metadata:
languageName: node
linkType: hard

"uuid@npm:^8.3.2":
version: 8.3.2
resolution: "uuid@npm:8.3.2"
bin:
uuid: dist/bin/uuid
checksum: 10c0/bcbb807a917d374a49f475fae2e87fdca7da5e5530820ef53f65ba1d12131bd81a92ecf259cc7ce317cbe0f289e7d79fdfebcef9bfa3087c8c8a2fa304c9be54
languageName: node
linkType: hard

"wrappy@npm:1":
version: 1.0.2
resolution: "wrappy@npm:1.0.2"
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/check_create_redwood_app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "check_test_project_fixture",
"private": true,
"dependencies": {
"@actions/core": "1.10.1",
"@actions/core": "1.11.1",
"@actions/exec": "1.1.1"
},
"packageManager": "yarn@4.4.0"
Expand Down
23 changes: 7 additions & 16 deletions .github/actions/check_create_redwood_app/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ __metadata:
version: 8
cacheKey: 10c0

"@actions/core@npm:1.10.1":
version: 1.10.1
resolution: "@actions/core@npm:1.10.1"
"@actions/core@npm:1.11.1":
version: 1.11.1
resolution: "@actions/core@npm:1.11.1"
dependencies:
"@actions/exec": "npm:^1.1.1"
"@actions/http-client": "npm:^2.0.1"
uuid: "npm:^8.3.2"
checksum: 10c0/7a61446697a23dcad3545cf0634dedbdedf20ae9a0ee6ee977554589a15deb4a93593ee48a41258933d58ce0778f446b0d2c162b60750956fb75e0b9560fb832
checksum: 10c0/9aa30b397d8d0dbc74e69fe46b23fb105cab989beb420c57eacbfc51c6804abe8da0f46973ca9f639d532ea4c096d0f4d37da0223fbe94f304fa3c5f53537c30
languageName: node
linkType: hard

"@actions/exec@npm:1.1.1":
"@actions/exec@npm:1.1.1, @actions/exec@npm:^1.1.1":
version: 1.1.1
resolution: "@actions/exec@npm:1.1.1"
dependencies:
Expand Down Expand Up @@ -44,7 +44,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "check_test_project_fixture@workspace:."
dependencies:
"@actions/core": "npm:1.10.1"
"@actions/core": "npm:1.11.1"
"@actions/exec": "npm:1.1.1"
languageName: unknown
linkType: soft
Expand All @@ -55,12 +55,3 @@ __metadata:
checksum: 10c0/e27e7e896f2426c1c747325b5f54efebc1a004647d853fad892b46d64e37591ccd0b97439470795e5262b5c0748d22beb4489a04a0a448029636670bfd801b75
languageName: node
linkType: hard

"uuid@npm:^8.3.2":
version: 8.3.2
resolution: "uuid@npm:8.3.2"
bin:
uuid: dist/bin/uuid
checksum: 10c0/bcbb807a917d374a49f475fae2e87fdca7da5e5530820ef53f65ba1d12131bd81a92ecf259cc7ce317cbe0f289e7d79fdfebcef9bfa3087c8c8a2fa304c9be54
languageName: node
linkType: hard
2 changes: 1 addition & 1 deletion .github/actions/detect-changes/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "detect-changes",
"private": true,
"dependencies": {
"@actions/core": "1.10.1",
"@actions/core": "1.11.1",
"@actions/exec": "1.1.1"
},
"packageManager": "yarn@4.4.0"
Expand Down
23 changes: 7 additions & 16 deletions .github/actions/detect-changes/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ __metadata:
version: 8
cacheKey: 10c0

"@actions/core@npm:1.10.1":
version: 1.10.1
resolution: "@actions/core@npm:1.10.1"
"@actions/core@npm:1.11.1":
version: 1.11.1
resolution: "@actions/core@npm:1.11.1"
dependencies:
"@actions/exec": "npm:^1.1.1"
"@actions/http-client": "npm:^2.0.1"
uuid: "npm:^8.3.2"
checksum: 10c0/7a61446697a23dcad3545cf0634dedbdedf20ae9a0ee6ee977554589a15deb4a93593ee48a41258933d58ce0778f446b0d2c162b60750956fb75e0b9560fb832
checksum: 10c0/9aa30b397d8d0dbc74e69fe46b23fb105cab989beb420c57eacbfc51c6804abe8da0f46973ca9f639d532ea4c096d0f4d37da0223fbe94f304fa3c5f53537c30
languageName: node
linkType: hard

"@actions/exec@npm:1.1.1":
"@actions/exec@npm:1.1.1, @actions/exec@npm:^1.1.1":
version: 1.1.1
resolution: "@actions/exec@npm:1.1.1"
dependencies:
Expand Down Expand Up @@ -44,7 +44,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "detect-changes@workspace:."
dependencies:
"@actions/core": "npm:1.10.1"
"@actions/core": "npm:1.11.1"
"@actions/exec": "npm:1.1.1"
languageName: unknown
linkType: soft
Expand All @@ -55,12 +55,3 @@ __metadata:
checksum: 10c0/e27e7e896f2426c1c747325b5f54efebc1a004647d853fad892b46d64e37591ccd0b97439470795e5262b5c0748d22beb4489a04a0a448029636670bfd801b75
languageName: node
linkType: hard

"uuid@npm:^8.3.2":
version: 8.3.2
resolution: "uuid@npm:8.3.2"
bin:
uuid: dist/bin/uuid
checksum: 10c0/bcbb807a917d374a49f475fae2e87fdca7da5e5530820ef53f65ba1d12131bd81a92ecf259cc7ce317cbe0f289e7d79fdfebcef9bfa3087c8c8a2fa304c9be54
languageName: node
linkType: hard
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3
uses: github/codeql-action/init@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3
with:
languages: ${{ matrix.language }}
config-file: ./.github/codeql/codeql-config.yml
Expand All @@ -61,7 +61,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3
uses: github/codeql-action/autobuild@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand All @@ -75,4 +75,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3
uses: github/codeql-action/analyze@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3
4 changes: 2 additions & 2 deletions .github/workflows/scorecard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:

steps:
- name: 'Checkout code'
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
with:
persist-credentials: false

Expand Down Expand Up @@ -68,6 +68,6 @@ jobs:
# Upload the results to GitHub's code scanning dashboard (optional).
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
- name: 'Upload to code-scanning'
uses: github/codeql-action/upload-sarif@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3
uses: github/codeql-action/upload-sarif@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3
with:
sarif_file: results.sarif
4 changes: 2 additions & 2 deletions __fixtures__/test-project/scripts/seed.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ export default async () => {
// Create your database records here! For example, seed some users:
//
// const users = [
// { name: 'Alice', email: 'alice@redwoodjs.com },
// { name: 'Bob', email: 'bob@redwoodjs.com },
// { name: 'Alice', email: 'alice@redwoodjs.com' },
// { name: 'Bob', email: 'bob@redwoodjs.com' },
// ]
//
// await db.user.createMany({ data: users })
Expand Down
2 changes: 1 addition & 1 deletion docs/.node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20.17.0
20.18.0
2 changes: 1 addition & 1 deletion docs/docs/tutorial/chapter4/deployment.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Grove is currently under development and is not meant to your production-ready a
You'll only need to do this once, and then you'll have the `grove` CLI command and can deploy any Redwood app directly from your development machine:

```bash
curl -L https://install.grove.dev | sh
curl -L https://grove.dev/install.sh | sh
```

That will download a simple bash script and then run it, installing the Grove CLI tool, which is written in Go.
Expand Down
Loading

0 comments on commit fc43540

Please sign in to comment.