Skip to content

Commit 9b1affd

Browse files
committed
Merge branch 'main' of github.com:redwoodjs/redwood into feat/dbauth-cookie+generic-handler
* 'main' of github.com:redwoodjs/redwood: (125 commits) chore(release-tooling): Reminder to update Algolia chore(release-tooling): Add note about generating release notes chore(release-tooling): Add more detailed instructions for after releasing chore(release-tooling): Fix PR count message fix(crwa): use `fs.renameSync` instead of `fs.rename` (redwoodjs#9787) chore(release-tooling): Update to node 20 in version check chore(deps): bump @adobe/css-tools from 4.3.1 to 4.3.2 in /__fixtures__/example-todo-main (redwoodjs#9785) chore(crwa): add e2e tests for create-redwood-app (redwoodjs#9783) chore(release-tooling): fetch -> pull (redwoodjs#9784) feat(scaffold/cell): Adds TypedDocument Support to Cell and Scaffold Generators (redwoodjs#9693) fix: Support Custom Id Field Names in when generating Cells (redwoodjs#9778) chore(framework-tools): .gitignore (redwoodjs#9782) Use build:pack for dbauth when rebuilding the test project (redwoodjs#9781) chore(test-project): Fix test-project generation script, and regenerate fixture (redwoodjs#9779) Fix dbAuth allowUserFields initialization syntax (redwoodjs#9780) chore(framework-tools): add `project:tarsync` script (redwoodjs#9766) fix(otel): Fix OTel sdk loading (redwoodjs#9777) fix: Fixes way OpenTelemetry setup template uses project-config for port setting (redwoodjs#9775) chore(router): Miniscule fixes chore(router): Move useMatch to its own file (redwoodjs#9770) ...
2 parents e05a906 + 1075258 commit 9b1affd

File tree

597 files changed

+40970
-35438
lines changed

Some content is hidden

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

597 files changed

+40970
-35438
lines changed

.eslintrc.js

+18
Original file line numberDiff line numberDiff line change
@@ -184,5 +184,23 @@ module.exports = {
184184
'@redwoodjs/process-env-computed': 'off',
185185
},
186186
},
187+
{
188+
files: ['packages/project-config/**'],
189+
excludedFiles: [
190+
'**/__tests__/**',
191+
'**/*.test.ts?(x)',
192+
'**/*.spec.ts?(x)',
193+
],
194+
rules: {
195+
'import/no-extraneous-dependencies': [
196+
'error',
197+
{
198+
devDependencies: false,
199+
optionalDependencies: false,
200+
peerDependencies: true,
201+
},
202+
],
203+
},
204+
},
187205
],
188206
}

.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@3.7.0"
8+
"packageManager": "yarn@4.0.2"
99
}

.github/actions/check_create_redwood_app/yarn.lock

+14-14
Original file line numberDiff line numberDiff line change
@@ -2,57 +2,57 @@
22
# Manual changes might be lost - proceed with caution!
33

44
__metadata:
5-
version: 6
6-
cacheKey: 8c0
5+
version: 8
6+
cacheKey: 10c0
77

88
"@actions/core@npm:1.10.1":
99
version: 1.10.1
1010
resolution: "@actions/core@npm:1.10.1"
1111
dependencies:
12-
"@actions/http-client": ^2.0.1
13-
uuid: ^8.3.2
14-
checksum: 7a61446697a23dcad3545cf0634dedbdedf20ae9a0ee6ee977554589a15deb4a93593ee48a41258933d58ce0778f446b0d2c162b60750956fb75e0b9560fb832
12+
"@actions/http-client": "npm:^2.0.1"
13+
uuid: "npm:^8.3.2"
14+
checksum: 8c0/7a61446697a23dcad3545cf0634dedbdedf20ae9a0ee6ee977554589a15deb4a93593ee48a41258933d58ce0778f446b0d2c162b60750956fb75e0b9560fb832
1515
languageName: node
1616
linkType: hard
1717

