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 
…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)
  ...
  • Loading branch information
@dac09
dac09 committed Jan 2, 2024
2 parents e05a906 + 1075258 commit 9b1affd
Show file tree
Hide file tree
Showing 597 changed files with 40,970 additions and 35,438 deletions.
18 changes: 18 additions & 0 deletions .eslintrc.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,5 +184,23 @@ module.exports = {
'@redwoodjs/process-env-computed': 'off',
},
},
{
files: ['packages/project-config/**'],
excludedFiles: [
'**/__tests__/**',
'**/*.test.ts?(x)',
'**/*.spec.ts?(x)',
],
rules: {
'import/no-extraneous-dependencies': [
'error',
{
devDependencies: false,
optionalDependencies: false,
peerDependencies: true,
},
],
},
},
],
}
2 changes: 1 addition & 1 deletion .github/actions/check_create_redwood_app/package.json
View file
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@3.7.0"
"packageManager": "yarn@4.0.2"
}
28 changes: 14 additions & 14 deletions .github/actions/check_create_redwood_app/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,57 +2,57 @@
# Manual changes might be lost - proceed with caution!

__metadata:
version: 6
cacheKey: 8c0
version: 8
cacheKey: 10c0

"@actions/core@npm:1.10.1":
version: 1.10.1
resolution: "@actions/core@npm:1.10.1"
dependencies:
"@actions/http-client": ^2.0.1
uuid: ^8.3.2
checksum: 7a61446697a23dcad3545cf0634dedbdedf20ae9a0ee6ee977554589a15deb4a93593ee48a41258933d58ce0778f446b0d2c162b60750956fb75e0b9560fb832
"@actions/http-client": "npm:^2.0.1"
uuid: "npm:^8.3.2"
checksum: 8c0/7a61446697a23dcad3545cf0634dedbdedf20ae9a0ee6ee977554589a15deb4a93593ee48a41258933d58ce0778f446b0d2c162b60750956fb75e0b9560fb832
languageName: node
linkType: hard

"@actions/exec@npm:1.1.1":
version: 1.1.1
resolution: "@actions/exec@npm:1.1.1"
dependencies:
"@actions/io": ^1.0.1
checksum: 4a09f6bdbe50ce68b5cf8a7254d176230d6a74bccf6ecc3857feee209a8c950ba9adec87cc5ecceb04110182d1c17117234e45557d72fde6229b7fd3a395322a
"@actions/io": "npm:^1.0.1"
checksum: 8c0/4a09f6bdbe50ce68b5cf8a7254d176230d6a74bccf6ecc3857feee209a8c950ba9adec87cc5ecceb04110182d1c17117234e45557d72fde6229b7fd3a395322a
languageName: node
linkType: hard

"@actions/http-client@npm:^2.0.1":
version: 2.0.1
resolution: "@actions/http-client@npm:2.0.1"
dependencies:
tunnel: ^0.0.6
checksum: b58987ba2f53d7988f612ede7ff834573a3360c21f8fdea9fea92f26ada0fd0efafb22aa7d83f49c18965a5b765775d5253e2edb8d9476d924c4b304ef726b67
tunnel: "npm:^0.0.6"
checksum: 8c0/b58987ba2f53d7988f612ede7ff834573a3360c21f8fdea9fea92f26ada0fd0efafb22aa7d83f49c18965a5b765775d5253e2edb8d9476d924c4b304ef726b67
languageName: node
linkType: hard

"@actions/io@npm:^1.0.1":
version: 1.1.2
resolution: "@actions/io@npm:1.1.2"
checksum: 61c871bbee1cf58f57917d9bb2cf6bb7ea4dc40de3f65c7fb4ec619ceff57fc98f56be9cca2d476b09e7a96e1cba0d88cd125c4f690d384b9483935186f256c1
checksum: 8c0/61c871bbee1cf58f57917d9bb2cf6bb7ea4dc40de3f65c7fb4ec619ceff57fc98f56be9cca2d476b09e7a96e1cba0d88cd125c4f690d384b9483935186f256c1
languageName: node
linkType: hard

"check_test_project_fixture@workspace:.":
version: 0.0.0-use.local
resolution: "check_test_project_fixture@workspace:."
dependencies:
"@actions/core": 1.10.1
"@actions/exec": 1.1.1
"@actions/core": "npm:1.10.1"
"@actions/exec": "npm:1.1.1"
languageName: unknown
linkType: soft

