Skip to content

Commit

Permalink
Merge branch 'main' of github.com:redwoodjs/redwood into feat/dbauth-…
Browse files Browse the repository at this point in the history
…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)
  • Loading branch information
dac09 committed Jan 21, 2024
2 parents bf2b589 + 41ac728 commit 5900629
Show file tree
Hide file tree
Showing 94 changed files with 3,005 additions and 789 deletions.
8 changes: 6 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ jobs:
uses: SimenB/github-actions-cpu-cores@v2

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

build-lint-test-skip:
needs: detect-changes
Expand Down Expand Up @@ -811,6 +811,10 @@ jobs:
name: 🌲 Create Redwood App
runs-on: ubuntu-latest

env:
REDWOOD_CI: 1
REDWOOD_DISABLE_TELEMETRY: 1

steps:
- uses: actions/checkout@v4

Expand Down Expand Up @@ -848,7 +852,7 @@ jobs:
git config --global user.name "Your Name"
- name: e2e test
run: yarn test e2e
run: yarn test:e2e
working-directory: ./packages/create-redwood-app
env:
PROJECT_PATH: ${{ env.PROJECT_PATH }}
Expand Down
1 change: 1 addition & 0 deletions __fixtures__/example-todo-main/web/src/graphql/graphql.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ export type Scalars = {
Int: { input: number; output: number; }
Float: { input: number; output: number; }
BigInt: { input: any; output: any; }
Byte: { input: any; output: any; }
Date: { input: any; output: any; }
DateTime: { input: any; output: any; }
JSON: { input: any; output: any; }
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/realtime.md
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ subscription CountdownFromInterval {
}
```

This example showcases how a subscription can yields its own response.
This example showcases how a subscription yields its own response.

## Live Queries

Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
"release:notes": "node ./tasks/release/generateReleaseNotes.mjs",
"release:triage": "node ./tasks/release/triage/triage.mjs",
"smoke-tests": "node ./tasks/smoke-tests/smoke-tests.mjs",
"test": "nx run-many -t test -- --colors --maxWorkers=4",
"test-ci": "nx run-many -t test -- --colors --maxWorkers",
"test": "nx run-many -t test -- --minWorkers=1 --maxWorkers=4",
"test-ci": "nx run-many -t test",
"test:k6": "tsx ./tasks/k6-test/run-k6-tests.mts",
"test:types": "tstyche"
},
Expand Down
1 change: 1 addition & 0 deletions packages/api-server/ambient.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
declare module 'dotenv-defaults'
4 changes: 3 additions & 1 deletion packages/api-server/dist.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ describe('dist', () => {
"apiCliOptions": {
"apiRootPath": {
"alias": [
"api-root-path",
"rootPath",
"root-path",
],
Expand Down Expand Up @@ -71,10 +72,11 @@ describe('dist', () => {
"type": "string",
},
},
"createServer": [Function],
"webCliOptions": {
"apiHost": {
"alias": "api-host",
"desc": "Forward requests from the apiUrl, defined in redwood.toml to this host",
"desc": "Forward requests from the apiUrl, defined in redwood.toml, to this host",
"type": "string",
},
"port": {
Expand Down
9 changes: 9 additions & 0 deletions packages/api-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,16 @@
"@types/yargs": "17.0.32",
"aws-lambda": "1.0.7",
"jest": "29.7.0",
"pino-abstract-transport": "1.1.0",
"typescript": "5.3.3"
},
"peerDependencies": {
"@redwoodjs/graphql-server": "6.0.7"
},
"peerDependenciesMeta": {
"@redwoodjs/graphql-server": {
"optional": true
}
},
"gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
}
Loading

0 comments on commit 5900629

Please sign in to comment.