1818
"@actions/exec@npm:1.1.1":
1919
version: 1.1.1
2020
resolution: "@actions/exec@npm:1.1.1"
2121
dependencies:
22-
"@actions/io": ^1.0.1
23-
checksum: 4a09f6bdbe50ce68b5cf8a7254d176230d6a74bccf6ecc3857feee209a8c950ba9adec87cc5ecceb04110182d1c17117234e45557d72fde6229b7fd3a395322a
22+
"@actions/io": "npm:^1.0.1"
23+
checksum: 8c0/4a09f6bdbe50ce68b5cf8a7254d176230d6a74bccf6ecc3857feee209a8c950ba9adec87cc5ecceb04110182d1c17117234e45557d72fde6229b7fd3a395322a
2424
languageName: node
2525
linkType: hard
2626

2727
"@actions/http-client@npm:^2.0.1":
2828
version: 2.0.1
2929
resolution: "@actions/http-client@npm:2.0.1"
3030
dependencies:
31-
tunnel: ^0.0.6
32-
checksum: b58987ba2f53d7988f612ede7ff834573a3360c21f8fdea9fea92f26ada0fd0efafb22aa7d83f49c18965a5b765775d5253e2edb8d9476d924c4b304ef726b67
31+
tunnel: "npm:^0.0.6"
32+
checksum: 8c0/b58987ba2f53d7988f612ede7ff834573a3360c21f8fdea9fea92f26ada0fd0efafb22aa7d83f49c18965a5b765775d5253e2edb8d9476d924c4b304ef726b67
3333
languageName: node
3434
linkType: hard
3535

3636
"@actions/io@npm:^1.0.1":
3737
version: 1.1.2
3838
resolution: "@actions/io@npm:1.1.2"
39-
checksum: 61c871bbee1cf58f57917d9bb2cf6bb7ea4dc40de3f65c7fb4ec619ceff57fc98f56be9cca2d476b09e7a96e1cba0d88cd125c4f690d384b9483935186f256c1
39+
checksum: 8c0/61c871bbee1cf58f57917d9bb2cf6bb7ea4dc40de3f65c7fb4ec619ceff57fc98f56be9cca2d476b09e7a96e1cba0d88cd125c4f690d384b9483935186f256c1
4040
languageName: node
4141
linkType: hard
4242

4343
"check_test_project_fixture@workspace:.":
4444
version: 0.0.0-use.local
4545
resolution: "check_test_project_fixture@workspace:."
4646
dependencies:
47-
"@actions/core": 1.10.1
48-
"@actions/exec": 1.1.1
47+
"@actions/core": "npm:1.10.1"
48+
"@actions/exec": "npm:1.1.1"
4949
languageName: unknown
5050
linkType: soft
5151

5252
"tunnel@npm:^0.0.6":
5353
version: 0.0.6
5454
resolution: "tunnel@npm:0.0.6"
55-
checksum: e27e7e896f2426c1c747325b5f54efebc1a004647d853fad892b46d64e37591ccd0b97439470795e5262b5c0748d22beb4489a04a0a448029636670bfd801b75
55+
checksum: 8c0/e27e7e896f2426c1c747325b5f54efebc1a004647d853fad892b46d64e37591ccd0b97439470795e5262b5c0748d22beb4489a04a0a448029636670bfd801b75
5656
languageName: node
5757
linkType: hard
5858

@@ -61,6 +61,6 @@ __metadata:
6161
resolution: "uuid@npm:8.3.2"
6262
bin:
6363
uuid: dist/bin/uuid
64-
checksum: bcbb807a917d374a49f475fae2e87fdca7da5e5530820ef53f65ba1d12131bd81a92ecf259cc7ce317cbe0f289e7d79fdfebcef9bfa3087c8c8a2fa304c9be54
64+
checksum: 8c0/bcbb807a917d374a49f475fae2e87fdca7da5e5530820ef53f65ba1d12131bd81a92ecf259cc7ce317cbe0f289e7d79fdfebcef9bfa3087c8c8a2fa304c9be54
6565
languageName: node
6666
linkType: hard