"tunnel@npm:^0.0.6":
version: 0.0.6
resolution: "tunnel@npm:0.0.6"
checksum: e27e7e896f2426c1c747325b5f54efebc1a004647d853fad892b46d64e37591ccd0b97439470795e5262b5c0748d22beb4489a04a0a448029636670bfd801b75
checksum: 8c0/e27e7e896f2426c1c747325b5f54efebc1a004647d853fad892b46d64e37591ccd0b97439470795e5262b5c0748d22beb4489a04a0a448029636670bfd801b75
languageName: node
linkType: hard

Expand All @@ -61,6 +61,6 @@ __metadata:
resolution: "uuid@npm:8.3.2"
bin:
uuid: dist/bin/uuid
checksum: bcbb807a917d374a49f475fae2e87fdca7da5e5530820ef53f65ba1d12131bd81a92ecf259cc7ce317cbe0f289e7d79fdfebcef9bfa3087c8c8a2fa304c9be54
checksum: 8c0/bcbb807a917d374a49f475fae2e87fdca7da5e5530820ef53f65ba1d12131bd81a92ecf259cc7ce317cbe0f289e7d79fdfebcef9bfa3087c8c8a2fa304c9be54
languageName: node
linkType: hard
2 changes: 1 addition & 1 deletion .github/actions/check_test_project_fixture/package.json
View file
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@3.7.0"
"packageManager": "yarn@4.0.2"
}
28 changes: 14 additions & 14 deletions .github/actions/check_test_project_fixture/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,57 +2,57 @@
# Manual changes might be lost - proceed with caution!

__metadata:
version: 6
cacheKey: 8c0
version: 8
cacheKey: 10c0

"@actions/core@npm:1.10.1":
version: 1.10.1
resolution: "@actions/core@npm:1.10.1"
dependencies:
"@actions/http-client": ^2.0.1
uuid: ^8.3.2
checksum: 7a61446697a23dcad3545cf0634dedbdedf20ae9a0ee6ee977554589a15deb4a93593ee48a41258933d58ce0778f446b0d2c162b60750956fb75e0b9560fb832
"@actions/http-client": "npm:^2.0.1"
uuid: "npm:^8.3.2"
checksum: 8c0/7a61446697a23dcad3545cf0634dedbdedf20ae9a0ee6ee977554589a15deb4a93593ee48a41258933d58ce0778f446b0d2c162b60750956fb75e0b9560fb832
languageName: node
linkType: hard

"@actions/exec@npm:1.1.1":
version: 1.1.1
resolution: "@actions/exec@npm:1.1.1"
dependencies:
"@actions/io": ^1.0.1
checksum: 4a09f6bdbe50ce68b5cf8a7254d176230d6a74bccf6ecc3857feee209a8c950ba9adec87cc5ecceb04110182d1c17117234e45557d72fde6229b7fd3a395322a
"@actions/io": "npm:^1.0.1"
checksum: 8c0/4a09f6bdbe50ce68b5cf8a7254d176230d6a74bccf6ecc3857feee209a8c950ba9adec87cc5ecceb04110182d1c17117234e45557d72fde6229b7fd3a395322a
languageName: node
linkType: hard

"@actions/http-client@npm:^2.0.1":
version: 2.0.1
resolution: "@actions/http-client@npm:2.0.1"
dependencies:
tunnel: ^0.0.6
checksum: b58987ba2f53d7988f612ede7ff834573a3360c21f8fdea9fea92f26ada0fd0efafb22aa7d83f49c18965a5b765775d5253e2edb8d9476d924c4b304ef726b67
tunnel: "npm:^0.0.6"
checksum: 8c0/b58987ba2f53d7988f612ede7ff834573a3360c21f8fdea9fea92f26ada0fd0efafb22aa7d83f49c18965a5b765775d5253e2edb8d9476d924c4b304ef726b67
languageName: node
linkType: hard

