Skip to content

Commit 5900629

Browse files
committed
Merge branch 'main' of github.com:redwoodjs/redwood into feat/dbauth-fetch-handler
* 'main' of github.com:redwoodjs/redwood: feat(server file): add `createServer` (redwoodjs#9845) chore(crwa): set `REDWOOD_CI` and `REDWOOD_DISABLE_TELEMETRY` (redwoodjs#9857) Fix(crwa): Exit 0 after Quit install (redwoodjs#9856) chore(crwa): switch to vitest (redwoodjs#9855) chore(api): Switch to use vitest over jest (redwoodjs#9853) fix(server): ensure consistency between CLI serve entrypoints regarding help and strict (redwoodjs#9809) Improve how the api-server watch command works (redwoodjs#9841) docs(typo): correct grammar in realtime docs (redwoodjs#9850) Add support for Prisma Bytes and GraphQL scalar Byte (redwoodjs#9847) packages/cli: Switch from substr (deprecated) to slice (redwoodjs#9849)
2 parents bf2b589 + 41ac728 commit 5900629

File tree

94 files changed

+3005
-789
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+3005
-789
lines changed

.github/workflows/ci.yml

+6-2
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ jobs:
134134
uses: SimenB/github-actions-cpu-cores@v2
135135

136136
- name: 🧪 Test
137-
run: yarn test-ci ${{ steps.cpu-cores.outputs.count }}
137+
run: yarn test-ci --minWorkers=1 --maxWorkers=${{ steps.cpu-cores.outputs.count }}
138138

139139
build-lint-test-skip:
140140
needs: detect-changes
@@ -811,6 +811,10 @@ jobs:
811811
name: 🌲 Create Redwood App
812812
runs-on: ubuntu-latest
813813

814+
env:
815+
REDWOOD_CI: 1
816+
REDWOOD_DISABLE_TELEMETRY: 1
817+
814818
steps:
815819
- uses: actions/checkout@v4
816820

@@ -848,7 +852,7 @@ jobs:
848852
git config --global user.name "Your Name"
849853
850854
- name: e2e test
851-
run: yarn test e2e
855+
run: yarn test:e2e
852856
working-directory: ./packages/create-redwood-app
853857
env:
854858
PROJECT_PATH: ${{ env.PROJECT_PATH }}

__fixtures__/example-todo-main/web/src/graphql/graphql.ts

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ export type Scalars = {
1515
Int: { input: number; output: number; }
1616
Float: { input: number; output: number; }
1717
BigInt: { input: any; output: any; }
18+
Byte: { input: any; output: any; }
1819
Date: { input: any; output: any; }
1920
DateTime: { input: any; output: any; }
2021
JSON: { input: any; output: any; }

docs/docs/realtime.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ subscription CountdownFromInterval {
260260
}
261261
```
262262
263-
This example showcases how a subscription can yields its own response.
263+
This example showcases how a subscription yields its own response.
264264
265265
## Live Queries
266266

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
"release:notes": "node ./tasks/release/generateReleaseNotes.mjs",
3535
"release:triage": "node ./tasks/release/triage/triage.mjs",
3636
"smoke-tests": "node ./tasks/smoke-tests/smoke-tests.mjs",
37-
"test": "nx run-many -t test -- --colors --maxWorkers=4",
38-
"test-ci": "nx run-many -t test -- --colors --maxWorkers",
37+
"test": "nx run-many -t test -- --minWorkers=1 --maxWorkers=4",
38+
"test-ci": "nx run-many -t test",
3939
"test:k6": "tsx ./tasks/k6-test/run-k6-tests.mts",
4040
"test:types": "tstyche"
4141
},

packages/api-server/ambient.d.ts

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
declare module 'dotenv-defaults'

packages/api-server/dist.test.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ describe('dist', () => {
3737
"apiCliOptions": {
3838
"apiRootPath": {
3939
"alias": [
40+
"api-root-path",
4041
"rootPath",
4142
"root-path",
4243
],
@@ -71,10 +72,11 @@ describe('dist', () => {
7172
"type": "string",
7273
},
7374
},
75+
"createServer": [Function],
7476
"webCliOptions": {
7577
"apiHost": {
7678
"alias": "api-host",
77-
"desc": "Forward requests from the apiUrl, defined in redwood.toml to this host",
79+
"desc": "Forward requests from the apiUrl, defined in redwood.toml, to this host",
7880
"type": "string",
7981
},
8082
"port": {

packages/api-server/package.json

+9
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,16 @@
6161
"@types/yargs": "17.0.32",
6262
"aws-lambda": "1.0.7",
6363
"jest": "29.7.0",
64+
"pino-abstract-transport": "1.1.0",
6465
"typescript": "5.3.3"
6566
},
67+
"peerDependencies": {
68+
"@redwoodjs/graphql-server": "6.0.7"
69+
},
70+
"peerDependenciesMeta": {
71+
"@redwoodjs/graphql-server": {
72+
"optional": true
73+
}
74+
},
6675
"gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
6776
}

0 commit comments

Comments
 (0)