.github/actions/check_test_project_fixture/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@3.7.0"
8+
"packageManager": "yarn@4.0.2"
99
}

.github/actions/check_test_project_fixture/yarn.lock

+14-14
Original file line numberDiff line numberDiff line change
@@ -2,57 +2,57 @@
22
# Manual changes might be lost - proceed with caution!
33

44
__metadata:
5-
version: 6
6-
cacheKey: 8c0
5+
version: 8
6+
cacheKey: 10c0
77

88
"@actions/core@npm:1.10.1":
99
version: 1.10.1
1010
resolution: "@actions/core@npm:1.10.1"
1111
dependencies:
12-
"@actions/http-client": ^2.0.1
13-
uuid: ^8.3.2
14-
checksum: 7a61446697a23dcad3545cf0634dedbdedf20ae9a0ee6ee977554589a15deb4a93593ee48a41258933d58ce0778f446b0d2c162b60750956fb75e0b9560fb832
12+
"@actions/http-client": "npm:^2.0.1"
13+
uuid: "npm:^8.3.2"
14+
checksum: 8c0/7a61446697a23dcad3545cf0634dedbdedf20ae9a0ee6ee977554589a15deb4a93593ee48a41258933d58ce0778f446b0d2c162b60750956fb75e0b9560fb832
1515
languageName: node
1616
linkType: hard
1717

1818
"@actions/exec@npm:1.1.1":
1919
version: 1.1.1
2020
resolution: "@actions/exec@npm:1.1.1"
2121
dependencies:
22-
"@actions/io": ^1.0.1
23-
checksum: 4a09f6bdbe50ce68b5cf8a7254d176230d6a74bccf6ecc3857feee209a8c950ba9adec87cc5ecceb04110182d1c17117234e45557d72fde6229b7fd3a395322a
22+
"@actions/io": "npm:^1.0.1"
23+
checksum: 8c0/4a09f6bdbe50ce68b5cf8a7254d176230d6a74bccf6ecc3857feee209a8c950ba9adec87cc5ecceb04110182d1c17117234e45557d72fde6229b7fd3a395322a
2424
languageName: node
2525
linkType: hard
2626

2727
"@actions/http-client@npm:^2.0.1":
2828
version: 2.0.1
2929
resolution: "@actions/http-client@npm:2.0.1"
3030
dependencies:
31-
tunnel: ^0.0.6
32-
checksum: b58987ba2f53d7988f612ede7ff834573a3360c21f8fdea9fea92f26ada0fd0efafb22aa7d83f49c18965a5b765775d5253e2edb8d9476d924c4b304ef726b67
31+
tunnel: "npm:^0.0.6"
32+
checksum: 8c0/b58987ba2f53d7988f612ede7ff834573a3360c21f8fdea9fea92f26ada0fd0efafb22aa7d83f49c18965a5b765775d5253e2edb8d9476d924c4b304ef726b67
3333
languageName: node
3434
linkType: hard
3535

3636
"@actions/io@npm:^1.0.1":
3737
version: 1.1.2
3838
resolution: "@actions/io@npm:1.1.2"
39-
checksum: 61c871bbee1cf58f57917d9bb2cf6bb7ea4dc40de3f65c7fb4ec619ceff57fc98f56be9cca2d476b09e7a96e1cba0d88cd125c4f690d384b9483935186f256c1
39+
checksum: 8c0/61c871bbee1cf58f57917d9bb2cf6bb7ea4dc40de3f65c7fb4ec619ceff57fc98f56be9cca2d476b09e7a96e1cba0d88cd125c4f690d384b9483935186f256c1
4040
languageName: node
4141
linkType: hard
4242

4343
"check_test_project_fixture@workspace:.":
4444
version: 0.0.0-use.local
4545
resolution: "check_test_project_fixture@workspace:."
4646
dependencies:
47-
"@actions/core": 1.10.1
48-
"@actions/exec": 1.1.1
47+
"@actions/core": "npm:1.10.1"
48+
"@actions/exec": "npm:1.1.1"
4949
languageName: unknown
5050
linkType: soft
5151