"@actions/io@npm:^1.0.1":
version: 1.1.2
resolution: "@actions/io@npm:1.1.2"
checksum: 61c871bbee1cf58f57917d9bb2cf6bb7ea4dc40de3f65c7fb4ec619ceff57fc98f56be9cca2d476b09e7a96e1cba0d88cd125c4f690d384b9483935186f256c1
checksum: 8c0/61c871bbee1cf58f57917d9bb2cf6bb7ea4dc40de3f65c7fb4ec619ceff57fc98f56be9cca2d476b09e7a96e1cba0d88cd125c4f690d384b9483935186f256c1
languageName: node
linkType: hard

"check_test_project_fixture@workspace:.":
version: 0.0.0-use.local
resolution: "check_test_project_fixture@workspace:."
dependencies:
"@actions/core": 1.10.1
"@actions/exec": 1.1.1
"@actions/core": "npm:1.10.1"
"@actions/exec": "npm:1.1.1"
languageName: unknown
linkType: soft

"tunnel@npm:^0.0.6":
version: 0.0.6
resolution: "tunnel@npm:0.0.6"
checksum: e27e7e896f2426c1c747325b5f54efebc1a004647d853fad892b46d64e37591ccd0b97439470795e5262b5c0748d22beb4489a04a0a448029636670bfd801b75
checksum: 8c0/e27e7e896f2426c1c747325b5f54efebc1a004647d853fad892b46d64e37591ccd0b97439470795e5262b5c0748d22beb4489a04a0a448029636670bfd801b75
languageName: node
linkType: hard

Expand All @@ -61,6 +61,6 @@ __metadata:
resolution: "uuid@npm:8.3.2"
bin:
uuid: dist/bin/uuid
checksum: bcbb807a917d374a49f475fae2e87fdca7da5e5530820ef53f65ba1d12131bd81a92ecf259cc7ce317cbe0f289e7d79fdfebcef9bfa3087c8c8a2fa304c9be54
checksum: 8c0/bcbb807a917d374a49f475fae2e87fdca7da5e5530820ef53f65ba1d12131bd81a92ecf259cc7ce317cbe0f289e7d79fdfebcef9bfa3087c8c8a2fa304c9be54
languageName: node
linkType: hard
40 changes: 40 additions & 0 deletions .github/actions/detect-changes/cases/code_changes.mjs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
/**
* Detects if the given file path points to a code file (as apposed to a docs
* file)
*/
function isCodeFile(filePath) {
if (filePath.startsWith('docs')) {
return false
}

if (
[
'CHANGELOG.md',
'CODE_OF_CONDUCT.md',
'CONTRIBUTING.md',
'CONTRIBUTORS.md',
'LICENSE',
'README.md',
'SECURITY.md',
].includes(filePath)
) {
return false
}

return true
}

/**
* Checks if the given array of file paths contains any files with potential
* code changes
*/
export function hasCodeChanges(changedFiles) {
return changedFiles.some((file) => {
if (isCodeFile(file)) {
console.log(`Found code file: ${file}`)
return true
}

return false
})
}
33 changes: 0 additions & 33 deletions .github/actions/detect-changes/cases/onlydocs.mjs
View file

This file was deleted.

4 changes: 3 additions & 1 deletion .github/actions/detect-changes/cases/rsc.mjs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ export function rscChanged(changedFiles){
changedFile.startsWith('packages/internal/') ||
changedFile.startsWith('packages/project-config/') ||
changedFile.startsWith('packages/web/') ||
changedFile.startsWith('packages/vite/')
changedFile.startsWith('packages/vite/') ||
changedFile.startsWith('__fixtures__/test-project-rsa') ||
changedFile.startsWith('__fixtures__/test-project-rsc-external-packages')
) {
console.log('RSC change detected:', changedFile)
return true
Expand Down
3 changes: 2 additions & 1 deletion .github/actions/detect-changes/cases/ssr.mjs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ export function ssrChanged(changedFiles){
for (const changedFile of changedFiles) {
if (
changedFile.startsWith('tasks/smoke-tests/streaming-ssr') ||
changedFile.startsWith('tasks/smoke-tests/basePlaywright.config.ts') ||
changedFile === 'tasks/smoke-tests/basePlaywright.config.ts' ||
changedFile === 'tasks/test-project/codemods/delayedPage.js' ||
changedFile.startsWith('packages/internal/') ||
changedFile.startsWith('packages/project-config/') ||
changedFile.startsWith('packages/web/') ||
Expand Down
Loading

0 comments on commit 9b1affd

Please sign in to comment.