Skip to content

Commit bb1db16

Browse files
pantheredeyepantheredeye
committed
Merge branch 'main' of https://github.com/pantheredeye/redwood into bb-docs-azure
2 parents c583ccc + d2fe56c commit bb1db16

File tree

347 files changed

+54061
-3148
lines changed

Some content is hidden

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

347 files changed

+54061
-3148
lines changed

‎.changesets/11447.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
- fix(resolutions): Remove rehackt resolution (#11447) by @Tobbe
2+
3+
The rehackt resolution isn't needed anymore. Apollo Client has updated to rehackt 0.1.0. See https://github.com/apollographql/apollo-client/blob/HEAD/CHANGELOG.md#3101
4+
5+
Unfortunately this requires our users to manually go and update their resolutions

‎.changesets/11458.md

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
- fix(linting): Re-enable babel presets during linting of javascript projects (#11458) by @Josh-Walker-GM
2+
3+
The `yarn rw lint` command was failing for JavaScript projects. This change re-enables certain babel plugins to correct this issue and allow this command to succeed again.

‎.changesets/11459.md

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
- fix(jobs): Make deleteSuccessfulJobs configurable (#11459) by @Tobbe
2+
3+
Make the jobs Executor respect the `deleteSuccessfulJobs` config option

‎.changesets/11531.md

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
- fix(auth0): avoid use of undefined global in browser environment (#11531) by @Josh-Walker-GM
2+
3+
The Auth0 auth provider was failing in the browser due to trying to access `global`. This change corrects this and fixes Auth0 usage in the browser.

‎.changesets/11533.md

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
- [gh11385] Updated the generated page template (#11533) by @ahaywood
2+
3+
This change alters the default content produced when you generate page with `yarn rw g page`. Previously our generated content contained code that would error out if you had a route parameter in your page - because the link we automatically generated would not contain a value for that parameter.

‎.changesets/11534.md

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
- fix(cli): handle both single and double quotes during dbAuth setup (#11534) by @Josh-Walker-GM
2+
3+
If you had changed your prettier config to use double quotes instead of the default single quotes then the `yarn rw setup auth dbAuth` would fail. This change fixes that command to work regardless of quote flavour.

‎.changesets/11540.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
- fix(graphql): Allow including 'File' scalar by default to be disabled (#11540) by @Josh-Walker-GM
2+
3+
As of v8.0.0 a `File` scalar was added to your graphql schema by default. This could be problematic if you wanted to define your own `File` scalar.
4+
5+
With this change it is now possible to disable including this scalar by default. To see how to do so look at the `Default Scalar` section of the `Graphql` docs [here](https://docs.redwoodjs.com/docs/graphql#default-scalars)

‎.changesets/11542.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
- feat(cli): Make scaffolded layout routing type-safe (#11542) by @Tobbe
2+
3+
With this feature we now make sure only valid route names are passed as `titleTo` and `buttonTo` props to the scaffolded layout.
4+
5+
This also means you get helpful code completion when typing out the prop values

‎.changesets/11572.md

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
- Default NODE_ENV to "development" if it's `undefined` when starting jobs worker (#11572) by @cannikin
2+
3+
This mimics the behavior of `yarn rw dev` where `NODE_ENV` will equal `development` if you don't set it explicitly.

‎.changesets/11578.md

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- Fixes `yarn rw jobs clear` command (#11578) by @cannikin

‎.changesets/11591.md

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
- fix(router): Add missing dependency for RSC (#11591) by @Tobbe
2+
3+
Adding missing dependency `react-server-dom-webpack` to the `@redwoodjs/router` package. This should fix an error some people were seeing when trying to use RSC.

‎.github/workflows/ci.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,9 @@ jobs:
108108
- name: 🔎 Lint
109109
run: yarn lint
110110

111-
- name: 🥡 Check packaging and attw
112-
run: yarn check:package
111+
# TODO(jgmw): Re-enable when it doesn't hang
112+
# - name: 🥡 Check packaging and attw
113+
# run: yarn check:package
113114

114115
- name: 🌡 Test Types
115116
run: yarn test:types
@@ -183,7 +184,7 @@ jobs:
183184
spec: |
184185
cypress/e2e/01-tutorial/*.cy.js
185186
186-
- uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4
187+
- uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4
187188
if: always()
188189
with:
189190
name: logs

‎.github/workflows/require-release-label.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
issues: read
2222
pull-requests: read
2323
steps:
24-
- uses: mheap/github-action-required-labels@5847eef68201219cf0a4643ea7be61e77837bbce # v5
24+
- uses: mheap/github-action-required-labels@d25134c992b943fb6ad00c25ea00eb5988c0a9dd # v5
2525
with:
2626
mode: exactly
2727
count: 1

‎.github/workflows/scorecard.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ jobs:
3232

3333
steps:
3434
- name: 'Checkout code'
35-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
35+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
3636
with:
3737
persist-credentials: false
3838

3939
- name: 'Run analysis'
40-
uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
40+
uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
4141
with:
4242
results_file: results.sarif
4343
results_format: sarif

‎__fixtures__/fragment-test-project/package.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,8 @@
2020
"prisma": {
2121
"seed": "yarn rw exec seed"
2222
},
23-
"packageManager": "yarn@4.1.1"
23+
"packageManager": "yarn@4.1.1",
24+
"resolutions": {
25+
"rollup": "4.21.3"
26+
}
2427
}

‎__fixtures__/fragment-test-project/web/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
"@redwoodjs/router": "7.0.0",
1717
"@redwoodjs/web": "7.0.0",
1818
"humanize-string": "2.1.0",
19-
"react": "19.0.0-rc-8269d55d-20240802",
20-
"react-dom": "19.0.0-rc-8269d55d-20240802"
19+
"react": "19.0.0-rc-f2df5694-20240916",
20+
"react-dom": "19.0.0-rc-f2df5694-20240916"
2121
},
2222
"devDependencies": {
2323
"@redwoodjs/vite": "7.0.0",

‎__fixtures__/rsc-caching/package.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
"packageManager": "yarn@4.1.1",
2424
"resolutions": {
2525
"@apollo/client-react-streaming/superjson": "^1.12.2",
26-
"@apollo/client/rehackt": "0.1.0",
27-
"react-is": "19.0.0-rc-8269d55d-20240802"
26+
"react-is": "19.0.0-rc-f2df5694-20240916"
2827
}
2928
}

‎__fixtures__/rsc-caching/web/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
"@redwoodjs/web": "8.0.0-canary.1102",
2121
"@tobbe.dev/rsc-test": "0.0.5",
2222
"client-only": "0.0.1",
23-
"react": "19.0.0-rc-8269d55d-20240802",
24-
"react-dom": "19.0.0-rc-8269d55d-20240802"
23+
"react": "19.0.0-rc-f2df5694-20240916",
24+
"react-dom": "19.0.0-rc-f2df5694-20240916"
2525
},
2626
"devDependencies": {
2727
"@redwoodjs/vite": "8.0.0-canary.1102",

‎__fixtures__/rsc-caching/web/src/pages/CachingOnePage/CachingOnePage.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ const CachingOnePage = () => {
1212
Find me in{' '}
1313
<code>./web/src/pages/CachingOnePage/CachingOnePage.tsx</code>
1414
</p>
15-
<p>
15+
{/*
1616
My default route is named <code>cachingOne</code>, link to me with `
1717
<Link to={routes.cachingOne()}>CachingOne</Link>`
18-
</p>
18+
*/}
1919
</>
2020
)
2121
}

‎__fixtures__/rsc-caching/web/src/pages/CachingTwoPage/CachingTwoPage.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ const CachingTwoPage = () => {
1212
Find me in{' '}
1313
<code>./web/src/pages/CachingTwoPage/CachingTwoPage.tsx</code>
1414
</p>
15-
<p>
15+
{/*
1616
My default route is named <code>cachingTwo</code>, link to me with `
1717
<Link to={routes.cachingTwo()}>CachingTwo</Link>`
18-
</p>
18+
*/}
1919
</>
2020
)
2121
}

‎__fixtures__/test-project-rsa/package.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
"packageManager": "yarn@4.1.1",
2323
"resolutions": {
2424
"@apollo/client-react-streaming/superjson": "^1.12.2",
25-
"@apollo/client/rehackt": "0.1.0",
26-
"react-is": "19.0.0-rc-8269d55d-20240802"
25+
"react-is": "19.0.0-rc-f2df5694-20240916"
2726
}
2827
}

‎__fixtures__/test-project-rsa/web/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
"@redwoodjs/forms": "8.0.0-canary.144",
1616
"@redwoodjs/router": "8.0.0-canary.144",
1717
"@redwoodjs/web": "8.0.0-canary.144",
18-
"react": "19.0.0-rc-8269d55d-20240802",
19-
"react-dom": "19.0.0-rc-8269d55d-20240802"
18+
"react": "19.0.0-rc-f2df5694-20240916",
19+
"react-dom": "19.0.0-rc-f2df5694-20240916"
2020
},
2121
"devDependencies": {
2222
"@redwoodjs/vite": "8.0.0-canary.144",

‎__fixtures__/test-project-rsc-kitchen-sink/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"packageManager": "yarn@4.1.1",
2424
"resolutions": {
2525
"@apollo/client-react-streaming/superjson": "^1.12.2",
26-
"@apollo/client/rehackt": "0.1.0",
27-
"react-is": "19.0.0-rc-8269d55d-20240802"
26+
"react-is": "19.0.0-rc-f2df5694-20240916",
27+
"rollup": "4.21.3"
2828
}
2929
}

‎__fixtures__/test-project-rsc-kitchen-sink/web/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
"@redwoodjs/web": "8.0.0-canary.861",
2121
"@tobbe.dev/rsc-test": "0.0.5",
2222
"client-only": "0.0.1",
23-
"react": "19.0.0-rc-8269d55d-20240802",
24-
"react-dom": "19.0.0-rc-8269d55d-20240802"
23+
"react": "19.0.0-rc-f2df5694-20240916",
24+
"react-dom": "19.0.0-rc-f2df5694-20240916"
2525
},
2626
"devDependencies": {
2727
"@redwoodjs/vite": "8.0.0-canary.861",

‎__fixtures__/test-project-rsc-kitchen-sink/web/src/layouts/NavigationLayout/NavigationLayout.css

+4
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,9 @@
5151
& > main {
5252
display: flex;
5353
flex-grow: 1;
54+
55+
& > div {
56+
width: 100%;
57+
}
5458
}
5559
}

‎__fixtures__/test-project-rsc-kitchen-sink/web/src/pages/BlogPage/BlogPage.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ const BlogPage = () => {
1111
<p>
1212
Find me in <code>./web/src/pages/BlogPage/BlogPage.tsx</code>
1313
</p>
14-
<p>
14+
{/*}
1515
My default route is named <code>blog</code>, link to me with `
1616
<Link to={routes.blog()}>Blog</Link>`
17-
</p>
17+
*/}
1818
</>
1919
)
2020
}

‎__fixtures__/test-project/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"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",
26-
"@apollo/client/rehackt": "0.1.0",
27-
"react-is": "19.0.0-rc-8269d55d-20240802"
26+
"react-is": "19.0.0-rc-f2df5694-20240916",
27+
"rollup": "4.21.3"
2828
}
2929
}

‎__fixtures__/test-project/web/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@
1616
"@redwoodjs/router": "8.0.0",
1717
"@redwoodjs/web": "8.0.0",
1818
"humanize-string": "2.1.0",
19-
"react": "19.0.0-rc-8269d55d-20240802",
20-
"react-dom": "19.0.0-rc-8269d55d-20240802"
19+
"react": "19.0.0-rc-f2df5694-20240916",
20+
"react-dom": "19.0.0-rc-f2df5694-20240916"
2121
},
2222
"devDependencies": {
2323
"@redwoodjs/vite": "8.0.0",
2424
"@types/react": "^18.2.55",
2525
"@types/react-dom": "^18.2.19",
2626
"autoprefixer": "^10.4.20",
27-
"postcss": "^8.4.45",
27+
"postcss": "^8.4.47",
2828
"postcss-loader": "^8.1.1",
2929
"prettier-plugin-tailwindcss": "^0.5.12",
30-
"tailwindcss": "^3.4.10"
30+
"tailwindcss": "^3.4.12"
3131
}
3232
}

