Skip to content

Commit 0bf315a

Browse files
committed
Merge branch 'main' of github.com:redwoodjs/redwood into try/apollo-upload-link
* 'main' of github.com:redwoodjs/redwood: (56 commits) chore(deps): update babel monorepo (redwoodjs#11190) fix(deps): update dependency jscodeshift to v17 (redwoodjs#11233) chore(deps): update babel monorepo (redwoodjs#11228) chore(deps): update dependency @clerk/types to v3.65.3 (redwoodjs#11230) fix(deps): update dependency vite-plugin-cjs-interop to v2.1.2 (redwoodjs#11224) fix(deps): update graphql-tools monorepo (redwoodjs#11232) chore(deps): update dependency @clerk/clerk-react to v4.32.3 (redwoodjs#11229) fix(deps): update dependency @clerk/clerk-sdk-node to v4.13.21 (redwoodjs#11231) fix(deps): update dependency cheerio to v1.0.0 (redwoodjs#11218) chore(deps): update yarn to v4.4.0 (redwoodjs#11227) fix(deps): update dependency core-js to v3.38.0 (redwoodjs#11226) chore(deps): update eslint monorepo to v9.9.0 (redwoodjs#11202) fix(api-server): Use createServer in all cases, to make fastify config consistent (redwoodjs#11176) chore(deps): update dependency tsx to v4.17.0 (redwoodjs#11199) chore(deps): update dependency @types/vscode to v1.92.0 (redwoodjs#11193) fix(deps): update dependency @graphql-yoga/plugin-defer-stream to v3.6.3 (redwoodjs#11211) fix(deps): update dependency @graphql-yoga/plugin-persisted-operations to v3.6.3 (redwoodjs#11213) chore(deps): update dependency eslint-plugin-perfectionist to v3.1.3 (redwoodjs#11195) chore(deps): update dependency eslint-plugin-jsdoc to v48.11.0 (redwoodjs#11194) chore(deps): update dependency @playwright/test to v1.46.0 (redwoodjs#11191) ...
2 parents 11c7eb3 + c3f23c8 commit 0bf315a

File tree

93 files changed

+1996
-1999
lines changed

Some content is hidden

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

93 files changed

+1996
-1999
lines changed

.changesets/11176.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
- fix(api-server): Use createServer in all cases, to make fastify config consistent (#11176) by @dac09
2+
3+
This PR removes all the cases where we use `createFastifyInstance` for the api server, and replaces it with `createServer`.
4+
5+
This makes sure that the API server config is always consistent - whether you use a server file or not. (createServer was only used when we had a server file before)

.changesets/11189.md

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
- fix(babel-plugins): Handle additional syntax when extracting graphql options (#11189) by @Josh-Walker-GM
2+
3+
This fixes an issue with the automatic extraction of options from the `createGraphQLHandler` function when you were wrapping that function within a custom handler function. For example the following would have failed before this fix:
4+
```ts
5+
const graphQLHandler = createGraphQLHandler({
6+
// ...options
7+
})
8+
export const handler = (event, context) => {
9+
return graphQLHandler(event, context)
10+
}
11+
```

.github/actions/check_changesets/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
"@actions/exec": "1.1.1",
77
"@actions/github": "6.0.0"
88
},
9-
"packageManager": "yarn@4.3.1"
9+
"packageManager": "yarn@4.4.0"
1010
}

.github/actions/check_create_redwood_app/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
"@actions/core": "1.10.1",
66
"@actions/exec": "1.1.1"
77
},
8-
"packageManager": "yarn@4.3.1"
8+
"packageManager": "yarn@4.4.0"
99
}

.github/actions/detect-changes/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
"@actions/core": "1.10.1",
66
"@actions/exec": "1.1.1"
77
},
8-
"packageManager": "yarn@4.3.1"
8+
"packageManager": "yarn@4.4.0"
99
}

__fixtures__/test-project/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"prisma": {
2121
"seed": "yarn rw exec seed"
2222
},
23-
"packageManager": "yarn@4.3.1",
23+
"packageManager": "yarn@4.4.0",
2424
"resolutions": {
2525
"@storybook/react-dom-shim@npm:7.6.17": "https://verdaccio.tobbe.dev/@storybook/react-dom-shim/-/react-dom-shim-8.0.8.tgz",
2626
"@apollo/client/rehackt": "0.1.0",

docs/docs/how-to/test-in-github-actions.md

+6-4
Original file line numberDiff line numberDiff line change
@@ -226,11 +226,12 @@ jobs:
226226
- 5432:5432
227227

228228
steps:
229-
- uses: actions/checkout@v3
229+
- uses: actions/checkout@v4
230230
- name: Use Node.js ${{ matrix.node-version }}
231-
uses: actions/setup-node@v3
231+
uses: actions/setup-node@v4
232232
with:
233233
node-version: ${{ matrix.node-version }}
234+
- run: corepack enable
234235
# install all the dependencies
235236
- run: yarn install
236237
# build the redwood app
@@ -325,11 +326,12 @@ jobs:
325326
- 5432:5432
326327
327328
steps:
328-
- uses: actions/checkout@v3
329+
- uses: actions/checkout@v4
329330
- name: Use Node.js ${{ matrix.node-version }}
330-
uses: actions/setup-node@v3
331+
uses: actions/setup-node@v4
331332
with:
332333
node-version: ${{ matrix.node-version }}
334+
- run: corepack enable
333335
# install all the dependencies
334336
- run: yarn install
335337
# build the redwood app

docs/package.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424
]
2525
},
2626
"dependencies": {
27-
"@docusaurus/core": "3.4.0",
28-
"@docusaurus/plugin-content-docs": "3.4.0",
29-
"@docusaurus/preset-classic": "3.4.0",
30-
"@docusaurus/theme-common": "3.4.0",
27+
"@docusaurus/core": "3.5.1",
28+
"@docusaurus/plugin-content-docs": "3.5.1",
29+
"@docusaurus/preset-classic": "3.5.1",
30+
"@docusaurus/theme-common": "3.5.1",
3131
"@mdx-js/react": "3.0.1",
3232
"clsx": "2.1.1",
3333
"prism-react-renderer": "2.3.1",
@@ -36,9 +36,9 @@
3636
"react-player": "2.16.0"
3737
},
3838
"devDependencies": {
39-
"@docusaurus/module-type-aliases": "3.4.0",
40-
"@docusaurus/tsconfig": "3.4.0",
39+
"@docusaurus/module-type-aliases": "3.5.1",
40+
"@docusaurus/tsconfig": "3.5.1",
4141
"typescript": "5.5.4"
4242
},
43-
"packageManager": "yarn@4.3.1"
43+
"packageManager": "yarn@4.4.0"
4444
}

0 commit comments

Comments
 (0)