5252
"tunnel@npm:^0.0.6":
5353
version: 0.0.6
5454
resolution: "tunnel@npm:0.0.6"
55-
checksum: e27e7e896f2426c1c747325b5f54efebc1a004647d853fad892b46d64e37591ccd0b97439470795e5262b5c0748d22beb4489a04a0a448029636670bfd801b75
55+
checksum: 8c0/e27e7e896f2426c1c747325b5f54efebc1a004647d853fad892b46d64e37591ccd0b97439470795e5262b5c0748d22beb4489a04a0a448029636670bfd801b75
5656
languageName: node
5757
linkType: hard
5858

@@ -61,6 +61,6 @@ __metadata:
6161
resolution: "uuid@npm:8.3.2"
6262
bin:
6363
uuid: dist/bin/uuid
64-
checksum: bcbb807a917d374a49f475fae2e87fdca7da5e5530820ef53f65ba1d12131bd81a92ecf259cc7ce317cbe0f289e7d79fdfebcef9bfa3087c8c8a2fa304c9be54
64+
checksum: 8c0/bcbb807a917d374a49f475fae2e87fdca7da5e5530820ef53f65ba1d12131bd81a92ecf259cc7ce317cbe0f289e7d79fdfebcef9bfa3087c8c8a2fa304c9be54
6565
languageName: node
6666
linkType: hard
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
/**
2+
* Detects if the given file path points to a code file (as apposed to a docs
3+
* file)
4+
*/
5+
function isCodeFile(filePath) {
6+
if (filePath.startsWith('docs')) {
7+
return false
8+
}
9+
10+
if (
11+
[
12+
'CHANGELOG.md',
13+
'CODE_OF_CONDUCT.md',
14+
'CONTRIBUTING.md',
15+
'CONTRIBUTORS.md',
16+
'LICENSE',
17+
'README.md',
18+
'SECURITY.md',
19+
].includes(filePath)
20+
) {
21+
return false
22+
}
23+
24+
return true
25+
}
26+
27+
/**
28+
* Checks if the given array of file paths contains any files with potential
29+
* code changes
30+
*/
31+
export function hasCodeChanges(changedFiles) {
32+
return changedFiles.some((file) => {
33+
if (isCodeFile(file)) {
34+
console.log(`Found code file: ${file}`)
35+
return true
36+
}
37+
38+
return false
39+
})
40+
}

.github/actions/detect-changes/cases/onlydocs.mjs

-33
This file was deleted.

.github/actions/detect-changes/cases/rsc.mjs

+3-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ export function rscChanged(changedFiles){
2020
changedFile.startsWith('packages/internal/') ||
2121
changedFile.startsWith('packages/project-config/') ||
2222
changedFile.startsWith('packages/web/') ||
23-
changedFile.startsWith('packages/vite/')
23+
changedFile.startsWith('packages/vite/') ||
24+
changedFile.startsWith('__fixtures__/test-project-rsa') ||
25+
changedFile.startsWith('__fixtures__/test-project-rsc-external-packages')
2426
) {
2527
console.log('RSC change detected:', changedFile)
2628
return true

.github/actions/detect-changes/cases/ssr.mjs

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ export function ssrChanged(changedFiles){
88
for (const changedFile of changedFiles) {
99
if (
1010
changedFile.startsWith('tasks/smoke-tests/streaming-ssr') ||
11-
changedFile.startsWith('tasks/smoke-tests/basePlaywright.config.ts') ||
11+
changedFile === 'tasks/smoke-tests/basePlaywright.config.ts' ||
12+
changedFile === 'tasks/test-project/codemods/delayedPage.js' ||
1213
changedFile.startsWith('packages/internal/') ||
1314
changedFile.startsWith('packages/project-config/') ||
1415
changedFile.startsWith('packages/web/') ||

0 commit comments

Comments
 (0)