‎__fixtures__/test-project/web/src/components/Contact/ContactsCell/ContactsCell.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ export const Loading = () => <div>Loading...</div>
2727
export const Empty = () => {
2828
return (
2929
<div className="rw-text-center">
30-
{'No contacts yet. '}
30+
No contacts yet.{' '}
3131
<Link to={routes.newContact()} className="rw-link">
32-
{'Create one?'}
32+
Create one?
3333
</Link>
3434
</div>
3535
)

‎__fixtures__/test-project/web/src/components/Post/PostsCell/PostsCell.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ export const Loading = () => <div>Loading...</div>
2626
export const Empty = () => {
2727
return (
2828
<div className="rw-text-center">
29-
{'No posts yet. '}
29+
No posts yet.{' '}
3030
<Link to={routes.newPost()} className="rw-link">
31-
{'Create one?'}
31+
Create one?
3232
</Link>
3333
</div>
3434
)

‎__fixtures__/test-project/web/src/layouts/ScaffoldLayout/ScaffoldLayout.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ import { Toaster } from '@redwoodjs/web/toast'
33

44
type LayoutProps = {
55
title: string
6-
titleTo: string
6+
titleTo: keyof typeof routes
77
buttonLabel: string
8-
buttonTo: string
8+
buttonTo: keyof typeof routes
99
children: React.ReactNode
1010
}
1111

‎__fixtures__/test-project/web/src/pages/BlogPostPage/BlogPostPage.tsx

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// import { Link, routes } from '@redwoodjs/router'
12
import { Metadata } from '@redwoodjs/web'
23

34
type BlogPostPageProps = {

‎__fixtures__/test-project/web/src/pages/ProfilePage/ProfilePage.tsx

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { Metadata } from '@redwoodjs/web'
22

33
import { useAuth } from 'src/auth'
4+
// import { Link, routes } from '@redwoodjs/router'
45

56
const ProfilePage = () => {
67
const { currentUser, isAuthenticated, hasRole, loading } = useAuth()

‎docs/.node-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20.16.0
1+
20.17.0

‎docs/docs/background-jobs.md

+15-1
Original file line numberDiff line numberDiff line change
@@ -701,7 +701,7 @@ By checking the `lastError` field in the database you can see what the last erro
701701
702702
## Deployment
703703
704-
For many use cases you may simply be able to rely on the job runner to start your job workers, which will run forever:
704+
For many use cases you may be able to rely on the job runner to start and detach your job workers, which will then run forever:
705705
706706
```bash
707707
yarn rw jobs start
@@ -723,6 +723,20 @@ Of course if you have a process monitor system watching your workers you'll want
723723
724724
:::
725725
726+
### NODE_ENV
727+
728+
You'll need to explicitly set your `NODE_ENV` when in environments other than development or test. We like having a `.env` file in a serverfull production environment, and you just include:
729+
730+
```bash
731+
NODE_ENV=production
732+
```
733+
734+
If you're using Docker, make sure you have an `ENV` declaration for it:
735+
736+
```docker
737+
ENV NODE_ENV="production"
738+
```
739+
726740
## Advanced Job Workers
727741
728742
As noted above, although the workers are started and detached using the `yarn rw jobs start` command, there is nothing to monitor those workers to make sure they keep running. To do that, you'll want to start the workers yourself (or have your process monitor start them) using command line flags.

‎docs/docs/cli-commands.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -954,11 +954,11 @@ const QuotePage = ({ id }) => {
954954
<>
955955
<h1>QuotePage</h1>
956956
<p>Find me in "./web/src/pages/QuotePage/QuotePage.js"</p>
957-
<p>
957+
{/*
958958
My default route is named "quote", link to me with `
959959
<Link to={routes.quote({ id: 42 })}>Quote 42</Link>`
960-
</p>
961-
<p>The parameter passed to me is {id}</p>
960+
The parameter passed to me is {id}
961+
*/}
962962
</>
963963
)
964964
}

0 commit comments

Comments
 (0)