Skip to content

Commit

Permalink
Merge branch 'main' of github.com:redwoodjs/redwood into try/apollo-u…
Browse files Browse the repository at this point in the history
…pload-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)
  ...
  • Loading branch information
dac09 committed Aug 13, 2024
2 parents 11c7eb3 + c3f23c8 commit 0bf315a
Show file tree
Hide file tree
Showing 93 changed files with 1,996 additions and 1,999 deletions.
5 changes: 5 additions & 0 deletions .changesets/11176.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
- fix(api-server): Use createServer in all cases, to make fastify config consistent (#11176) by @dac09

This PR removes all the cases where we use `createFastifyInstance` for the api server, and replaces it with `createServer`.

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)
11 changes: 11 additions & 0 deletions .changesets/11189.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
- fix(babel-plugins): Handle additional syntax when extracting graphql options (#11189) by @Josh-Walker-GM

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:
```ts
const graphQLHandler = createGraphQLHandler({
// ...options
})
export const handler = (event, context) => {
return graphQLHandler(event, context)
}
```
2 changes: 1 addition & 1 deletion .github/actions/check_changesets/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
"@actions/exec": "1.1.1",
"@actions/github": "6.0.0"
},
"packageManager": "yarn@4.3.1"
"packageManager": "yarn@4.4.0"
}
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 @@ -5,5 +5,5 @@
"@actions/core": "1.10.1",
"@actions/exec": "1.1.1"
},
"packageManager": "yarn@4.3.1"
"packageManager": "yarn@4.4.0"
}
2 changes: 1 addition & 1 deletion .github/actions/detect-changes/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"@actions/core": "1.10.1",
"@actions/exec": "1.1.1"
},
"packageManager": "yarn@4.3.1"
"packageManager": "yarn@4.4.0"
}
2 changes: 1 addition & 1 deletion __fixtures__/test-project/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"prisma": {
"seed": "yarn rw exec seed"
},
"packageManager": "yarn@4.3.1",
"packageManager": "yarn@4.4.0",
"resolutions": {
"@storybook/react-dom-shim@npm:7.6.17": "https://verdaccio.tobbe.dev/@storybook/react-dom-shim/-/react-dom-shim-8.0.8.tgz",
"@apollo/client/rehackt": "0.1.0",
Expand Down
10 changes: 6 additions & 4 deletions docs/docs/how-to/test-in-github-actions.md
Original file line number Diff line number Diff line change
Expand Up @@ -226,11 +226,12 @@ jobs:
- 5432:5432

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- run: corepack enable
# install all the dependencies
- run: yarn install
# build the redwood app
Expand Down Expand Up @@ -325,11 +326,12 @@ jobs:
- 5432:5432
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- run: corepack enable
# install all the dependencies
- run: yarn install
# build the redwood app
Expand Down
14 changes: 7 additions & 7 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@
]
},
"dependencies": {
"@docusaurus/core": "3.4.0",
"@docusaurus/plugin-content-docs": "3.4.0",
"@docusaurus/preset-classic": "3.4.0",
"@docusaurus/theme-common": "3.4.0",
"@docusaurus/core": "3.5.1",
"@docusaurus/plugin-content-docs": "3.5.1",
"@docusaurus/preset-classic": "3.5.1",
"@docusaurus/theme-common": "3.5.1",
"@mdx-js/react": "3.0.1",
"clsx": "2.1.1",
"prism-react-renderer": "2.3.1",
Expand All @@ -36,9 +36,9 @@
"react-player": "2.16.0"
},
"devDependencies": {
"@docusaurus/module-type-aliases": "3.4.0",
"@docusaurus/tsconfig": "3.4.0",
"@docusaurus/module-type-aliases": "3.5.1",
"@docusaurus/tsconfig": "3.5.1",
"typescript": "5.5.4"
},
"packageManager": "yarn@4.3.1"
"packageManager": "yarn@4.4.0"
}
Loading

0 comments on commit 0bf315a

Please sign in to comment.