From 3493e1b1fcbdc052d09f8c46e841a53c67c32996 Mon Sep 17 00:00:00 2001 From: Josh GM Walker <56300765+Josh-Walker-GM@users.noreply.github.com> Date: Fri, 7 Jun 2024 16:42:15 +0100 Subject: [PATCH 01/66] chore(tasks): Switch target react version in downgrade script (#10749) --- tasks/downgradeToReact18.mts | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tasks/downgradeToReact18.mts b/tasks/downgradeToReact18.mts index dd66ab7913e1..4de28998c87e 100644 --- a/tasks/downgradeToReact18.mts +++ b/tasks/downgradeToReact18.mts @@ -44,29 +44,30 @@ async function parsePackageJsonFiles(packageJsonFilePaths: string[]) { } async function downgradeReactVersion(packageJsonArray: PackageJson[]) { + const targetReactVersion = "18.3.1" for (const packageJson of packageJsonArray) { if (packageJson.dependencies?.react?.startsWith('19.')) { - packageJson.dependencies.react = '18.2.0' + packageJson.dependencies.react = targetReactVersion } if (packageJson.devDependencies?.react?.startsWith('19.')) { - packageJson.devDependencies.react = '18.2.0' + packageJson.devDependencies.react = targetReactVersion } if (packageJson.peerDependencies?.react?.startsWith('19.')) { - packageJson.peerDependencies.react = '18.2.0' + packageJson.peerDependencies.react = targetReactVersion } if (packageJson.dependencies?.['react-dom']?.startsWith('19.')) { - packageJson.dependencies['react-dom'] = '18.2.0' + packageJson.dependencies['react-dom'] = targetReactVersion } if (packageJson.devDependencies?.['react-dom']?.startsWith('19.')) { - packageJson.devDependencies['react-dom'] = '18.2.0' + packageJson.devDependencies['react-dom'] = targetReactVersion } if (packageJson.peerDependencies?.['react-dom']?.startsWith('19.')) { - packageJson.peerDependencies['react-dom'] = '18.2.0' + packageJson.peerDependencies['react-dom'] = targetReactVersion } } } From 0b5408abc51b334bc081c0b56188e3d0ead9dfee Mon Sep 17 00:00:00 2001 From: Tobbe Lundberg Date: Fri, 7 Jun 2024 19:15:32 +0200 Subject: [PATCH 02/66] RSC: Silence unsupported-dynamic-import warning (#10750) --- packages/vite/src/rsc/rscBuildForSsr.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/vite/src/rsc/rscBuildForSsr.ts b/packages/vite/src/rsc/rscBuildForSsr.ts index 345051f092fd..f1f8dd3ba6e7 100644 --- a/packages/vite/src/rsc/rscBuildForSsr.ts +++ b/packages/vite/src/rsc/rscBuildForSsr.ts @@ -111,6 +111,9 @@ export async function rscBuildForSsr({ }, esbuild: { logLevel: verbose ? 'debug' : 'silent', + logOverride: { + 'unsupported-dynamic-import': 'silent', + }, }, logLevel: verbose ? 'info' : 'silent', }) From b5ad2c358bb13e531b73565dd2ba5c8839c9a443 Mon Sep 17 00:00:00 2001 From: Tobbe Lundberg Date: Fri, 7 Jun 2024 19:30:10 +0200 Subject: [PATCH 03/66] chore(deps): Switch to smol-toml (#10746) --- packages/cli-helpers/package.json | 2 +- .../__snapshots__/project.test.ts.snap | 60 ++++++++++--------- .../src/lib/__tests__/project.test.ts | 2 +- packages/cli-helpers/src/lib/project.ts | 22 ++++--- packages/cli/package.json | 2 +- packages/cli/src/commands/deploy/baremetal.js | 2 +- .../deploy/providers/coherenceHandler.js | 2 +- packages/codemods/package.json | 1 - packages/project-config/package.json | 2 +- packages/project-config/src/config.ts | 2 +- packages/structure/package.json | 2 +- packages/structure/src/model/RWTOML.ts | 10 +--- yarn.lock | 23 ++++--- 13 files changed, 69 insertions(+), 63 deletions(-) diff --git a/packages/cli-helpers/package.json b/packages/cli-helpers/package.json index 18904453a9f9..e22e86512752 100644 --- a/packages/cli-helpers/package.json +++ b/packages/cli-helpers/package.json @@ -28,7 +28,6 @@ }, "dependencies": { "@babel/core": "^7.22.20", - "@iarna/toml": "2.2.5", "@opentelemetry/api": "1.8.0", "@redwoodjs/project-config": "workspace:*", "@redwoodjs/telemetry": "workspace:*", @@ -40,6 +39,7 @@ "pascalcase": "1.0.0", "prettier": "3.2.5", "prompts": "2.4.2", + "smol-toml": "1.2.1", "terminal-link": "2.1.1" }, "devDependencies": { diff --git a/packages/cli-helpers/src/lib/__tests__/__snapshots__/project.test.ts.snap b/packages/cli-helpers/src/lib/__tests__/__snapshots__/project.test.ts.snap index c3d1be489a33..6b777b615443 100644 --- a/packages/cli-helpers/src/lib/__tests__/__snapshots__/project.test.ts.snap +++ b/packages/cli-helpers/src/lib/__tests__/__snapshots__/project.test.ts.snap @@ -53,16 +53,18 @@ exports[`addEnvVar > addEnvVar adds environment variables as part of a setup tas exports[`updateTomlConfig > updateTomlConfig configures a new CLI plugin > adds package but keeps autoInstall false 1`] = ` "[web] title = "Redwood App" -port = 8_910 +port = 8910 apiUrl = "/.redwood/functions" -includeEnvironmentVariables = [ ] +includeEnvironmentVariables = [] [api] -port = 8_911 +port = 8911 +[experimental] [experimental.cli] autoInstall = false - +[experimental] +[experimental.cli] [[experimental.cli.plugins]] package = "@example/test-package-when-autoInstall-false" enabled = true @@ -72,19 +74,21 @@ enabled = true exports[`updateTomlConfig > updateTomlConfig configures a new CLI plugin > adds when experimental cli has some plugins configured 1`] = ` "[web] title = "Redwood App" -port = 8_910 +port = 8910 apiUrl = "/.redwood/functions" -includeEnvironmentVariables = [ ] +includeEnvironmentVariables = [] [api] -port = 8_911 +port = 8911 +[experimental] [experimental.cli] autoInstall = true - [[experimental.cli.plugins]] - package = "@existing-example/some-package-when-cli-has-some-packages-configured" - +[[experimental.cli.plugins]] +package = "@existing-example/some-package-when-cli-has-some-packages-configured" +[experimental] +[experimental.cli] [[experimental.cli.plugins]] package = "@example/test-package-name" enabled = true @@ -94,35 +98,37 @@ enabled = true exports[`updateTomlConfig > updateTomlConfig configures a new CLI plugin > adds when experimental cli is not configured 1`] = ` "[web] title = "Redwood App" -port = 8_910 +port = 8910 apiUrl = "/.redwood/functions" -includeEnvironmentVariables = [ ] +includeEnvironmentVariables = [] [api] -port = 8_911 - +port = 8911 +[experimental] [experimental.cli] autoInstall = true - [[experimental.cli.plugins]] - package = "@example/test-package-when-cli-not-configured" - enabled = true +[[experimental.cli.plugins]] +package = "@example/test-package-when-cli-not-configured" +enabled = true " `; exports[`updateTomlConfig > updateTomlConfig configures a new CLI plugin > adds when experimental cli is setup but has no plugins configured 1`] = ` "[web] title = "Redwood App" -port = 8_910 +port = 8910 apiUrl = "/.redwood/functions" -includeEnvironmentVariables = [ ] +includeEnvironmentVariables = [] [api] -port = 8_911 +port = 8911 +[experimental] [experimental.cli] autoInstall = true - +[experimental] +[experimental.cli] [[experimental.cli.plugins]] package = "@example/test-package-when-no-plugins-configured" enabled = true @@ -132,18 +138,18 @@ enabled = true exports[`updateTomlConfig > updateTomlConfig configures a new CLI plugin > does not add duplicate place when experimental cli has that plugin configured 1`] = ` "[web] title = "Redwood App" -port = 8_910 +port = 8910 apiUrl = "/.redwood/functions" -includeEnvironmentVariables = [ ] +includeEnvironmentVariables = [] [api] -port = 8_911 +port = 8911 +[experimental] [experimental.cli] autoInstall = true - [[experimental.cli.plugins]] - package = "@existing-example/some-package-name-already-exists" - +[[experimental.cli.plugins]] +package = "@existing-example/some-package-name-already-exists" " `; diff --git a/packages/cli-helpers/src/lib/__tests__/project.test.ts b/packages/cli-helpers/src/lib/__tests__/project.test.ts index c423ecff3bc9..c2fc1823768c 100644 --- a/packages/cli-helpers/src/lib/__tests__/project.test.ts +++ b/packages/cli-helpers/src/lib/__tests__/project.test.ts @@ -9,7 +9,7 @@ vi.mock('node:fs', async () => { import * as fs from 'node:fs' -import * as toml from '@iarna/toml' +import * as toml from 'smol-toml' import { vi, describe, beforeEach, afterEach, it, expect } from 'vitest' import { updateTomlConfig, addEnvVar } from '../project.js' diff --git a/packages/cli-helpers/src/lib/project.ts b/packages/cli-helpers/src/lib/project.ts index 88a29412c584..25c43a10e91b 100644 --- a/packages/cli-helpers/src/lib/project.ts +++ b/packages/cli-helpers/src/lib/project.ts @@ -1,9 +1,8 @@ import * as fs from 'node:fs' import * as path from 'node:path' -import type { JsonMap } from '@iarna/toml' -import toml from '@iarna/toml' import dotenv from 'dotenv' +import toml from 'smol-toml' import type { Config } from '@redwoodjs/project-config' import { @@ -55,7 +54,7 @@ export const updateTomlConfig = (packageName: string) => { const redwoodTomlPath = getConfigPath() const originalTomlContent = fs.readFileSync(redwoodTomlPath, 'utf-8') - let tomlToAppend = {} as JsonMap + let tomlToAppend: Record = {} const config = getConfig(redwoodTomlPath) @@ -94,7 +93,12 @@ export const updateTomlConfig = (packageName: string) => { } } - const newConfig = originalTomlContent + '\n' + toml.stringify(tomlToAppend) + const newConfig = + originalTomlContent + + '\n' + + (Object.keys(tomlToAppend).length > 0 + ? toml.stringify(tomlToAppend) + '\n' + : '') return fs.writeFileSync(redwoodTomlPath, newConfig, 'utf-8') } @@ -207,11 +211,13 @@ export function setTomlSetting( const redwoodTomlPath = getConfigPath() const originalTomlContent = fs.readFileSync(redwoodTomlPath, 'utf-8') - // Can't type toml.parse because this PR has not been included in a released yet - // https://github.com/iarna/iarna-toml/commit/5a89e6e65281e4544e23d3dbaf9e8428ed8140e9 - const redwoodTomlObject = toml.parse(originalTomlContent) as any + const redwoodTomlObject = toml.parse(originalTomlContent) + const sectionValue = redwoodTomlObject[section] - const existingValue = redwoodTomlObject?.[section]?.[setting] + const existingValue = + // I don't like this type cast, but I couldn't come up with a much better + // solution + (sectionValue as Record | undefined)?.[setting] // If the setting already exists in the given section, and has the given // value already, just return diff --git a/packages/cli/package.json b/packages/cli/package.json index dc627ad50fe7..a2de48d9af7b 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -28,7 +28,6 @@ }, "dependencies": { "@babel/runtime-corejs3": "7.24.5", - "@iarna/toml": "2.2.5", "@opentelemetry/api": "1.8.0", "@opentelemetry/core": "1.22.0", "@opentelemetry/exporter-trace-otlp-http": "0.49.1", @@ -75,6 +74,7 @@ "prompts": "2.4.2", "rimraf": "5.0.7", "semver": "7.6.2", + "smol-toml": "1.2.1", "string-env-interpolation": "1.0.1", "systeminformation": "5.22.9", "terminal-link": "2.1.1", diff --git a/packages/cli/src/commands/deploy/baremetal.js b/packages/cli/src/commands/deploy/baremetal.js index 9ded79319a37..26c87269692f 100644 --- a/packages/cli/src/commands/deploy/baremetal.js +++ b/packages/cli/src/commands/deploy/baremetal.js @@ -1,9 +1,9 @@ import path from 'path' -import toml from '@iarna/toml' import boxen from 'boxen' import fs from 'fs-extra' import { Listr } from 'listr2' +import toml from 'smol-toml' import { env as envInterpolation } from 'string-env-interpolation' import terminalLink from 'terminal-link' import { titleCase } from 'title-case' diff --git a/packages/cli/src/commands/setup/deploy/providers/coherenceHandler.js b/packages/cli/src/commands/setup/deploy/providers/coherenceHandler.js index f86317371031..cc9a7bc23360 100644 --- a/packages/cli/src/commands/setup/deploy/providers/coherenceHandler.js +++ b/packages/cli/src/commands/setup/deploy/providers/coherenceHandler.js @@ -1,9 +1,9 @@ import path from 'path' -import toml from '@iarna/toml' import { getSchema, getConfig } from '@prisma/internals' import fs from 'fs-extra' import { Listr } from 'listr2' +import toml from 'smol-toml' import { colors as c, diff --git a/packages/codemods/package.json b/packages/codemods/package.json index 0eeecb29f2c1..78ee70ddf0d9 100644 --- a/packages/codemods/package.json +++ b/packages/codemods/package.json @@ -29,7 +29,6 @@ "@babel/plugin-transform-typescript": "^7.22.15", "@babel/runtime-corejs3": "7.24.5", "@babel/traverse": "^7.22.20", - "@iarna/toml": "2.2.5", "@redwoodjs/project-config": "workspace:*", "@svgr/core": "8.1.0", "@svgr/plugin-jsx": "8.1.0", diff --git a/packages/project-config/package.json b/packages/project-config/package.json index 5749c47d528d..f789aac485b0 100644 --- a/packages/project-config/package.json +++ b/packages/project-config/package.json @@ -27,9 +27,9 @@ "test:watch": "vitest watch" }, "dependencies": { - "@iarna/toml": "2.2.5", "deepmerge": "4.3.1", "fast-glob": "3.3.2", + "smol-toml": "1.2.1", "string-env-interpolation": "1.0.1" }, "devDependencies": { diff --git a/packages/project-config/src/config.ts b/packages/project-config/src/config.ts index 2531cc8f5ac2..b57cf94d64cb 100644 --- a/packages/project-config/src/config.ts +++ b/packages/project-config/src/config.ts @@ -1,7 +1,7 @@ import fs from 'fs' -import toml from '@iarna/toml' import merge from 'deepmerge' +import toml from 'smol-toml' import { env as envInterpolation } from 'string-env-interpolation' import { getConfigPath } from './configPath.js' diff --git a/packages/structure/package.json b/packages/structure/package.json index 8307c8ddd89f..784515bf7f1c 100644 --- a/packages/structure/package.json +++ b/packages/structure/package.json @@ -26,7 +26,6 @@ }, "dependencies": { "@babel/runtime-corejs3": "7.24.5", - "@iarna/toml": "2.2.5", "@prisma/internals": "5.14.0", "@redwoodjs/project-config": "workspace:*", "@types/line-column": "1.0.2", @@ -44,6 +43,7 @@ "lodash-decorators": "6.0.1", "lru-cache": "10.2.2", "proxyquire": "2.1.3", + "smol-toml": "1.2.1", "ts-morph": "15.1.0", "vscode-languageserver": "6.1.1", "vscode-languageserver-textdocument": "1.0.11", diff --git a/packages/structure/src/model/RWTOML.ts b/packages/structure/src/model/RWTOML.ts index 4728f8337b20..4cbcee25ab85 100644 --- a/packages/structure/src/model/RWTOML.ts +++ b/packages/structure/src/model/RWTOML.ts @@ -1,5 +1,4 @@ -import type { JsonMap } from '@iarna/toml' -import { parse as parseTOML } from '@iarna/toml' +import toml from 'smol-toml' import { Range } from 'vscode-languageserver-types' import { FileNode } from '../ide' @@ -20,13 +19,10 @@ export class RWTOML extends FileNode { // } // TODO: diagnostics @lazy() get parsedTOML() { - return parseTOML(this.text) + return toml.parse(this.text) } @lazy() get web_includeEnvironmentVariables(): string[] | undefined { - return ( - ((this.parsedTOML?.web as JsonMap) - ?.includeEnvironmentVariables as string[]) ?? [] - ) + return this.parsedTOML?.web?.['includeEnvironmentVariables'] ?? [] } *diagnostics() { try { diff --git a/yarn.lock b/yarn.lock index 963251db18a7..893f04a9d03e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4894,13 +4894,6 @@ __metadata: languageName: node linkType: hard -"@iarna/toml@npm:2.2.5": - version: 2.2.5 - resolution: "@iarna/toml@npm:2.2.5" - checksum: 10c0/d095381ad4554aca233b7cf5a91f243ef619e5e15efd3157bc640feac320545450d14b394aebbf6f02a2047437ced778ae598d5879a995441ab7b6c0b2c2f201 - languageName: node - linkType: hard - "@ioredis/commands@npm:^1.1.1": version: 1.2.0 resolution: "@ioredis/commands@npm:1.2.0" @@ -7931,7 +7924,6 @@ __metadata: resolution: "@redwoodjs/cli-helpers@workspace:packages/cli-helpers" dependencies: "@babel/core": "npm:^7.22.20" - "@iarna/toml": "npm:2.2.5" "@opentelemetry/api": "npm:1.8.0" "@redwoodjs/project-config": "workspace:*" "@redwoodjs/telemetry": "workspace:*" @@ -7946,6 +7938,7 @@ __metadata: pascalcase: "npm:1.0.0" prettier: "npm:3.2.5" prompts: "npm:2.4.2" + smol-toml: "npm:1.2.1" terminal-link: "npm:2.1.1" tsx: "npm:4.10.3" typescript: "npm:5.4.5" @@ -8003,7 +7996,6 @@ __metadata: "@babel/cli": "npm:7.24.5" "@babel/core": "npm:^7.22.20" "@babel/runtime-corejs3": "npm:7.24.5" - "@iarna/toml": "npm:2.2.5" "@opentelemetry/api": "npm:1.8.0" "@opentelemetry/core": "npm:1.22.0" "@opentelemetry/exporter-trace-otlp-http": "npm:0.49.1" @@ -8052,6 +8044,7 @@ __metadata: prompts: "npm:2.4.2" rimraf: "npm:5.0.7" semver: "npm:7.6.2" + smol-toml: "npm:1.2.1" string-env-interpolation: "npm:1.0.1" systeminformation: "npm:5.22.9" terminal-link: "npm:2.1.1" @@ -8078,7 +8071,6 @@ __metadata: "@babel/plugin-transform-typescript": "npm:^7.22.15" "@babel/runtime-corejs3": "npm:7.24.5" "@babel/traverse": "npm:^7.22.20" - "@iarna/toml": "npm:2.2.5" "@redwoodjs/project-config": "workspace:*" "@svgr/core": "npm:8.1.0" "@svgr/plugin-jsx": "npm:8.1.0" @@ -8518,11 +8510,11 @@ __metadata: version: 0.0.0-use.local resolution: "@redwoodjs/project-config@workspace:packages/project-config" dependencies: - "@iarna/toml": "npm:2.2.5" "@redwoodjs/framework-tools": "workspace:*" deepmerge: "npm:4.3.1" fast-glob: "npm:3.3.2" rimraf: "npm:5.0.7" + smol-toml: "npm:1.2.1" string-env-interpolation: "npm:1.0.1" tsx: "npm:4.10.3" typescript: "npm:5.4.5" @@ -8607,7 +8599,6 @@ __metadata: "@babel/cli": "npm:7.24.5" "@babel/core": "npm:^7.22.20" "@babel/runtime-corejs3": "npm:7.24.5" - "@iarna/toml": "npm:2.2.5" "@prisma/internals": "npm:5.14.0" "@redwoodjs/project-config": "workspace:*" "@types/fs-extra": "npm:11.0.4" @@ -8629,6 +8620,7 @@ __metadata: lodash-decorators: "npm:6.0.1" lru-cache: "npm:10.2.2" proxyquire: "npm:2.1.3" + smol-toml: "npm:1.2.1" ts-morph: "npm:15.1.0" typescript: "npm:5.4.5" vitest: "npm:1.6.0" @@ -28744,6 +28736,13 @@ __metadata: languageName: node linkType: hard +"smol-toml@npm:1.2.1": + version: 1.2.1 + resolution: "smol-toml@npm:1.2.1" + checksum: 10c0/ef713022d327493b6680ba51b9651abbb9c5abf2199e03faaa98ea49ad96ab9336bb4edafa6c70bdb2f1399f709f92a576b026e75cfd32066f3ec1c6fea797fb + languageName: node + linkType: hard + "snake-case@npm:^3.0.4": version: 3.0.4 resolution: "snake-case@npm:3.0.4" From 3ddbb4b9c49c4a4f6389903c8bcfc7db0cd65bed Mon Sep 17 00:00:00 2001 From: Rob Cameron Date: Fri, 7 Jun 2024 10:51:01 -0700 Subject: [PATCH 04/66] Updates seeds script to be generic, no more errors throw on first run (#10739) If you edit the `schema.prisma` file and change the table name before running `yarn rw prisma migrate dev` the first time, you'll get a scary error at the end of your run: ![Image](https://github.com/orgs/redwoodjs/projects/18/assets/300/e0af73f0-3fa9-4b49-bfc9-b54fe9d8a868) The error is caught, and doesn't stop the migration from running, but looks nasty. Everyone will see this when running through the tutorial as the first thing we do is change the `schema.prisma` file and then create a migration. The seed should not contain any actual seed data, just comments about how to use it when the time comes. I've updated the template to be much simpler to start, and includes a link to a new doc I created that goes into more detail about how to use seeds, best practices, etc. The first time you migrate the console message will point you to the file, and the file will point you to the docs. --------- Co-authored-by: Josh GM Walker <56300765+Josh-Walker-GM@users.noreply.github.com> --- .changesets/10739.md | 3 + __fixtures__/empty-project/scripts/seed.ts | 44 ++-- .../fragment-test-project/scripts/seed.ts | 58 +---- __fixtures__/test-project-rsa/scripts/seed.ts | 67 ++---- __fixtures__/test-project/scripts/seed.ts | 73 ++---- docs/docs/database-seeds.md | 223 ++++++++++++++++++ docs/sidebars.js | 1 + .../templates/js/scripts/seed.js | 72 ++---- .../templates/ts/scripts/seed.ts | 73 ++---- 9 files changed, 320 insertions(+), 294 deletions(-) create mode 100644 .changesets/10739.md create mode 100644 docs/docs/database-seeds.md diff --git a/.changesets/10739.md b/.changesets/10739.md new file mode 100644 index 000000000000..aebc770448f0 --- /dev/null +++ b/.changesets/10739.md @@ -0,0 +1,3 @@ +- Updates seeds script to be more generic, no more errors throw on first run (#10739) by @cannikin + +Updated the template seed script to not contain any actual seed data, just comments about how to use it when the time comes. The first time you migrate the console message will point you to the file, and the file will point you to a new docs page which goes into much more detail on usage. diff --git a/__fixtures__/empty-project/scripts/seed.ts b/__fixtures__/empty-project/scripts/seed.ts index 3aab114e7aee..c0b5473072b0 100644 --- a/__fixtures__/empty-project/scripts/seed.ts +++ b/__fixtures__/empty-project/scripts/seed.ts @@ -1,40 +1,28 @@ -import type { Prisma } from '@prisma/client' +// eslint-disable-next-line @typescript-eslint/no-unused-vars import { db } from 'api/src/lib/db' +// Manually apply seeds via the `yarn rw prisma db seed` command. +// +// Seeds automatically run the first time you run the `yarn rw prisma migrate dev` +// command and every time you run the `yarn rw prisma migrate reset` command. +// +// See https://redwoodjs.com/docs/database-seeds for more info + export default async () => { try { + // Create your database records here! For example, seed some users: // - // Manually seed via `yarn rw prisma db seed` - // Seeds automatically with `yarn rw prisma migrate dev` and `yarn rw prisma migrate reset` - // - // Update "const data = []" to match your data model and seeding needs + // const users = [ + // { name: 'Alice', email: 'alice@redwoodjs.com }, + // { name: 'Bob', email: 'bob@redwoodjs.com }, + // ] // - const data: Prisma.UserExampleCreateArgs['data'][] = [ - // To try this example data with the UserExample model in schema.prisma, - // uncomment the lines below and run 'yarn rw prisma migrate dev' - // - // { name: 'alice', email: 'alice@example.com' }, - // { name: 'mark', email: 'mark@example.com' }, - // { name: 'jackie', email: 'jackie@example.com' }, - // { name: 'bob', email: 'bob@example.com' }, - ] - console.log( - "\nUsing the default './scripts/seed.{js,ts}' template\nEdit the file to add seed data\n" - ) + // await db.user.createMany({ data: users }) - // Note: if using PostgreSQL, using `createMany` to insert multiple records is much faster - // @see: https://www.prisma.io/docs/reference/api-reference/prisma-client-reference#createmany - await Promise.all( - // - // Change to match your data model and seeding needs - // - data.map(async (data: Prisma.UserExampleCreateArgs['data']) => { - const record = await db.userExample.create({ data }) - console.log(record) - }) + console.info( + '\n No seed data, skipping. See scripts/seed.ts to start seeding your database!\n' ) } catch (error) { - console.warn('Please define your seed data.') console.error(error) } } diff --git a/__fixtures__/fragment-test-project/scripts/seed.ts b/__fixtures__/fragment-test-project/scripts/seed.ts index 46378476943e..20606dae9ea8 100644 --- a/__fixtures__/fragment-test-project/scripts/seed.ts +++ b/__fixtures__/fragment-test-project/scripts/seed.ts @@ -135,61 +135,19 @@ export default async () => { } try { + // Create your database records here! For example, seed some users: // - // Manually seed via `yarn rw prisma db seed` - // Seeds automatically with `yarn rw prisma migrate dev` and `yarn rw prisma migrate reset` + // const users = [ + // { name: 'Alice', email: 'alice@redwoodjs.com }, + // { name: 'Bob', email: 'bob@redwoodjs.com }, + // ] // - // Update "const data = []" to match your data model and seeding needs - // - const data: Prisma.UserExampleCreateArgs['data'][] = [ - // To try this example data with the UserExample model in schema.prisma, - // uncomment the lines below and run 'yarn rw prisma migrate dev' - // - // { name: 'alice', email: 'alice@example.com' }, - // { name: 'mark', email: 'mark@example.com' }, - // { name: 'jackie', email: 'jackie@example.com' }, - // { name: 'bob', email: 'bob@example.com' }, - ] - console.log( - "\nUsing the default './scripts/seed.ts' template\nEdit the file to add seed data\n" - ) + // await db.user.createMany({ data: users }) - // Note: if using PostgreSQL, using `createMany` to insert multiple records is much faster - // @see: https://www.prisma.io/docs/reference/api-reference/prisma-client-reference#createmany - await Promise.all( - // - // Change to match your data model and seeding needs - // - data.map(async (data: Prisma.UserExampleCreateArgs['data']) => { - const record = await db.userExample.create({ data }) - console.log(record) - }) + console.info( + '\n No seed data, skipping. See scripts/seed.ts to start seeding your database!\n' ) - - // If using dbAuth and seeding users, you'll need to add a `hashedPassword` - // and associated `salt` to their record. Here's how to create them using - // the same algorithm that dbAuth uses internally: - // - // import { hashPassword } from '@redwoodjs/auth-dbauth-api' - // - // const users = [ - // { name: 'john', email: 'john@example.com', password: 'secret1' }, - // { name: 'jane', email: 'jane@example.com', password: 'secret2' } - // ] - // - // for (const user of users) { - // const [hashedPassword, salt] = hashPassword(user.password) - // await db.user.create({ - // data: { - // name: user.name, - // email: user.email, - // hashedPassword, - // salt - // } - // }) - // } } catch (error) { - console.warn('Please define your seed data.') console.error(error) } } diff --git a/__fixtures__/test-project-rsa/scripts/seed.ts b/__fixtures__/test-project-rsa/scripts/seed.ts index 5797fd9426c1..c0b5473072b0 100644 --- a/__fixtures__/test-project-rsa/scripts/seed.ts +++ b/__fixtures__/test-project-rsa/scripts/seed.ts @@ -1,63 +1,28 @@ -import type { Prisma } from '@prisma/client' +// eslint-disable-next-line @typescript-eslint/no-unused-vars import { db } from 'api/src/lib/db' +// Manually apply seeds via the `yarn rw prisma db seed` command. +// +// Seeds automatically run the first time you run the `yarn rw prisma migrate dev` +// command and every time you run the `yarn rw prisma migrate reset` command. +// +// See https://redwoodjs.com/docs/database-seeds for more info + export default async () => { try { + // Create your database records here! For example, seed some users: // - // Manually seed via `yarn rw prisma db seed` - // Seeds automatically with `yarn rw prisma migrate dev` and `yarn rw prisma migrate reset` - // - // Update "const data = []" to match your data model and seeding needs + // const users = [ + // { name: 'Alice', email: 'alice@redwoodjs.com }, + // { name: 'Bob', email: 'bob@redwoodjs.com }, + // ] // - const data: Prisma.UserExampleCreateArgs['data'][] = [ - // To try this example data with the UserExample model in schema.prisma, - // uncomment the lines below and run 'yarn rw prisma migrate dev' - // - // { name: 'alice', email: 'alice@example.com' }, - // { name: 'mark', email: 'mark@example.com' }, - // { name: 'jackie', email: 'jackie@example.com' }, - // { name: 'bob', email: 'bob@example.com' }, - ] - console.log( - "\nUsing the default './scripts/seed.{js,ts}' template\nEdit the file to add seed data\n" - ) + // await db.user.createMany({ data: users }) - // Note: if using PostgreSQL, using `createMany` to insert multiple records is much faster - // @see: https://www.prisma.io/docs/reference/api-reference/prisma-client-reference#createmany - Promise.all( - // - // Change to match your data model and seeding needs - // - data.map(async (data: Prisma.UserExampleCreateArgs['data']) => { - const record = await db.userExample.create({ data }) - console.log(record) - }) + console.info( + '\n No seed data, skipping. See scripts/seed.ts to start seeding your database!\n' ) - - // If using dbAuth and seeding users, you'll need to add a `hashedPassword` - // and associated `salt` to their record. Here's how to create them using - // the same algorithm that dbAuth uses internally: - // - // import { hashPassword } from '@redwoodjs/auth-dbauth-api' - // - // const users = [ - // { name: 'john', email: 'john@example.com', password: 'secret1' }, - // { name: 'jane', email: 'jane@example.com', password: 'secret2' } - // ] - // - // for (const user of users) { - // const [hashedPassword, salt] = hashPassword(user.password) - // await db.user.create({ - // data: { - // name: user.name, - // email: user.email, - // hashedPassword, - // salt - // } - // }) - // } } catch (error) { - console.warn('Please define your seed data.') console.error(error) } } diff --git a/__fixtures__/test-project/scripts/seed.ts b/__fixtures__/test-project/scripts/seed.ts index 215900151faa..d10455870a24 100644 --- a/__fixtures__/test-project/scripts/seed.ts +++ b/__fixtures__/test-project/scripts/seed.ts @@ -1,6 +1,15 @@ +// eslint-disable-next-line @typescript-eslint/no-unused-vars import type { Prisma } from '@prisma/client' +// eslint-disable-next-line @typescript-eslint/no-unused-vars import { db } from 'api/src/lib/db' +// Manually apply seeds via the `yarn rw prisma db seed` command. +// +// Seeds automatically run the first time you run the `yarn rw prisma migrate dev` +// command and every time you run the `yarn rw prisma migrate reset` command. +// +// See https://redwoodjs.com/docs/database-seeds for more info + export default async () => { try { const users = [ @@ -64,65 +73,19 @@ export default async () => { } try { + // Create your database records here! For example, seed some users: // - // Manually seed via `yarn rw prisma db seed` - // Seeds automatically with `yarn rw prisma migrate dev` and `yarn rw prisma migrate reset` - // - // Update "const data = []" to match your data model and seeding needs + // const users = [ + // { name: 'Alice', email: 'alice@redwoodjs.com }, + // { name: 'Bob', email: 'bob@redwoodjs.com }, + // ] // - const data: Prisma.UserExampleCreateArgs['data'][] = [ - // To try this example data with the UserExample model in schema.prisma, - // uncomment the lines below and run 'yarn rw prisma migrate dev' - // - // { name: 'alice', email: 'alice@example.com' }, - // { name: 'mark', email: 'mark@example.com' }, - // { name: 'jackie', email: 'jackie@example.com' }, - // { name: 'bob', email: 'bob@example.com' }, - ] - console.log( - "\nUsing the default './scripts/seed.ts' template\nEdit the file to add seed data\n" - ) + // await db.user.createMany({ data: users }) - if ((await db.userExample.count()) === 0) { - // Note: if using PostgreSQL, using `createMany` to insert multiple records is much faster - // @see: https://www.prisma.io/docs/reference/api-reference/prisma-client-reference#createmany - await Promise.all( - // - // Change to match your data model and seeding needs - // - data.map(async (data: Prisma.UserExampleCreateArgs['data']) => { - const record = await db.userExample.create({ data }) - console.log(record) - }) - ) - } else { - console.log('Users already seeded') - } - - // If using dbAuth and seeding users, you'll need to add a `hashedPassword` - // and associated `salt` to their record. Here's how to create them using - // the same algorithm that dbAuth uses internally: - // - // import { hashPassword } from '@redwoodjs/auth-dbauth-api' - // - // const users = [ - // { name: 'john', email: 'john@example.com', password: 'secret1' }, - // { name: 'jane', email: 'jane@example.com', password: 'secret2' } - // ] - // - // for (const user of users) { - // const [hashedPassword, salt] = hashPassword(user.password) - // await db.user.create({ - // data: { - // name: user.name, - // email: user.email, - // hashedPassword, - // salt - // } - // }) - // } + console.info( + '\n No seed data, skipping. See scripts/seed.ts to start seeding your database!\n' + ) } catch (error) { - console.warn('Please define your seed data.') console.error(error) } } diff --git a/docs/docs/database-seeds.md b/docs/docs/database-seeds.md new file mode 100644 index 000000000000..65ffe013993a --- /dev/null +++ b/docs/docs/database-seeds.md @@ -0,0 +1,223 @@ +# Database Seeds + +Seeds are data that are required in order for your app to function. Think of +the data a new developer would need to get up and running with your codebase, or +data that needs to exist when a new instance of your application is deployed to +a new environment. + +Seed data are things like: + +* An admin user so that you can log in to your new instance +* A list of categories that can be assigned to a Product +* Lists of roles and permissions + +Seed data is not meant for: + +* Sample data to be used in development +* Data to run tests against +* Randomized data + +## Best Practices + +Ideally seed data should be idempotent: you can execute the seed +script against your database at any time and end up with the seed data properly +populated in the database. It should not result in wiping out existing records +or creating duplicates of any seeded data that is already present. + +Making your seeds idempotent requires more code than just a straight +`createMany()`. The code examples below use the safest idempotent strategy +by having an `upsert` check if a record with the same unique identifier +already exists, and if so just update it, if not then create it. But, this +technique requires a separate SQL statement for each member of your data array +and is less performant than `createMany()`. + +You could also do a check if *any* data exists in the database first, and if +not, create the records with `createMany()`. However, this means that any +existing seed data that may have been modified will remain, and would not be +updated to match what you expect in your seed. + +When in doubt, `upsert`! + +## When seeds run + +Seeds are automatically run the first time you migrate your database: + +```bash +yarn rw prisma migrate dev +``` + +They are run *every* time you reset your database: + +```bash +yarn rw prisma migrate reset +``` + +You can manually run seeds at any time with the following command: + +``` +yarn rw prisma db seed +``` + +You generally don't need to keep invoking your seeds over and over again, so it +makes sense that Prisma only does it on a complete database reset, or when the +database is created with the first `prisma migrate dev` execution. But as your +schema evolves you may add a new model that requires some seeded data and so +you can add it to your seed file and then manually run it to create those +records. + +### Performance + +Prisma is faster at execting a `createMany()` instead of many `create` or +`upsert` functions. Unfortunately, you lose the ability to easily make your seed +idempotent with a single function call. + +One solution to simulate an `upsert` will still using `createMany()` could be +to start with the full array of data and first check to see whether each of +those records already exist in the database. If they do, create two +arrays: one for records that don't exist and run `createMany()` with them, and +the second list for records that do exist, and run `updateMany()` on those. + +Unfortunately this relies on a select query for each record, which may negate +the performance benefits of `createMany()`. Since you are running seeds +realitively rarely, it's our recommendation that you focus less on absolute +performance and worry more about making them easy to maintain. + +## Types + +If you're using Typescript you'll probably want to type your seeds as well. +Getting the right types for Prisma models can be tricky, but here's the formula: + +```javascript title="scripts/seed.ts" +import { db } from 'api/src/lib/db' +// highlight-next-line +import type { Prisma } from '@prisma/client' + +export default async () => { + try { + // highlight-next-line + const users: Prisma.UserCreateArgs['data'][] = [ + { name: 'Alice', email: 'alice@redwoodjs.com }, + { name: 'Bob', email: 'bob@redwoodjs.com }, + ] + + await db.user.createMany({ data: users }) + } catch (error) { + console.error(error) + } +} +``` + +## Creating seed data + +Take a look at `scripts/seed.js` (or `.ts` if you're working on a Typescript +project): + +```javascript title="scripts/seed.js" +import { db } from 'api/src/lib/db' + +export default async () => { + try { + // Create your database records here! For example, seed some users: + // + // const users = [ + // { name: 'Alice', email: 'alice@redwoodjs.com }, + // { name: 'Bob', email: 'bob@redwoodjs.com }, + // ] + // + // await db.user.createMany({ data: users }) + + console.info( + '\n No seed data, skipping. See scripts/seed.ts to start seeding your database!\n' + ) + } catch (error) { + console.error(error) + } +} +``` + +Let's create some categories for a bookstore. For this example, assume the +`Category` model has a unique constraint on the `name` field. Remove the +commented example and add your code: + +```javascript title="scripts/seed.js" +export default async () => { + try { + const data = [ + { name: 'Art', bisacCode: 'ART000000' }, + { name: 'Biography', bisacCode: 'BIO000000' }, + { name: 'Fiction', bisacCode: 'FIC000000' }, + { name: 'Nature', bisacCode: 'NAT000000' }, + { name: 'Travel', bisacCode: 'TRV000000' }, + { name: 'World History', bisacCode: 'HIS037000' } + ] + + for (const item of data) { + await db.category.upsert({ + where: { name: item.name }, + update: { code: item.code }, + create: { name: item.name, code: item.code } + }) + } + } catch (error) { + console.error(error) + } +} +``` + +You can now execute this seed as many times as you want and you'll end up with +that exact list in the database each time. And, any additional categories you've +created in the meantime will remain. Remember: seeds are meant to be the +*minimum* amount of data you need for your app to run, not necessarily *all* the +data that will ever be present in those tables. + +# Seeding users for dbAuth + +If using dbAuth and seeding users, you'll need to add a `hashedPassword` and +`salt` using the same algorithm that dbAuth uses internally. Here's an easy way +do that: + +```javascript title="scripts/seed.js" +import { hashPassword } from '@redwoodjs/auth-dbauth-api' + +export default async () => { + const users = [ + { name: 'John', email: 'john@example.com', password: 'secret1' }, + { name: 'Jane', email: 'jane@example.com', password: 'secret2' } + ] + + for (const user of users) { + const [hashedPassword, salt] = hashPassword(user.password) + + await db.user.upsert({ + where: { + email: user.email + }, + create: { + name: user.name, + email: user.email, + hashedPassword, + salt + }, + update: { + name: user.name, + hashedPassword, + salt + } + }) + } +} +``` + +## What if I don't need seeds? + +In order to stop automatically executing seeds with the `prisma migrate` +commands you can remove the following lines from `package.json` in the root of +your app: + +```json +"prisma": { + "seed": "yarn rw exec seed" +}, +``` + +You can then delete the `scripts/seed.js` file. diff --git a/docs/sidebars.js b/docs/sidebars.js index d378b67ebf77..98ac63190fbf 100644 --- a/docs/sidebars.js +++ b/docs/sidebars.js @@ -139,6 +139,7 @@ module.exports = { { type: 'doc', label: 'Vercel', id: 'deploy/vercel' }, ], }, + 'database-seeds', 'directives', 'docker', 'environment-variables', diff --git a/packages/create-redwood-app/templates/js/scripts/seed.js b/packages/create-redwood-app/templates/js/scripts/seed.js index 84ef62a4f014..ed7d229f3cf5 100644 --- a/packages/create-redwood-app/templates/js/scripts/seed.js +++ b/packages/create-redwood-app/templates/js/scripts/seed.js @@ -1,66 +1,28 @@ +// eslint-disable-next-line no-unused-vars import { db } from 'api/src/lib/db' +// Manually apply seeds via the `yarn rw prisma db seed` command. +// +// Seeds automatically run the first time you run the `yarn rw prisma migrate dev` +// command and every time you run the `yarn rw prisma migrate reset` command. +// +// See https://redwoodjs.com/docs/database-seeds for more info + export default async () => { try { + // Create your database records here! For example, seed some users: // - // Manually seed via `yarn rw prisma db seed` - // Seeds automatically with `yarn rw prisma migrate dev` and `yarn rw prisma migrate reset` - // - // Update "const data = []" to match your data model and seeding needs + // const users = [ + // { name: 'Alice', email: 'alice@redwoodjs.com }, + // { name: 'Bob', email: 'bob@redwoodjs.com }, + // ] // - const data = [ - // To try this example data with the UserExample model in schema.prisma, - // uncomment the lines below and run 'yarn rw prisma migrate dev' - // - // { name: 'alice', email: 'alice@example.com' }, - // { name: 'mark', email: 'mark@example.com' }, - // { name: 'jackie', email: 'jackie@example.com' }, - // { name: 'bob', email: 'bob@example.com' }, - ] - console.log( - "\nUsing the default './scripts/seed.js' template\nEdit the file to add seed data\n" - ) - - if ((await db.userExample.count()) === 0) { - // Note: if using PostgreSQL, using `createMany` to insert multiple records is much faster - // @see: https://www.prisma.io/docs/reference/api-reference/prisma-client-reference#createmany - await Promise.all( - // - // Change to match your data model and seeding needs - // - data.map(async (data) => { - const record = await db.userExample.create({ data }) - console.log(record) - }) - ) - } else { - console.log('Users already seeded') - } + // await db.user.createMany({ data: users }) - // If using dbAuth and seeding users, you'll need to add a `hashedPassword` - // and associated `salt` to their record. Here's how to create them using - // the same algorithm that dbAuth uses internally: - // - // import { hashPassword } from '@redwoodjs/auth-dbauth-api' - // - // const users = [ - // { name: 'john', email: 'john@example.com', password: 'secret1' }, - // { name: 'jane', email: 'jane@example.com', password: 'secret2' } - // ] - // - // for (const user of users) { - // const [hashedPassword, salt] = hashPassword(user.password) - // await db.user.create({ - // data: { - // name: user.name, - // email: user.email, - // hashedPassword, - // salt - // } - // }) - // } + console.info( + '\n No seed data, skipping. See scripts/seed.js to start seeding your database!\n' + ) } catch (error) { - console.warn('Please define your seed data.') console.error(error) } } diff --git a/packages/create-redwood-app/templates/ts/scripts/seed.ts b/packages/create-redwood-app/templates/ts/scripts/seed.ts index a8ccfa6f40bb..b107a5148522 100644 --- a/packages/create-redwood-app/templates/ts/scripts/seed.ts +++ b/packages/create-redwood-app/templates/ts/scripts/seed.ts @@ -1,67 +1,30 @@ +// eslint-disable-next-line @typescript-eslint/no-unused-vars import type { Prisma } from '@prisma/client' +// eslint-disable-next-line @typescript-eslint/no-unused-vars import { db } from 'api/src/lib/db' +// Manually apply seeds via the `yarn rw prisma db seed` command. +// +// Seeds automatically run the first time you run the `yarn rw prisma migrate dev` +// command and every time you run the `yarn rw prisma migrate reset` command. +// +// See https://redwoodjs.com/docs/database-seeds for more info + export default async () => { try { + // Create your database records here! For example, seed some users: // - // Manually seed via `yarn rw prisma db seed` - // Seeds automatically with `yarn rw prisma migrate dev` and `yarn rw prisma migrate reset` - // - // Update "const data = []" to match your data model and seeding needs + // const users = [ + // { name: 'Alice', email: 'alice@redwoodjs.com }, + // { name: 'Bob', email: 'bob@redwoodjs.com }, + // ] // - const data: Prisma.UserExampleCreateArgs['data'][] = [ - // To try this example data with the UserExample model in schema.prisma, - // uncomment the lines below and run 'yarn rw prisma migrate dev' - // - // { name: 'alice', email: 'alice@example.com' }, - // { name: 'mark', email: 'mark@example.com' }, - // { name: 'jackie', email: 'jackie@example.com' }, - // { name: 'bob', email: 'bob@example.com' }, - ] - console.log( - "\nUsing the default './scripts/seed.ts' template\nEdit the file to add seed data\n" - ) - - if ((await db.userExample.count()) === 0) { - // Note: if using PostgreSQL, using `createMany` to insert multiple records is much faster - // @see: https://www.prisma.io/docs/reference/api-reference/prisma-client-reference#createmany - await Promise.all( - // - // Change to match your data model and seeding needs - // - data.map(async (data: Prisma.UserExampleCreateArgs['data']) => { - const record = await db.userExample.create({ data }) - console.log(record) - }) - ) - } else { - console.log('Users already seeded') - } + // await db.user.createMany({ data: users }) - // If using dbAuth and seeding users, you'll need to add a `hashedPassword` - // and associated `salt` to their record. Here's how to create them using - // the same algorithm that dbAuth uses internally: - // - // import { hashPassword } from '@redwoodjs/auth-dbauth-api' - // - // const users = [ - // { name: 'john', email: 'john@example.com', password: 'secret1' }, - // { name: 'jane', email: 'jane@example.com', password: 'secret2' } - // ] - // - // for (const user of users) { - // const [hashedPassword, salt] = hashPassword(user.password) - // await db.user.create({ - // data: { - // name: user.name, - // email: user.email, - // hashedPassword, - // salt - // } - // }) - // } + console.info( + '\n No seed data, skipping. See scripts/seed.ts to start seeding your database!\n' + ) } catch (error) { - console.warn('Please define your seed data.') console.error(error) } } From fbb4f9e234eeed1d5177902e36196c405daf8399 Mon Sep 17 00:00:00 2001 From: Rob Cameron Date: Fri, 7 Jun 2024 10:59:27 -0700 Subject: [PATCH 05/66] Seed update: forgot to push this up before merging! (#10751) --- __fixtures__/test-project/scripts/seed.ts | 2 -- packages/create-redwood-app/templates/ts/scripts/seed.ts | 2 -- 2 files changed, 4 deletions(-) diff --git a/__fixtures__/test-project/scripts/seed.ts b/__fixtures__/test-project/scripts/seed.ts index d10455870a24..3fa44e0fd0ec 100644 --- a/__fixtures__/test-project/scripts/seed.ts +++ b/__fixtures__/test-project/scripts/seed.ts @@ -1,6 +1,4 @@ // eslint-disable-next-line @typescript-eslint/no-unused-vars -import type { Prisma } from '@prisma/client' -// eslint-disable-next-line @typescript-eslint/no-unused-vars import { db } from 'api/src/lib/db' // Manually apply seeds via the `yarn rw prisma db seed` command. diff --git a/packages/create-redwood-app/templates/ts/scripts/seed.ts b/packages/create-redwood-app/templates/ts/scripts/seed.ts index b107a5148522..c0b5473072b0 100644 --- a/packages/create-redwood-app/templates/ts/scripts/seed.ts +++ b/packages/create-redwood-app/templates/ts/scripts/seed.ts @@ -1,6 +1,4 @@ // eslint-disable-next-line @typescript-eslint/no-unused-vars -import type { Prisma } from '@prisma/client' -// eslint-disable-next-line @typescript-eslint/no-unused-vars import { db } from 'api/src/lib/db' // Manually apply seeds via the `yarn rw prisma db seed` command. From 9faa5827250fad86d8fe54bc33d54ef474b6bf60 Mon Sep 17 00:00:00 2001 From: Josh GM Walker <56300765+Josh-Walker-GM@users.noreply.github.com> Date: Fri, 7 Jun 2024 19:17:56 +0100 Subject: [PATCH 06/66] feat(cli): Notices for vite storybook command (#10747) This adds notices to inform users to try out the vite based storybook command. --- .../storybook-vite/src/commands/storybookHandler.ts | 6 ++++++ .../storybook/src/commands/storybookHandler.ts | 12 +++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/packages/cli-packages/storybook-vite/src/commands/storybookHandler.ts b/packages/cli-packages/storybook-vite/src/commands/storybookHandler.ts index 968c026bc6d6..261b6e805380 100644 --- a/packages/cli-packages/storybook-vite/src/commands/storybookHandler.ts +++ b/packages/cli-packages/storybook-vite/src/commands/storybookHandler.ts @@ -34,6 +34,12 @@ export async function handler({ port, smokeTest, }: StorybookYargsOptions) { + console.log( + c.bold( + `\nPlease find documentation and links to provide feedback for this new command at:\n -> https://community.redwoodjs.com/t/7212\n\n`, + ), + ) + // We add a stub file to type generation because users don't have Storybook // installed when they first start a project. We need to remove the file once // they install Storybook so that the real types come through. diff --git a/packages/cli-packages/storybook/src/commands/storybookHandler.ts b/packages/cli-packages/storybook/src/commands/storybookHandler.ts index 31deb4773958..86a7fa023816 100644 --- a/packages/cli-packages/storybook/src/commands/storybookHandler.ts +++ b/packages/cli-packages/storybook/src/commands/storybookHandler.ts @@ -4,7 +4,7 @@ import path from 'node:path' import type { ExecaError } from 'execa' import execa from 'execa' -import { getPaths } from '@redwoodjs/project-config' +import { BundlerEnum, getConfig, getPaths } from '@redwoodjs/project-config' // Allow import of untyped package // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore @@ -21,6 +21,16 @@ export async function handler({ port, smokeTest, }: StorybookYargsOptions) { + // Notice to vite users to try `yarn rw storybook-vite`. This will eventually be the default + // once we have removed webpack. Until then we give a small nudge to vite users to try it out. + if (getConfig().web.bundler === BundlerEnum.VITE) { + console.log( + c.bold( + `\nIt looks like you're using vite, please try:\n\n yarn rw storybook-vite\n\nThis will run storybook using vite which should be a much nicer experience for you.\nYou can find out more at: https://community.redwoodjs.com/t/7212\n\n`, + ), + ) + } + // We add a stub file to type generation because users don't have Storybook // installed when they first start a project. We need to remove the file once // they install Storybook so that the real types come through. From ed75ed871967f59985cb84436de0eace69b55866 Mon Sep 17 00:00:00 2001 From: Tobbe Lundberg Date: Sat, 8 Jun 2024 11:32:33 +0200 Subject: [PATCH 07/66] RSC: Externalize more modules during build (#10753) --- packages/vite/src/rsc/rscBuildAnalyze.ts | 14 +++++++++++--- packages/vite/src/rsc/rscBuildForSsr.ts | 7 +++++++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/packages/vite/src/rsc/rscBuildAnalyze.ts b/packages/vite/src/rsc/rscBuildAnalyze.ts index 90bff4c98ed5..fef49d334722 100644 --- a/packages/vite/src/rsc/rscBuildAnalyze.ts +++ b/packages/vite/src/rsc/rscBuildAnalyze.ts @@ -49,9 +49,17 @@ export async function rscBuildAnalyze() { // going to be RSCs // As of vite 5.2 `true` here means "all except node built-ins" noExternal: true, - // TODO (RSC): Figure out what the `external` list should be. Right - // now it's just copied from waku, plus we added prisma - external: ['react', 'minimatch', '@prisma/client'], + // Anything we know won't have "use client" or "use server" in it can + // safely be external. The more we can externalize the better, because + // it means we can skip analyzing them, which means faster build times. + external: [ + 'react', + 'minimatch', + '@prisma/client', + '@prisma/fetch-engine', + '@prisma/internals', + 'playwright', + ], resolve: { externalConditions: ['react-server'], }, diff --git a/packages/vite/src/rsc/rscBuildForSsr.ts b/packages/vite/src/rsc/rscBuildForSsr.ts index f1f8dd3ba6e7..b370f9852997 100644 --- a/packages/vite/src/rsc/rscBuildForSsr.ts +++ b/packages/vite/src/rsc/rscBuildForSsr.ts @@ -45,6 +45,13 @@ export async function rscBuildForSsr({ // Files included in `noExternal` are files we want Vite to analyze // As of vite 5.2 `true` here means "all except node built-ins" noExternal: true, + external: [ + 'minimatch', + '@prisma/client', + '@prisma/fetch-engine', + '@prisma/internals', + 'playwright', + ], }, plugins: [ cjsInterop({ dependencies: ['@redwoodjs/**'] }), From 868b6b029b01c95d7e4bedc2f11c2740eafae866 Mon Sep 17 00:00:00 2001 From: Tobbe Lundberg Date: Sat, 8 Jun 2024 23:08:25 +0200 Subject: [PATCH 08/66] chore(spelling): Fix some spelling mistakes in vite/middleware (#10755) --- packages/vite/src/middleware/MiddlewareRequest.ts | 2 +- packages/vite/src/middleware/MiddlewareResponse.ts | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/packages/vite/src/middleware/MiddlewareRequest.ts b/packages/vite/src/middleware/MiddlewareRequest.ts index 535f441344e4..78d6e6739790 100644 --- a/packages/vite/src/middleware/MiddlewareRequest.ts +++ b/packages/vite/src/middleware/MiddlewareRequest.ts @@ -16,7 +16,7 @@ class AuthStateJar { /** * Always returns the server auth state, even if its set to null, - * it'll fall back to the initial state (created when mwReq is initialised) + * it'll fall back to the initial state (created when mwReq is initialized) */ get() { return this._data || this._initialState diff --git a/packages/vite/src/middleware/MiddlewareResponse.ts b/packages/vite/src/middleware/MiddlewareResponse.ts index 4fe4c8e26c4b..b49c43c25851 100644 --- a/packages/vite/src/middleware/MiddlewareResponse.ts +++ b/packages/vite/src/middleware/MiddlewareResponse.ts @@ -7,7 +7,7 @@ export class MiddlewareShortCircuit extends Error { mwResponse: MiddlewareResponse constructor(body?: BodyInit | null, responseInit?: ResponseInit) { - super('Short cirtcuit. Skipping all middleware, and returning early') + super('Short circuit. Skipping all middleware, and returning early') this.name = 'MiddlewareShortCircuit' this.mwResponse = new MiddlewareResponse(body, responseInit) } @@ -15,7 +15,8 @@ export class MiddlewareShortCircuit extends Error { /** * This is actually a Response builder class - * After setting all the required proeprties, we can call `build` to get a Web API Response object + * After setting all the required properties, we can call `build` to get a Web + * API Response object */ export class MiddlewareResponse { cookies = new CookieJar() @@ -66,7 +67,8 @@ export class MiddlewareResponse { /** * Skip the current middleware and move to the next one. - * Careful: It creates a new Response, so any middleware that modifies the response before the current one will be lost. + * Careful: It creates a new Response, so any middleware that modifies the + * response before the current one will be lost. * @returns MiddlewareResponse */ static next = () => { @@ -74,8 +76,8 @@ export class MiddlewareResponse { } /** - * - * Return a MiddlewareResponse object that will redirect the client to the specified location + * Return a MiddlewareResponse object that will redirect the client to the + * specified location * * @returns MiddlewareResponse */ From 07c6122204ff882d9f87cee87f25f459e8782829 Mon Sep 17 00:00:00 2001 From: Tobbe Lundberg Date: Sun, 9 Jun 2024 00:10:04 +0200 Subject: [PATCH 09/66] @redwoodjs/server-store and @redwoodjs/cookie-jar (#10756) --- packages/cookie-jar/README.md | 3 ++ packages/cookie-jar/build.mts | 8 ++++ packages/cookie-jar/package.json | 37 ++++++++++++++++++ .../src}/CookieJar.test.ts | 0 .../src}/CookieJar.ts | 0 packages/cookie-jar/tsconfig.json | 14 +++++++ packages/server-store/README.md | 3 ++ packages/server-store/build.mts | 8 ++++ packages/server-store/package.json | 38 +++++++++++++++++++ .../{vite => server-store}/src/serverStore.ts | 5 +-- packages/server-store/tsconfig.json | 16 ++++++++ packages/vite/package.json | 6 +-- packages/vite/src/devFeServer.ts | 5 ++- .../vite/src/middleware/MiddlewareRequest.ts | 3 +- .../vite/src/middleware/MiddlewareResponse.ts | 2 +- packages/vite/src/middleware/index.ts | 1 - .../src/middleware/invokeMiddleware.test.ts | 3 +- .../vite/src/middleware/invokeMiddleware.ts | 3 +- packages/vite/src/rsc/rscBuildAnalyze.ts | 2 + packages/vite/src/rsc/rscBuildForServer.ts | 7 +++- packages/vite/src/rsc/rscBuildForSsr.ts | 2 + packages/vite/src/rsc/rscRequestHandler.ts | 3 +- packages/vite/src/rsc/rscStudioHandlers.ts | 2 +- packages/vite/src/rsc/rscWorker.ts | 5 ++- packages/vite/src/runFeServer.ts | 5 ++- packages/vite/tsconfig.json | 2 + yarn.lock | 33 ++++++++++++++++ 27 files changed, 195 insertions(+), 21 deletions(-) create mode 100644 packages/cookie-jar/README.md create mode 100644 packages/cookie-jar/build.mts create mode 100644 packages/cookie-jar/package.json rename packages/{vite/src/middleware => cookie-jar/src}/CookieJar.test.ts (100%) rename packages/{vite/src/middleware => cookie-jar/src}/CookieJar.ts (100%) create mode 100644 packages/cookie-jar/tsconfig.json create mode 100644 packages/server-store/README.md create mode 100644 packages/server-store/build.mts create mode 100644 packages/server-store/package.json rename packages/{vite => server-store}/src/serverStore.ts (94%) create mode 100644 packages/server-store/tsconfig.json diff --git a/packages/cookie-jar/README.md b/packages/cookie-jar/README.md new file mode 100644 index 000000000000..02ca3ab09214 --- /dev/null +++ b/packages/cookie-jar/README.md @@ -0,0 +1,3 @@ +# Cookie Jar + +Specialized cookie map, that lets you set cookies with options diff --git a/packages/cookie-jar/build.mts b/packages/cookie-jar/build.mts new file mode 100644 index 000000000000..a607d8f03817 --- /dev/null +++ b/packages/cookie-jar/build.mts @@ -0,0 +1,8 @@ +import { build, defaultBuildOptions } from '@redwoodjs/framework-tools' + +await build({ + buildOptions: { + ...defaultBuildOptions, + format: 'cjs', + }, +}) diff --git a/packages/cookie-jar/package.json b/packages/cookie-jar/package.json new file mode 100644 index 000000000000..b8e6a16c0a83 --- /dev/null +++ b/packages/cookie-jar/package.json @@ -0,0 +1,37 @@ +{ + "name": "@redwoodjs/cookie-jar", + "version": "7.0.0", + "repository": { + "type": "git", + "url": "git+https://github.com/redwoodjs/redwood.git", + "directory": "packages/cookie-jar" + }, + "license": "MIT", + "type": "commonjs", + "exports": { + "types": "./dist/CookieJar.d.ts", + "default": "./dist/CookieJar.js" + }, + "types": "./dist/CookieJar.d.ts", + "files": [ + "dist" + ], + "scripts": { + "build": "tsx ./build.mts && run build:types", + "build:pack": "yarn pack -o redwoodjs-cookie-jar.tgz", + "build:types": "tsc --build --verbose" + }, + "dependencies": { + "cookie": "0.6.0", + "esbuild": "0.21.3", + "fast-glob": "3.3.2", + "fs-extra": "11.2.0" + }, + "devDependencies": { + "@redwoodjs/framework-tools": "workspace:*", + "@types/fs-extra": "11.0.4", + "tsx": "4.10.3", + "typescript": "5.4.5" + }, + "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" +} diff --git a/packages/vite/src/middleware/CookieJar.test.ts b/packages/cookie-jar/src/CookieJar.test.ts similarity index 100% rename from packages/vite/src/middleware/CookieJar.test.ts rename to packages/cookie-jar/src/CookieJar.test.ts diff --git a/packages/vite/src/middleware/CookieJar.ts b/packages/cookie-jar/src/CookieJar.ts similarity index 100% rename from packages/vite/src/middleware/CookieJar.ts rename to packages/cookie-jar/src/CookieJar.ts diff --git a/packages/cookie-jar/tsconfig.json b/packages/cookie-jar/tsconfig.json new file mode 100644 index 000000000000..d475921e8a0a --- /dev/null +++ b/packages/cookie-jar/tsconfig.json @@ -0,0 +1,14 @@ +{ + "extends": "../../tsconfig.compilerOption.json", + "compilerOptions": { + "moduleResolution": "NodeNext", + "module": "NodeNext", + "baseUrl": ".", + "rootDir": "src", + "outDir": "dist" + }, + "include": ["src"], + "references": [ + { "path": "../framework-tools" } + ] +} diff --git a/packages/server-store/README.md b/packages/server-store/README.md new file mode 100644 index 000000000000..ea834cad9252 --- /dev/null +++ b/packages/server-store/README.md @@ -0,0 +1,3 @@ +# Server Store + +Singleton used to access Async Local Storage diff --git a/packages/server-store/build.mts b/packages/server-store/build.mts new file mode 100644 index 000000000000..a607d8f03817 --- /dev/null +++ b/packages/server-store/build.mts @@ -0,0 +1,8 @@ +import { build, defaultBuildOptions } from '@redwoodjs/framework-tools' + +await build({ + buildOptions: { + ...defaultBuildOptions, + format: 'cjs', + }, +}) diff --git a/packages/server-store/package.json b/packages/server-store/package.json new file mode 100644 index 000000000000..7452b418d15c --- /dev/null +++ b/packages/server-store/package.json @@ -0,0 +1,38 @@ +{ + "name": "@redwoodjs/server-store", + "version": "7.0.0", + "repository": { + "type": "git", + "url": "git+https://github.com/redwoodjs/redwood.git", + "directory": "packages/server-store" + }, + "license": "MIT", + "type": "commonjs", + "exports": { + "types": "./dist/serverStore.d.ts", + "default": "./dist/serverStore.js" + }, + "types": "./dist/serverStore.d.ts", + "files": [ + "dist" + ], + "scripts": { + "build": "tsx ./build.mts && run build:types", + "build:pack": "yarn pack -o redwoodjs-server-store.tgz", + "build:types": "tsc --build --verbose" + }, + "dependencies": { + "@redwoodjs/auth": "workspace:*", + "@redwoodjs/cookie-jar": "workspace:*", + "esbuild": "0.21.3", + "fast-glob": "3.3.2", + "fs-extra": "11.2.0" + }, + "devDependencies": { + "@redwoodjs/framework-tools": "workspace:*", + "@types/fs-extra": "11.0.4", + "tsx": "4.10.3", + "typescript": "5.4.5" + }, + "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" +} diff --git a/packages/vite/src/serverStore.ts b/packages/server-store/src/serverStore.ts similarity index 94% rename from packages/vite/src/serverStore.ts rename to packages/server-store/src/serverStore.ts index deb32c0da917..0108219b765e 100644 --- a/packages/vite/src/serverStore.ts +++ b/packages/server-store/src/serverStore.ts @@ -1,8 +1,7 @@ import { AsyncLocalStorage } from 'async_hooks' -import type { ServerAuthState } from '@redwoodjs/auth/dist/AuthProvider/ServerAuthProvider.js' - -import { CookieJar } from './middleware/CookieJar.js' +import type { ServerAuthState } from '@redwoodjs/auth/dist/AuthProvider/ServerAuthProvider.js' with { 'resolution-mode': 'import' } +import { CookieJar } from '@redwoodjs/cookie-jar' export interface ServerStore extends Map {} diff --git a/packages/server-store/tsconfig.json b/packages/server-store/tsconfig.json new file mode 100644 index 000000000000..0fa558989214 --- /dev/null +++ b/packages/server-store/tsconfig.json @@ -0,0 +1,16 @@ +{ + "extends": "../../tsconfig.compilerOption.json", + "compilerOptions": { + "moduleResolution": "NodeNext", + "module": "NodeNext", + "baseUrl": ".", + "rootDir": "src", + "outDir": "dist" + }, + "include": ["src"], + "references": [ + { "path": "../auth/tsconfig.build.json" }, + { "path": "../cookie-jar" }, + { "path": "../framework-tools" } + ] +} diff --git a/packages/vite/package.json b/packages/vite/package.json index 55c6fdfb57f7..c4a08efbba78 100644 --- a/packages/vite/package.json +++ b/packages/vite/package.json @@ -44,10 +44,6 @@ "./middleware": { "types": "./dist/middleware/index.d.ts", "default": "./dist/middleware/index.js" - }, - "./serverStore": { - "types": "./dist/serverStore.d.ts", - "default": "./dist/serverStore.js" } }, "bin": { @@ -75,8 +71,10 @@ "@babel/traverse": "^7.22.20", "@redwoodjs/auth": "workspace:*", "@redwoodjs/babel-config": "workspace:*", + "@redwoodjs/cookie-jar": "workspace:*", "@redwoodjs/internal": "workspace:*", "@redwoodjs/project-config": "workspace:*", + "@redwoodjs/server-store": "workspace:*", "@redwoodjs/web": "workspace:*", "@swc/core": "1.5.7", "@vitejs/plugin-react": "4.2.1", diff --git a/packages/vite/src/devFeServer.ts b/packages/vite/src/devFeServer.ts index 42c8e54e7d36..a142135588fe 100644 --- a/packages/vite/src/devFeServer.ts +++ b/packages/vite/src/devFeServer.ts @@ -9,6 +9,10 @@ import type { RouteSpec } from '@redwoodjs/internal/dist/routes' import { getProjectRoutes } from '@redwoodjs/internal/dist/routes' import type { Paths } from '@redwoodjs/project-config' import { getConfig, getPaths } from '@redwoodjs/project-config' +import { + createPerRequestMap, + createServerStorage, +} from '@redwoodjs/server-store' import { registerFwGlobalsAndShims } from './lib/registerFwGlobalsAndShims.js' import { invoke } from './middleware/invokeMiddleware.js' @@ -16,7 +20,6 @@ import { createMiddlewareRouter } from './middleware/register.js' import type { Middleware } from './middleware/types.js' import { rscRoutesAutoLoader } from './plugins/vite-plugin-rsc-routes-auto-loader.js' import { createRscRequestHandler } from './rsc/rscRequestHandler.js' -import { createPerRequestMap, createServerStorage } from './serverStore.js' import { collectCssPaths, componentsModules } from './streaming/collectCss.js' import { createReactStreamingHandler } from './streaming/createReactStreamingHandler.js' import { diff --git a/packages/vite/src/middleware/MiddlewareRequest.ts b/packages/vite/src/middleware/MiddlewareRequest.ts index 78d6e6739790..9ba7dcc34483 100644 --- a/packages/vite/src/middleware/MiddlewareRequest.ts +++ b/packages/vite/src/middleware/MiddlewareRequest.ts @@ -2,8 +2,7 @@ import { Request as WhatWgRequest } from '@whatwg-node/fetch' import { middlewareDefaultAuthProviderState } from '@redwoodjs/auth/dist/AuthProvider/AuthProviderState.js' import type { ServerAuthState } from '@redwoodjs/auth/dist/AuthProvider/ServerAuthProvider.js' - -import { CookieJar } from './CookieJar.js' +import { CookieJar } from '@redwoodjs/cookie-jar' class AuthStateJar { private _data: ServerAuthState | null diff --git a/packages/vite/src/middleware/MiddlewareResponse.ts b/packages/vite/src/middleware/MiddlewareResponse.ts index b49c43c25851..43570999191b 100644 --- a/packages/vite/src/middleware/MiddlewareResponse.ts +++ b/packages/vite/src/middleware/MiddlewareResponse.ts @@ -1,7 +1,7 @@ import { Response as PonyResponse } from '@whatwg-node/fetch' import cookie from 'cookie' -import { CookieJar } from './CookieJar.js' +import { CookieJar } from '@redwoodjs/cookie-jar' export class MiddlewareShortCircuit extends Error { mwResponse: MiddlewareResponse diff --git a/packages/vite/src/middleware/index.ts b/packages/vite/src/middleware/index.ts index 6ea8a596ce7c..e5857b0fc17a 100644 --- a/packages/vite/src/middleware/index.ts +++ b/packages/vite/src/middleware/index.ts @@ -1,4 +1,3 @@ -export * from './CookieJar.js' export * from './MiddlewareRequest.js' export * from './MiddlewareResponse.js' export * from './types.js' diff --git a/packages/vite/src/middleware/invokeMiddleware.test.ts b/packages/vite/src/middleware/invokeMiddleware.test.ts index 98051fbbd1c0..28a4ca38e6db 100644 --- a/packages/vite/src/middleware/invokeMiddleware.test.ts +++ b/packages/vite/src/middleware/invokeMiddleware.test.ts @@ -3,8 +3,7 @@ import { afterAll, beforeAll, describe, expect, test, vi } from 'vitest' import type { ServerAuthState } from '@redwoodjs/auth' import { middlewareDefaultAuthProviderState } from '@redwoodjs/auth' - -import { createServerStorage } from '../serverStore' +import { createServerStorage } from '@redwoodjs/server-store' import { invoke } from './invokeMiddleware' import type { MiddlewareRequest } from './MiddlewareRequest' diff --git a/packages/vite/src/middleware/invokeMiddleware.ts b/packages/vite/src/middleware/invokeMiddleware.ts index 22ccacbb5a75..521fbfc4848c 100644 --- a/packages/vite/src/middleware/invokeMiddleware.ts +++ b/packages/vite/src/middleware/invokeMiddleware.ts @@ -1,6 +1,5 @@ import type { ServerAuthState } from '@redwoodjs/auth/dist/AuthProvider/ServerAuthProvider.js' - -import { setServerAuthState } from '../serverStore.js' +import { setServerAuthState } from '@redwoodjs/server-store' import { MiddlewareRequest } from './MiddlewareRequest.js' import { diff --git a/packages/vite/src/rsc/rscBuildAnalyze.ts b/packages/vite/src/rsc/rscBuildAnalyze.ts index fef49d334722..2290461f27ef 100644 --- a/packages/vite/src/rsc/rscBuildAnalyze.ts +++ b/packages/vite/src/rsc/rscBuildAnalyze.ts @@ -59,6 +59,8 @@ export async function rscBuildAnalyze() { '@prisma/fetch-engine', '@prisma/internals', 'playwright', + '@redwoodjs/cookie-jar', + '@redwoodjs/server-store', ], resolve: { externalConditions: ['react-server'], diff --git a/packages/vite/src/rsc/rscBuildForServer.ts b/packages/vite/src/rsc/rscBuildForServer.ts index 567b1b50efec..0f6b08d39bd3 100644 --- a/packages/vite/src/rsc/rscBuildForServer.ts +++ b/packages/vite/src/rsc/rscBuildForServer.ts @@ -53,7 +53,12 @@ export async function rscBuildForServer( // Can't inline prisma client (db calls fail at runtime) or react-dom // (css pre-init failure) // Server store has to be externalized, because it's a singleton (shared between FW and App) - external: ['@prisma/client', 'react-dom', '@redwoodjs/vite/serverStore'], + external: [ + '@prisma/client', + 'react-dom', + '@redwoodjs/cookie-jar', + '@redwoodjs/server-store', + ], resolve: { // These conditions are used in the plugin pipeline, and only affect non-externalized // dependencies during the SSR build. Which because of `noExternal: true` means all diff --git a/packages/vite/src/rsc/rscBuildForSsr.ts b/packages/vite/src/rsc/rscBuildForSsr.ts index b370f9852997..79c682bba936 100644 --- a/packages/vite/src/rsc/rscBuildForSsr.ts +++ b/packages/vite/src/rsc/rscBuildForSsr.ts @@ -51,6 +51,8 @@ export async function rscBuildForSsr({ '@prisma/fetch-engine', '@prisma/internals', 'playwright', + '@redwoodjs/cookie-jar', + '@redwoodjs/server-store', ], }, plugins: [ diff --git a/packages/vite/src/rsc/rscRequestHandler.ts b/packages/vite/src/rsc/rscRequestHandler.ts index 76786e5b61fd..a3f016bd5123 100644 --- a/packages/vite/src/rsc/rscRequestHandler.ts +++ b/packages/vite/src/rsc/rscRequestHandler.ts @@ -9,6 +9,8 @@ import type Router from 'find-my-way' import type { HTTPMethod } from 'find-my-way' import type { ViteDevServer } from 'vite' +import { getAuthState, getRequestHeaders } from '@redwoodjs/server-store' + import { decodeReply, decodeReplyFromBusboy, @@ -16,7 +18,6 @@ import { import { hasStatusCode } from '../lib/StatusError.js' import type { Middleware } from '../middleware' import { invoke } from '../middleware/invokeMiddleware' -import { getAuthState, getRequestHeaders } from '../serverStore' import { getFullUrlForFlightRequest } from '../utils' import type { RscFetchProps } from './rscFetchForClientRouter' diff --git a/packages/vite/src/rsc/rscStudioHandlers.ts b/packages/vite/src/rsc/rscStudioHandlers.ts index cf27ffebc735..7629d73304a6 100644 --- a/packages/vite/src/rsc/rscStudioHandlers.ts +++ b/packages/vite/src/rsc/rscStudioHandlers.ts @@ -4,8 +4,8 @@ import type { PassThrough } from 'node:stream' import type { Request } from 'express' import { getConfig, getRawConfig } from '@redwoodjs/project-config' +import { getAuthState, getRequestHeaders } from '@redwoodjs/server-store' -import { getAuthState, getRequestHeaders } from '../serverStore.js' import { getFullUrlForFlightRequest } from '../utils.js' import type { RenderInput } from './rscWorkerCommunication.js' diff --git a/packages/vite/src/rsc/rscWorker.ts b/packages/vite/src/rsc/rscWorker.ts index 0e15de449c7d..b0ee27d904e7 100644 --- a/packages/vite/src/rsc/rscWorker.ts +++ b/packages/vite/src/rsc/rscWorker.ts @@ -16,6 +16,10 @@ import type { ResolvedConfig } from 'vite' import { createServer, resolveConfig } from 'vite' import { getPaths } from '@redwoodjs/project-config' +import { + createPerRequestMap, + createServerStorage, +} from '@redwoodjs/server-store' import { getEntriesFromDist } from '../lib/entries.js' import { registerFwGlobalsAndShims } from '../lib/registerFwGlobalsAndShims.js' @@ -24,7 +28,6 @@ import { rscReloadPlugin } from '../plugins/vite-plugin-rsc-reload.js' import { rscRoutesAutoLoader } from '../plugins/vite-plugin-rsc-routes-auto-loader.js' import { rscTransformUseClientPlugin } from '../plugins/vite-plugin-rsc-transform-client.js' import { rscTransformUseServerPlugin } from '../plugins/vite-plugin-rsc-transform-server.js' -import { createPerRequestMap, createServerStorage } from '../serverStore.js' import type { MessageReq, diff --git a/packages/vite/src/runFeServer.ts b/packages/vite/src/runFeServer.ts index 6c7a043ad717..b4a673f8ad03 100644 --- a/packages/vite/src/runFeServer.ts +++ b/packages/vite/src/runFeServer.ts @@ -17,6 +17,10 @@ import { createProxyMiddleware } from 'http-proxy-middleware' import type { Manifest as ViteBuildManifest } from 'vite' import { getConfig, getPaths } from '@redwoodjs/project-config' +import { + createPerRequestMap, + createServerStorage, +} from '@redwoodjs/server-store' import { registerFwGlobalsAndShims } from './lib/registerFwGlobalsAndShims.js' import { invoke } from './middleware/invokeMiddleware.js' @@ -25,7 +29,6 @@ import type { Middleware } from './middleware/types.js' import { getRscStylesheetLinkGenerator } from './rsc/rscCss.js' import { createRscRequestHandler } from './rsc/rscRequestHandler.js' import { setClientEntries } from './rsc/rscWorkerCommunication.js' -import { createPerRequestMap, createServerStorage } from './serverStore.js' import { createReactStreamingHandler } from './streaming/createReactStreamingHandler.js' import type { RWRouteManifest } from './types.js' import { convertExpressHeaders, getFullUrl } from './utils.js' diff --git a/packages/vite/tsconfig.json b/packages/vite/tsconfig.json index 7a14ff97cc24..35043e882523 100644 --- a/packages/vite/tsconfig.json +++ b/packages/vite/tsconfig.json @@ -6,9 +6,11 @@ }, "include": ["src/**/*", "./ambient.d.ts", "./modules.d.ts"], "references": [ + { "path": "../cookie-jar" }, { "path": "../internal" }, { "path": "../project-config" }, { "path": "../router" }, + { "path": "../server-store" }, { "path": "../web" } ] } diff --git a/yarn.lock b/yarn.lock index 893f04a9d03e..d234b5fb8e50 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8110,6 +8110,21 @@ __metadata: languageName: unknown linkType: soft +"@redwoodjs/cookie-jar@workspace:*, @redwoodjs/cookie-jar@workspace:packages/cookie-jar": + version: 0.0.0-use.local + resolution: "@redwoodjs/cookie-jar@workspace:packages/cookie-jar" + dependencies: + "@redwoodjs/framework-tools": "workspace:*" + "@types/fs-extra": "npm:11.0.4" + cookie: "npm:0.6.0" + esbuild: "npm:0.21.3" + fast-glob: "npm:3.3.2" + fs-extra: "npm:11.2.0" + tsx: "npm:4.10.3" + typescript: "npm:5.4.5" + languageName: unknown + linkType: soft + "@redwoodjs/core@workspace:packages/core": version: 0.0.0-use.local resolution: "@redwoodjs/core@workspace:packages/core" @@ -8592,6 +8607,22 @@ __metadata: languageName: unknown linkType: soft +"@redwoodjs/server-store@workspace:*, @redwoodjs/server-store@workspace:packages/server-store": + version: 0.0.0-use.local + resolution: "@redwoodjs/server-store@workspace:packages/server-store" + dependencies: + "@redwoodjs/auth": "workspace:*" + "@redwoodjs/cookie-jar": "workspace:*" + "@redwoodjs/framework-tools": "workspace:*" + "@types/fs-extra": "npm:11.0.4" + esbuild: "npm:0.21.3" + fast-glob: "npm:3.3.2" + fs-extra: "npm:11.2.0" + tsx: "npm:4.10.3" + typescript: "npm:5.4.5" + languageName: unknown + linkType: soft + "@redwoodjs/structure@workspace:*, @redwoodjs/structure@workspace:packages/structure": version: 0.0.0-use.local resolution: "@redwoodjs/structure@workspace:packages/structure" @@ -8713,8 +8744,10 @@ __metadata: "@babel/traverse": "npm:^7.22.20" "@redwoodjs/auth": "workspace:*" "@redwoodjs/babel-config": "workspace:*" + "@redwoodjs/cookie-jar": "workspace:*" "@redwoodjs/internal": "workspace:*" "@redwoodjs/project-config": "workspace:*" + "@redwoodjs/server-store": "workspace:*" "@redwoodjs/web": "workspace:*" "@swc/core": "npm:1.5.7" "@types/busboy": "npm:^1" From 3933a97907510194d57b6e6a056f186826e4c44c Mon Sep 17 00:00:00 2001 From: Tobbe Lundberg Date: Sun, 9 Jun 2024 00:27:08 +0200 Subject: [PATCH 10/66] chore(npm): Normalize repo url (#10757) --- packages/adapters/fastify/web/package.json | 2 +- packages/api-server/package.json | 2 +- packages/api/package.json | 2 +- packages/auth-providers/auth0/api/package.json | 2 +- packages/auth-providers/auth0/setup/package.json | 2 +- packages/auth-providers/auth0/web/package.json | 2 +- packages/auth-providers/azureActiveDirectory/api/package.json | 2 +- .../auth-providers/azureActiveDirectory/setup/package.json | 2 +- packages/auth-providers/azureActiveDirectory/web/package.json | 2 +- packages/auth-providers/clerk/api/package.json | 2 +- packages/auth-providers/clerk/setup/package.json | 2 +- packages/auth-providers/clerk/web/package.json | 2 +- packages/auth-providers/custom/setup/package.json | 2 +- packages/auth-providers/dbAuth/api/package.json | 2 +- packages/auth-providers/dbAuth/middleware/package.json | 2 +- packages/auth-providers/dbAuth/setup/package.json | 2 +- packages/auth-providers/dbAuth/web/package.json | 2 +- packages/auth-providers/firebase/api/package.json | 2 +- packages/auth-providers/firebase/setup/package.json | 2 +- packages/auth-providers/firebase/web/package.json | 2 +- packages/auth-providers/netlify/api/package.json | 2 +- packages/auth-providers/netlify/setup/package.json | 2 +- packages/auth-providers/netlify/web/package.json | 2 +- packages/auth-providers/supabase/api/package.json | 2 +- packages/auth-providers/supabase/middleware/package.json | 2 +- packages/auth-providers/supabase/setup/package.json | 2 +- packages/auth-providers/supabase/web/package.json | 2 +- packages/auth-providers/supertokens/api/package.json | 2 +- packages/auth-providers/supertokens/setup/package.json | 2 +- packages/auth-providers/supertokens/web/package.json | 2 +- packages/auth/package.json | 2 +- packages/babel-config/package.json | 2 +- packages/cli-helpers/package.json | 2 +- packages/cli-packages/dataMigrate/package.json | 2 +- packages/cli-packages/storybook-vite/package.json | 2 +- packages/cli-packages/storybook/package.json | 2 +- packages/cli/package.json | 2 +- packages/codemods/package.json | 2 +- packages/context/package.json | 2 +- packages/core/package.json | 2 +- packages/create-redwood-app/package.json | 2 +- packages/eslint-config/package.json | 2 +- packages/eslint-plugin/package.json | 2 +- packages/forms/package.json | 2 +- packages/framework-tools/package.json | 2 +- packages/graphql-server/package.json | 2 +- packages/internal/package.json | 2 +- packages/mailer/core/package.json | 2 +- packages/mailer/handlers/in-memory/package.json | 2 +- packages/mailer/handlers/nodemailer/package.json | 2 +- packages/mailer/handlers/resend/package.json | 2 +- packages/mailer/handlers/studio/package.json | 2 +- packages/mailer/renderers/mjml-react/package.json | 2 +- packages/mailer/renderers/react-email/package.json | 2 +- packages/ogimage-gen/package.json | 2 +- packages/prerender/package.json | 2 +- packages/project-config/package.json | 2 +- packages/realtime/package.json | 2 +- packages/record/package.json | 2 +- packages/router/package.json | 2 +- packages/storybook/package.json | 4 ++-- packages/structure/package.json | 2 +- packages/telemetry/package.json | 2 +- packages/testing/package.json | 2 +- packages/tui/package.json | 2 +- packages/vite/package.json | 2 +- packages/web-server/package.json | 2 +- packages/web/package.json | 2 +- 68 files changed, 69 insertions(+), 69 deletions(-) diff --git a/packages/adapters/fastify/web/package.json b/packages/adapters/fastify/web/package.json index 42f755fe6583..c79d2ef18aa1 100644 --- a/packages/adapters/fastify/web/package.json +++ b/packages/adapters/fastify/web/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/adapters/fastify/web" }, "license": "MIT", diff --git a/packages/api-server/package.json b/packages/api-server/package.json index 610e3742a6e7..4838671ca473 100644 --- a/packages/api-server/package.json +++ b/packages/api-server/package.json @@ -4,7 +4,7 @@ "description": "Redwood's HTTP server for Serverless Functions", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/api-server" }, "license": "MIT", diff --git a/packages/api/package.json b/packages/api/package.json index f29a533a345b..f2872b0ae017 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/api" }, "license": "MIT", diff --git a/packages/auth-providers/auth0/api/package.json b/packages/auth-providers/auth0/api/package.json index ee8f9b4194ca..1a2b7d904971 100644 --- a/packages/auth-providers/auth0/api/package.json +++ b/packages/auth-providers/auth0/api/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/auth-providers/auth0/api" }, "license": "MIT", diff --git a/packages/auth-providers/auth0/setup/package.json b/packages/auth-providers/auth0/setup/package.json index 043d64e5a556..fa3ee3ebd6b0 100644 --- a/packages/auth-providers/auth0/setup/package.json +++ b/packages/auth-providers/auth0/setup/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/auth-providers/auth0/setup" }, "license": "MIT", diff --git a/packages/auth-providers/auth0/web/package.json b/packages/auth-providers/auth0/web/package.json index af81995b271c..c941981656b4 100644 --- a/packages/auth-providers/auth0/web/package.json +++ b/packages/auth-providers/auth0/web/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/auth-providers/auth0/web" }, "license": "MIT", diff --git a/packages/auth-providers/azureActiveDirectory/api/package.json b/packages/auth-providers/azureActiveDirectory/api/package.json index 390b9949fa72..da3504a1d7d0 100644 --- a/packages/auth-providers/azureActiveDirectory/api/package.json +++ b/packages/auth-providers/azureActiveDirectory/api/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/auth-providers/azureActiveDirectory/api" }, "license": "MIT", diff --git a/packages/auth-providers/azureActiveDirectory/setup/package.json b/packages/auth-providers/azureActiveDirectory/setup/package.json index 96989d7a5cd5..95f381cd253c 100644 --- a/packages/auth-providers/azureActiveDirectory/setup/package.json +++ b/packages/auth-providers/azureActiveDirectory/setup/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/auth-providers/azureActiveDirectory/setup" }, "license": "MIT", diff --git a/packages/auth-providers/azureActiveDirectory/web/package.json b/packages/auth-providers/azureActiveDirectory/web/package.json index f01821571b59..f288fe0cff91 100644 --- a/packages/auth-providers/azureActiveDirectory/web/package.json +++ b/packages/auth-providers/azureActiveDirectory/web/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/auth-providers/azureActiveDirectory/web" }, "license": "MIT", diff --git a/packages/auth-providers/clerk/api/package.json b/packages/auth-providers/clerk/api/package.json index d9548267fee2..70062fea3ff5 100644 --- a/packages/auth-providers/clerk/api/package.json +++ b/packages/auth-providers/clerk/api/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/auth-providers/clerk/api" }, "license": "MIT", diff --git a/packages/auth-providers/clerk/setup/package.json b/packages/auth-providers/clerk/setup/package.json index 7d35c7d7351b..fdb5c1f412da 100644 --- a/packages/auth-providers/clerk/setup/package.json +++ b/packages/auth-providers/clerk/setup/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/auth-providers/clerk/setup" }, "license": "MIT", diff --git a/packages/auth-providers/clerk/web/package.json b/packages/auth-providers/clerk/web/package.json index 6ce9d39ad719..61345893c11c 100644 --- a/packages/auth-providers/clerk/web/package.json +++ b/packages/auth-providers/clerk/web/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/auth-providers/clerk/web" }, "license": "MIT", diff --git a/packages/auth-providers/custom/setup/package.json b/packages/auth-providers/custom/setup/package.json index 1c983f638e9e..48fa05fe30ac 100644 --- a/packages/auth-providers/custom/setup/package.json +++ b/packages/auth-providers/custom/setup/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/auth-providers/custom/setup" }, "license": "MIT", diff --git a/packages/auth-providers/dbAuth/api/package.json b/packages/auth-providers/dbAuth/api/package.json index 0a65aaebe97b..5ef05ccdbd60 100644 --- a/packages/auth-providers/dbAuth/api/package.json +++ b/packages/auth-providers/dbAuth/api/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/auth-providers/dbAuth/api" }, "license": "MIT", diff --git a/packages/auth-providers/dbAuth/middleware/package.json b/packages/auth-providers/dbAuth/middleware/package.json index 4030b09656b2..7c52bb662708 100644 --- a/packages/auth-providers/dbAuth/middleware/package.json +++ b/packages/auth-providers/dbAuth/middleware/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/auth-providers/dbAuth/middleware" }, "license": "MIT", diff --git a/packages/auth-providers/dbAuth/setup/package.json b/packages/auth-providers/dbAuth/setup/package.json index 36ca1aad3b82..595cd7944b4f 100644 --- a/packages/auth-providers/dbAuth/setup/package.json +++ b/packages/auth-providers/dbAuth/setup/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/auth-providers/dbAuth/setup" }, "license": "MIT", diff --git a/packages/auth-providers/dbAuth/web/package.json b/packages/auth-providers/dbAuth/web/package.json index c7703fd65f46..d2c6051253b4 100644 --- a/packages/auth-providers/dbAuth/web/package.json +++ b/packages/auth-providers/dbAuth/web/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/auth-providers/dbAuth/web" }, "license": "MIT", diff --git a/packages/auth-providers/firebase/api/package.json b/packages/auth-providers/firebase/api/package.json index f4f03e2176cd..b06e60aec331 100644 --- a/packages/auth-providers/firebase/api/package.json +++ b/packages/auth-providers/firebase/api/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/auth-providers/firebase/api" }, "license": "MIT", diff --git a/packages/auth-providers/firebase/setup/package.json b/packages/auth-providers/firebase/setup/package.json index 8019417f2c74..4cdf4d617e29 100644 --- a/packages/auth-providers/firebase/setup/package.json +++ b/packages/auth-providers/firebase/setup/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/auth-providers/firebase/setup" }, "license": "MIT", diff --git a/packages/auth-providers/firebase/web/package.json b/packages/auth-providers/firebase/web/package.json index 31e4c6947c91..b5281052c170 100644 --- a/packages/auth-providers/firebase/web/package.json +++ b/packages/auth-providers/firebase/web/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/auth-providers/firebase/web" }, "license": "MIT", diff --git a/packages/auth-providers/netlify/api/package.json b/packages/auth-providers/netlify/api/package.json index f34422387b46..72d0cb0b40b8 100644 --- a/packages/auth-providers/netlify/api/package.json +++ b/packages/auth-providers/netlify/api/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/auth-providers/netlify/api" }, "license": "MIT", diff --git a/packages/auth-providers/netlify/setup/package.json b/packages/auth-providers/netlify/setup/package.json index 0da3bc7166f3..adec10b0f7a1 100644 --- a/packages/auth-providers/netlify/setup/package.json +++ b/packages/auth-providers/netlify/setup/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/auth-providers/netlify/setup" }, "license": "MIT", diff --git a/packages/auth-providers/netlify/web/package.json b/packages/auth-providers/netlify/web/package.json index 4c00dc22f96e..3eeaa9c13b16 100644 --- a/packages/auth-providers/netlify/web/package.json +++ b/packages/auth-providers/netlify/web/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/auth-providers/netlify/web" }, "license": "MIT", diff --git a/packages/auth-providers/supabase/api/package.json b/packages/auth-providers/supabase/api/package.json index 2c527cd95609..c38cb2f1df3e 100644 --- a/packages/auth-providers/supabase/api/package.json +++ b/packages/auth-providers/supabase/api/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/auth-providers/supabase/api" }, "license": "MIT", diff --git a/packages/auth-providers/supabase/middleware/package.json b/packages/auth-providers/supabase/middleware/package.json index a75584dc7808..074c2bca17f6 100644 --- a/packages/auth-providers/supabase/middleware/package.json +++ b/packages/auth-providers/supabase/middleware/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/auth-providers/supabase/middleware" }, "license": "MIT", diff --git a/packages/auth-providers/supabase/setup/package.json b/packages/auth-providers/supabase/setup/package.json index 3b2f7de762bf..4ab6868dfad8 100644 --- a/packages/auth-providers/supabase/setup/package.json +++ b/packages/auth-providers/supabase/setup/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/auth-providers/supabase/setup" }, "license": "MIT", diff --git a/packages/auth-providers/supabase/web/package.json b/packages/auth-providers/supabase/web/package.json index 333ff93ebad1..024ea70716dd 100644 --- a/packages/auth-providers/supabase/web/package.json +++ b/packages/auth-providers/supabase/web/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/auth-providers/supabase/web" }, "license": "MIT", diff --git a/packages/auth-providers/supertokens/api/package.json b/packages/auth-providers/supertokens/api/package.json index 76aa785fa9c8..a05a29b6ff17 100644 --- a/packages/auth-providers/supertokens/api/package.json +++ b/packages/auth-providers/supertokens/api/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/auth-providers/supertokens/api" }, "license": "MIT", diff --git a/packages/auth-providers/supertokens/setup/package.json b/packages/auth-providers/supertokens/setup/package.json index 1d0c0347a6eb..6524226d1fb1 100644 --- a/packages/auth-providers/supertokens/setup/package.json +++ b/packages/auth-providers/supertokens/setup/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/auth-providers/supertokens/setup" }, "license": "MIT", diff --git a/packages/auth-providers/supertokens/web/package.json b/packages/auth-providers/supertokens/web/package.json index 2b70d7e695ef..0c3838784be3 100644 --- a/packages/auth-providers/supertokens/web/package.json +++ b/packages/auth-providers/supertokens/web/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/auth-providers/supertokens/web" }, "license": "MIT", diff --git a/packages/auth/package.json b/packages/auth/package.json index 21f26c972050..3f169c25a942 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/auth" }, "license": "MIT", diff --git a/packages/babel-config/package.json b/packages/babel-config/package.json index 222bca5fef1d..684ddff8f73a 100644 --- a/packages/babel-config/package.json +++ b/packages/babel-config/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/babel-config" }, "license": "MIT", diff --git a/packages/cli-helpers/package.json b/packages/cli-helpers/package.json index e22e86512752..96520caf61a5 100644 --- a/packages/cli-helpers/package.json +++ b/packages/cli-helpers/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/cli-helpers" }, "license": "MIT", diff --git a/packages/cli-packages/dataMigrate/package.json b/packages/cli-packages/dataMigrate/package.json index 6ebea4c3d165..2037a51a69e8 100644 --- a/packages/cli-packages/dataMigrate/package.json +++ b/packages/cli-packages/dataMigrate/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/cli-packages/dataMigrate" }, "license": "MIT", diff --git a/packages/cli-packages/storybook-vite/package.json b/packages/cli-packages/storybook-vite/package.json index a4fe05878c2c..29f099afc0ce 100644 --- a/packages/cli-packages/storybook-vite/package.json +++ b/packages/cli-packages/storybook-vite/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/cli-packages/storybook-vite" }, "license": "MIT", diff --git a/packages/cli-packages/storybook/package.json b/packages/cli-packages/storybook/package.json index 0b6d27f4a12c..eea3ec92ece6 100644 --- a/packages/cli-packages/storybook/package.json +++ b/packages/cli-packages/storybook/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/cli-packages/storybook" }, "license": "MIT", diff --git a/packages/cli/package.json b/packages/cli/package.json index a2de48d9af7b..289ca6b0f707 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -4,7 +4,7 @@ "description": "The Redwood Command Line", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/cli" }, "license": "MIT", diff --git a/packages/codemods/package.json b/packages/codemods/package.json index 78ee70ddf0d9..d27847bd7f93 100644 --- a/packages/codemods/package.json +++ b/packages/codemods/package.json @@ -4,7 +4,7 @@ "description": "Codemods to ease upgrading a RedwoodJS Project", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/codemods" }, "license": "MIT", diff --git a/packages/context/package.json b/packages/context/package.json index 56592bc162c1..697fb7380286 100644 --- a/packages/context/package.json +++ b/packages/context/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/context" }, "license": "MIT", diff --git a/packages/core/package.json b/packages/core/package.json index b70033cf2b97..f3b0cc76febc 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -4,7 +4,7 @@ "description": "Foundational packages and config required to build RedwoodJS.", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/core" }, "license": "MIT", diff --git a/packages/create-redwood-app/package.json b/packages/create-redwood-app/package.json index f0f881c95114..f6921f956a41 100644 --- a/packages/create-redwood-app/package.json +++ b/packages/create-redwood-app/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/create-redwood-app" }, "license": "MIT", diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json index ff16bfa9f717..f73974f0e29f 100644 --- a/packages/eslint-config/package.json +++ b/packages/eslint-config/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/eslint-config" }, "license": "MIT", diff --git a/packages/eslint-plugin/package.json b/packages/eslint-plugin/package.json index 7a0324f1b1f7..1fef357e70f1 100644 --- a/packages/eslint-plugin/package.json +++ b/packages/eslint-plugin/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/eslint-plugin" }, "license": "MIT", diff --git a/packages/forms/package.json b/packages/forms/package.json index d9657e245e42..f5fec1725d66 100644 --- a/packages/forms/package.json +++ b/packages/forms/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/forms" }, "license": "MIT", diff --git a/packages/framework-tools/package.json b/packages/framework-tools/package.json index c999749b5155..df46993b018c 100644 --- a/packages/framework-tools/package.json +++ b/packages/framework-tools/package.json @@ -4,7 +4,7 @@ "private": true, "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/framework-tools" }, "license": "MIT", diff --git a/packages/graphql-server/package.json b/packages/graphql-server/package.json index b166b9948218..774630501f72 100644 --- a/packages/graphql-server/package.json +++ b/packages/graphql-server/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/graphql-server" }, "license": "MIT", diff --git a/packages/internal/package.json b/packages/internal/package.json index 9c475b1a3e5c..566ed7c7b114 100644 --- a/packages/internal/package.json +++ b/packages/internal/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/internal" }, "license": "MIT", diff --git a/packages/mailer/core/package.json b/packages/mailer/core/package.json index 902ed8d1c077..abd1864c5068 100644 --- a/packages/mailer/core/package.json +++ b/packages/mailer/core/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/mailer/core" }, "license": "MIT", diff --git a/packages/mailer/handlers/in-memory/package.json b/packages/mailer/handlers/in-memory/package.json index b1f6c58ee83f..aba443ef53e6 100644 --- a/packages/mailer/handlers/in-memory/package.json +++ b/packages/mailer/handlers/in-memory/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/mailer/handlers/in-memory" }, "license": "MIT", diff --git a/packages/mailer/handlers/nodemailer/package.json b/packages/mailer/handlers/nodemailer/package.json index 0bd82778ae3b..013a61890a0f 100644 --- a/packages/mailer/handlers/nodemailer/package.json +++ b/packages/mailer/handlers/nodemailer/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/mailer/handlers/nodemailer" }, "license": "MIT", diff --git a/packages/mailer/handlers/resend/package.json b/packages/mailer/handlers/resend/package.json index 0aa4c47adba9..4d57a1102b7e 100644 --- a/packages/mailer/handlers/resend/package.json +++ b/packages/mailer/handlers/resend/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/mailer/handlers/resend" }, "license": "MIT", diff --git a/packages/mailer/handlers/studio/package.json b/packages/mailer/handlers/studio/package.json index 2047845274b4..dc686f28623e 100644 --- a/packages/mailer/handlers/studio/package.json +++ b/packages/mailer/handlers/studio/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/mailer/handlers/studio" }, "license": "MIT", diff --git a/packages/mailer/renderers/mjml-react/package.json b/packages/mailer/renderers/mjml-react/package.json index c3c744c84546..0be035e6cddf 100644 --- a/packages/mailer/renderers/mjml-react/package.json +++ b/packages/mailer/renderers/mjml-react/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/mailer/renderers/mjml-react" }, "license": "MIT", diff --git a/packages/mailer/renderers/react-email/package.json b/packages/mailer/renderers/react-email/package.json index f636084eddee..6b9dfdcc2d14 100644 --- a/packages/mailer/renderers/react-email/package.json +++ b/packages/mailer/renderers/react-email/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/mailer/renderers/react-email" }, "license": "MIT", diff --git a/packages/ogimage-gen/package.json b/packages/ogimage-gen/package.json index 42a5d6e60622..e35f6e1706c8 100644 --- a/packages/ogimage-gen/package.json +++ b/packages/ogimage-gen/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/ogimage-gen" }, "license": "MIT", diff --git a/packages/prerender/package.json b/packages/prerender/package.json index fee17387c8ff..b8a9714bbe6b 100644 --- a/packages/prerender/package.json +++ b/packages/prerender/package.json @@ -4,7 +4,7 @@ "description": "RedwoodJS prerender", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/prerender" }, "license": "MIT", diff --git a/packages/project-config/package.json b/packages/project-config/package.json index f789aac485b0..04cb782ec11c 100644 --- a/packages/project-config/package.json +++ b/packages/project-config/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/project-config" }, "license": "MIT", diff --git a/packages/realtime/package.json b/packages/realtime/package.json index def234eb1d18..1fdeb13ce8cc 100644 --- a/packages/realtime/package.json +++ b/packages/realtime/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/realtime" }, "license": "MIT", diff --git a/packages/record/package.json b/packages/record/package.json index ebf91c31ebfd..8d62e7fcf069 100644 --- a/packages/record/package.json +++ b/packages/record/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/record" }, "license": "MIT", diff --git a/packages/router/package.json b/packages/router/package.json index 890f31fea959..905e1a4f0164 100644 --- a/packages/router/package.json +++ b/packages/router/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/router" }, "license": "MIT", diff --git a/packages/storybook/package.json b/packages/storybook/package.json index 1e3a2aa1fd6c..811e6ecf44f9 100644 --- a/packages/storybook/package.json +++ b/packages/storybook/package.json @@ -10,11 +10,11 @@ "Vite" ], "bugs": { - "url": "https://github.com/redwoodjs/redwood/issues" + "url": "git+https://github.com/redwoodjs/redwood/issues" }, "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/storybook" }, "license": "MIT", diff --git a/packages/structure/package.json b/packages/structure/package.json index 784515bf7f1c..85005f862ec4 100644 --- a/packages/structure/package.json +++ b/packages/structure/package.json @@ -4,7 +4,7 @@ "description": "noun: the arrangement of and relations between the parts or elements of something complex", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/structure" }, "license": "MIT", diff --git a/packages/telemetry/package.json b/packages/telemetry/package.json index 5c67146cfc26..dde0c52a8e2d 100644 --- a/packages/telemetry/package.json +++ b/packages/telemetry/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/telemetry" }, "license": "MIT", diff --git a/packages/testing/package.json b/packages/testing/package.json index 4cbcaa6e2e93..7270ba61854b 100644 --- a/packages/testing/package.json +++ b/packages/testing/package.json @@ -4,7 +4,7 @@ "description": "Tools, wrappers and configuration for testing a Redwood project.", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/testing" }, "license": "MIT", diff --git a/packages/tui/package.json b/packages/tui/package.json index a5eb24e1e81f..602d1e6798b9 100644 --- a/packages/tui/package.json +++ b/packages/tui/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/tui" }, "license": "MIT", diff --git a/packages/vite/package.json b/packages/vite/package.json index c4a08efbba78..e4f4c9e329e3 100644 --- a/packages/vite/package.json +++ b/packages/vite/package.json @@ -4,7 +4,7 @@ "description": "Vite configuration package for Redwood", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/vite" }, "license": "MIT", diff --git a/packages/web-server/package.json b/packages/web-server/package.json index 142b58657a6a..1a821fba135a 100644 --- a/packages/web-server/package.json +++ b/packages/web-server/package.json @@ -4,7 +4,7 @@ "description": "Redwood's server for the Web side", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/web-server" }, "license": "MIT", diff --git a/packages/web/package.json b/packages/web/package.json index 572fe9f5d37a..23fb0f0ab03f 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "repository": { "type": "git", - "url": "https://github.com/redwoodjs/redwood.git", + "url": "git+https://github.com/redwoodjs/redwood.git", "directory": "packages/web" }, "license": "MIT", From b1b58bd159c5e78f19493d074bf0a790d34989dd Mon Sep 17 00:00:00 2001 From: Tobbe Lundberg Date: Sun, 9 Jun 2024 10:08:05 +0200 Subject: [PATCH 11/66] RSC: Wrap App around Routes in ServerEntry (#10760) --- __fixtures__/test-project-rsa/web/src/entry.server.tsx | 5 ++++- .../experimental/templates/rsc/entry.server.tsx.template | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/__fixtures__/test-project-rsa/web/src/entry.server.tsx b/__fixtures__/test-project-rsa/web/src/entry.server.tsx index 1621bd5bd233..174ff4a57fea 100644 --- a/__fixtures__/test-project-rsa/web/src/entry.server.tsx +++ b/__fixtures__/test-project-rsa/web/src/entry.server.tsx @@ -1,5 +1,6 @@ import type { TagDescriptor } from '@redwoodjs/web/dist/components/htmlTags' +import App from './App' import { Document } from './Document' import Routes from './Routes' @@ -16,7 +17,9 @@ interface Props { export const ServerEntry: React.FC = ({ css, meta, location }) => { return ( - + + + ) } diff --git a/packages/cli/src/commands/experimental/templates/rsc/entry.server.tsx.template b/packages/cli/src/commands/experimental/templates/rsc/entry.server.tsx.template index 1621bd5bd233..174ff4a57fea 100644 --- a/packages/cli/src/commands/experimental/templates/rsc/entry.server.tsx.template +++ b/packages/cli/src/commands/experimental/templates/rsc/entry.server.tsx.template @@ -1,5 +1,6 @@ import type { TagDescriptor } from '@redwoodjs/web/dist/components/htmlTags' +import App from './App' import { Document } from './Document' import Routes from './Routes' @@ -16,7 +17,9 @@ interface Props { export const ServerEntry: React.FC = ({ css, meta, location }) => { return ( - + + + ) } From 2e72321381166aa10a16d969759f3b9597c88c70 Mon Sep 17 00:00:00 2001 From: Tobbe Lundberg Date: Sun, 9 Jun 2024 10:28:06 +0200 Subject: [PATCH 12/66] RSC: getLocation in ServerRouter (#10759) --- .../test-project-rsa/web/src/entry.server.tsx | 9 ++------- .../web/src/entry.server.tsx | 9 ++------- .../templates/rsc/entry.server.tsx.template | 9 ++------- packages/router/package.json | 1 + packages/router/src/server-router.tsx | 12 +++++------- packages/router/tsconfig.json | 1 + yarn.lock | 1 + 7 files changed, 14 insertions(+), 28 deletions(-) diff --git a/__fixtures__/test-project-rsa/web/src/entry.server.tsx b/__fixtures__/test-project-rsa/web/src/entry.server.tsx index 174ff4a57fea..d49d791dfe8d 100644 --- a/__fixtures__/test-project-rsa/web/src/entry.server.tsx +++ b/__fixtures__/test-project-rsa/web/src/entry.server.tsx @@ -7,18 +7,13 @@ import Routes from './Routes' interface Props { css: string[] meta?: TagDescriptor[] - location: { - pathname: string - hash?: string - search?: string - } } -export const ServerEntry: React.FC = ({ css, meta, location }) => { +export const ServerEntry: React.FC = ({ css, meta }) => { return ( - + ) diff --git a/__fixtures__/test-project-rsc-kitchen-sink/web/src/entry.server.tsx b/__fixtures__/test-project-rsc-kitchen-sink/web/src/entry.server.tsx index ee8495317ced..6ffa36cefa74 100644 --- a/__fixtures__/test-project-rsc-kitchen-sink/web/src/entry.server.tsx +++ b/__fixtures__/test-project-rsc-kitchen-sink/web/src/entry.server.tsx @@ -7,18 +7,13 @@ import Routes from './Routes' interface Props { css: string[] meta?: TagDescriptor[] - location: { - pathname: string - hash?: string - search?: string - } } -export const ServerEntry: React.FC = ({ css, meta, location }) => { +export const ServerEntry: React.FC = ({ css, meta }) => { return ( - + ) diff --git a/packages/cli/src/commands/experimental/templates/rsc/entry.server.tsx.template b/packages/cli/src/commands/experimental/templates/rsc/entry.server.tsx.template index 174ff4a57fea..d49d791dfe8d 100644 --- a/packages/cli/src/commands/experimental/templates/rsc/entry.server.tsx.template +++ b/packages/cli/src/commands/experimental/templates/rsc/entry.server.tsx.template @@ -7,18 +7,13 @@ import Routes from './Routes' interface Props { css: string[] meta?: TagDescriptor[] - location: { - pathname: string - hash?: string - search?: string - } } -export const ServerEntry: React.FC = ({ css, meta, location }) => { +export const ServerEntry: React.FC = ({ css, meta }) => { return ( - + ) diff --git a/packages/router/package.json b/packages/router/package.json index 905e1a4f0164..606285d61c06 100644 --- a/packages/router/package.json +++ b/packages/router/package.json @@ -27,6 +27,7 @@ "dependencies": { "@babel/runtime-corejs3": "7.24.5", "@redwoodjs/auth": "workspace:*", + "@redwoodjs/server-store": "workspace:*", "core-js": "3.37.1" }, "devDependencies": { diff --git a/packages/router/src/server-router.tsx b/packages/router/src/server-router.tsx index e64d29411585..89ed8afa5be2 100644 --- a/packages/router/src/server-router.tsx +++ b/packages/router/src/server-router.tsx @@ -1,9 +1,10 @@ import type { ReactNode } from 'react' import React from 'react' +import { getLocation } from '@redwoodjs/server-store' + import { analyzeRoutes } from './analyzeRoutes' import type { Wrappers } from './analyzeRoutes' -import type { LocationContextType } from './location' import { namedRoutes } from './namedRoutes' import { normalizePage } from './page' import type { RouterContextProviderProps } from './router-context' @@ -17,14 +18,11 @@ export interface RouterProps trailingSlashes?: TrailingSlashesTypes pageLoadingDelay?: number children: ReactNode - location: LocationContextType } -export const Router: React.FC = ({ - paramTypes, - children, - location, -}) => { +export const Router: React.FC = ({ paramTypes, children }) => { + const location = getLocation() + const analyzedRoutes = analyzeRoutes(children, { currentPathName: location.pathname, // @TODO We haven't handled this with SSR/Streaming yet. diff --git a/packages/router/tsconfig.json b/packages/router/tsconfig.json index f59657fb129b..5e4a0566b236 100644 --- a/packages/router/tsconfig.json +++ b/packages/router/tsconfig.json @@ -7,5 +7,6 @@ "include": ["src", "./ambient.d.ts"], "references": [ { "path": "../auth/tsconfig.build.json" }, + { "path": "../server-store" }, ] } diff --git a/yarn.lock b/yarn.lock index d234b5fb8e50..bc3c25e103ba 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8592,6 +8592,7 @@ __metadata: "@babel/core": "npm:^7.22.20" "@babel/runtime-corejs3": "npm:7.24.5" "@redwoodjs/auth": "workspace:*" + "@redwoodjs/server-store": "workspace:*" "@testing-library/jest-dom": "npm:6.4.5" "@types/react": "npm:^18.2.55" "@types/react-dom": "npm:^18.2.19" From 7e065cd415f02b927fb7ec98280deccdb1ce7476 Mon Sep 17 00:00:00 2001 From: allen joslin Date: Sun, 9 Jun 2024 04:30:19 -0400 Subject: [PATCH 13/66] Updates to the FlightControl deployment (#10716) Co-authored-by: Tobbe Lundberg --- docs/docs/deploy/flightcontrol.md | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/docs/docs/deploy/flightcontrol.md b/docs/docs/deploy/flightcontrol.md index 192efd1776b6..ffcb0409c42e 100644 --- a/docs/docs/deploy/flightcontrol.md +++ b/docs/docs/deploy/flightcontrol.md @@ -9,16 +9,15 @@ description: How to deploy a Redwood app to AWS via Flightcontrol ## Flightcontrol Deploy Setup 1. In your project, run the command `yarn rw setup deploy flightcontrol --database=YOUR_DB_TYPE` where YOUR_DB_TYPE is `mysql` or `postgresql` -2. Commit the changes and push to github -3. If you don't have an account, sign up at [app.flightcontrol.dev/signup](https://app.flightcontrol.dev/signup?ref=redwood) -4. Create a new project from the onboarding screen or project list - 1. Connect your Github account and select your repo - 2. Select "Config Type" as `flightcontrol.json` - 3. Click "Create Project" and complete any required steps like linking your AWS account. -5. If using dbAuth, add the session secret key env variable in the Flightcontrol dashboard - - -NOTE: If you are using yarn v1, remove the `installCommand`'s from flightcontrol.json +2. NOTE: The RedwoodJS Flightcontrol setup defaults to an environment\[0] of 'Development', add to the array to deploy more environments. +3. Commit the changes and push to github. +4. If you don't have an account, sign up at [app.flightcontrol.dev/signup](https://app.flightcontrol.dev/signup?ref=redwood). +5. Create a new project from the onboarding screen or project list. + 1. Connect your Github account and select your repo. + 2. Click "Create Project" and complete any required steps like linking your AWS account. + 3. Configuration Type should autoselect as `flightcontrol.json`. + 4. NOTE: `flightcontrol.json` is now the source of truth for your Project and its Environments. +6. Add your env vars in Flightcontrol for your Environment. +7. If using dbAuth, add the session secret key env variable in the Flightcontrol dashboard. If you have *any* problems or questions, Flightcontrol is very responsive in [their support Discord](https://discord.gg/yY8rSPrD6q). - From 73241a0fa9b833f4d871fdd2738bdafece79ecea Mon Sep 17 00:00:00 2001 From: Josh GM Walker <56300765+Josh-Walker-GM@users.noreply.github.com> Date: Sun, 9 Jun 2024 16:56:07 +0100 Subject: [PATCH 14/66] feat(cli): react compiler lint only setting (#10761) This PR adds to the TOML configuration for the experimental react compiler. It adds a `lintOnly` option which when set to true will enable linting rules but not include the compiler during code compilation. --- .changesets/10761.md | 3 +++ packages/babel-config/src/web.ts | 10 +++++++--- .../commands/experimental/setupReactCompilerHandler.js | 2 +- packages/project-config/src/__tests__/config.test.ts | 1 + packages/project-config/src/config.ts | 2 ++ 5 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 .changesets/10761.md diff --git a/.changesets/10761.md b/.changesets/10761.md new file mode 100644 index 000000000000..b04a7717c4f7 --- /dev/null +++ b/.changesets/10761.md @@ -0,0 +1,3 @@ +- feat(cli): react compiler lint only setting (#10761) by @Josh-Walker-GM + +You can now add `lintOnly = true` within your `[experimental.reactCompiler]` TOML settings to enable the react compiler linting rules without the compiler itself enabled during code compilation. See [here](https://community.redwoodjs.com/t/react-compiler-setup-experimental/7128) for more details. diff --git a/packages/babel-config/src/web.ts b/packages/babel-config/src/web.ts index 556d7fc89e80..6c8a46e58beb 100644 --- a/packages/babel-config/src/web.ts +++ b/packages/babel-config/src/web.ts @@ -31,8 +31,12 @@ export const getWebSideBabelPlugins = ( // Need the project config to know if trusted graphql documents is being used and decide to use // the gql tag import or the trusted document gql function generated by code gen client preset const config = getConfig() - const reactCompilerEnabled = - config.experimental?.reactCompiler?.enabled ?? false + + // The compiler config has both an enabled and lintOnly setting so we have to ensure + // the user wants to do more than simply lint before enabling the plugin + const useReactCompiler = + config.experimental?.reactCompiler?.enabled && + config.experimental?.reactCompiler?.lintOnly === false const useTrustedDocumentsGqlTag = config.graphql.trustedDocuments @@ -44,7 +48,7 @@ export const getWebSideBabelPlugins = ( const commonPlugins = forVite ? [] : getCommonPlugins() const plugins = [ // It is important that this plugin run first, as noted here: https://react.dev/learn/react-compiler - reactCompilerEnabled && [ + useReactCompiler && [ 'babel-plugin-react-compiler', { // No specific config at this time... diff --git a/packages/cli/src/commands/experimental/setupReactCompilerHandler.js b/packages/cli/src/commands/experimental/setupReactCompilerHandler.js index 9b547accdc3d..61cf4bd26fd1 100644 --- a/packages/cli/src/commands/experimental/setupReactCompilerHandler.js +++ b/packages/cli/src/commands/experimental/setupReactCompilerHandler.js @@ -56,7 +56,7 @@ export const handler = async ({ force, verbose }) => { writeFile( redwoodTomlPath, configContent.concat( - '\n[experimental.reactCompiler]\n enabled = true\n', + '\n[experimental.reactCompiler]\n enabled = true\n lintOnly = false\n', ), { overwriteExisting: true, // redwood.toml always exists diff --git a/packages/project-config/src/__tests__/config.test.ts b/packages/project-config/src/__tests__/config.test.ts index cac2873e5cde..a3b7973860c4 100644 --- a/packages/project-config/src/__tests__/config.test.ts +++ b/packages/project-config/src/__tests__/config.test.ts @@ -64,6 +64,7 @@ describe('getConfig', () => { }, "reactCompiler": { "enabled": false, + "lintOnly": false, }, "realtime": { "enabled": false, diff --git a/packages/project-config/src/config.ts b/packages/project-config/src/config.ts index b57cf94d64cb..6268dc96c2b4 100644 --- a/packages/project-config/src/config.ts +++ b/packages/project-config/src/config.ts @@ -120,6 +120,7 @@ export interface Config { } reactCompiler: { enabled: boolean + lintOnly: boolean } } } @@ -207,6 +208,7 @@ const DEFAULT_CONFIG: Config = { }, reactCompiler: { enabled: false, + lintOnly: false, }, }, } From 1e2fd695f1668d28c6b6fd8b28644085f933ce01 Mon Sep 17 00:00:00 2001 From: Tobbe Lundberg Date: Sun, 9 Jun 2024 19:50:46 +0200 Subject: [PATCH 15/66] chore(graphql-server): Fix ts-refs, a comment and imports (#10763) --- packages/graphql-server/src/rootSchema.ts | 6 +----- packages/graphql-server/tsconfig.json | 1 + 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/packages/graphql-server/src/rootSchema.ts b/packages/graphql-server/src/rootSchema.ts index 4010e7d87d99..1703552e2aa7 100644 --- a/packages/graphql-server/src/rootSchema.ts +++ b/packages/graphql-server/src/rootSchema.ts @@ -1,4 +1,3 @@ -/* eslint-disable @typescript-eslint/ban-ts-comment */ import { BigIntResolver, DateResolver, @@ -10,12 +9,9 @@ import { } from 'graphql-scalars' import gql from 'graphql-tag' +import { prismaVersion, redwoodVersion } from '@redwoodjs/api' import type { GlobalContext } from '@redwoodjs/context' -// @TODO move prismaVersion & redwoodVersion to internal? -// We don't want a circular dependency here.. -const { prismaVersion, redwoodVersion } = require('@redwoodjs/api') - /** * This adds scalar types for dealing with Date, Time, DateTime, and JSON. * This also adds a root Query type which is needed to start the GraphQL server on a fresh install. diff --git a/packages/graphql-server/tsconfig.json b/packages/graphql-server/tsconfig.json index 1d50da1fc74f..db1326b03e47 100644 --- a/packages/graphql-server/tsconfig.json +++ b/packages/graphql-server/tsconfig.json @@ -7,5 +7,6 @@ "include": ["ambient.d.ts", "src/**/*"], "references": [ { "path": "../api" }, + { "path": "../context" }, ] } From c69c2229f5bab302fbddf7a105b3272ae4ff21d2 Mon Sep 17 00:00:00 2001 From: Josh GM Walker <56300765+Josh-Walker-GM@users.noreply.github.com> Date: Sun, 9 Jun 2024 19:16:33 +0100 Subject: [PATCH 16/66] fix: smol-toml imports (#10764) **Problem** There is no default export from the `smol-toml` package and so usage such as that shown below does not quite work. ```ts import toml from 'smol-toml' toml.parse(...) ``` Instead the easiest change is to adopt: ```ts import * as toml from 'smol-toml' toml.parse(...) ``` which was already being used within a test file. **Changes** 1. Uses namespace imports for the smol toml package where that package is used. **Update** It is somewhat confusing that the `import toml from 'smol-toml'` does not appear to be working given that the documentation for the package says that you should be able to do things that way. I'll see if this change fixes the bug that I believe is happening. We can easily revert or update the usage here when we understand better. --- packages/cli-helpers/src/lib/project.ts | 2 +- packages/cli/src/commands/deploy/baremetal.js | 2 +- .../cli/src/commands/setup/deploy/providers/coherenceHandler.js | 2 +- packages/project-config/src/config.ts | 2 +- packages/structure/src/model/RWTOML.ts | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/cli-helpers/src/lib/project.ts b/packages/cli-helpers/src/lib/project.ts index 25c43a10e91b..783fc207b4e5 100644 --- a/packages/cli-helpers/src/lib/project.ts +++ b/packages/cli-helpers/src/lib/project.ts @@ -2,7 +2,7 @@ import * as fs from 'node:fs' import * as path from 'node:path' import dotenv from 'dotenv' -import toml from 'smol-toml' +import * as toml from 'smol-toml' import type { Config } from '@redwoodjs/project-config' import { diff --git a/packages/cli/src/commands/deploy/baremetal.js b/packages/cli/src/commands/deploy/baremetal.js index 26c87269692f..f2ca4fde6ba2 100644 --- a/packages/cli/src/commands/deploy/baremetal.js +++ b/packages/cli/src/commands/deploy/baremetal.js @@ -3,7 +3,7 @@ import path from 'path' import boxen from 'boxen' import fs from 'fs-extra' import { Listr } from 'listr2' -import toml from 'smol-toml' +import * as toml from 'smol-toml' import { env as envInterpolation } from 'string-env-interpolation' import terminalLink from 'terminal-link' import { titleCase } from 'title-case' diff --git a/packages/cli/src/commands/setup/deploy/providers/coherenceHandler.js b/packages/cli/src/commands/setup/deploy/providers/coherenceHandler.js index cc9a7bc23360..cc2c6c7ec033 100644 --- a/packages/cli/src/commands/setup/deploy/providers/coherenceHandler.js +++ b/packages/cli/src/commands/setup/deploy/providers/coherenceHandler.js @@ -3,7 +3,7 @@ import path from 'path' import { getSchema, getConfig } from '@prisma/internals' import fs from 'fs-extra' import { Listr } from 'listr2' -import toml from 'smol-toml' +import * as toml from 'smol-toml' import { colors as c, diff --git a/packages/project-config/src/config.ts b/packages/project-config/src/config.ts index 6268dc96c2b4..71a2a7e89d2c 100644 --- a/packages/project-config/src/config.ts +++ b/packages/project-config/src/config.ts @@ -1,7 +1,7 @@ import fs from 'fs' import merge from 'deepmerge' -import toml from 'smol-toml' +import * as toml from 'smol-toml' import { env as envInterpolation } from 'string-env-interpolation' import { getConfigPath } from './configPath.js' diff --git a/packages/structure/src/model/RWTOML.ts b/packages/structure/src/model/RWTOML.ts index 4cbcee25ab85..53a54fbfad85 100644 --- a/packages/structure/src/model/RWTOML.ts +++ b/packages/structure/src/model/RWTOML.ts @@ -1,4 +1,4 @@ -import toml from 'smol-toml' +import * as toml from 'smol-toml' import { Range } from 'vscode-languageserver-types' import { FileNode } from '../ide' From 3f8102b5fd6eefbb62b498f26ae2f17547a14830 Mon Sep 17 00:00:00 2001 From: Tobbe Lundberg Date: Sun, 9 Jun 2024 20:27:27 +0200 Subject: [PATCH 17/66] RSC: externalize modules for dbAuth (#10765) --- packages/vite/src/rsc/rscBuildAnalyze.ts | 9 +++++--- packages/vite/src/rsc/rscBuildForServer.ts | 9 +++++++- packages/vite/src/rsc/rscBuildForSsr.ts | 24 ++++++++++++++++++++-- 3 files changed, 36 insertions(+), 6 deletions(-) diff --git a/packages/vite/src/rsc/rscBuildAnalyze.ts b/packages/vite/src/rsc/rscBuildAnalyze.ts index 2290461f27ef..b826887d17fd 100644 --- a/packages/vite/src/rsc/rscBuildAnalyze.ts +++ b/packages/vite/src/rsc/rscBuildAnalyze.ts @@ -53,14 +53,17 @@ export async function rscBuildAnalyze() { // safely be external. The more we can externalize the better, because // it means we can skip analyzing them, which means faster build times. external: [ - 'react', - 'minimatch', '@prisma/client', '@prisma/fetch-engine', '@prisma/internals', - 'playwright', + '@redwoodjs/auth-dbauth-api', '@redwoodjs/cookie-jar', '@redwoodjs/server-store', + '@simplewebauthn/server', + 'graphql-scalars', + 'minimatch', + 'playwright', + 'react', ], resolve: { externalConditions: ['react-server'], diff --git a/packages/vite/src/rsc/rscBuildForServer.ts b/packages/vite/src/rsc/rscBuildForServer.ts index 0f6b08d39bd3..ec49631c04bb 100644 --- a/packages/vite/src/rsc/rscBuildForServer.ts +++ b/packages/vite/src/rsc/rscBuildForServer.ts @@ -55,9 +55,16 @@ export async function rscBuildForServer( // Server store has to be externalized, because it's a singleton (shared between FW and App) external: [ '@prisma/client', - 'react-dom', + '@prisma/fetch-engine', + '@prisma/internals', + '@redwoodjs/auth-dbauth-api', '@redwoodjs/cookie-jar', '@redwoodjs/server-store', + '@simplewebauthn/server', + 'graphql-scalars', + 'minimatch', + 'playwright', + 'react-dom', ], resolve: { // These conditions are used in the plugin pipeline, and only affect non-externalized diff --git a/packages/vite/src/rsc/rscBuildForSsr.ts b/packages/vite/src/rsc/rscBuildForSsr.ts index 79c682bba936..1f97b9aebcea 100644 --- a/packages/vite/src/rsc/rscBuildForSsr.ts +++ b/packages/vite/src/rsc/rscBuildForSsr.ts @@ -1,3 +1,5 @@ +import fs from 'node:fs' + import { build as viteBuild } from 'vite' import { cjsInterop } from 'vite-plugin-cjs-interop' @@ -46,13 +48,16 @@ export async function rscBuildForSsr({ // As of vite 5.2 `true` here means "all except node built-ins" noExternal: true, external: [ - 'minimatch', '@prisma/client', '@prisma/fetch-engine', '@prisma/internals', - 'playwright', + '@redwoodjs/auth-dbauth-api', '@redwoodjs/cookie-jar', '@redwoodjs/server-store', + '@simplewebauthn/server', + 'graphql-scalars', + 'minimatch', + 'playwright', ], }, plugins: [ @@ -131,5 +136,20 @@ export async function rscBuildForSsr({ throw new Error('Unexpected vite ssr build output') } + // TODO (RSC): This is horrible. Please help me find a better way to do this. + // Really should not be search/replacing in the built files like this. + const entryServerMjs = fs.readFileSync( + rwPaths.web.distSsrEntryServer, + 'utf-8', + ) + + fs.writeFileSync( + rwPaths.web.distSsrEntryServer, + entryServerMjs.replace( + /import (require\S+) from "graphql-scalars";/, + 'import * as $1 from "graphql-scalars";', + ), + ) + return ssrBuildOutput.output } From 0512b45a8cbc798db22e41d49749090aed53e9af Mon Sep 17 00:00:00 2001 From: Tobbe Lundberg Date: Sun, 9 Jun 2024 21:42:56 +0200 Subject: [PATCH 18/66] RSC: Add 'use client' to auth templates (#10766) --- .../src/templates/web/auth.rsc.ts.template | 26 +++++ .../src/templates/web/auth.rsc.ts.template | 17 ++++ .../src/templates/web/auth.rsc.tsx.template | 66 +++++++++++++ .../src/templates/web/auth.rsc.ts.template | 94 +++++++++++++++++++ .../src/templates/web/auth.rsc.ts.template | 7 ++ .../web/auth.webAuthn.rsc.ts.template | 8 ++ .../src/templates/web/auth.rsc.ts.template | 34 +++++++ .../src/templates/web/auth.rsc.ts.template | 10 ++ .../src/templates/web/auth.rsc.ts.template | 12 +++ .../src/templates/web/auth.rsc.tsx.template | 63 +++++++++++++ .../src/auth/__tests__/authTasks.test.ts | 12 ++- .../src/auth/__tests__/setupHelpers.test.ts | 10 ++ packages/cli-helpers/src/auth/authTasks.ts | 14 ++- 13 files changed, 369 insertions(+), 4 deletions(-) create mode 100644 packages/auth-providers/auth0/setup/src/templates/web/auth.rsc.ts.template create mode 100644 packages/auth-providers/azureActiveDirectory/setup/src/templates/web/auth.rsc.ts.template create mode 100644 packages/auth-providers/clerk/setup/src/templates/web/auth.rsc.tsx.template create mode 100644 packages/auth-providers/custom/setup/src/templates/web/auth.rsc.ts.template create mode 100644 packages/auth-providers/dbAuth/setup/src/templates/web/auth.rsc.ts.template create mode 100644 packages/auth-providers/dbAuth/setup/src/templates/web/auth.webAuthn.rsc.ts.template create mode 100644 packages/auth-providers/firebase/setup/src/templates/web/auth.rsc.ts.template create mode 100644 packages/auth-providers/netlify/setup/src/templates/web/auth.rsc.ts.template create mode 100644 packages/auth-providers/supabase/setup/src/templates/web/auth.rsc.ts.template create mode 100644 packages/auth-providers/supertokens/setup/src/templates/web/auth.rsc.tsx.template diff --git a/packages/auth-providers/auth0/setup/src/templates/web/auth.rsc.ts.template b/packages/auth-providers/auth0/setup/src/templates/web/auth.rsc.ts.template new file mode 100644 index 000000000000..b33c381df6a1 --- /dev/null +++ b/packages/auth-providers/auth0/setup/src/templates/web/auth.rsc.ts.template @@ -0,0 +1,26 @@ +'use client' + +import { Auth0Client } from '@auth0/auth0-spa-js' + +import { createAuth } from '@redwoodjs/auth-auth0-web' + +const auth0 = new Auth0Client({ + domain: process.env.AUTH0_DOMAIN || '', + clientId: process.env.AUTH0_CLIENT_ID || '', + authorizationParams: { + redirect_uri: process.env.AUTH0_REDIRECT_URI, + audience: process.env.AUTH0_AUDIENCE, + }, + + // Storing tokens in the browser's local storage provides persistence across page refreshes and browser tabs. + // But if an attacker can run JavaScript in your SPA using a cross-site scripting (XSS) attack, + // they can retrieve the tokens stored in local storage. + // See https://auth0.com/docs/libraries/auth0-spa-js#change-storage-options. + cacheLocation: 'localstorage', + + // `useRefreshTokens` is required for automatically extending sessions beyond what's set in the initial JWT expiration. + // See https://auth0.com/docs/tokens/refresh-tokens. + // useRefreshTokens: true, +}) + +export const { AuthProvider, useAuth } = createAuth(auth0) diff --git a/packages/auth-providers/azureActiveDirectory/setup/src/templates/web/auth.rsc.ts.template b/packages/auth-providers/azureActiveDirectory/setup/src/templates/web/auth.rsc.ts.template new file mode 100644 index 000000000000..6e7a7c56373a --- /dev/null +++ b/packages/auth-providers/azureActiveDirectory/setup/src/templates/web/auth.rsc.ts.template @@ -0,0 +1,17 @@ +'use client' + +import { PublicClientApplication } from '@azure/msal-browser' + +import { createAuth } from '@redwoodjs/auth-azure-active-directory-web' + +const azureActiveDirectoryClient = new PublicClientApplication({ + auth: { + clientId: process.env.AZURE_ACTIVE_DIRECTORY_CLIENT_ID || '', + authority: process.env.AZURE_ACTIVE_DIRECTORY_AUTHORITY, + redirectUri: process.env.AZURE_ACTIVE_DIRECTORY_REDIRECT_URI, + postLogoutRedirectUri: + process.env.AZURE_ACTIVE_DIRECTORY_LOGOUT_REDIRECT_URI, + }, +}) + +export const { AuthProvider, useAuth } = createAuth(azureActiveDirectoryClient) diff --git a/packages/auth-providers/clerk/setup/src/templates/web/auth.rsc.tsx.template b/packages/auth-providers/clerk/setup/src/templates/web/auth.rsc.tsx.template new file mode 100644 index 000000000000..95e8bcc2428f --- /dev/null +++ b/packages/auth-providers/clerk/setup/src/templates/web/auth.rsc.tsx.template @@ -0,0 +1,66 @@ +'use client' + +import React, { useEffect } from 'react' + +import { ClerkProvider, useUser } from '@clerk/clerk-react' + +import { createAuth } from '@redwoodjs/auth-clerk-web' +import { navigate } from '@redwoodjs/router' + +export const { AuthProvider: ClerkRwAuthProvider, useAuth } = createAuth() + +const ClerkStatusUpdater = () => { + const { isSignedIn, user, isLoaded } = useUser() + const { reauthenticate } = useAuth() + + useEffect(() => { + if (isLoaded) { + reauthenticate() + } + }, [isSignedIn, user, reauthenticate, isLoaded]) + + return null +} + +type ClerkOptions = + | { publishableKey: string; frontendApi?: never } + | { publishableKey?: never; frontendApi: string } + +interface Props { + children: React.ReactNode +} + +const ClerkProviderWrapper = ({ + children, + clerkOptions, +}: Props & { clerkOptions: ClerkOptions }) => { + const { reauthenticate } = useAuth() + + return ( + reauthenticate().then(() => navigate(to))} + > + {children} + + + ) +} + +export const AuthProvider = ({ children }: Props) => { + const publishableKey = process.env.CLERK_PUBLISHABLE_KEY + const frontendApi = + process.env.CLERK_FRONTEND_API_URL || process.env.CLERK_FRONTEND_API + + const clerkOptions: ClerkOptions = publishableKey + ? { publishableKey } + : { frontendApi } + + return ( + + + {children} + + + ) +} diff --git a/packages/auth-providers/custom/setup/src/templates/web/auth.rsc.ts.template b/packages/auth-providers/custom/setup/src/templates/web/auth.rsc.ts.template new file mode 100644 index 000000000000..a18efd7698c9 --- /dev/null +++ b/packages/auth-providers/custom/setup/src/templates/web/auth.rsc.ts.template @@ -0,0 +1,94 @@ +'use client' + +import { createAuthentication } from '@redwoodjs/auth' + +// If you're integrating with an auth service provider you should delete this interface. +// Instead you should import the type from their auth client sdk. +export interface AuthClient { + login: () => User + logout: () => void + signup: () => User + getToken: () => string + getUserMetadata: () => User | null +} + +// If you're integrating with an auth service provider you should delete this interface. +// This type should be inferred from the general interface above. +interface User { + // The name of the id variable will vary depending on what auth service + // provider you're integrating with. Another common name is `sub` + id: string + email?: string + username?: string + roles: string[] +} + +// If you're integrating with an auth service provider you should delete this interface +// This type should be inferred from the general interface above +export interface ValidateResetTokenResponse { + error?: string + [key: string]: string | undefined +} + +// Replace this with the auth service provider client sdk +const client = { + login: () => ({ + id: 'unique-user-id', + email: 'email@example.com', + roles: [], + }), + signup: () => ({ + id: 'unique-user-id', + email: 'email@example.com', + roles: [], + }), + logout: () => {}, + getToken: () => 'super-secret-short-lived-token', + getUserMetadata: () => ({ + id: 'unique-user-id', + email: 'email@example.com', + roles: [], + }), +} + +function createAuth() { + const authImplementation = createAuthImplementation(client) + + // You can pass custom provider hooks here if you need to as a second + // argument. See the Redwood framework source code for how that's used + return createAuthentication(authImplementation) +} + +// This is where most of the integration work will take place. You should keep +// the shape of this object (i.e. keep all the key names) but change all the +// values/functions to use methods from the auth service provider client sdk +// you're integrating with +function createAuthImplementation(client: AuthClient) { + return { + type: 'custom-auth', + client, + login: async () => client.login(), + logout: async () => client.logout(), + signup: async () => client.signup(), + getToken: async () => client.getToken(), + /** + * Actual user metadata might look something like this + * { + * "id": "11111111-2222-3333-4444-5555555555555", + * "aud": "authenticated", + * "role": "authenticated", + * "roles": ["admin"], + * "email": "email@example.com", + * "app_metadata": { + * "provider": "email" + * }, + * "user_metadata": null, + * "created_at": "2016-05-15T19:53:12.368652374-07:00", + * "updated_at": "2016-05-15T19:53:12.368652374-07:00" + * } + */ + getUserMetadata: async () => client.getUserMetadata(), + } +} + +export const { AuthProvider, useAuth } = createAuth() diff --git a/packages/auth-providers/dbAuth/setup/src/templates/web/auth.rsc.ts.template b/packages/auth-providers/dbAuth/setup/src/templates/web/auth.rsc.ts.template new file mode 100644 index 000000000000..ce4ac92d89a9 --- /dev/null +++ b/packages/auth-providers/dbAuth/setup/src/templates/web/auth.rsc.ts.template @@ -0,0 +1,7 @@ +'use client' + +import { createDbAuthClient, createAuth } from '@redwoodjs/auth-dbauth-web' + +const dbAuthClient = createDbAuthClient() + +export const { AuthProvider, useAuth } = createAuth(dbAuthClient) diff --git a/packages/auth-providers/dbAuth/setup/src/templates/web/auth.webAuthn.rsc.ts.template b/packages/auth-providers/dbAuth/setup/src/templates/web/auth.webAuthn.rsc.ts.template new file mode 100644 index 000000000000..cd2530e9a520 --- /dev/null +++ b/packages/auth-providers/dbAuth/setup/src/templates/web/auth.webAuthn.rsc.ts.template @@ -0,0 +1,8 @@ +'use client' + +import { createDbAuthClient, createAuth } from '@redwoodjs/auth-dbauth-web' +import WebAuthnClient from '@redwoodjs/auth-dbauth-web/webAuthn' + +const dbAuthClient = createDbAuthClient({ webAuthn: new WebAuthnClient() }) + +export const { AuthProvider, useAuth } = createAuth(dbAuthClient) diff --git a/packages/auth-providers/firebase/setup/src/templates/web/auth.rsc.ts.template b/packages/auth-providers/firebase/setup/src/templates/web/auth.rsc.ts.template new file mode 100644 index 000000000000..f7551a2634d5 --- /dev/null +++ b/packages/auth-providers/firebase/setup/src/templates/web/auth.rsc.ts.template @@ -0,0 +1,34 @@ +'use client' + +import { initializeApp, getApp, getApps } from 'firebase/app' +import * as firebaseAuth from 'firebase/auth' + +import { createAuth } from '@redwoodjs/auth-firebase-web' + +const firebaseConfig = { + apiKey: process.env.FIREBASE_API_KEY, + authDomain: process.env.FIREBASE_AUTH_DOMAIN, + + // Optional config, may be needed, depending on how you use firebase + // projectId: process.env.FIREBASE_PROJECT_ID, + // storageBucket: process.env.FIREBASE_STORAGE_BUCKET, + // messagingSenderId: process.env.FIREBASE_MESSAGING_SENDER_ID, + // appId: process.env.FIREBASE_APP_ID, +} + +const firebaseApp = ((config) => { + const apps = getApps() + + if (!apps.length) { + initializeApp(config) + } + + return getApp() +})(firebaseConfig) + +export const firebaseClient = { + firebaseAuth, + firebaseApp, // optional +} + +export const { AuthProvider, useAuth } = createAuth(firebaseClient) diff --git a/packages/auth-providers/netlify/setup/src/templates/web/auth.rsc.ts.template b/packages/auth-providers/netlify/setup/src/templates/web/auth.rsc.ts.template new file mode 100644 index 000000000000..2eb96c85a512 --- /dev/null +++ b/packages/auth-providers/netlify/setup/src/templates/web/auth.rsc.ts.template @@ -0,0 +1,10 @@ +'use client' + +import netlifyIdentity from 'netlify-identity-widget' + +import { createAuth } from '@redwoodjs/auth-netlify-web' +import { isBrowser } from '@redwoodjs/prerender/browserUtils' + +isBrowser && netlifyIdentity.init() + +export const { AuthProvider, useAuth } = createAuth(netlifyIdentity) diff --git a/packages/auth-providers/supabase/setup/src/templates/web/auth.rsc.ts.template b/packages/auth-providers/supabase/setup/src/templates/web/auth.rsc.ts.template new file mode 100644 index 000000000000..50ac2b5b366b --- /dev/null +++ b/packages/auth-providers/supabase/setup/src/templates/web/auth.rsc.ts.template @@ -0,0 +1,12 @@ +'use client' + +import { createClient } from '@supabase/supabase-js' + +import { createAuth } from '@redwoodjs/auth-supabase-web' + +const supabaseClient = createClient( + process.env.SUPABASE_URL || '', + process.env.SUPABASE_KEY || '' +) + +export const { AuthProvider, useAuth } = createAuth(supabaseClient) diff --git a/packages/auth-providers/supertokens/setup/src/templates/web/auth.rsc.tsx.template b/packages/auth-providers/supertokens/setup/src/templates/web/auth.rsc.tsx.template new file mode 100644 index 000000000000..40c2b4d5a827 --- /dev/null +++ b/packages/auth-providers/supertokens/setup/src/templates/web/auth.rsc.tsx.template @@ -0,0 +1,63 @@ +'use client' + +import SuperTokens, { SuperTokensWrapper } from 'supertokens-auth-react' +import Session from 'supertokens-auth-react/recipe/session' +import ThirdPartyEmailPassword, { + Github, + Google, + Apple, +} from 'supertokens-auth-react/recipe/thirdpartyemailpassword' +import { ThirdPartyEmailPasswordPreBuiltUI } from 'supertokens-auth-react/recipe/thirdpartyemailpassword/prebuiltui' + +import { createAuth } from '@redwoodjs/auth-supertokens-web' +import { isBrowser } from '@redwoodjs/prerender/browserUtils' + +const websiteDomain = + process.env.SUPERTOKENS_WEBSITE_DOMAIN || 'http://localhost:8910' +const apiDomain = process.env.SUPERTOKENS_API_DOMAIN || websiteDomain +const apiGatewayPath = + process.env.SUPERTOKENS_API_GATEWAY_PATH || '/.redwood/functions' + +const superTokensClient = { + sessionRecipe: Session, + redirectToAuth: SuperTokens.redirectToAuth, +} + +export const PreBuiltUI = [ThirdPartyEmailPasswordPreBuiltUI] + +isBrowser && + SuperTokens.init({ + appInfo: { + appName: process.env.SUPERTOKENS_APP_NAME, + apiDomain, + websiteDomain, + apiGatewayPath, + websiteBasePath: '/auth', + apiBasePath: '/auth', + }, + recipeList: [ + Session.init(), + ThirdPartyEmailPassword.init({ + signInAndUpFeature: { + providers: [Github.init(), Google.init(), Apple.init()], + }, + }), + ], + }) + +const { AuthProvider: SuperTokensAuthProvider, useAuth } = + createAuth(superTokensClient) + +interface Props { + children: React.ReactNode +} + +const AuthProvider = ({ children }: Props) => { + return ( + + {children} + + ) +} + +export { AuthProvider, useAuth } diff --git a/packages/cli-helpers/src/auth/__tests__/authTasks.test.ts b/packages/cli-helpers/src/auth/__tests__/authTasks.test.ts index 25a96399f168..a46972fafd6f 100644 --- a/packages/cli-helpers/src/auth/__tests__/authTasks.test.ts +++ b/packages/cli-helpers/src/auth/__tests__/authTasks.test.ts @@ -58,7 +58,7 @@ import fs from 'fs' import path from 'path' import { vol } from 'memfs' -import { vi, beforeEach, describe, it, expect, test } from 'vitest' +import { vi, afterAll, beforeEach, describe, it, expect, test } from 'vitest' import { getPaths } from '../../lib/paths.js' import { isTypeScriptProject } from '../../lib/project.js' @@ -92,6 +92,12 @@ function platformPath(filePath: string) { return filePath.split('/').join(path.sep) } +const original_RWJS_CWD = process.env.RWJS_CWD + +afterAll(() => { + process.env.RWJS_CWD = original_RWJS_CWD +}) + beforeEach(() => { vi.restoreAllMocks() vi.mocked(isTypeScriptProject).mockReturnValue(true) @@ -100,7 +106,10 @@ beforeEach(() => { mockedPathGenerator('App.tsx', 'Routes.tsx'), ) + process.env.RWJS_CWD = getPaths().base + vol.fromJSON({ + [path.join(getPaths().base, 'redwood.toml')]: '# redwood.toml', [path.join( getPaths().base, platformPath('/templates/web/auth.ts.template'), @@ -152,6 +161,7 @@ describe('authTasks', () => { // though it was on the mock filesystem. vol.reset() vol.fromJSON({ + [path.join(getPaths().base, 'redwood.toml')]: '# redwood.toml', [getPaths().web.app]: webAppTsx, [getPaths().api.graphql]: graphqlTs, [getPaths().web.routes]: routesTsx, diff --git a/packages/cli-helpers/src/auth/__tests__/setupHelpers.test.ts b/packages/cli-helpers/src/auth/__tests__/setupHelpers.test.ts index 068059935b46..96ca83834890 100644 --- a/packages/cli-helpers/src/auth/__tests__/setupHelpers.test.ts +++ b/packages/cli-helpers/src/auth/__tests__/setupHelpers.test.ts @@ -8,6 +8,14 @@ vi.mock('@redwoodjs/telemetry', () => { } }) +vi.mock('@redwoodjs/project-config', async (importOriginal) => { + const originalProjectConfig = await importOriginal() + return { + ...originalProjectConfig, + getConfig: () => ({}), + } +}) + vi.mock('../../lib/paths', () => { const path = require('path') const __dirname = path.resolve() @@ -46,6 +54,8 @@ import prompts from 'prompts' import { vi, describe, afterEach, it, expect } from 'vitest' import type { Mock, MockedFunction } from 'vitest' +import type * as ProjectConfig from '@redwoodjs/project-config' + import { standardAuthHandler } from '../setupHelpers.js' describe('Auth generator tests', () => { diff --git a/packages/cli-helpers/src/auth/authTasks.ts b/packages/cli-helpers/src/auth/authTasks.ts index 145172daab79..576fe25ce905 100644 --- a/packages/cli-helpers/src/auth/authTasks.ts +++ b/packages/cli-helpers/src/auth/authTasks.ts @@ -3,7 +3,7 @@ import path from 'path' import type { ListrRenderer, ListrTask, ListrTaskWrapper } from 'listr2' -import { resolveFile } from '@redwoodjs/project-config' +import { getConfig, resolveFile } from '@redwoodjs/project-config' import { colors } from '../lib/colors.js' import type { ExistingFiles } from '../lib/index.js' @@ -342,12 +342,20 @@ export const createWebAuth = (basedir: string, webAuthn: boolean) => { const templatesBaseDir = path.join(basedir, 'templates', 'web') const templates = fs.readdirSync(templatesBaseDir) + const rscEnabled = getConfig().experimental?.rsc?.enabled + + const templateStart = + 'auth' + (webAuthn ? '.webAuthn' : '') + (rscEnabled ? '.rsc' : '') + '.ts' + const templateFileName = templates.find((template) => { - return template.startsWith('auth.' + (webAuthn ? 'webAuthn.ts' : 'ts')) + return template.startsWith(templateStart) }) if (!templateFileName) { - throw new Error('Could not find the auth.ts template') + throw new Error( + 'Could not find the auth.ts(x) template, looking for filename starting with ' + + templateStart, + ) } const templateExtension = templateFileName.split('.').at(-2) From 93222ddfc51a650bc9330725c7f3d56cb7847f9e Mon Sep 17 00:00:00 2001 From: Tobbe Lundberg Date: Sun, 9 Jun 2024 22:03:01 +0200 Subject: [PATCH 19/66] chore(naming): Rename variable to match usage (#10767) --- .vscode/settings.json | 1 + .../vite-plugin-rsc-route-auto-loader.test.mts | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 5ff09f5935a6..65eceb57b6b3 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -32,6 +32,7 @@ "Flightcontrol", "graphiql", "memfs", + "mojombo", "OGIMAGE", "opentelemetry", "pino", diff --git a/packages/vite/src/plugins/__tests__/vite-plugin-rsc-route-auto-loader.test.mts b/packages/vite/src/plugins/__tests__/vite-plugin-rsc-route-auto-loader.test.mts index 795aa276bc9b..90e71f4fae30 100644 --- a/packages/vite/src/plugins/__tests__/vite-plugin-rsc-route-auto-loader.test.mts +++ b/packages/vite/src/plugins/__tests__/vite-plugin-rsc-route-auto-loader.test.mts @@ -1,11 +1,12 @@ import path from 'node:path' + import { vol } from 'memfs' import { normalizePath } from 'vite' import { afterAll, beforeAll, describe, it, expect, vi, Mock, beforeEach, afterEach } from 'vitest' import { processPagesDir } from '@redwoodjs/project-config' -import type ProjectConfig from '@redwoodjs/project-config' +import type * as ProjectConfig from '@redwoodjs/project-config' import { rscRoutesAutoLoader } from '../vite-plugin-rsc-routes-auto-loader' @@ -14,14 +15,14 @@ vi.mock('fs', async () => ({ default: (await import('memfs')).fs })) const RWJS_CWD = process.env.RWJS_CWD vi.mock('@redwoodjs/project-config', async (importOriginal) => { - const originalGetPaths = await importOriginal() + const originalProjectConfig = await importOriginal() return { - ...originalGetPaths, + ...originalProjectConfig, getPaths: () => { return { - ...originalGetPaths.getPaths(), + ...originalProjectConfig.getPaths(), web: { - ...originalGetPaths.getPaths().web, + ...originalProjectConfig.getPaths().web, routes: '/Users/mojombo/rw-app/web/src/Routes.tsx', }, } From 0e9698b8a67848b3c26fe0db540b8a734f45b5e7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 19:41:52 +0100 Subject: [PATCH 20/66] chore(deps): update dependency @types/envinfo to v7.8.4 (#10774) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [@types/envinfo](https://togithub.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/envinfo) ([source](https://togithub.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/envinfo)) | [`7.8.3` -> `7.8.4`](https://renovatebot.com/diffs/npm/@types%2fenvinfo/7.8.3/7.8.4) | [![age](https://developer.mend.io/api/mc/badges/age/npm/@types%2fenvinfo/7.8.4?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/@types%2fenvinfo/7.8.4?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/@types%2fenvinfo/7.8.3/7.8.4?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@types%2fenvinfo/7.8.3/7.8.4?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/redwoodjs/redwood). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- packages/telemetry/package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/telemetry/package.json b/packages/telemetry/package.json index dde0c52a8e2d..4c820837be1d 100644 --- a/packages/telemetry/package.json +++ b/packages/telemetry/package.json @@ -31,7 +31,7 @@ "yargs": "17.7.2" }, "devDependencies": { - "@types/envinfo": "7.8.3", + "@types/envinfo": "7.8.4", "@types/uuid": "9.0.8", "@types/yargs": "17.0.32", "tsx": "4.10.3", diff --git a/yarn.lock b/yarn.lock index bc3c25e103ba..77f2ef8210c5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8669,7 +8669,7 @@ __metadata: dependencies: "@redwoodjs/project-config": "workspace:*" "@redwoodjs/structure": "workspace:*" - "@types/envinfo": "npm:7.8.3" + "@types/envinfo": "npm:7.8.4" "@types/uuid": "npm:9.0.8" "@types/yargs": "npm:17.0.32" "@whatwg-node/fetch": "npm:0.9.17" @@ -10828,10 +10828,10 @@ __metadata: languageName: node linkType: hard -"@types/envinfo@npm:7.8.3": - version: 7.8.3 - resolution: "@types/envinfo@npm:7.8.3" - checksum: 10c0/31a504f317c8b2c93dda513d3c117f518f27cf3f36aba65e78bf908927f9ef304351fe49d6ba19515994b91d1d1c23a089bfd3c8b0f1e84737606f6791a05ff6 +"@types/envinfo@npm:7.8.4": + version: 7.8.4 + resolution: "@types/envinfo@npm:7.8.4" + checksum: 10c0/843ccff3edf8c62f2e01a1bdc1712ca67032e6b84b54610cf973c31aed485a537a5e441875fd6974abd9dcc746086ffb21236c04f79b274045fb0868cab0df9d languageName: node linkType: hard From 828ac3f090337b7fe955e527b33793d86b102d91 Mon Sep 17 00:00:00 2001 From: Tom Mrazauskas Date: Mon, 10 Jun 2024 21:43:19 +0300 Subject: [PATCH 21/66] chore: upgrade TSTyche to v2 (#10769) TSTyche 2 shipped today. Now it has watch mode! You can run `yarn test:types --watch`. Also matchers got improved / renamed. For instance, assignability can be checked both ways using `.toBeAssignableTo()` and `.toBeAssignableWith()`. I have updated the type tests with the new names accordingly. --- package.json | 2 +- packages/router/package.json | 2 +- .../src/__typetests__/routeParamsTypes.test.ts | 10 +++++----- packages/web/package.json | 2 +- .../web/src/__typetests__/cellProps.test.tsx | 12 ++++++------ .../src/__typetests__/cellSuccessData.test.tsx | 8 ++++---- yarn.lock | 16 ++++++++-------- 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/package.json b/package.json index e6ecce97a736..3200095c4449 100644 --- a/package.json +++ b/package.json @@ -104,7 +104,7 @@ "ora": "7.0.1", "prompts": "2.4.2", "rimraf": "5.0.7", - "tstyche": "1.1.0", + "tstyche": "2.0.0", "tsx": "4.10.3", "typescript": "5.4.5", "vitest": "1.6.0", diff --git a/packages/router/package.json b/packages/router/package.json index 606285d61c06..3c7118d179b4 100644 --- a/packages/router/package.json +++ b/packages/router/package.json @@ -38,7 +38,7 @@ "@types/react-dom": "^18.2.19", "react": "19.0.0-beta-04b058868c-20240508", "react-dom": "19.0.0-beta-04b058868c-20240508", - "tstyche": "1.1.0", + "tstyche": "2.0.0", "typescript": "5.4.5", "vitest": "1.6.0" }, diff --git a/packages/router/src/__typetests__/routeParamsTypes.test.ts b/packages/router/src/__typetests__/routeParamsTypes.test.ts index 36c674d527ba..df4a4f1e815c 100644 --- a/packages/router/src/__typetests__/routeParamsTypes.test.ts +++ b/packages/router/src/__typetests__/routeParamsTypes.test.ts @@ -130,19 +130,19 @@ describe('RouteParams<>', () => { describe('ParamType<>', () => { test('Float', () => { - expect>().type.toBeAssignable(1.02) + expect>().type.toBeAssignableWith(1.02) }) test('Boolean', () => { - expect>().type.toBeAssignable(true) - expect>().type.toBeAssignable(false) + expect>().type.toBeAssignableWith(true) + expect>().type.toBeAssignableWith(false) }) test('Int', () => { - expect>().type.toBeAssignable(51) + expect>().type.toBeAssignableWith(51) }) test('String', () => { - expect>().type.toBeAssignable('bazinga') + expect>().type.toBeAssignableWith('bazinga') }) }) diff --git a/packages/web/package.json b/packages/web/package.json index 23fb0f0ab03f..449aa192ea4d 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -63,7 +63,7 @@ "nodemon": "3.1.0", "react": "19.0.0-beta-04b058868c-20240508", "react-dom": "19.0.0-beta-04b058868c-20240508", - "tstyche": "1.1.0", + "tstyche": "2.0.0", "typescript": "5.4.5", "vitest": "1.6.0" }, diff --git a/packages/web/src/__typetests__/cellProps.test.tsx b/packages/web/src/__typetests__/cellProps.test.tsx index 0b4f8c37e1dc..6797e42bbcf6 100644 --- a/packages/web/src/__typetests__/cellProps.test.tsx +++ b/packages/web/src/__typetests__/cellProps.test.tsx @@ -68,7 +68,7 @@ describe('CellProps mapper type', () => { ExampleQueryVariables > - expect().type.toBeAssignable({ + expect().type.toBeAssignableWith({ customProp: 55, category: 'Dinner', saved: true, @@ -83,7 +83,7 @@ describe('CellProps mapper type', () => { EmptyVariables > - expect().type.toBeAssignable({ + expect().type.toBeAssignableWith({ customProp: 55, }) }) @@ -111,7 +111,7 @@ describe('CellProps mapper type', () => { > // Note that the gql variables are no longer required here - expect().type.toBeAssignable({ + expect().type.toBeAssignableWith({ word: 'abracadabra', customProp: 99, }) @@ -134,7 +134,7 @@ describe('CellProps mapper type', () => { EmptyVariables > - expect().type.toBeAssignable({ + expect().type.toBeAssignableWith({ fetchPolicy: 'cache-only', customProp: 55, }) @@ -163,7 +163,7 @@ describe('CellProps mapper type', () => { > // Note that the gql variables are no longer required here - expect().type.toBeAssignable({ + expect().type.toBeAssignableWith({ customProp: 99, }) }) @@ -185,7 +185,7 @@ describe('CellProps mapper type', () => { EmptyVariables > - expect().type.toBeAssignable({ + expect().type.toBeAssignableWith({ customProp: 55, }) }) diff --git a/packages/web/src/__typetests__/cellSuccessData.test.tsx b/packages/web/src/__typetests__/cellSuccessData.test.tsx index 5db88f5dc69e..b8dd277ba996 100644 --- a/packages/web/src/__typetests__/cellSuccessData.test.tsx +++ b/packages/web/src/__typetests__/cellSuccessData.test.tsx @@ -9,13 +9,13 @@ describe('CellSuccessData', () => { foo: '', } - expect(value).type.toEqual<{ foo: string }>() + expect(value).type.toBe<{ foo: string }>() }) it('removes null and undefined from properties', () => { const value: CellSuccessData<{ foo?: string | null }> = { foo: '' } - expect(value).type.toEqual<{ foo: string }>() + expect(value).type.toBe<{ foo: string }>() }) }) @@ -30,7 +30,7 @@ describe('CellSuccessData', () => { bar: '', } - expect(value).type.toEqual<{ foo: string; bar: string }>() + expect(value).type.toBe<{ foo: string; bar: string }>() }) it('does not remove null or undefined from properties', () => { @@ -42,7 +42,7 @@ describe('CellSuccessData', () => { bar: '', } - expect(value).type.toEqual<{ foo?: string | null; bar?: string | null }>() + expect(value).type.toBe<{ foo?: string | null; bar?: string | null }>() }) }) }) diff --git a/yarn.lock b/yarn.lock index 77f2ef8210c5..229abbd53fe6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8599,7 +8599,7 @@ __metadata: core-js: "npm:3.37.1" react: "npm:19.0.0-beta-04b058868c-20240508" react-dom: "npm:19.0.0-beta-04b058868c-20240508" - tstyche: "npm:1.1.0" + tstyche: "npm:2.0.0" typescript: "npm:5.4.5" vitest: "npm:1.6.0" peerDependencies: @@ -8835,7 +8835,7 @@ __metadata: react-hot-toast: "npm:2.4.1" stacktracey: "npm:2.1.8" ts-toolbelt: "npm:9.6.0" - tstyche: "npm:1.1.0" + tstyche: "npm:2.0.0" typescript: "npm:5.4.5" vitest: "npm:1.6.0" peerDependencies: @@ -28162,7 +28162,7 @@ __metadata: ora: "npm:7.0.1" prompts: "npm:2.4.2" rimraf: "npm:5.0.7" - tstyche: "npm:1.1.0" + tstyche: "npm:2.0.0" tsx: "npm:4.10.3" typescript: "npm:5.4.5" vitest: "npm:1.6.0" @@ -30378,17 +30378,17 @@ __metadata: languageName: node linkType: hard -"tstyche@npm:1.1.0": - version: 1.1.0 - resolution: "tstyche@npm:1.1.0" +"tstyche@npm:2.0.0": + version: 2.0.0 + resolution: "tstyche@npm:2.0.0" peerDependencies: typescript: 4.x || 5.x peerDependenciesMeta: typescript: optional: true bin: - tstyche: build/bin.js - checksum: 10c0/4a54afed4c8081baaa13a1b5eb7e2eff1a39dbede912986b5f32c7af723eb4580acaf9aacfb3fd034705126df3491d61dcf09f3c1344d15cd617c813ea9f0be6 + tstyche: ./build/bin.js + checksum: 10c0/3688e63b0b5ba3b58417b8e515ce4bc3d2ca53357914028d954cda83d14d169d091cf8f28bb02371120d3363d183821d554c6c031cf74f28ff443d065c8e5695 languageName: node linkType: hard From b2042419d9c8faead88f164722565a067bf3d306 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 19:48:51 +0100 Subject: [PATCH 22/66] fix(deps): update dependency systeminformation to v5.22.10 (#10785) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [systeminformation](https://systeminformation.io) ([source](https://togithub.com/sebhildebrandt/systeminformation)) | [`5.22.9` -> `5.22.10`](https://renovatebot.com/diffs/npm/systeminformation/5.22.9/5.22.10) | [![age](https://developer.mend.io/api/mc/badges/age/npm/systeminformation/5.22.10?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/systeminformation/5.22.10?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/systeminformation/5.22.9/5.22.10?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/systeminformation/5.22.9/5.22.10?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
sebhildebrandt/systeminformation (systeminformation) ### [`v5.22.10`](https://togithub.com/sebhildebrandt/systeminformation/compare/v5.22.9...v5.22.10) [Compare Source](https://togithub.com/sebhildebrandt/systeminformation/compare/v5.22.9...v5.22.10)
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/redwoodjs/redwood). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- packages/cli/package.json | 2 +- packages/create-redwood-app/package.json | 2 +- packages/internal/package.json | 2 +- packages/telemetry/package.json | 2 +- yarn.lock | 16 ++++++++-------- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/cli/package.json b/packages/cli/package.json index 289ca6b0f707..cc4bd3bc6d74 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -76,7 +76,7 @@ "semver": "7.6.2", "smol-toml": "1.2.1", "string-env-interpolation": "1.0.1", - "systeminformation": "5.22.9", + "systeminformation": "5.22.10", "terminal-link": "2.1.1", "title-case": "3.0.3", "uuid": "9.0.1", diff --git a/packages/create-redwood-app/package.json b/packages/create-redwood-app/package.json index f6921f956a41..a6c12296d300 100644 --- a/packages/create-redwood-app/package.json +++ b/packages/create-redwood-app/package.json @@ -42,7 +42,7 @@ "fs-extra": "11.2.0", "klaw-sync": "6.0.0", "semver": "7.6.2", - "systeminformation": "5.22.9", + "systeminformation": "5.22.10", "terminal-link": "2.1.1", "tsx": "4.10.3", "untildify": "4.0.0", diff --git a/packages/internal/package.json b/packages/internal/package.json index 566ed7c7b114..045169c50d7c 100644 --- a/packages/internal/package.json +++ b/packages/internal/package.json @@ -64,7 +64,7 @@ "rimraf": "5.0.7", "source-map": "0.7.4", "string-env-interpolation": "1.0.1", - "systeminformation": "5.22.9", + "systeminformation": "5.22.10", "terminal-link": "2.1.1", "ts-node": "10.9.2", "typescript": "5.4.5" diff --git a/packages/telemetry/package.json b/packages/telemetry/package.json index 4c820837be1d..5d86e08aae19 100644 --- a/packages/telemetry/package.json +++ b/packages/telemetry/package.json @@ -26,7 +26,7 @@ "@whatwg-node/fetch": "0.9.17", "ci-info": "4.0.0", "envinfo": "7.13.0", - "systeminformation": "5.22.9", + "systeminformation": "5.22.10", "uuid": "9.0.1", "yargs": "17.7.2" }, diff --git a/yarn.lock b/yarn.lock index 229abbd53fe6..a7ec0625da56 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8046,7 +8046,7 @@ __metadata: semver: "npm:7.6.2" smol-toml: "npm:1.2.1" string-env-interpolation: "npm:1.0.1" - systeminformation: "npm:5.22.9" + systeminformation: "npm:5.22.10" terminal-link: "npm:2.1.1" title-case: "npm:3.0.3" tsx: "npm:4.10.3" @@ -8373,7 +8373,7 @@ __metadata: rimraf: "npm:5.0.7" source-map: "npm:0.7.4" string-env-interpolation: "npm:1.0.1" - systeminformation: "npm:5.22.9" + systeminformation: "npm:5.22.10" terminal-link: "npm:2.1.1" ts-node: "npm:10.9.2" tsx: "npm:4.10.3" @@ -8675,7 +8675,7 @@ __metadata: "@whatwg-node/fetch": "npm:0.9.17" ci-info: "npm:4.0.0" envinfo: "npm:7.13.0" - systeminformation: "npm:5.22.9" + systeminformation: "npm:5.22.10" tsx: "npm:4.10.3" typescript: "npm:5.4.5" uuid: "npm:9.0.1" @@ -15172,7 +15172,7 @@ __metadata: fs-extra: "npm:11.2.0" klaw-sync: "npm:6.0.0" semver: "npm:7.6.2" - systeminformation: "npm:5.22.9" + systeminformation: "npm:5.22.10" terminal-link: "npm:2.1.1" tsx: "npm:4.10.3" untildify: "npm:4.0.0" @@ -29717,12 +29717,12 @@ __metadata: languageName: node linkType: hard -"systeminformation@npm:5.22.9": - version: 5.22.9 - resolution: "systeminformation@npm:5.22.9" +"systeminformation@npm:5.22.10": + version: 5.22.10 + resolution: "systeminformation@npm:5.22.10" bin: systeminformation: lib/cli.js - checksum: 10c0/c8aa32c4e0729df3ee23c04be7532fbd259213c016010ae1e85b06cbf9e38adfaa2921162e291c2afca3a0ba444f233a1673510daf2abeddfd3877de827941b2 + checksum: 10c0/ffe7774acdb04a21a10651c227f8d319b7798dbe4cbb21e473e183511b59e2c2ca14a33e3acb89030e74380e758e2c38d4289104fc5596e5970e19b6a6dab113 conditions: (os=darwin | os=linux | os=win32 | os=freebsd | os=openbsd | os=netbsd | os=sunos | os=android) languageName: node linkType: hard From 8e9634bf153f06cbeb92f80960508916d75db75a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 20:05:13 +0100 Subject: [PATCH 23/66] chore(deps): update dependency @types/mjml to v4.7.4 (#10777) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [@types/mjml](https://togithub.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/mjml) ([source](https://togithub.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/mjml)) | [`4.7.1` -> `4.7.4`](https://renovatebot.com/diffs/npm/@types%2fmjml/4.7.1/4.7.4) | [![age](https://developer.mend.io/api/mc/badges/age/npm/@types%2fmjml/4.7.4?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/@types%2fmjml/4.7.4?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/@types%2fmjml/4.7.1/4.7.4?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@types%2fmjml/4.7.1/4.7.4?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled because a matching PR was automerged previously. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/redwoodjs/redwood). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index a7ec0625da56..c14f895f09f8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11224,11 +11224,11 @@ __metadata: linkType: hard "@types/mjml@npm:4": - version: 4.7.1 - resolution: "@types/mjml@npm:4.7.1" + version: 4.7.4 + resolution: "@types/mjml@npm:4.7.4" dependencies: "@types/mjml-core": "npm:*" - checksum: 10c0/52dc7cf2388f8def26ae3fae3a230650d4aa76de10a0ef832a4db0c9a8a20daed7520ceeecee037992a884e422a18735c096ca48e8bc2bbb6a3e76fa02ba3d74 + checksum: 10c0/6f4bbdf709e1f6c9b26be67146b1e4c759142fb4ddfa4c079b600835701bb2039c60cd530d016f1d2f1aef4256580e30cdc942c3acd6935e2fe56b5a665795ae languageName: node linkType: hard From f21537c2083a633d5d7c172b17d42f69e1154759 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 20:25:59 +0100 Subject: [PATCH 24/66] fix(deps): update dependency vite to v5.2.13 (#10786) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [vite](https://vitejs.dev) ([source](https://togithub.com/vitejs/vite/tree/HEAD/packages/vite)) | [`5.2.11` -> `5.2.13`](https://renovatebot.com/diffs/npm/vite/5.2.11/5.2.13) | [![age](https://developer.mend.io/api/mc/badges/age/npm/vite/5.2.13?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/vite/5.2.13?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/vite/5.2.11/5.2.13?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/vite/5.2.11/5.2.13?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
vitejs/vite (vite) ### [`v5.2.13`](https://togithub.com/vitejs/vite/releases/tag/v5.2.13) [Compare Source](https://togithub.com/vitejs/vite/compare/v5.2.12...v5.2.13) Please refer to [CHANGELOG.md](https://togithub.com/vitejs/vite/blob/v5.2.13/packages/vite/CHANGELOG.md) for details. ### [`v5.2.12`](https://togithub.com/vitejs/vite/blob/HEAD/packages/vite/CHANGELOG.md#small5212-2024-05-28-small) [Compare Source](https://togithub.com/vitejs/vite/compare/v5.2.11...v5.2.12) - chore: move to eslint flat config ([#​16743](https://togithub.com/vitejs/vite/issues/16743)) ([8f16765](https://togithub.com/vitejs/vite/commit/8f16765)), closes [#​16743](https://togithub.com/vitejs/vite/issues/16743) - chore(deps): remove unused deps ([#​17329](https://togithub.com/vitejs/vite/issues/17329)) ([5a45745](https://togithub.com/vitejs/vite/commit/5a45745)), closes [#​17329](https://togithub.com/vitejs/vite/issues/17329) - chore(deps): update all non-major dependencies ([#​16722](https://togithub.com/vitejs/vite/issues/16722)) ([b45922a](https://togithub.com/vitejs/vite/commit/b45922a)), closes [#​16722](https://togithub.com/vitejs/vite/issues/16722) - fix: mention `build.rollupOptions.output.manualChunks` instead of `build.rollupOutput.manualChunks` ([89378c0](https://togithub.com/vitejs/vite/commit/89378c0)), closes [#​16721](https://togithub.com/vitejs/vite/issues/16721) - fix(build): make SystemJSWrapRE match lazy ([#​16633](https://togithub.com/vitejs/vite/issues/16633)) ([6583ad2](https://togithub.com/vitejs/vite/commit/6583ad2)), closes [#​16633](https://togithub.com/vitejs/vite/issues/16633) - fix(css): avoid generating empty JS files when JS files becomes empty but has CSS files imported ([#​1](https://togithub.com/vitejs/vite/issues/1) ([95fe5a7](https://togithub.com/vitejs/vite/commit/95fe5a7)), closes [#​16078](https://togithub.com/vitejs/vite/issues/16078) - fix(css): handle lightningcss compiled css in Deno ([#​17301](https://togithub.com/vitejs/vite/issues/17301)) ([8e4e932](https://togithub.com/vitejs/vite/commit/8e4e932)), closes [#​17301](https://togithub.com/vitejs/vite/issues/17301) - fix(css): only use files the current bundle contains ([#​16684](https://togithub.com/vitejs/vite/issues/16684)) ([15a6ebb](https://togithub.com/vitejs/vite/commit/15a6ebb)), closes [#​16684](https://togithub.com/vitejs/vite/issues/16684) - fix(css): page reload was not happening with .css?raw ([#​16455](https://togithub.com/vitejs/vite/issues/16455)) ([8041846](https://togithub.com/vitejs/vite/commit/8041846)), closes [#​16455](https://togithub.com/vitejs/vite/issues/16455) - fix(deps): update all non-major dependencies ([#​16603](https://togithub.com/vitejs/vite/issues/16603)) ([6711553](https://togithub.com/vitejs/vite/commit/6711553)), closes [#​16603](https://togithub.com/vitejs/vite/issues/16603) - fix(deps): update all non-major dependencies ([#​16660](https://togithub.com/vitejs/vite/issues/16660)) ([bf2f014](https://togithub.com/vitejs/vite/commit/bf2f014)), closes [#​16660](https://togithub.com/vitejs/vite/issues/16660) - fix(deps): update all non-major dependencies ([#​17321](https://togithub.com/vitejs/vite/issues/17321)) ([4a89766](https://togithub.com/vitejs/vite/commit/4a89766)), closes [#​17321](https://togithub.com/vitejs/vite/issues/17321) - fix(error-logging): rollup errors weren't displaying id and codeframe ([#​16540](https://togithub.com/vitejs/vite/issues/16540)) ([22dc196](https://togithub.com/vitejs/vite/commit/22dc196)), closes [#​16540](https://togithub.com/vitejs/vite/issues/16540) - fix(hmr): normalize the path info ([#​14255](https://togithub.com/vitejs/vite/issues/14255)) ([6a085d0](https://togithub.com/vitejs/vite/commit/6a085d0)), closes [#​14255](https://togithub.com/vitejs/vite/issues/14255) - fix(hmr): trigger page reload when calling invalidate on root module ([#​16636](https://togithub.com/vitejs/vite/issues/16636)) ([2b61cc3](https://togithub.com/vitejs/vite/commit/2b61cc3)), closes [#​16636](https://togithub.com/vitejs/vite/issues/16636) - fix(logger): truncate log over 5000 characters long ([#​16581](https://togithub.com/vitejs/vite/issues/16581)) ([b0b839a](https://togithub.com/vitejs/vite/commit/b0b839a)), closes [#​16581](https://togithub.com/vitejs/vite/issues/16581) - fix(optimizer): log dependencies added by plugins ([#​16729](https://togithub.com/vitejs/vite/issues/16729)) ([f0fb987](https://togithub.com/vitejs/vite/commit/f0fb987)), closes [#​16729](https://togithub.com/vitejs/vite/issues/16729) - fix(sourcemap): improve sourcemap compatibility for vue2 ([#​16594](https://togithub.com/vitejs/vite/issues/16594)) ([913c040](https://togithub.com/vitejs/vite/commit/913c040)), closes [#​16594](https://togithub.com/vitejs/vite/issues/16594) - docs: correct proxy shorthand example ([#​15938](https://togithub.com/vitejs/vite/issues/15938)) ([abf766e](https://togithub.com/vitejs/vite/commit/abf766e)), closes [#​15938](https://togithub.com/vitejs/vite/issues/15938) - docs: deprecate server.hot ([#​16741](https://togithub.com/vitejs/vite/issues/16741)) ([e7d38ab](https://togithub.com/vitejs/vite/commit/e7d38ab)), closes [#​16741](https://togithub.com/vitejs/vite/issues/16741)
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/redwoodjs/redwood). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- packages/ogimage-gen/package.json | 2 +- packages/storybook/package.json | 2 +- packages/vite/package.json | 2 +- yarn.lock | 14 +++++++------- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/ogimage-gen/package.json b/packages/ogimage-gen/package.json index e35f6e1706c8..782d40e5b47b 100644 --- a/packages/ogimage-gen/package.json +++ b/packages/ogimage-gen/package.json @@ -53,7 +53,7 @@ "ts-toolbelt": "9.6.0", "tsx": "4.10.3", "typescript": "5.4.5", - "vite": "5.2.11", + "vite": "5.2.13", "vitest": "1.6.0" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" diff --git a/packages/storybook/package.json b/packages/storybook/package.json index 811e6ecf44f9..b8c7765f21b1 100644 --- a/packages/storybook/package.json +++ b/packages/storybook/package.json @@ -63,7 +63,7 @@ "@types/node": "20.12.12", "tsx": "4.10.3", "typescript": "5.4.5", - "vite": "5.2.11" + "vite": "5.2.13" }, "peerDependencies": { "@redwoodjs/project-config": "workspace:*", diff --git a/packages/vite/package.json b/packages/vite/package.json index e4f4c9e329e3..6865c7d5311d 100644 --- a/packages/vite/package.json +++ b/packages/vite/package.json @@ -92,7 +92,7 @@ "isbot": "5.1.6", "react": "19.0.0-beta-04b058868c-20240508", "react-server-dom-webpack": "19.0.0-beta-04b058868c-20240508", - "vite": "5.2.11", + "vite": "5.2.13", "vite-plugin-cjs-interop": "2.1.0", "yargs-parser": "21.1.1" }, diff --git a/yarn.lock b/yarn.lock index c14f895f09f8..8e8e1bfcdead 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8489,7 +8489,7 @@ __metadata: ts-toolbelt: "npm:9.6.0" tsx: "npm:4.10.3" typescript: "npm:5.4.5" - vite: "npm:5.2.11" + vite: "npm:5.2.13" vitest: "npm:1.6.0" languageName: unknown linkType: soft @@ -8775,7 +8775,7 @@ __metadata: rollup: "npm:4.17.2" tsx: "npm:4.10.3" typescript: "npm:5.4.5" - vite: "npm:5.2.11" + vite: "npm:5.2.13" vite-plugin-cjs-interop: "npm:2.1.0" vitest: "npm:1.6.0" yargs-parser: "npm:21.1.1" @@ -29206,7 +29206,7 @@ __metadata: tsx: "npm:4.10.3" typescript: "npm:5.4.5" unplugin-auto-import: "npm:^0.17.5" - vite: "npm:5.2.11" + vite: "npm:5.2.13" peerDependencies: "@redwoodjs/project-config": "workspace:*" "@redwoodjs/router": "workspace:*" @@ -31262,9 +31262,9 @@ __metadata: languageName: node linkType: hard -"vite@npm:5.2.11, vite@npm:^5.0.0": - version: 5.2.11 - resolution: "vite@npm:5.2.11" +"vite@npm:5.2.13, vite@npm:^5.0.0": + version: 5.2.13 + resolution: "vite@npm:5.2.13" dependencies: esbuild: "npm:^0.20.1" fsevents: "npm:~2.3.3" @@ -31298,7 +31298,7 @@ __metadata: optional: true bin: vite: bin/vite.js - checksum: 10c0/664b8d68e4f5152ae16bd2041af1bbaf11c43630ac461835bc31ff7d019913b33e465386e09f66dc1037d7aeefbb06939e0173787c063319bc2bd30c3b9ad8e4 + checksum: 10c0/f7a99da71884e69cc581dcfb43d73c8d56d73b9668d6980131603c544d6323c6003a20f376531dc0cfcf36bf5009bc465f89e6c5f8bd9d22868987aba4e4af1b languageName: node linkType: hard From 767954314ba69d12b09c7d2f21e0a2c6e8d7373b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 20:26:20 +0100 Subject: [PATCH 25/66] chore(deps): update dependency @types/nodemailer to v6.4.15 (#10778) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [@types/nodemailer](https://togithub.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/nodemailer) ([source](https://togithub.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/nodemailer)) | [`6.4.14` -> `6.4.15`](https://renovatebot.com/diffs/npm/@types%2fnodemailer/6.4.14/6.4.15) | [![age](https://developer.mend.io/api/mc/badges/age/npm/@types%2fnodemailer/6.4.15?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/@types%2fnodemailer/6.4.15?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/@types%2fnodemailer/6.4.14/6.4.15?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@types%2fnodemailer/6.4.14/6.4.15?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled because a matching PR was automerged previously. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/redwoodjs/redwood). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 8e8e1bfcdead..04d2eb0d880a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11301,11 +11301,11 @@ __metadata: linkType: hard "@types/nodemailer@npm:^6": - version: 6.4.14 - resolution: "@types/nodemailer@npm:6.4.14" + version: 6.4.15 + resolution: "@types/nodemailer@npm:6.4.15" dependencies: "@types/node": "npm:*" - checksum: 10c0/b5958843576cde76dc532aa7b726182fef8b466fa9fcaf1aa03f89f02e896bec4e28b593ffa1a289a46bd0b7fdf34da0640ab7ef8f0811948016f58f77e16307 + checksum: 10c0/553e613fe08fd663bff1fb3647a8ebbcc4ca297a6249296a43f3c92499158acad5955689be2096ff3fe72f145e80d749c1fc66d5549fe665d7ceb6d0946f2a26 languageName: node linkType: hard From 9ba0a719205954c488791b4ac2459c3f3b727ca2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 19:27:20 +0000 Subject: [PATCH 26/66] chore(deps): update dependency @types/lodash to v4.17.5 (#10775) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [@types/lodash](https://togithub.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/lodash) ([source](https://togithub.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/lodash)) | [`4.17.3` -> `4.17.5`](https://renovatebot.com/diffs/npm/@types%2flodash/4.17.3/4.17.5) | [![age](https://developer.mend.io/api/mc/badges/age/npm/@types%2flodash/4.17.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/@types%2flodash/4.17.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/@types%2flodash/4.17.3/4.17.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@types%2flodash/4.17.3/4.17.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/redwoodjs/redwood). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- packages/api-server/package.json | 2 +- packages/cli-helpers/package.json | 2 +- packages/core/package.json | 2 +- packages/graphql-server/package.json | 2 +- packages/structure/package.json | 2 +- yarn.lock | 18 +++++++++--------- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/packages/api-server/package.json b/packages/api-server/package.json index 4838671ca473..7ecc64cf2155 100644 --- a/packages/api-server/package.json +++ b/packages/api-server/package.json @@ -51,7 +51,7 @@ "devDependencies": { "@redwoodjs/framework-tools": "workspace:*", "@types/aws-lambda": "8.10.138", - "@types/lodash": "4.17.3", + "@types/lodash": "4.17.5", "@types/qs": "6.9.15", "@types/split2": "4.2.3", "@types/yargs": "17.0.32", diff --git a/packages/cli-helpers/package.json b/packages/cli-helpers/package.json index 96520caf61a5..0c9b09d39024 100644 --- a/packages/cli-helpers/package.json +++ b/packages/cli-helpers/package.json @@ -43,7 +43,7 @@ "terminal-link": "2.1.1" }, "devDependencies": { - "@types/lodash": "4.17.3", + "@types/lodash": "4.17.5", "@types/pascalcase": "1.0.3", "@types/yargs": "17.0.32", "tsx": "4.10.3", diff --git a/packages/core/package.json b/packages/core/package.json index f3b0cc76febc..a1aa9e32bacf 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -74,7 +74,7 @@ "webpack-retry-chunk-load-plugin": "3.1.1" }, "devDependencies": { - "@types/lodash": "4.17.3", + "@types/lodash": "4.17.5", "jest": "29.7.0" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" diff --git a/packages/graphql-server/package.json b/packages/graphql-server/package.json index 774630501f72..6aa7896367c2 100644 --- a/packages/graphql-server/package.json +++ b/packages/graphql-server/package.json @@ -53,7 +53,7 @@ "@redwoodjs/realtime": "workspace:*", "@types/aws-lambda": "8.10.138", "@types/jsonwebtoken": "9.0.6", - "@types/lodash": "4.17.3", + "@types/lodash": "4.17.5", "@types/uuid": "9.0.8", "@whatwg-node/fetch": "0.9.17", "jest": "29.7.0", diff --git a/packages/structure/package.json b/packages/structure/package.json index 85005f862ec4..b07def80d6ce 100644 --- a/packages/structure/package.json +++ b/packages/structure/package.json @@ -54,7 +54,7 @@ "@babel/cli": "7.24.5", "@babel/core": "^7.22.20", "@types/fs-extra": "11.0.4", - "@types/lodash": "4.17.3", + "@types/lodash": "4.17.5", "@types/node": "20.12.12", "@types/vscode": "1.89.0", "typescript": "5.4.5", diff --git a/yarn.lock b/yarn.lock index 04d2eb0d880a..7557ece44e80 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7295,7 +7295,7 @@ __metadata: "@redwoodjs/project-config": "workspace:*" "@redwoodjs/web-server": "workspace:*" "@types/aws-lambda": "npm:8.10.138" - "@types/lodash": "npm:4.17.3" + "@types/lodash": "npm:4.17.5" "@types/qs": "npm:6.9.15" "@types/split2": "npm:4.2.3" "@types/yargs": "npm:17.0.32" @@ -7927,7 +7927,7 @@ __metadata: "@opentelemetry/api": "npm:1.8.0" "@redwoodjs/project-config": "workspace:*" "@redwoodjs/telemetry": "workspace:*" - "@types/lodash": "npm:4.17.3" + "@types/lodash": "npm:4.17.5" "@types/pascalcase": "npm:1.0.3" "@types/yargs": "npm:17.0.32" chalk: "npm:4.1.2" @@ -8138,7 +8138,7 @@ __metadata: "@redwoodjs/project-config": "workspace:*" "@redwoodjs/testing": "workspace:*" "@redwoodjs/web-server": "workspace:*" - "@types/lodash": "npm:4.17.3" + "@types/lodash": "npm:4.17.5" babel-loader: "npm:^9.1.3" copy-webpack-plugin: "npm:11.0.0" core-js: "npm:3.37.1" @@ -8314,7 +8314,7 @@ __metadata: "@redwoodjs/realtime": "workspace:*" "@types/aws-lambda": "npm:8.10.138" "@types/jsonwebtoken": "npm:9.0.6" - "@types/lodash": "npm:4.17.3" + "@types/lodash": "npm:4.17.5" "@types/uuid": "npm:9.0.8" "@whatwg-node/fetch": "npm:0.9.17" core-js: "npm:3.37.1" @@ -8635,7 +8635,7 @@ __metadata: "@redwoodjs/project-config": "workspace:*" "@types/fs-extra": "npm:11.0.4" "@types/line-column": "npm:1.0.2" - "@types/lodash": "npm:4.17.3" + "@types/lodash": "npm:4.17.5" "@types/node": "npm:20.12.12" "@types/vscode": "npm:1.89.0" camelcase: "npm:6.3.0" @@ -11120,10 +11120,10 @@ __metadata: languageName: node linkType: hard -"@types/lodash@npm:4.17.3, @types/lodash@npm:^4.14.167": - version: 4.17.3 - resolution: "@types/lodash@npm:4.17.3" - checksum: 10c0/04eb8cfde06b12f4b68251b8956a636c4e80e4ac85926f41d502e26b9c6d050dbbc9e586e4bf706c62e97d78309c3dad079e791f07efbe7ff6f19ccf62a414b4 +"@types/lodash@npm:4.17.5, @types/lodash@npm:^4.14.167": + version: 4.17.5 + resolution: "@types/lodash@npm:4.17.5" + checksum: 10c0/55924803ed853e72261512bd3eaf2c5b16558c3817feb0a3125ef757afe46e54b86f33d1960e40b7606c0ddab91a96f47966bf5e6006b7abfd8994c13b04b19b languageName: node linkType: hard From e5663d0a9c1b9bfff6e7fe344ad31aafec75a600 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 19:29:10 +0000 Subject: [PATCH 27/66] chore(deps): update dependency @playwright/test to v1.44.1 (#10771) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [@playwright/test](https://playwright.dev) ([source](https://togithub.com/microsoft/playwright)) | [`1.44.0` -> `1.44.1`](https://renovatebot.com/diffs/npm/@playwright%2ftest/1.44.0/1.44.1) | [![age](https://developer.mend.io/api/mc/badges/age/npm/@playwright%2ftest/1.44.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/@playwright%2ftest/1.44.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/@playwright%2ftest/1.44.0/1.44.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@playwright%2ftest/1.44.0/1.44.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
microsoft/playwright (@​playwright/test) ### [`v1.44.1`](https://togithub.com/microsoft/playwright/releases/tag/v1.44.1) [Compare Source](https://togithub.com/microsoft/playwright/compare/v1.44.0...v1.44.1) ##### Highlights [https://github.com/microsoft/playwright/issues/30779](https://togithub.com/microsoft/playwright/issues/30779) - \[REGRESSION]: When using `video: 'on'` with VSCode extension the browser got closed [https://github.com/microsoft/playwright/issues/30755](https://togithub.com/microsoft/playwright/issues/30755) - \[REGRESSION]: Electron launch with spaces inside executablePath didn't work[https://github.com/microsoft/playwright/issues/30770](https://togithub.com/microsoft/playwright/issues/30770)0 - \[REGRESSION]: Mask elements outside of viewport when creating fullscreen screenshots didn't wor[https://github.com/microsoft/playwright/issues/30858](https://togithub.com/microsoft/playwright/issues/30858)58 - \[REGRESSION]: ipv6 got shown instead of localhost in show-trace/show-report #### Browser Versions - Chromium 125.0.6422.14 - Mozilla Firefox 125.0.1 - WebKit 17.4 This version was also tested against the following stable channels: - Google Chrome 124 - Microsoft Edge 124
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/redwoodjs/redwood). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- packages/ogimage-gen/package.json | 2 +- yarn.lock | 32 +++++++++++++++---------------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index 3200095c4449..0bacc137b9f6 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "@babel/runtime-corejs3": "7.24.5", "@faker-js/faker": "8.4.1", "@npmcli/arborist": "7.5.2", - "@playwright/test": "1.44.0", + "@playwright/test": "1.44.1", "@testing-library/jest-dom": "6.4.5", "@testing-library/react": "14.3.1", "@testing-library/user-event": "14.5.2", diff --git a/packages/ogimage-gen/package.json b/packages/ogimage-gen/package.json index 782d40e5b47b..da3a6ad76693 100644 --- a/packages/ogimage-gen/package.json +++ b/packages/ogimage-gen/package.json @@ -48,7 +48,7 @@ "react-dom": "19.0.0-beta-04b058868c-20240508" }, "devDependencies": { - "@playwright/test": "1.44.0", + "@playwright/test": "1.44.1", "@redwoodjs/framework-tools": "workspace:*", "ts-toolbelt": "9.6.0", "tsx": "4.10.3", diff --git a/yarn.lock b/yarn.lock index 7557ece44e80..ea602814130a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6400,14 +6400,14 @@ __metadata: languageName: node linkType: hard -"@playwright/test@npm:1.44.0": - version: 1.44.0 - resolution: "@playwright/test@npm:1.44.0" +"@playwright/test@npm:1.44.1": + version: 1.44.1 + resolution: "@playwright/test@npm:1.44.1" dependencies: - playwright: "npm:1.44.0" + playwright: "npm:1.44.1" bin: playwright: cli.js - checksum: 10c0/34c48b18f64f1be6ccba3e27fa4691aa9f7f8ea1eb1555ac4ae8e4bfc9136d61923a4376d8a711390c95401e4cfd77a15b18aab6a507bddd9925e6dab3acb9e1 + checksum: 10c0/f72669db3dfa83dc12d43ddbce8fbb27a69a80347b515fa00d8467ca640f8c7b7f5f5ff6d6cdfc5a1bce2c7d4b6ee62b988d682ef265f567302998de4f2a64ab languageName: node linkType: hard @@ -8476,7 +8476,7 @@ __metadata: version: 0.0.0-use.local resolution: "@redwoodjs/ogimage-gen@workspace:packages/ogimage-gen" dependencies: - "@playwright/test": "npm:1.44.0" + "@playwright/test": "npm:1.44.1" "@redwoodjs/framework-tools": "workspace:*" "@redwoodjs/internal": "workspace:*" "@redwoodjs/project-config": "workspace:*" @@ -25912,27 +25912,27 @@ __metadata: languageName: node linkType: hard -"playwright-core@npm:1.44.0": - version: 1.44.0 - resolution: "playwright-core@npm:1.44.0" +"playwright-core@npm:1.44.1": + version: 1.44.1 + resolution: "playwright-core@npm:1.44.1" bin: playwright-core: cli.js - checksum: 10c0/e1220371a76cdf145f6aaefb2dd6c5194531d1c1e2b67712c56dbc1d589dffb66fd4fc0168be60cd2115aca40660aa13c572e14be47674c0542bc879705b9fb3 + checksum: 10c0/6ffa3a04822b3df86d7f47a97e4f20318c0c50868ba4311820e6626ecadaab1424fbd0a3d01f0b4228adc0c781115e44b801742a4970b88739f804d82f142d68 languageName: node linkType: hard -"playwright@npm:1.44.0": - version: 1.44.0 - resolution: "playwright@npm:1.44.0" +"playwright@npm:1.44.1": + version: 1.44.1 + resolution: "playwright@npm:1.44.1" dependencies: fsevents: "npm:2.3.2" - playwright-core: "npm:1.44.0" + playwright-core: "npm:1.44.1" dependenciesMeta: fsevents: optional: true bin: playwright: cli.js - checksum: 10c0/dcbee9022623dd9e219e9867983789262e80339f0c3601219930883e5a304ce75e1397715c0f378a2bab0a799cf88a73ea4b58fe595cfd9058bd7a82f5d8e3b6 + checksum: 10c0/de827d17746b18ae2ec67d510a640d8ceebf8ee8e3d8399bccffa83b76a967498ca377777e4e6a1daaef4b3c86cb2c44c7468de53d2d915acc61b3b89c032738 languageName: node linkType: hard @@ -28123,7 +28123,7 @@ __metadata: "@babel/runtime-corejs3": "npm:7.24.5" "@faker-js/faker": "npm:8.4.1" "@npmcli/arborist": "npm:7.5.2" - "@playwright/test": "npm:1.44.0" + "@playwright/test": "npm:1.44.1" "@testing-library/jest-dom": "npm:6.4.5" "@testing-library/react": "npm:14.3.1" "@testing-library/user-event": "npm:14.5.2" From df2bf6caec393975ba94fa90470929f7e6438194 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 19:42:58 +0000 Subject: [PATCH 28/66] fix(deps): update dependency isbot to v5.1.9 (#10783) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [isbot](https://isbot.js.org) ([source](https://togithub.com/omrilotan/isbot)) | [`5.1.6` -> `5.1.9`](https://renovatebot.com/diffs/npm/isbot/5.1.6/5.1.9) | [![age](https://developer.mend.io/api/mc/badges/age/npm/isbot/5.1.9?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/isbot/5.1.9?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/isbot/5.1.6/5.1.9?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/isbot/5.1.6/5.1.9?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
omrilotan/isbot (isbot) ### [`v5.1.9`](https://togithub.com/omrilotan/isbot/blob/HEAD/CHANGELOG.md#519) [Compare Source](https://togithub.com/omrilotan/isbot/compare/v5.1.8...v5.1.9) - \[Pattern] A more careful match for RSS substring ### [`v5.1.8`](https://togithub.com/omrilotan/isbot/blob/HEAD/CHANGELOG.md#518) [Compare Source](https://togithub.com/omrilotan/isbot/compare/v5.1.7...v5.1.8) - \[Pattern] Recognise timestamp in user agent string - is used to generate unique strings for each request ### [`v5.1.7`](https://togithub.com/omrilotan/isbot/blob/HEAD/CHANGELOG.md#517) [Compare Source](https://togithub.com/omrilotan/isbot/compare/v5.1.6...v5.1.7) - \[Pattern] Ignore NewsSapphire in-app browser (news app) - \[Pattern] Ignore locales with calendar in user agent
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/redwoodjs/redwood). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- packages/vite/package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/vite/package.json b/packages/vite/package.json index 6865c7d5311d..ad21d46ba773 100644 --- a/packages/vite/package.json +++ b/packages/vite/package.json @@ -89,7 +89,7 @@ "express": "4.19.2", "find-my-way": "8.2.0", "http-proxy-middleware": "2.0.6", - "isbot": "5.1.6", + "isbot": "5.1.9", "react": "19.0.0-beta-04b058868c-20240508", "react-server-dom-webpack": "19.0.0-beta-04b058868c-20240508", "vite": "5.2.13", diff --git a/yarn.lock b/yarn.lock index ea602814130a..00cda3811077 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8769,7 +8769,7 @@ __metadata: find-my-way: "npm:8.2.0" glob: "npm:10.3.15" http-proxy-middleware: "npm:2.0.6" - isbot: "npm:5.1.6" + isbot: "npm:5.1.9" react: "npm:19.0.0-beta-04b058868c-20240508" react-server-dom-webpack: "npm:19.0.0-beta-04b058868c-20240508" rollup: "npm:4.17.2" @@ -20802,10 +20802,10 @@ __metadata: languageName: node linkType: hard -"isbot@npm:5.1.6": - version: 5.1.6 - resolution: "isbot@npm:5.1.6" - checksum: 10c0/c0883a4f91882abed46be2bedb0e36acf8db74ec9866d752991ebb2982c84faa04a774bd20d36b988701611e2fdf518a977edd640a9b28e668a91d3e2c48a3d7 +"isbot@npm:5.1.9": + version: 5.1.9 + resolution: "isbot@npm:5.1.9" + checksum: 10c0/8dbe7b42efcef074e194fce8261e06c0a514908ed6d803137c5364a988f34dc0d0a50fdbeed397502b51d84caab65cb149135fdfa5b5ddae5a990c0c09a63f3d languageName: node linkType: hard From 2c352ceca4d9ac5714285993a03b2ba04c19cd11 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 19:47:58 +0000 Subject: [PATCH 29/66] chore(deps): update dependency @supabase/supabase-js to v2.43.4 (#10772) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [@supabase/supabase-js](https://togithub.com/supabase/supabase-js) | [`2.43.2` -> `2.43.4`](https://renovatebot.com/diffs/npm/@supabase%2fsupabase-js/2.43.2/2.43.4) | [![age](https://developer.mend.io/api/mc/badges/age/npm/@supabase%2fsupabase-js/2.43.4?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/@supabase%2fsupabase-js/2.43.4?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/@supabase%2fsupabase-js/2.43.2/2.43.4?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@supabase%2fsupabase-js/2.43.2/2.43.4?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
supabase/supabase-js (@​supabase/supabase-js) ### [`v2.43.4`](https://togithub.com/supabase/supabase-js/releases/tag/v2.43.4) [Compare Source](https://togithub.com/supabase/supabase-js/compare/v2.43.3...v2.43.4) ##### Reverts - Revert "fix: use proper dual-packaging" ([4ad906d](https://togithub.com/supabase/supabase-js/commit/4ad906d55ecaa03eaa6df8be5955777327bbd082)) - Revert "fix: bump postgrest-js" ([24de3b7](https://togithub.com/supabase/supabase-js/commit/24de3b708274aaed4c92f7370d6922419b2af8d2)) ### [`v2.43.3`](https://togithub.com/supabase/supabase-js/releases/tag/v2.43.3) [Compare Source](https://togithub.com/supabase/supabase-js/compare/v2.43.2...v2.43.3) ##### Bug Fixes - bump postgrest-js ([fe21f2f](https://togithub.com/supabase/supabase-js/commit/fe21f2f30b12bb30efd3e9a7cd2ab17a9ddb02d7)) - use proper dual-packaging ([056bc8f](https://togithub.com/supabase/supabase-js/commit/056bc8fb3d39beaec55011af4cda75ae8c6addd0))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/redwoodjs/redwood). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- packages/auth-providers/supabase/web/package.json | 4 ++-- yarn.lock | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/auth-providers/supabase/web/package.json b/packages/auth-providers/supabase/web/package.json index 024ea70716dd..eb2712a8f3ae 100644 --- a/packages/auth-providers/supabase/web/package.json +++ b/packages/auth-providers/supabase/web/package.json @@ -31,14 +31,14 @@ "@babel/cli": "7.24.5", "@babel/core": "^7.22.20", "@supabase/ssr": "0.3.0", - "@supabase/supabase-js": "2.43.2", + "@supabase/supabase-js": "2.43.4", "@types/react": "^18.2.55", "react": "19.0.0-beta-04b058868c-20240508", "typescript": "5.4.5", "vitest": "1.6.0" }, "peerDependencies": { - "@supabase/supabase-js": "2.43.2" + "@supabase/supabase-js": "2.43.4" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" } diff --git a/yarn.lock b/yarn.lock index 00cda3811077..a955210604f6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7777,14 +7777,14 @@ __metadata: "@babel/runtime-corejs3": "npm:7.24.5" "@redwoodjs/auth": "workspace:*" "@supabase/ssr": "npm:0.3.0" - "@supabase/supabase-js": "npm:2.43.2" + "@supabase/supabase-js": "npm:2.43.4" "@types/react": "npm:^18.2.55" core-js: "npm:3.37.1" react: "npm:19.0.0-beta-04b058868c-20240508" typescript: "npm:5.4.5" vitest: "npm:1.6.0" peerDependencies: - "@supabase/supabase-js": 2.43.2 + "@supabase/supabase-js": 2.43.4 languageName: unknown linkType: soft @@ -10101,9 +10101,9 @@ __metadata: languageName: node linkType: hard -"@supabase/supabase-js@npm:2.43.2": - version: 2.43.2 - resolution: "@supabase/supabase-js@npm:2.43.2" +"@supabase/supabase-js@npm:2.43.4": + version: 2.43.4 + resolution: "@supabase/supabase-js@npm:2.43.4" dependencies: "@supabase/auth-js": "npm:2.64.2" "@supabase/functions-js": "npm:2.3.1" @@ -10111,7 +10111,7 @@ __metadata: "@supabase/postgrest-js": "npm:1.15.2" "@supabase/realtime-js": "npm:2.9.5" "@supabase/storage-js": "npm:2.5.5" - checksum: 10c0/5bb5eddcc7e6ce47cb4137f415bd9882026186a30010758e82004924204a7fe96a46f106bac9008839604bf39b805dc5c5df4bc4f26792e88f8847f49537e2e4 + checksum: 10c0/466efc6f9d9353c2d9d0881acb4aeaf441b06a97ee099d8eff6c8602ba6cbeef0b409808f36b39e0b843159f0ca2e9476d2b3c25547c103e51ce55c42dce84f8 languageName: node linkType: hard From 9a1f5d7711c0eb92bf61a5473ed7ebe993cab9da Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 19:49:29 +0000 Subject: [PATCH 30/66] fix(deps): update dependency @clerk/clerk-sdk-node to v4.13.20 (#10780) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [@clerk/clerk-sdk-node](https://clerk.com/) ([source](https://togithub.com/clerk/javascript/tree/HEAD/packages/sdk-node)) | [`4.13.16` -> `4.13.20`](https://renovatebot.com/diffs/npm/@clerk%2fclerk-sdk-node/4.13.16/4.13.20) | [![age](https://developer.mend.io/api/mc/badges/age/npm/@clerk%2fclerk-sdk-node/4.13.20?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/@clerk%2fclerk-sdk-node/4.13.20?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/@clerk%2fclerk-sdk-node/4.13.16/4.13.20?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@clerk%2fclerk-sdk-node/4.13.16/4.13.20?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
clerk/javascript (@​clerk/clerk-sdk-node) ### [`v4.13.20`](https://togithub.com/clerk/javascript/releases/tag/%40clerk/clerk-sdk-node%404.13.20) [Compare Source](https://togithub.com/clerk/javascript/compare/@clerk/clerk-sdk-node@4.13.19...@clerk/clerk-sdk-node@4.13.20) ##### Patch Changes - Updated dependencies \[[`9cd588d77`](https://togithub.com/clerk/javascript/commit/9cd588d779055b6bb5fd8f6d698a38586ce69485)]: - [@​clerk/backend](https://togithub.com/clerk/backend)[@​0](https://togithub.com/0).38.12 ### [`v4.13.19`](https://togithub.com/clerk/javascript/releases/tag/%40clerk/clerk-sdk-node%404.13.19) [Compare Source](https://togithub.com/clerk/javascript/compare/@clerk/clerk-sdk-node@4.13.18...@clerk/clerk-sdk-node@4.13.19) ##### Patch Changes - Updated dependencies \[[`76a1087c3`](https://togithub.com/clerk/javascript/commit/76a1087c372d16dd2ab3b6f0b6f4961c00448a52)]: - [@​clerk/types](https://togithub.com/clerk/types)[@​3](https://togithub.com/3).65.2 - [@​clerk/backend](https://togithub.com/clerk/backend)[@​0](https://togithub.com/0).38.11 ### [`v4.13.18`](https://togithub.com/clerk/javascript/releases/tag/%40clerk/clerk-sdk-node%404.13.18) [Compare Source](https://togithub.com/clerk/javascript/compare/@clerk/clerk-sdk-node@4.13.17...@clerk/clerk-sdk-node@4.13.18) ##### Patch Changes - Updated dependencies \[[`a8c0128be`](https://togithub.com/clerk/javascript/commit/a8c0128beb404d6c6e707b0735b439af6efdd076)]: - [@​clerk/types](https://togithub.com/clerk/types)[@​3](https://togithub.com/3).65.1 - [@​clerk/backend](https://togithub.com/clerk/backend)[@​0](https://togithub.com/0).38.10 ### [`v4.13.17`](https://togithub.com/clerk/javascript/releases/tag/%40clerk/clerk-sdk-node%404.13.17) [Compare Source](https://togithub.com/clerk/javascript/compare/@clerk/clerk-sdk-node@4.13.16...@clerk/clerk-sdk-node@4.13.17) ##### Patch Changes - Updated dependencies \[[`fcc349cb5`](https://togithub.com/clerk/javascript/commit/fcc349cb59e4bfdf82165144ca5509a8c73d1325)]: - [@​clerk/types](https://togithub.com/clerk/types)[@​3](https://togithub.com/3).65.0 - [@​clerk/backend](https://togithub.com/clerk/backend)[@​0](https://togithub.com/0).38.9
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/redwoodjs/redwood). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .../auth-providers/clerk/api/package.json | 2 +- yarn.lock | 33 ++++++++++++------- 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/packages/auth-providers/clerk/api/package.json b/packages/auth-providers/clerk/api/package.json index 70062fea3ff5..a79446e6c6e2 100644 --- a/packages/auth-providers/clerk/api/package.json +++ b/packages/auth-providers/clerk/api/package.json @@ -24,7 +24,7 @@ }, "dependencies": { "@babel/runtime-corejs3": "7.24.5", - "@clerk/clerk-sdk-node": "4.13.16", + "@clerk/clerk-sdk-node": "4.13.20", "core-js": "3.37.1" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index a955210604f6..c7c3e6a57d41 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2139,12 +2139,12 @@ __metadata: languageName: node linkType: hard -"@clerk/backend@npm:0.38.8": - version: 0.38.8 - resolution: "@clerk/backend@npm:0.38.8" +"@clerk/backend@npm:0.38.12": + version: 0.38.12 + resolution: "@clerk/backend@npm:0.38.12" dependencies: "@clerk/shared": "npm:1.4.1" - "@clerk/types": "npm:3.64.1" + "@clerk/types": "npm:3.65.2" "@peculiar/webcrypto": "npm:1.4.1" "@types/node": "npm:16.18.6" cookie: "npm:0.5.0" @@ -2152,7 +2152,7 @@ __metadata: node-fetch-native: "npm:1.0.1" snakecase-keys: "npm:5.4.4" tslib: "npm:2.4.1" - checksum: 10c0/ca0abedde2d002532743ca0939aed642c5a945aa2f26ab6f85b6a654e552dfa4fc67144cc794bbd01e2ab8056fae0b4b68fc78b551aa0007a8ec253895cf449d + checksum: 10c0/c2f67cea992be4d0ac37712138d5b515d9b47993e28b0ff1b7b5cef961eefea834a700c89cb435994c606e4d434a436a43a184716cb21ab3c9e040ffbcdf4647 languageName: node linkType: hard @@ -2169,20 +2169,20 @@ __metadata: languageName: node linkType: hard -"@clerk/clerk-sdk-node@npm:4.13.16": - version: 4.13.16 - resolution: "@clerk/clerk-sdk-node@npm:4.13.16" +"@clerk/clerk-sdk-node@npm:4.13.20": + version: 4.13.20 + resolution: "@clerk/clerk-sdk-node@npm:4.13.20" dependencies: - "@clerk/backend": "npm:0.38.8" + "@clerk/backend": "npm:0.38.12" "@clerk/shared": "npm:1.4.1" - "@clerk/types": "npm:3.64.1" + "@clerk/types": "npm:3.65.2" "@types/cookies": "npm:0.7.7" "@types/express": "npm:4.17.14" "@types/node-fetch": "npm:2.6.2" camelcase-keys: "npm:6.2.2" snakecase-keys: "npm:3.2.1" tslib: "npm:2.4.1" - checksum: 10c0/91a07ede82e6bdbb746d008d672b1c721ec35fcbacabe5ed4a94a9aaae80b4b4b3b5050cfcbad655bbce4a352d6fb7ccf6ff85187943a6f3a55f9bb3844f740e + checksum: 10c0/1950b1139c3880f40cd256869e86dacf97c9509b95703de28ddbc9afb0b81b7298899a781b79156a9cf6bc0f8bd636e584f712fc68721dd6689c9b588dbdb765 languageName: node linkType: hard @@ -2211,6 +2211,15 @@ __metadata: languageName: node linkType: hard +"@clerk/types@npm:3.65.2": + version: 3.65.2 + resolution: "@clerk/types@npm:3.65.2" + dependencies: + csstype: "npm:3.1.1" + checksum: 10c0/036f4443b383c81ee07df281fe0044eb66f6a647655cd7d10684ef4760afdc50f056f0bd9c8d78bd8506636011c954f092d17a4f95857245bd4539e58cb99131 + languageName: node + linkType: hard + "@colors/colors@npm:1.5.0": version: 1.5.0 resolution: "@colors/colors@npm:1.5.0" @@ -7482,7 +7491,7 @@ __metadata: "@babel/cli": "npm:7.24.5" "@babel/core": "npm:^7.22.20" "@babel/runtime-corejs3": "npm:7.24.5" - "@clerk/clerk-sdk-node": "npm:4.13.16" + "@clerk/clerk-sdk-node": "npm:4.13.20" "@redwoodjs/api": "workspace:*" "@types/aws-lambda": "npm:8.10.138" core-js: "npm:3.37.1" From 2d535c1a7f6ed9df7218748248f94e2cb1ec9980 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 19:49:54 +0000 Subject: [PATCH 31/66] fix(deps): update dependency vite-plugin-cjs-interop to v2.1.1 (#10787) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [vite-plugin-cjs-interop](https://togithub.com/cyco130/vite-plugin-cjs-interop) | [`2.1.0` -> `2.1.1`](https://renovatebot.com/diffs/npm/vite-plugin-cjs-interop/2.1.0/2.1.1) | [![age](https://developer.mend.io/api/mc/badges/age/npm/vite-plugin-cjs-interop/2.1.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/vite-plugin-cjs-interop/2.1.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/vite-plugin-cjs-interop/2.1.0/2.1.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/vite-plugin-cjs-interop/2.1.0/2.1.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
cyco130/vite-plugin-cjs-interop (vite-plugin-cjs-interop) ### [`v2.1.1`](https://togithub.com/cyco130/vite-plugin-cjs-interop/compare/2.1.0...2.1.1) [Compare Source](https://togithub.com/cyco130/vite-plugin-cjs-interop/compare/2.1.0...2.1.1)
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/redwoodjs/redwood). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- packages/vite/package.json | 2 +- yarn.lock | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/vite/package.json b/packages/vite/package.json index ad21d46ba773..c9c7d04e3658 100644 --- a/packages/vite/package.json +++ b/packages/vite/package.json @@ -93,7 +93,7 @@ "react": "19.0.0-beta-04b058868c-20240508", "react-server-dom-webpack": "19.0.0-beta-04b058868c-20240508", "vite": "5.2.13", - "vite-plugin-cjs-interop": "2.1.0", + "vite-plugin-cjs-interop": "2.1.1", "yargs-parser": "21.1.1" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index c7c3e6a57d41..ea5be91878d0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8785,7 +8785,7 @@ __metadata: tsx: "npm:4.10.3" typescript: "npm:5.4.5" vite: "npm:5.2.13" - vite-plugin-cjs-interop: "npm:2.1.0" + vite-plugin-cjs-interop: "npm:2.1.1" vitest: "npm:1.6.0" yargs-parser: "npm:21.1.1" bin: @@ -22889,12 +22889,12 @@ __metadata: languageName: node linkType: hard -"magic-string@npm:^0.30.0, magic-string@npm:^0.30.5, magic-string@npm:^0.30.8": - version: 0.30.8 - resolution: "magic-string@npm:0.30.8" +"magic-string@npm:^0.30.0, magic-string@npm:^0.30.10, magic-string@npm:^0.30.5": + version: 0.30.10 + resolution: "magic-string@npm:0.30.10" dependencies: "@jridgewell/sourcemap-codec": "npm:^1.4.15" - checksum: 10c0/51a1f06f678c082aceddfb5943de9b6bdb88f2ea1385a1c2adf116deb73dfcfa50df6c222901d691b529455222d4d68d0b28be5689ac6f69b3baa3462861f922 + checksum: 10c0/aa9ca17eae571a19bce92c8221193b6f93ee8511abb10f085e55ffd398db8e4c089a208d9eac559deee96a08b7b24d636ea4ab92f09c6cf42a7d1af51f7fd62b languageName: node linkType: hard @@ -31258,16 +31258,16 @@ __metadata: languageName: node linkType: hard -"vite-plugin-cjs-interop@npm:2.1.0": - version: 2.1.0 - resolution: "vite-plugin-cjs-interop@npm:2.1.0" +"vite-plugin-cjs-interop@npm:2.1.1": + version: 2.1.1 + resolution: "vite-plugin-cjs-interop@npm:2.1.1" dependencies: acorn: "npm:^8.11.3" acorn-import-assertions: "npm:^1.9.0" estree-walker: "npm:^3.0.3" - magic-string: "npm:^0.30.8" - minimatch: "npm:^9.0.3" - checksum: 10c0/0481d21e4a95977ca899c076d0d03b7d2fe207d69303344d4c7a8e12cf7cb547e18c446d1b71fb2d1f0bf6fdad4bcd35129cace162814eade756fbf90c64d95f + magic-string: "npm:^0.30.10" + minimatch: "npm:^9.0.4" + checksum: 10c0/17ae116184c00269dae7498d82302362d42d2ec013998c8c9400116a53c7f96e06e12e08de2e85878fa560338d8715218381243240868ac334c4b03575b6dc69 languageName: node linkType: hard From f7d1bb523afc25f88c3e7b9fac79498a623eaa84 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 19:50:37 +0000 Subject: [PATCH 32/66] chore(deps): update dependency @npmcli/arborist to v7.5.3 (#10770) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [@npmcli/arborist](https://togithub.com/npm/cli) ([source](https://togithub.com/npm/cli/tree/HEAD/workspaces/arborist)) | [`7.5.2` -> `7.5.3`](https://renovatebot.com/diffs/npm/@npmcli%2farborist/7.5.2/7.5.3) | [![age](https://developer.mend.io/api/mc/badges/age/npm/@npmcli%2farborist/7.5.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/@npmcli%2farborist/7.5.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/@npmcli%2farborist/7.5.2/7.5.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@npmcli%2farborist/7.5.2/7.5.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
npm/cli (@​npmcli/arborist) ### [`v7.5.3`](https://togithub.com/npm/cli/blob/HEAD/workspaces/arborist/CHANGELOG.md#753-2024-05-29) [Compare Source](https://togithub.com/npm/cli/compare/v7.5.2...v7.5.3) ##### Bug Fixes - [`2d1d8d0`](https://togithub.com/npm/cli/commit/2d1d8d0ef18a10ac7938380884745f1d3c3cb078) [#​7559](https://togithub.com/npm/cli/pull/7559) adds `node:` specifier to all native node modules ([#​7559](https://togithub.com/npm/cli/issues/7559)) ([@​reggi](https://togithub.com/reggi)) ##### Chores - [`4a36d78`](https://togithub.com/npm/cli/commit/4a36d78f6474835df1d3cd358145e74e38e3ea7a) [#​7568](https://togithub.com/npm/cli/pull/7568) fix linting in arborist debugger ([@​wraithgar](https://togithub.com/wraithgar))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/redwoodjs/redwood). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 0bacc137b9f6..0a8cbb21b205 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ "@babel/preset-typescript": "^7.22.15", "@babel/runtime-corejs3": "7.24.5", "@faker-js/faker": "8.4.1", - "@npmcli/arborist": "7.5.2", + "@npmcli/arborist": "7.5.3", "@playwright/test": "1.44.1", "@testing-library/jest-dom": "6.4.5", "@testing-library/react": "14.3.1", diff --git a/yarn.lock b/yarn.lock index ea5be91878d0..9487d24d7a44 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5549,9 +5549,9 @@ __metadata: languageName: node linkType: hard -"@npmcli/arborist@npm:7.5.2": - version: 7.5.2 - resolution: "@npmcli/arborist@npm:7.5.2" +"@npmcli/arborist@npm:7.5.3": + version: 7.5.3 + resolution: "@npmcli/arborist@npm:7.5.3" dependencies: "@isaacs/string-locale-compare": "npm:^1.1.0" "@npmcli/fs": "npm:^3.1.1" @@ -5590,7 +5590,7 @@ __metadata: walk-up-path: "npm:^3.0.1" bin: arborist: bin/index.js - checksum: 10c0/e34133649b408b39073ba1382cd4ea9b9e02f8a2f4ed4d714998707bfb65dd2b1509e86172a862176e2648940089bbbc451ef9eeeab2ae6cbad99d0dba087ed3 + checksum: 10c0/61e8f73f687c5c62704de6d2a081490afe6ba5e5526b9b2da44c6cb137df30256d5650235d4ece73454ddc4c40a291e26881bbcaa83c03404177cb3e05e26721 languageName: node linkType: hard @@ -28131,7 +28131,7 @@ __metadata: "@babel/preset-typescript": "npm:^7.22.15" "@babel/runtime-corejs3": "npm:7.24.5" "@faker-js/faker": "npm:8.4.1" - "@npmcli/arborist": "npm:7.5.2" + "@npmcli/arborist": "npm:7.5.3" "@playwright/test": "npm:1.44.1" "@testing-library/jest-dom": "npm:6.4.5" "@testing-library/react": "npm:14.3.1" From c65cf5aa24ecc93dc7eb3efd9e24ec879bd65f71 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 19:51:44 +0000 Subject: [PATCH 33/66] fix(deps): update dependency react-hook-form to v7.51.5 (#10784) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [react-hook-form](https://www.react-hook-form.com) ([source](https://togithub.com/react-hook-form/react-hook-form)) | [`7.51.4` -> `7.51.5`](https://renovatebot.com/diffs/npm/react-hook-form/7.51.4/7.51.5) | [![age](https://developer.mend.io/api/mc/badges/age/npm/react-hook-form/7.51.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/react-hook-form/7.51.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/react-hook-form/7.51.4/7.51.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/react-hook-form/7.51.4/7.51.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
react-hook-form/react-hook-form (react-hook-form) ### [`v7.51.5`](https://togithub.com/react-hook-form/react-hook-form/releases/tag/v7.51.5) [Compare Source](https://togithub.com/react-hook-form/react-hook-form/compare/v7.51.4...v7.51.5) 📖 fix broken link to examples in README.md ([#​11805](https://togithub.com/react-hook-form/react-hook-form/issues/11805)) ⌨️ close: correct type of error field in getFieldState return object ([#​11831](https://togithub.com/react-hook-form/react-hook-form/issues/11831)) 🐞 fix [#​11842](https://togithub.com/react-hook-form/react-hook-form/issues/11842) radio buttons not disabled when multiple share a name ([#​11873](https://togithub.com/react-hook-form/react-hook-form/issues/11873)) 🐞 fix [#​11821](https://togithub.com/react-hook-form/react-hook-form/issues/11821) set value with disabled false before mount ([#​11880](https://togithub.com/react-hook-form/react-hook-form/issues/11880)) 🐞 fix setError to preserve existing errors elsewhere in the object ([#​11888](https://togithub.com/react-hook-form/react-hook-form/issues/11888)) ⌨️ fix: add info.value type to WatchObserver ([#​11872](https://togithub.com/react-hook-form/react-hook-form/issues/11872)) 🫡 fix issue with internal `set` api ([#​11915](https://togithub.com/react-hook-form/react-hook-form/issues/11915)) thanks to [@​mjr2595](https://togithub.com/mjr2595) [@​erashu212](https://togithub.com/erashu212) [@​SimonJTurner](https://togithub.com/SimonJTurner) and [@​peinguin](https://togithub.com/peinguin)
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/redwoodjs/redwood). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- packages/forms/package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/forms/package.json b/packages/forms/package.json index f5fec1725d66..6dea922805c8 100644 --- a/packages/forms/package.json +++ b/packages/forms/package.json @@ -27,7 +27,7 @@ "core-js": "3.37.1", "graphql": "16.8.1", "pascalcase": "1.0.0", - "react-hook-form": "7.51.4" + "react-hook-form": "7.51.5" }, "devDependencies": { "@babel/cli": "7.24.5", diff --git a/yarn.lock b/yarn.lock index 9487d24d7a44..19f20f4b8a3f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8276,7 +8276,7 @@ __metadata: pascalcase: "npm:1.0.0" react: "npm:19.0.0-beta-04b058868c-20240508" react-dom: "npm:19.0.0-beta-04b058868c-20240508" - react-hook-form: "npm:7.51.4" + react-hook-form: "npm:7.51.5" typescript: "npm:5.4.5" vitest: "npm:1.6.0" peerDependencies: @@ -27079,12 +27079,12 @@ __metadata: languageName: node linkType: hard -"react-hook-form@npm:7.51.4": - version: 7.51.4 - resolution: "react-hook-form@npm:7.51.4" +"react-hook-form@npm:7.51.5": + version: 7.51.5 + resolution: "react-hook-form@npm:7.51.5" peerDependencies: react: ^16.8.0 || ^17 || ^18 - checksum: 10c0/73b585adb80bd99ae1fc21208e389fd9830f82c8c8bab4b6c4d5853f858a3259b8dc8fd4aa4608a0bd95bc69883c9332f2fa5e8c80dc17dbb2866de9744dbdb6 + checksum: 10c0/5b13f99a125d92ee618f2d4e218d5ec854f8cac1b568e83b4b125efb002cc79eef0f5c06b54015c78e16a830cf1ea356a646e8c6abb00b7ca8225dba9a92091e languageName: node linkType: hard From 2171d1a85410d62d6f9dadd206a139ae52e6589f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 20:52:03 +0100 Subject: [PATCH 34/66] chore(deps): update dependency @types/busboy to v1.5.4 (#10773) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [@types/busboy](https://togithub.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/busboy) ([source](https://togithub.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/busboy)) | [`1.5.0` -> `1.5.4`](https://renovatebot.com/diffs/npm/@types%2fbusboy/1.5.0/1.5.4) | [![age](https://developer.mend.io/api/mc/badges/age/npm/@types%2fbusboy/1.5.4?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/@types%2fbusboy/1.5.4?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/@types%2fbusboy/1.5.0/1.5.4?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@types%2fbusboy/1.5.0/1.5.4?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled because a matching PR was automerged previously. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/redwoodjs/redwood). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 19f20f4b8a3f..b5f67296b6be 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10731,11 +10731,11 @@ __metadata: linkType: hard "@types/busboy@npm:^1": - version: 1.5.0 - resolution: "@types/busboy@npm:1.5.0" + version: 1.5.4 + resolution: "@types/busboy@npm:1.5.4" dependencies: "@types/node": "npm:*" - checksum: 10c0/5ba425839c89ba70f504047e4c85068f07309d47c35407645a8b29c2b68bd85bf93b1ca11ed431657c63f602d465b18918f704ed6bf551060ae53ce83d357800 + checksum: 10c0/0bdd209069a445d5a71277e558978ec0db1b1a3d108335da96477d017177ae349c4d81d604db0bea19e3c99c10af2d60dbac20e36cef7cb7a517e5a4760738bd languageName: node linkType: hard From 1cca32b64be250b72ff0c0f17b2c348675212a98 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 21:21:25 +0100 Subject: [PATCH 35/66] chore(deps): update dependency supertokens-node to v15.2.3 (#10779) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [supertokens-node](https://togithub.com/supertokens/supertokens-node) | [`15.2.2` -> `15.2.3`](https://renovatebot.com/diffs/npm/supertokens-node/15.2.2/15.2.3) | [![age](https://developer.mend.io/api/mc/badges/age/npm/supertokens-node/15.2.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/supertokens-node/15.2.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/supertokens-node/15.2.2/15.2.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/supertokens-node/15.2.2/15.2.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
supertokens/supertokens-node (supertokens-node) ### [`v15.2.3`](https://togithub.com/supertokens/supertokens-node/releases/tag/v15.2.3) [Compare Source](https://togithub.com/supertokens/supertokens-node/compare/v15.2.2...v15.2.3) #### What's Changed - fix: thirdparty recursion and config reference issues by [@​sattvikc](https://togithub.com/sattvikc) in [https://github.com/supertokens/supertokens-node/pull/847](https://togithub.com/supertokens/supertokens-node/pull/847) **Full Changelog**: https://github.com/supertokens/supertokens-node/compare/v15.2.2...v15.2.3
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/redwoodjs/redwood). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- packages/auth-providers/supertokens/api/package.json | 2 +- yarn.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/auth-providers/supertokens/api/package.json b/packages/auth-providers/supertokens/api/package.json index a05a29b6ff17..3afbcbf30351 100644 --- a/packages/auth-providers/supertokens/api/package.json +++ b/packages/auth-providers/supertokens/api/package.json @@ -37,7 +37,7 @@ "vitest": "1.6.0" }, "peerDependencies": { - "supertokens-node": "15.2.2" + "supertokens-node": "15.2.3" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" } diff --git a/yarn.lock b/yarn.lock index b5f67296b6be..dfa3aa6b0e6b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7812,7 +7812,7 @@ __metadata: typescript: "npm:5.4.5" vitest: "npm:1.6.0" peerDependencies: - supertokens-node: 15.2.2 + supertokens-node: 15.2.3 languageName: unknown linkType: soft From 1b10029a72254f963bbbb0f1df317425385f04d4 Mon Sep 17 00:00:00 2001 From: Tobbe Lundberg Date: Mon, 10 Jun 2024 22:22:30 +0200 Subject: [PATCH 36/66] fix(dbauth): Combine react imports (#10788) --- .changesets/10788.md | 3 ++ .../web/src/pages/LoginPage/LoginPage.tsx | 3 +- .../web/src/pages/SignupPage/SignupPage.tsx | 3 +- .../dbAuth/middleware/src/index.ts | 13 +++-- .../__snapshots__/dbAuth.test.js.snap | 54 +++++++------------ .../dbAuth/templates/login.tsx.template | 3 +- .../templates/login.webAuthn.tsx.template | 3 +- .../dbAuth/templates/signup.tsx.template | 3 +- .../vite/src/middleware/invokeMiddleware.ts | 20 +++---- 9 files changed, 46 insertions(+), 59 deletions(-) create mode 100644 .changesets/10788.md diff --git a/.changesets/10788.md b/.changesets/10788.md new file mode 100644 index 000000000000..f4bf753f7a83 --- /dev/null +++ b/.changesets/10788.md @@ -0,0 +1,3 @@ +- fix(dbauth): Combine react imports (#10788) by @Tobbe + +Clean up imports in `g dbAuth` templates diff --git a/__fixtures__/test-project/web/src/pages/LoginPage/LoginPage.tsx b/__fixtures__/test-project/web/src/pages/LoginPage/LoginPage.tsx index a61d5ffaedee..bf4e38e13723 100644 --- a/__fixtures__/test-project/web/src/pages/LoginPage/LoginPage.tsx +++ b/__fixtures__/test-project/web/src/pages/LoginPage/LoginPage.tsx @@ -1,5 +1,4 @@ -import { useRef } from 'react' -import { useEffect } from 'react' +import { useEffect, useRef } from 'react' import { Form, diff --git a/__fixtures__/test-project/web/src/pages/SignupPage/SignupPage.tsx b/__fixtures__/test-project/web/src/pages/SignupPage/SignupPage.tsx index d92e41baeeb1..cbc4435e057b 100644 --- a/__fixtures__/test-project/web/src/pages/SignupPage/SignupPage.tsx +++ b/__fixtures__/test-project/web/src/pages/SignupPage/SignupPage.tsx @@ -1,5 +1,4 @@ -import { useRef } from 'react' -import { useEffect } from 'react' +import { useEffect, useRef } from 'react' import { Form, diff --git a/packages/auth-providers/dbAuth/middleware/src/index.ts b/packages/auth-providers/dbAuth/middleware/src/index.ts index 7cf01c9c8804..d201de75ad3b 100644 --- a/packages/auth-providers/dbAuth/middleware/src/index.ts +++ b/packages/auth-providers/dbAuth/middleware/src/index.ts @@ -32,8 +32,13 @@ export const initDbAuthMiddleware = ({ dbAuthUrl = '/middleware/dbauth', }: DbAuthMiddlewareOptions): [Middleware, '*'] => { const mw: Middleware = async (req, res = MiddlewareResponse.next()) => { - // Handoff POST and some GET requests to the dbAuthHandler. The url is configurable on the dbAuth client side. - // This is where we handle login, logout, and signup, etc., no need to enrich the context + console.log('dbAuthUrl', dbAuthUrl) + console.log('req.url', req.url) + + // Handoff POST and some GET requests to the dbAuthHandler. The url is + // configurable on the dbAuth client side. + // This is where we handle login, logout, and signup, etc., no need to + // enrich the context if (req.url.includes(dbAuthUrl)) { // Short circuit here ... // if the call came from packages/auth-providers/dbAuth/web/src/getCurrentUserFromMiddleware.ts @@ -47,6 +52,7 @@ export const initDbAuthMiddleware = ({ return new MiddlewareResponse(JSON.stringify({ currentUser })) } else { const output = await dbAuthHandler(req) + console.log('output', output) const finalHeaders = new Headers() Object.entries(output.headers).forEach(([key, value]) => { @@ -128,7 +134,8 @@ async function validateSession({ // So that it goes into the catch block if (!decryptedSession) { throw new Error( - `No decrypted session found. Check passed in cookie name options to middleware, looking for "${cookieName}"`, + 'No decrypted session found. Check passed in cookie name option to ' + + `middleware. Looking for "${cookieName}"`, ) } diff --git a/packages/cli/src/commands/generate/dbAuth/__tests__/__snapshots__/dbAuth.test.js.snap b/packages/cli/src/commands/generate/dbAuth/__tests__/__snapshots__/dbAuth.test.js.snap index 33504e3400bc..5dd1f0c07cfa 100644 --- a/packages/cli/src/commands/generate/dbAuth/__tests__/__snapshots__/dbAuth.test.js.snap +++ b/packages/cli/src/commands/generate/dbAuth/__tests__/__snapshots__/dbAuth.test.js.snap @@ -103,8 +103,7 @@ export default ForgotPasswordPage `; exports[`dbAuth > handler > produces the correct files with custom password set via flag 2`] = ` -"import { useRef } from 'react' -import { useEffect } from 'react' +"import { useEffect, useRef } from 'react' import { Form, @@ -364,8 +363,7 @@ export default ResetPasswordPage `; exports[`dbAuth > handler > produces the correct files with custom password set via flag 4`] = ` -"import { useRef } from 'react' -import { useEffect } from 'react' +"import { useEffect, useRef } from 'react' import { Form, @@ -591,8 +589,7 @@ export default ForgotPasswordPage `; exports[`dbAuth > handler > produces the correct files with custom password set via prompt 2`] = ` -"import { useRef } from 'react' -import { useEffect } from 'react' +"import { useEffect, useRef } from 'react' import { Form, @@ -852,8 +849,7 @@ export default ResetPasswordPage `; exports[`dbAuth > handler > produces the correct files with custom password set via prompt 4`] = ` -"import { useRef } from 'react' -import { useEffect } from 'react' +"import { useEffect, useRef } from 'react' import { Form, @@ -1079,8 +1075,7 @@ export default ForgotPasswordPage `; exports[`dbAuth > handler > produces the correct files with custom username and password set via flag 2`] = ` -"import { useRef } from 'react' -import { useEffect } from 'react' +"import { useEffect, useRef } from 'react' import { Form, @@ -1340,8 +1335,7 @@ export default ResetPasswordPage `; exports[`dbAuth > handler > produces the correct files with custom username and password set via flag 4`] = ` -"import { useRef } from 'react' -import { useEffect } from 'react' +"import { useEffect, useRef } from 'react' import { Form, @@ -1567,8 +1561,7 @@ export default ForgotPasswordPage `; exports[`dbAuth > handler > produces the correct files with custom username and password set via prompt 2`] = ` -"import { useRef } from 'react' -import { useEffect } from 'react' +"import { useEffect, useRef } from 'react' import { Form, @@ -1828,8 +1821,7 @@ export default ResetPasswordPage `; exports[`dbAuth > handler > produces the correct files with custom username and password set via prompt 4`] = ` -"import { useRef } from 'react' -import { useEffect } from 'react' +"import { useEffect, useRef } from 'react' import { Form, @@ -2055,8 +2047,7 @@ export default ForgotPasswordPage `; exports[`dbAuth > handler > produces the correct files with custom username and password set via prompt and with webauthn enabled via flag 2`] = ` -"import { useRef, useState } from 'react' -import { useEffect } from 'react' +"import { useEffect, useRef, useState } from 'react' import { Form, @@ -2448,8 +2439,7 @@ export default ResetPasswordPage `; exports[`dbAuth > handler > produces the correct files with custom username and password set via prompt and with webauthn enabled via flag 4`] = ` -"import { useRef } from 'react' -import { useEffect } from 'react' +"import { useEffect, useRef } from 'react' import { Form, @@ -2675,8 +2665,7 @@ export default ForgotPasswordPage `; exports[`dbAuth > handler > produces the correct files with custom username and password set via prompt and with webauthn enabled via prompt 2`] = ` -"import { useRef } from 'react' -import { useEffect } from 'react' +"import { useEffect, useRef } from 'react' import { Form, @@ -2936,8 +2925,7 @@ export default ResetPasswordPage `; exports[`dbAuth > handler > produces the correct files with custom username and password set via prompt and with webauthn enabled via prompt 4`] = ` -"import { useRef } from 'react' -import { useEffect } from 'react' +"import { useEffect, useRef } from 'react' import { Form, @@ -3167,8 +3155,7 @@ export default ForgotPasswordPage `; exports[`dbAuth > handler > produces the correct files with custom username set via flag 2`] = ` -"import { useRef } from 'react' -import { useEffect } from 'react' +"import { useEffect, useRef } from 'react' import { Form, @@ -3430,8 +3417,7 @@ export default ResetPasswordPage `; exports[`dbAuth > handler > produces the correct files with custom username set via flag 4`] = ` -"import { useRef } from 'react' -import { useEffect } from 'react' +"import { useEffect, useRef } from 'react' import { Form, @@ -3661,8 +3647,7 @@ export default ForgotPasswordPage `; exports[`dbAuth > handler > produces the correct files with custom username set via prompt 2`] = ` -"import { useRef } from 'react' -import { useEffect } from 'react' +"import { useEffect, useRef } from 'react' import { Form, @@ -3924,8 +3909,7 @@ export default ResetPasswordPage `; exports[`dbAuth > handler > produces the correct files with custom username set via prompt 4`] = ` -"import { useRef } from 'react' -import { useEffect } from 'react' +"import { useEffect, useRef } from 'react' import { Form, @@ -4155,8 +4139,7 @@ export default ForgotPasswordPage `; exports[`dbAuth > handler > produces the correct files with default labels 2`] = ` -"import { useRef } from 'react' -import { useEffect } from 'react' +"import { useEffect, useRef } from 'react' import { Form, @@ -4418,8 +4401,7 @@ export default ResetPasswordPage `; exports[`dbAuth > handler > produces the correct files with default labels 4`] = ` -"import { useRef } from 'react' -import { useEffect } from 'react' +"import { useEffect, useRef } from 'react' import { Form, diff --git a/packages/cli/src/commands/generate/dbAuth/templates/login.tsx.template b/packages/cli/src/commands/generate/dbAuth/templates/login.tsx.template index 88fac90acf42..4fc88fc09039 100644 --- a/packages/cli/src/commands/generate/dbAuth/templates/login.tsx.template +++ b/packages/cli/src/commands/generate/dbAuth/templates/login.tsx.template @@ -1,5 +1,4 @@ -import { useRef } from 'react' -import { useEffect } from 'react' +import { useEffect, useRef } from 'react' import { Form, diff --git a/packages/cli/src/commands/generate/dbAuth/templates/login.webAuthn.tsx.template b/packages/cli/src/commands/generate/dbAuth/templates/login.webAuthn.tsx.template index bf25bef4cb64..1117c90f0145 100644 --- a/packages/cli/src/commands/generate/dbAuth/templates/login.webAuthn.tsx.template +++ b/packages/cli/src/commands/generate/dbAuth/templates/login.webAuthn.tsx.template @@ -1,5 +1,4 @@ -import { useRef, useState } from 'react' -import { useEffect } from 'react' +import { useEffect, useRef, useState } from 'react' import { Form, diff --git a/packages/cli/src/commands/generate/dbAuth/templates/signup.tsx.template b/packages/cli/src/commands/generate/dbAuth/templates/signup.tsx.template index e3e1196f9b34..42c1bf39d3d5 100644 --- a/packages/cli/src/commands/generate/dbAuth/templates/signup.tsx.template +++ b/packages/cli/src/commands/generate/dbAuth/templates/signup.tsx.template @@ -1,5 +1,4 @@ -import { useRef } from 'react' -import { useEffect } from 'react' +import { useEffect, useRef } from 'react' import { Form, diff --git a/packages/vite/src/middleware/invokeMiddleware.ts b/packages/vite/src/middleware/invokeMiddleware.ts index 521fbfc4848c..5a188246d69b 100644 --- a/packages/vite/src/middleware/invokeMiddleware.ts +++ b/packages/vite/src/middleware/invokeMiddleware.ts @@ -39,16 +39,16 @@ export const invoke = async ( // Error out early, incase user returns something else from the middleware // Returning nothing is still fine! - if (output instanceof MiddlewareResponse) { - mwRes = output - } else { - console.error('Return from middleware >> ', output) - console.error('\n----\n') - throw new Error( - 'Invalid return type from middleware. You must return a ' + - 'MiddlewareResponse or nothing at all', - ) - } + // if (output instanceof MiddlewareResponse) { + mwRes = output + // } else { + // console.error('Return from middleware >> ', output) + // console.error('\n----\n') + // throw new Error( + // 'Invalid return type from middleware. You must return a ' + + // 'MiddlewareResponse or nothing at all', + // ) + // } } catch (e) { // A short-circuit will prevent execution of all other middleware down the chain, // and prevent react rendering From ee554185ee7602e436c4b5b13ade904229f1886f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 20:37:06 +0000 Subject: [PATCH 37/66] fix(deps): update dependency eslint-plugin-react to v7.34.2 (#10782) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [eslint-plugin-react](https://togithub.com/jsx-eslint/eslint-plugin-react) | [`7.34.1` -> `7.34.2`](https://renovatebot.com/diffs/npm/eslint-plugin-react/7.34.1/7.34.2) | [![age](https://developer.mend.io/api/mc/badges/age/npm/eslint-plugin-react/7.34.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/eslint-plugin-react/7.34.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/eslint-plugin-react/7.34.1/7.34.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/eslint-plugin-react/7.34.1/7.34.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
jsx-eslint/eslint-plugin-react (eslint-plugin-react) ### [`v7.34.2`](https://togithub.com/jsx-eslint/eslint-plugin-react/releases/tag/v7.34.2) [Compare Source](https://togithub.com/jsx-eslint/eslint-plugin-react/compare/v7.34.1...v7.34.2) ##### Fixed - [`boolean-prop-naming`][boolean-prop-naming]: avoid a crash with a non-TSTypeReference type ([#​3718][] [@​developer-bandi](https://togithub.com/developer-bandi)) - [`jsx-no-leaked-render`][jsx-no-leaked-render]: invalid report if left side is boolean ([#​3746][] [@​akulsr0](https://togithub.com/akulsr0)) - [`jsx-closing-bracket-location`][jsx-closing-bracket-location]: message shows `{{details}}` when there are no details ([#​3759][] [@​mdjermanovic](https://togithub.com/mdjermanovic)) - [`no-invalid-html-attribute`][no-invalid-html-attribute]: ensure error messages are correct ([#​3759][] [@​mdjermanovic](https://togithub.com/mdjermanovic), [@​ljharb](https://togithub.com/ljharb)) ##### Changed - \[Refactor] create various eslint utils to fix eslint deprecations ([#​3759][] [@​mdjermanovic](https://togithub.com/mdjermanovic), [@​ljharb](https://togithub.com/ljharb)) [7.34.2]: https://togithub.com/jsx-eslint/eslint-plugin-react/compare/v7.34.1...v7.34.2 [#​3759]: https://togithub.com/jsx-eslint/eslint-plugin-react/pull/3759 [#​3746]: https://togithub.com/jsx-eslint/eslint-plugin-react/pull/3746 [#​3718]: https://togithub.com/jsx-eslint/eslint-plugin-react/pull/3718 [`boolean-prop-naming`]: docs/rules/boolean-prop-naming.md [`jsx-no-leaked-render`]: docs/rules/jsx-no-leaked-render.md [`jsx-closing-bracket-location`]: docs/rules/jsx-closing-bracket-location.md [`no-invalid-html-attribute`]: docs/rules/no-invalid-html-attribute.md
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/redwoodjs/redwood). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- packages/eslint-config/package.json | 2 +- yarn.lock | 130 ++++++++++++++-------------- 2 files changed, 67 insertions(+), 65 deletions(-) diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json index f73974f0e29f..b343528f53aa 100644 --- a/packages/eslint-config/package.json +++ b/packages/eslint-config/package.json @@ -29,7 +29,7 @@ "eslint-plugin-jest-dom": "4.0.3", "eslint-plugin-jsx-a11y": "6.8.0", "eslint-plugin-prettier": "5.1.3", - "eslint-plugin-react": "7.34.1", + "eslint-plugin-react": "7.34.2", "eslint-plugin-react-hooks": "4.6.0", "prettier": "3.2.5" }, diff --git a/yarn.lock b/yarn.lock index dfa3aa6b0e6b..bfb78395b29d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8214,7 +8214,7 @@ __metadata: eslint-plugin-jest-dom: "npm:4.0.3" eslint-plugin-jsx-a11y: "npm:6.8.0" eslint-plugin-prettier: "npm:5.1.3" - eslint-plugin-react: "npm:7.34.1" + eslint-plugin-react: "npm:7.34.2" eslint-plugin-react-hooks: "npm:4.6.0" jest: "npm:29.7.0" prettier: "npm:3.2.5" @@ -12814,16 +12814,17 @@ __metadata: languageName: node linkType: hard -"array-includes@npm:^3.1.6, array-includes@npm:^3.1.7": - version: 3.1.7 - resolution: "array-includes@npm:3.1.7" +"array-includes@npm:^3.1.6, array-includes@npm:^3.1.7, array-includes@npm:^3.1.8": + version: 3.1.8 + resolution: "array-includes@npm:3.1.8" dependencies: - call-bind: "npm:^1.0.2" - define-properties: "npm:^1.2.0" - es-abstract: "npm:^1.22.1" - get-intrinsic: "npm:^1.2.1" + call-bind: "npm:^1.0.7" + define-properties: "npm:^1.2.1" + es-abstract: "npm:^1.23.2" + es-object-atoms: "npm:^1.0.0" + get-intrinsic: "npm:^1.2.4" is-string: "npm:^1.0.7" - checksum: 10c0/692907bd7f19d06dc58ccb761f34b58f5dc0b437d2b47a8fe42a1501849a5cf5c27aed3d521a9702667827c2c85a7e75df00a402c438094d87fc43f39ebf9b2b + checksum: 10c0/5b1004d203e85873b96ddc493f090c9672fd6c80d7a60b798da8a14bff8a670ff95db5aafc9abc14a211943f05220dacf8ea17638ae0af1a6a47b8c0b48ce370 languageName: node linkType: hard @@ -12834,7 +12835,7 @@ __metadata: languageName: node linkType: hard -"array.prototype.findlast@npm:^1.2.4": +"array.prototype.findlast@npm:^1.2.5": version: 1.2.5 resolution: "array.prototype.findlast@npm:1.2.5" dependencies: @@ -16672,9 +16673,9 @@ __metadata: languageName: node linkType: hard -"es-abstract@npm:^1.20.4, es-abstract@npm:^1.21.2, es-abstract@npm:^1.22.1, es-abstract@npm:^1.22.3, es-abstract@npm:^1.23.0, es-abstract@npm:^1.23.2": - version: 1.23.2 - resolution: "es-abstract@npm:1.23.2" +"es-abstract@npm:^1.20.4, es-abstract@npm:^1.21.2, es-abstract@npm:^1.22.1, es-abstract@npm:^1.22.3, es-abstract@npm:^1.23.0, es-abstract@npm:^1.23.2, es-abstract@npm:^1.23.3": + version: 1.23.3 + resolution: "es-abstract@npm:1.23.3" dependencies: array-buffer-byte-length: "npm:^1.0.1" arraybuffer.prototype.slice: "npm:^1.0.3" @@ -16715,14 +16716,14 @@ __metadata: safe-regex-test: "npm:^1.0.3" string.prototype.trim: "npm:^1.2.9" string.prototype.trimend: "npm:^1.0.8" - string.prototype.trimstart: "npm:^1.0.7" + string.prototype.trimstart: "npm:^1.0.8" typed-array-buffer: "npm:^1.0.2" typed-array-byte-length: "npm:^1.0.1" typed-array-byte-offset: "npm:^1.0.2" - typed-array-length: "npm:^1.0.5" + typed-array-length: "npm:^1.0.6" unbox-primitive: "npm:^1.0.2" which-typed-array: "npm:^1.1.15" - checksum: 10c0/1262ebb7cdb79f255fc7d1f4505c0de2d88d117a0b21d0c984c28a0126efa717ef011f07d502353987cbade39f12c0a5ae59aef0b1231a51ce1b991e4e87c8bb + checksum: 10c0/d27e9afafb225c6924bee9971a7f25f20c314f2d6cb93a63cada4ac11dcf42040896a6c22e5fb8f2a10767055ed4ddf400be3b1eb12297d281726de470b75666 languageName: node linkType: hard @@ -16766,13 +16767,13 @@ __metadata: languageName: node linkType: hard -"es-iterator-helpers@npm:^1.0.15, es-iterator-helpers@npm:^1.0.17": - version: 1.0.18 - resolution: "es-iterator-helpers@npm:1.0.18" +"es-iterator-helpers@npm:^1.0.15, es-iterator-helpers@npm:^1.0.19": + version: 1.0.19 + resolution: "es-iterator-helpers@npm:1.0.19" dependencies: call-bind: "npm:^1.0.7" define-properties: "npm:^1.2.1" - es-abstract: "npm:^1.23.0" + es-abstract: "npm:^1.23.3" es-errors: "npm:^1.3.0" es-set-tostringtag: "npm:^2.0.3" function-bind: "npm:^1.1.2" @@ -16784,7 +16785,7 @@ __metadata: internal-slot: "npm:^1.0.7" iterator.prototype: "npm:^1.1.2" safe-array-concat: "npm:^1.1.2" - checksum: 10c0/93be402e01fa3d8bf62fcadd2fb3055126ffcfe8846911b10b85918ef46775252696c84e6191ec8125bedb61e92242ad1a54a86118436ba19814720cb9ff4aed + checksum: 10c0/ae8f0241e383b3d197383b9842c48def7fce0255fb6ed049311b686ce295595d9e389b466f6a1b7d4e7bb92d82f5e716d6fae55e20c1040249bf976743b038c5 languageName: node linkType: hard @@ -17336,31 +17337,31 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-react@npm:7.34.1": - version: 7.34.1 - resolution: "eslint-plugin-react@npm:7.34.1" +"eslint-plugin-react@npm:7.34.2": + version: 7.34.2 + resolution: "eslint-plugin-react@npm:7.34.2" dependencies: - array-includes: "npm:^3.1.7" - array.prototype.findlast: "npm:^1.2.4" + array-includes: "npm:^3.1.8" + array.prototype.findlast: "npm:^1.2.5" array.prototype.flatmap: "npm:^1.3.2" array.prototype.toreversed: "npm:^1.1.2" array.prototype.tosorted: "npm:^1.1.3" doctrine: "npm:^2.1.0" - es-iterator-helpers: "npm:^1.0.17" + es-iterator-helpers: "npm:^1.0.19" estraverse: "npm:^5.3.0" jsx-ast-utils: "npm:^2.4.1 || ^3.0.0" minimatch: "npm:^3.1.2" - object.entries: "npm:^1.1.7" - object.fromentries: "npm:^2.0.7" - object.hasown: "npm:^1.1.3" - object.values: "npm:^1.1.7" + object.entries: "npm:^1.1.8" + object.fromentries: "npm:^2.0.8" + object.hasown: "npm:^1.1.4" + object.values: "npm:^1.2.0" prop-types: "npm:^15.8.1" resolve: "npm:^2.0.0-next.5" semver: "npm:^6.3.1" - string.prototype.matchall: "npm:^4.0.10" + string.prototype.matchall: "npm:^4.0.11" peerDependencies: eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 - checksum: 10c0/7c61b1314d37a4ac2f2474f9571f801f1a1a5d81dcd4abbb5d07145406518722fb792367267757ee116bde254be9753242d6b93c9619110398b3fe1746e4848c + checksum: 10c0/37dc04424da8626f20a071466e7238d53ed111c53e5e5398d813ac2cf76a2078f00d91f7833fe5b2f0fc98f2688a75b36e78e9ada9f1068705d23c7031094316 languageName: node linkType: hard @@ -24868,25 +24869,26 @@ __metadata: languageName: node linkType: hard -"object.entries@npm:^1.1.7": - version: 1.1.7 - resolution: "object.entries@npm:1.1.7" +"object.entries@npm:^1.1.7, object.entries@npm:^1.1.8": + version: 1.1.8 + resolution: "object.entries@npm:1.1.8" dependencies: - call-bind: "npm:^1.0.2" - define-properties: "npm:^1.2.0" - es-abstract: "npm:^1.22.1" - checksum: 10c0/3ad1899cc7bf14546bf28f4a9b363ae8690b90948fcfbcac4c808395435d760f26193d9cae95337ce0e3c1e5c1f4fa45f7b46b31b68d389e9e117fce38775d86 + call-bind: "npm:^1.0.7" + define-properties: "npm:^1.2.1" + es-object-atoms: "npm:^1.0.0" + checksum: 10c0/db9ea979d2956a3bc26c262da4a4d212d36f374652cc4c13efdd069c1a519c16571c137e2893d1c46e1cb0e15c88fd6419eaf410c945f329f09835487d7e65d3 languageName: node linkType: hard -"object.fromentries@npm:^2.0.7": - version: 2.0.7 - resolution: "object.fromentries@npm:2.0.7" +"object.fromentries@npm:^2.0.7, object.fromentries@npm:^2.0.8": + version: 2.0.8 + resolution: "object.fromentries@npm:2.0.8" dependencies: - call-bind: "npm:^1.0.2" - define-properties: "npm:^1.2.0" - es-abstract: "npm:^1.22.1" - checksum: 10c0/071745c21f6fc9e6c914691f2532c1fb60ad967e5ddc52801d09958b5de926566299d07ae14466452a7efd29015f9145d6c09c573d93a0dc6f1683ee0ec2b93b + call-bind: "npm:^1.0.7" + define-properties: "npm:^1.2.1" + es-abstract: "npm:^1.23.2" + es-object-atoms: "npm:^1.0.0" + checksum: 10c0/cd4327e6c3369cfa805deb4cbbe919bfb7d3aeebf0bcaba291bb568ea7169f8f8cdbcabe2f00b40db0c20cd20f08e11b5f3a5a36fb7dd3fe04850c50db3bf83b languageName: node linkType: hard @@ -24915,7 +24917,7 @@ __metadata: languageName: node linkType: hard -"object.hasown@npm:^1.1.3": +"object.hasown@npm:^1.1.4": version: 1.1.4 resolution: "object.hasown@npm:1.1.4" dependencies: @@ -24926,14 +24928,14 @@ __metadata: languageName: node linkType: hard -"object.values@npm:^1.1.6, object.values@npm:^1.1.7": - version: 1.1.7 - resolution: "object.values@npm:1.1.7" +"object.values@npm:^1.1.6, object.values@npm:^1.1.7, object.values@npm:^1.2.0": + version: 1.2.0 + resolution: "object.values@npm:1.2.0" dependencies: - call-bind: "npm:^1.0.2" - define-properties: "npm:^1.2.0" - es-abstract: "npm:^1.22.1" - checksum: 10c0/e869d6a37fb7afdd0054dea49036d6ccebb84854a8848a093bbd1bc516f53e690bba88f0bc3e83fdfa74c601469ee6989c9b13359cda9604144c6e732fad3b6b + call-bind: "npm:^1.0.7" + define-properties: "npm:^1.2.1" + es-object-atoms: "npm:^1.0.0" + checksum: 10c0/15809dc40fd6c5529501324fec5ff08570b7d70fb5ebbe8e2b3901afec35cf2b3dc484d1210c6c642cd3e7e0a5e18dd1d6850115337fef46bdae14ab0cb18ac3 languageName: node linkType: hard @@ -29357,7 +29359,7 @@ __metadata: languageName: node linkType: hard -"string.prototype.matchall@npm:^4.0.10": +"string.prototype.matchall@npm:^4.0.11": version: 4.0.11 resolution: "string.prototype.matchall@npm:4.0.11" dependencies: @@ -29400,14 +29402,14 @@ __metadata: languageName: node linkType: hard -"string.prototype.trimstart@npm:^1.0.7": - version: 1.0.7 - resolution: "string.prototype.trimstart@npm:1.0.7" +"string.prototype.trimstart@npm:^1.0.8": + version: 1.0.8 + resolution: "string.prototype.trimstart@npm:1.0.8" dependencies: - call-bind: "npm:^1.0.2" - define-properties: "npm:^1.2.0" - es-abstract: "npm:^1.22.1" - checksum: 10c0/0bcf391b41ea16d4fda9c9953d0a7075171fe090d33b4cf64849af94944c50862995672ac03e0c5dba2940a213ad7f53515a668dac859ce22a0276289ae5cf4f + call-bind: "npm:^1.0.7" + define-properties: "npm:^1.2.1" + es-object-atoms: "npm:^1.0.0" + checksum: 10c0/d53af1899959e53c83b64a5fd120be93e067da740e7e75acb433849aa640782fb6c7d4cd5b84c954c84413745a3764df135a8afeb22908b86a835290788d8366 languageName: node linkType: hard @@ -30612,7 +30614,7 @@ __metadata: languageName: node linkType: hard -"typed-array-length@npm:^1.0.5": +"typed-array-length@npm:^1.0.6": version: 1.0.6 resolution: "typed-array-length@npm:1.0.6" dependencies: From a3772ba3327be2f304a3d1d9052b792c03792599 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 20:39:48 +0000 Subject: [PATCH 38/66] fix(deps): update dependency @swc/core to v1.5.27 (#10781) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [@swc/core](https://swc.rs) ([source](https://togithub.com/swc-project/swc)) | [`1.5.7` -> `1.5.27`](https://renovatebot.com/diffs/npm/@swc%2fcore/1.5.7/1.5.27) | [![age](https://developer.mend.io/api/mc/badges/age/npm/@swc%2fcore/1.5.27?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/@swc%2fcore/1.5.27?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/@swc%2fcore/1.5.7/1.5.27?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@swc%2fcore/1.5.7/1.5.27?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
swc-project/swc (@​swc/core) ### [`v1.5.27`](https://togithub.com/swc-project/swc/compare/v1.5.25...v1.5.27) [Compare Source](https://togithub.com/swc-project/swc/compare/v1.5.25...v1.5.27) ### [`v1.5.25`](https://togithub.com/swc-project/swc/blob/HEAD/CHANGELOG.md#1525---2024-06-05) [Compare Source](https://togithub.com/swc-project/swc/compare/v1.5.24...v1.5.25) ##### Bug Fixes - **(es/es2015)** Fix injection location of `this` for getter/setter properties ([#​8993](https://togithub.com/swc-project/swc/issues/8993)) ([09121a6](https://togithub.com/swc-project/swc/commit/09121a61cc5bf390b627e548c471bfc39ccb1c0f)) - **(es/minifier)** Preserve unused special properties ([#​9005](https://togithub.com/swc-project/swc/issues/9005)) ([e764ff6](https://togithub.com/swc-project/swc/commit/e764ff6f64d4e528a2af3e3ad7859ab3f8a2fe48)) - **(es/minifier)** Fix comparison of `-0.0` ([#​9012](https://togithub.com/swc-project/swc/issues/9012)) ([8a29577](https://togithub.com/swc-project/swc/commit/8a29577cc5bd3842d3bccfdbbffa45e4c9944d7f)) - **(es/minifier)** Do not index a string with a surrogate pair ([#​9013](https://togithub.com/swc-project/swc/issues/9013)) ([2879a4d](https://togithub.com/swc-project/swc/commit/2879a4d42b18e7e9d6bc12119a799c6a8c95e108)) - **(es/minifier)** Fix evaluation of `-0` as a string ([#​9011](https://togithub.com/swc-project/swc/issues/9011)) ([9f8e24a](https://togithub.com/swc-project/swc/commit/9f8e24a76c00b8f4470aadf22f071a60f409a13d)) - **(es/resolver)** Fix hoisting of `const` and `let` ([#​8987](https://togithub.com/swc-project/swc/issues/8987)) ([0d9ecf3](https://togithub.com/swc-project/swc/commit/0d9ecf39c1f452be1f2e583f72cebc6986a8088b)) ##### Features - **(es/minifier)** Detect TypeScript enum initialization pattern ([#​8986](https://togithub.com/swc-project/swc/issues/8986)) ([cc8c155](https://togithub.com/swc-project/swc/commit/cc8c1550ddd8f45712039663487fe07b8dfa2599)) - **(x)** Initialize project ([#​8999](https://togithub.com/swc-project/swc/issues/8999)) ([da70ebe](https://togithub.com/swc-project/swc/commit/da70ebed692d734ac4c042cd6a67fee9da793731)) ##### Performance - **(es/parser)** Add feature named `tracing-spans` ([#​9019](https://togithub.com/swc-project/swc/issues/9019)) ([3bf3114](https://togithub.com/swc-project/swc/commit/3bf31148ba5058323ee89bb2ca74b641c52c0669)) ### [`v1.5.24`](https://togithub.com/swc-project/swc/compare/v1.5.23...a1084695ae075079c8a0b967f45b6f4cc4c07bcd) [Compare Source](https://togithub.com/swc-project/swc/compare/v1.5.23...v1.5.24) ### [`v1.5.23`](https://togithub.com/swc-project/swc/blob/HEAD/CHANGELOG.md#1523---2024-05-30) [Compare Source](https://togithub.com/swc-project/swc/compare/v1.5.22...v1.5.23) ##### Bug Fixes - **(bindings/node)** Fix regression of JS APIs ([#​8998](https://togithub.com/swc-project/swc/issues/8998)) ([125ddd2](https://togithub.com/swc-project/swc/commit/125ddd2dd98e882f9e10b7d94f766eae85143d71)) - **(es/jest)** Handle `@jest/globals` ([#​8994](https://togithub.com/swc-project/swc/issues/8994)) ([a81a01f](https://togithub.com/swc-project/swc/commit/a81a01f629613a624798693e60f9796904a8dce1)) ### [`v1.5.22`](https://togithub.com/swc-project/swc/compare/v1.5.20...v1.5.22) [Compare Source](https://togithub.com/swc-project/swc/compare/v1.5.20...v1.5.22) ### [`v1.5.20`](https://togithub.com/swc-project/swc/compare/v1.5.19...v1.5.20) [Compare Source](https://togithub.com/swc-project/swc/compare/v1.5.19...v1.5.20) ### [`v1.5.19`](https://togithub.com/swc-project/swc/compare/v1.5.11...v1.5.19) [Compare Source](https://togithub.com/swc-project/swc/compare/v1.5.11...v1.5.19) ### [`v1.5.11`](https://togithub.com/swc-project/swc/compare/v1.5.7...v1.5.11) [Compare Source](https://togithub.com/swc-project/swc/compare/v1.5.7...v1.5.11)
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/redwoodjs/redwood). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- packages/vite/package.json | 2 +- yarn.lock | 106 ++++++++++++++++++------------------- 2 files changed, 54 insertions(+), 54 deletions(-) diff --git a/packages/vite/package.json b/packages/vite/package.json index c9c7d04e3658..f4d20ad42e86 100644 --- a/packages/vite/package.json +++ b/packages/vite/package.json @@ -76,7 +76,7 @@ "@redwoodjs/project-config": "workspace:*", "@redwoodjs/server-store": "workspace:*", "@redwoodjs/web": "workspace:*", - "@swc/core": "1.5.7", + "@swc/core": "1.5.27", "@vitejs/plugin-react": "4.2.1", "@whatwg-node/fetch": "0.9.17", "@whatwg-node/server": "0.9.34", diff --git a/yarn.lock b/yarn.lock index bfb78395b29d..621f3b21ae88 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8759,7 +8759,7 @@ __metadata: "@redwoodjs/project-config": "workspace:*" "@redwoodjs/server-store": "workspace:*" "@redwoodjs/web": "workspace:*" - "@swc/core": "npm:1.5.7" + "@swc/core": "npm:1.5.27" "@types/busboy": "npm:^1" "@types/cookie": "npm:^0" "@types/express": "npm:4" @@ -10251,94 +10251,94 @@ __metadata: languageName: node linkType: hard -"@swc/core-darwin-arm64@npm:1.5.7": - version: 1.5.7 - resolution: "@swc/core-darwin-arm64@npm:1.5.7" +"@swc/core-darwin-arm64@npm:1.5.27": + version: 1.5.27 + resolution: "@swc/core-darwin-arm64@npm:1.5.27" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"@swc/core-darwin-x64@npm:1.5.7": - version: 1.5.7 - resolution: "@swc/core-darwin-x64@npm:1.5.7" +"@swc/core-darwin-x64@npm:1.5.27": + version: 1.5.27 + resolution: "@swc/core-darwin-x64@npm:1.5.27" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"@swc/core-linux-arm-gnueabihf@npm:1.5.7": - version: 1.5.7 - resolution: "@swc/core-linux-arm-gnueabihf@npm:1.5.7" +"@swc/core-linux-arm-gnueabihf@npm:1.5.27": + version: 1.5.27 + resolution: "@swc/core-linux-arm-gnueabihf@npm:1.5.27" conditions: os=linux & cpu=arm languageName: node linkType: hard -"@swc/core-linux-arm64-gnu@npm:1.5.7": - version: 1.5.7 - resolution: "@swc/core-linux-arm64-gnu@npm:1.5.7" +"@swc/core-linux-arm64-gnu@npm:1.5.27": + version: 1.5.27 + resolution: "@swc/core-linux-arm64-gnu@npm:1.5.27" conditions: os=linux & cpu=arm64 & libc=glibc languageName: node linkType: hard -"@swc/core-linux-arm64-musl@npm:1.5.7": - version: 1.5.7 - resolution: "@swc/core-linux-arm64-musl@npm:1.5.7" +"@swc/core-linux-arm64-musl@npm:1.5.27": + version: 1.5.27 + resolution: "@swc/core-linux-arm64-musl@npm:1.5.27" conditions: os=linux & cpu=arm64 & libc=musl languageName: node linkType: hard -"@swc/core-linux-x64-gnu@npm:1.5.7": - version: 1.5.7 - resolution: "@swc/core-linux-x64-gnu@npm:1.5.7" +"@swc/core-linux-x64-gnu@npm:1.5.27": + version: 1.5.27 + resolution: "@swc/core-linux-x64-gnu@npm:1.5.27" conditions: os=linux & cpu=x64 & libc=glibc languageName: node linkType: hard -"@swc/core-linux-x64-musl@npm:1.5.7": - version: 1.5.7 - resolution: "@swc/core-linux-x64-musl@npm:1.5.7" +"@swc/core-linux-x64-musl@npm:1.5.27": + version: 1.5.27 + resolution: "@swc/core-linux-x64-musl@npm:1.5.27" conditions: os=linux & cpu=x64 & libc=musl languageName: node linkType: hard -"@swc/core-win32-arm64-msvc@npm:1.5.7": - version: 1.5.7 - resolution: "@swc/core-win32-arm64-msvc@npm:1.5.7" +"@swc/core-win32-arm64-msvc@npm:1.5.27": + version: 1.5.27 + resolution: "@swc/core-win32-arm64-msvc@npm:1.5.27" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"@swc/core-win32-ia32-msvc@npm:1.5.7": - version: 1.5.7 - resolution: "@swc/core-win32-ia32-msvc@npm:1.5.7" +"@swc/core-win32-ia32-msvc@npm:1.5.27": + version: 1.5.27 + resolution: "@swc/core-win32-ia32-msvc@npm:1.5.27" conditions: os=win32 & cpu=ia32 languageName: node linkType: hard -"@swc/core-win32-x64-msvc@npm:1.5.7": - version: 1.5.7 - resolution: "@swc/core-win32-x64-msvc@npm:1.5.7" +"@swc/core-win32-x64-msvc@npm:1.5.27": + version: 1.5.27 + resolution: "@swc/core-win32-x64-msvc@npm:1.5.27" conditions: os=win32 & cpu=x64 languageName: node linkType: hard -"@swc/core@npm:1.5.7, @swc/core@npm:^1.3.82": - version: 1.5.7 - resolution: "@swc/core@npm:1.5.7" +"@swc/core@npm:1.5.27, @swc/core@npm:^1.3.82": + version: 1.5.27 + resolution: "@swc/core@npm:1.5.27" dependencies: - "@swc/core-darwin-arm64": "npm:1.5.7" - "@swc/core-darwin-x64": "npm:1.5.7" - "@swc/core-linux-arm-gnueabihf": "npm:1.5.7" - "@swc/core-linux-arm64-gnu": "npm:1.5.7" - "@swc/core-linux-arm64-musl": "npm:1.5.7" - "@swc/core-linux-x64-gnu": "npm:1.5.7" - "@swc/core-linux-x64-musl": "npm:1.5.7" - "@swc/core-win32-arm64-msvc": "npm:1.5.7" - "@swc/core-win32-ia32-msvc": "npm:1.5.7" - "@swc/core-win32-x64-msvc": "npm:1.5.7" - "@swc/counter": "npm:^0.1.2" - "@swc/types": "npm:0.1.7" + "@swc/core-darwin-arm64": "npm:1.5.27" + "@swc/core-darwin-x64": "npm:1.5.27" + "@swc/core-linux-arm-gnueabihf": "npm:1.5.27" + "@swc/core-linux-arm64-gnu": "npm:1.5.27" + "@swc/core-linux-arm64-musl": "npm:1.5.27" + "@swc/core-linux-x64-gnu": "npm:1.5.27" + "@swc/core-linux-x64-musl": "npm:1.5.27" + "@swc/core-win32-arm64-msvc": "npm:1.5.27" + "@swc/core-win32-ia32-msvc": "npm:1.5.27" + "@swc/core-win32-x64-msvc": "npm:1.5.27" + "@swc/counter": "npm:^0.1.3" + "@swc/types": "npm:^0.1.8" peerDependencies: - "@swc/helpers": ^0.5.0 + "@swc/helpers": "*" dependenciesMeta: "@swc/core-darwin-arm64": optional: true @@ -10363,23 +10363,23 @@ __metadata: peerDependenciesMeta: "@swc/helpers": optional: true - checksum: 10c0/83ab96bee5d448e580d8a6c8c1d1fbfdfaf5561f8904140122e49c428c2336790d31e7bdcdf610ce8f20c7f682785263d2ebab7cb56c2dcb5ea46be54eab2c03 + checksum: 10c0/c9466b9120a3fbffc151c0fe095369bdbd23eeb9ca091e3767dfa8588290ccaeb2bc83796e8a5dded6a89beae59c9a387b0fc2fb3f2e2833797dd0d415a96f9b languageName: node linkType: hard -"@swc/counter@npm:^0.1.2, @swc/counter@npm:^0.1.3": +"@swc/counter@npm:^0.1.3": version: 0.1.3 resolution: "@swc/counter@npm:0.1.3" checksum: 10c0/8424f60f6bf8694cfd2a9bca45845bce29f26105cda8cf19cdb9fd3e78dc6338699e4db77a89ae449260bafa1cc6bec307e81e7fb96dbf7dcfce0eea55151356 languageName: node linkType: hard -"@swc/types@npm:0.1.7": - version: 0.1.7 - resolution: "@swc/types@npm:0.1.7" +"@swc/types@npm:^0.1.8": + version: 0.1.8 + resolution: "@swc/types@npm:0.1.8" dependencies: "@swc/counter": "npm:^0.1.3" - checksum: 10c0/da7c542de0a44b85a98139db03920448e86309d28ad9e9335f91b4025e5f32ae4fbbfdd0f287330fb0de737e7c5ec4f64ade0fc5fffea6c2fd9ac681b1e97bea + checksum: 10c0/a3bb7145d8f01d58f93683645ef530c479243f04c2a79a15020e2a1ac69003643bc1cad1075225f3992b2a5e55be43f264eaea88620263d90ada98a4107fb872 languageName: node linkType: hard From 9506216e5c658084fed559951b51be97c069202b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 21:59:10 +0100 Subject: [PATCH 39/66] chore(deps): update dependency @types/memjs to v1.3.3 (#10776) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [@types/memjs](https://togithub.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/memjs) ([source](https://togithub.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/memjs)) | [`1.3.0` -> `1.3.3`](https://renovatebot.com/diffs/npm/@types%2fmemjs/1.3.0/1.3.3) | [![age](https://developer.mend.io/api/mc/badges/age/npm/@types%2fmemjs/1.3.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/@types%2fmemjs/1.3.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/@types%2fmemjs/1.3.0/1.3.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@types%2fmemjs/1.3.0/1.3.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled because a matching PR was automerged previously. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/redwoodjs/redwood). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 621f3b21ae88..6789578530fc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11175,11 +11175,11 @@ __metadata: linkType: hard "@types/memjs@npm:1": - version: 1.3.0 - resolution: "@types/memjs@npm:1.3.0" + version: 1.3.3 + resolution: "@types/memjs@npm:1.3.3" dependencies: "@types/node": "npm:*" - checksum: 10c0/71d8dda576405a8ca16b6b312a546e4703f102a24d39c64d486b9bf6cdb13498ebf1c14e3b5ce583baeae47f84f21576c64950ba094b14ccd72639106a17dfd5 + checksum: 10c0/7179534b5f16e750fdc4e45242bf657b061ccbb876c721fc85c45b46cf9603503f286a9f2139cc86a95e1e2c6c7c8fce678fd8765ad5e1f9a888e5014d03a2b0 languageName: node linkType: hard From bd847a7e80b6d99acc7013cde0e7e8332a1fb713 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 23:28:45 +0100 Subject: [PATCH 40/66] chore(deps): bump braces from 3.0.2 to 3.0.3 (#10790) Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3.
Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=braces&package-manager=npm_and_yarn&previous-version=3.0.2&new-version=3.0.3)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/redwoodjs/redwood/network/alerts).
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Josh GM Walker <56300765+Josh-Walker-GM@users.noreply.github.com> --- yarn.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/yarn.lock b/yarn.lock index 6789578530fc..b8c5e6d54369 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13686,11 +13686,11 @@ __metadata: linkType: hard "braces@npm:^3.0.2, braces@npm:~3.0.2": - version: 3.0.2 - resolution: "braces@npm:3.0.2" + version: 3.0.3 + resolution: "braces@npm:3.0.3" dependencies: - fill-range: "npm:^7.0.1" - checksum: 10c0/321b4d675791479293264019156ca322163f02dc06e3c4cab33bb15cd43d80b51efef69b0930cfde3acd63d126ebca24cd0544fa6f261e093a0fb41ab9dda381 + fill-range: "npm:^7.1.1" + checksum: 10c0/7c6dfd30c338d2997ba77500539227b9d1f85e388a5f43220865201e407e076783d0881f2d297b9f80951b4c957fcf0b51c1d2d24227631643c3f7c284b0aa04 languageName: node linkType: hard @@ -18087,12 +18087,12 @@ __metadata: languageName: node linkType: hard -"fill-range@npm:^7.0.1": - version: 7.0.1 - resolution: "fill-range@npm:7.0.1" +"fill-range@npm:^7.1.1": + version: 7.1.1 + resolution: "fill-range@npm:7.1.1" dependencies: to-regex-range: "npm:^5.0.1" - checksum: 10c0/7cdad7d426ffbaadf45aeb5d15ec675bbd77f7597ad5399e3d2766987ed20bda24d5fac64b3ee79d93276f5865608bb22344a26b9b1ae6c4d00bd94bf611623f + checksum: 10c0/b75b691bbe065472f38824f694c2f7449d7f5004aa950426a2c28f0306c60db9b880c0b0e4ed819997ffb882d1da02cfcfc819bddc94d71627f5269682edf018 languageName: node linkType: hard From ae87abf4e64f008a145f40862ca50ff0fdf20f6c Mon Sep 17 00:00:00 2001 From: Tobbe Lundberg Date: Tue, 11 Jun 2024 09:45:55 -0400 Subject: [PATCH 41/66] fix(dbauth): Don't duplicate authDecoder creation (#10791) --- .changesets/10791.md | 3 + .../dbAuth/setup/jest.config.js | 5 ++ .../auth-providers/dbAuth/setup/package.json | 6 +- .../__snapshots__/setup.test.ts.snap | 29 ++++++ .../dbAuth/setup/src/__tests__/setup.test.ts | 90 +++++++++++++++++++ .../dbAuth/setup/src/setupHandler.ts | 38 +++++--- yarn.lock | 4 +- 7 files changed, 162 insertions(+), 13 deletions(-) create mode 100644 .changesets/10791.md create mode 100644 packages/auth-providers/dbAuth/setup/jest.config.js create mode 100644 packages/auth-providers/dbAuth/setup/src/__tests__/__snapshots__/setup.test.ts.snap create mode 100644 packages/auth-providers/dbAuth/setup/src/__tests__/setup.test.ts diff --git a/.changesets/10791.md b/.changesets/10791.md new file mode 100644 index 000000000000..e7bc5589f119 --- /dev/null +++ b/.changesets/10791.md @@ -0,0 +1,3 @@ +- fix(dbauth): Don't duplicate authDecoder creation (#10791) by @Tobbe + +Make it possible to run the dbAuth setup command more than once without getting invalid code diff --git a/packages/auth-providers/dbAuth/setup/jest.config.js b/packages/auth-providers/dbAuth/setup/jest.config.js new file mode 100644 index 000000000000..4ed1a0d238c7 --- /dev/null +++ b/packages/auth-providers/dbAuth/setup/jest.config.js @@ -0,0 +1,5 @@ +/** @type {import('@jest/types').Config.InitialOptions} */ +module.exports = { + testEnvironment: 'jest-environment-node', + testPathIgnorePatterns: ['fixtures', 'dist'], +} diff --git a/packages/auth-providers/dbAuth/setup/package.json b/packages/auth-providers/dbAuth/setup/package.json index 595cd7944b4f..6502a45b07b0 100644 --- a/packages/auth-providers/dbAuth/setup/package.json +++ b/packages/auth-providers/dbAuth/setup/package.json @@ -18,7 +18,9 @@ "build:pack": "yarn pack -o redwoodjs-auth-dbauth-setup.tgz", "build:types": "tsc --build --verbose", "build:watch": "nodemon --watch src --ext \"js,jsx,ts,tsx,template\" --ignore dist --exec \"yarn build\"", - "prepublishOnly": "NODE_ENV=production yarn build" + "prepublishOnly": "NODE_ENV=production yarn build", + "test": "jest src", + "test:watch": "yarn test --watch" }, "dependencies": { "@babel/runtime-corejs3": "7.24.5", @@ -33,6 +35,8 @@ "@babel/core": "^7.22.20", "@simplewebauthn/typescript-types": "7.4.0", "@types/yargs": "17.0.32", + "jest": "29.7.0", + "jest-environment-node": "29.7.0", "typescript": "5.4.5" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" diff --git a/packages/auth-providers/dbAuth/setup/src/__tests__/__snapshots__/setup.test.ts.snap b/packages/auth-providers/dbAuth/setup/src/__tests__/__snapshots__/setup.test.ts.snap new file mode 100644 index 000000000000..ba5075d93d85 --- /dev/null +++ b/packages/auth-providers/dbAuth/setup/src/__tests__/__snapshots__/setup.test.ts.snap @@ -0,0 +1,29 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`dbAuth setup command does not duplicate authDecoder creation 1`] = ` +" +import { createGraphQLHandler } from '@redwoodjs/graphql-server' + +import directives from 'src/directives/**/*.{js,ts}' +import sdls from 'src/graphql/**/*.sdl.{js,ts}' +import services from 'src/services/**/*.{js,ts}' + +import { cookieName, getCurrentUser } from 'src/lib/auth' +import { db } from 'src/lib/db' +import { logger } from 'src/lib/logger' + +const authDecoder = createAuthDecoder(cookieName) + +export const handler = createGraphQLHandler({ + getCurrentUser, + loggerConfig: { logger, options: {} }, + directives, + sdls, + services, + onException: () => { + // Disconnect from your database with an unhandled exception. + db.$disconnect() + }, +}) + " +`; diff --git a/packages/auth-providers/dbAuth/setup/src/__tests__/setup.test.ts b/packages/auth-providers/dbAuth/setup/src/__tests__/setup.test.ts new file mode 100644 index 000000000000..df2b50c9343d --- /dev/null +++ b/packages/auth-providers/dbAuth/setup/src/__tests__/setup.test.ts @@ -0,0 +1,90 @@ +import path from 'node:path' + +import { vol } from 'memfs' + +jest.mock('fs', () => require('memfs').fs) + +import { createAuthDecoderFunction } from '../setupHandler' + +const RWJS_CWD = process.env.RWJS_CWD +const redwoodProjectPath = '/redwood-app' + +jest.mock('../setupData', () => ({ + notes: '', + extraTask: undefined, +})) + +jest.mock('@redwoodjs/cli-helpers', () => { + return { + getGraphqlPath: () => { + return redwoodProjectPath + '/api/src/functions/graphql.ts' + }, + getPaths: () => ({ + base: redwoodProjectPath, + }), + colors: { + error: (str: string) => str, + warning: (str: string) => str, + green: (str: string) => str, + info: (str: string) => str, + bold: (str: string) => str, + underline: (str: string) => str, + }, + } +}) + +beforeAll(() => { + process.env.RWJS_CWD = redwoodProjectPath +}) + +afterAll(() => { + process.env.RWJS_CWD = RWJS_CWD +}) + +describe('dbAuth setup command', () => { + it('does not duplicate authDecoder creation', async () => { + vol.fromJSON( + { + [path.resolve(__dirname, '../../package.json')]: + '{ "version": "0.0.0" }', + 'api/src/functions/graphql.ts': ` +import { createGraphQLHandler } from '@redwoodjs/graphql-server' + +import directives from 'src/directives/**/*.{js,ts}' +import sdls from 'src/graphql/**/*.sdl.{js,ts}' +import services from 'src/services/**/*.{js,ts}' + +import { getCurrentUser } from 'src/lib/auth' +import { db } from 'src/lib/db' +import { logger } from 'src/lib/logger' + +export const handler = createGraphQLHandler({ + getCurrentUser, + loggerConfig: { logger, options: {} }, + directives, + sdls, + services, + onException: () => { + // Disconnect from your database with an unhandled exception. + db.$disconnect() + }, +}) + `, + }, + redwoodProjectPath, + ) + + createAuthDecoderFunction.task() + const updatedGraphqlTs = + vol.toJSON()[redwoodProjectPath + '/api/src/functions/graphql.ts'] + expect(updatedGraphqlTs).toMatch(/import { cookieName, getCurrentUser } fr/) + expect(updatedGraphqlTs).toMatch(/const authDecoder = createAuthDecoder\(c/) + expect(updatedGraphqlTs).toMatchSnapshot() + + // Running again shouldn't change anything in this case + createAuthDecoderFunction.task() + const updatedGraphqlTs2 = + vol.toJSON()[redwoodProjectPath + '/api/src/functions/graphql.ts'] + expect(updatedGraphqlTs).toEqual(updatedGraphqlTs2) + }) +}) diff --git a/packages/auth-providers/dbAuth/setup/src/setupHandler.ts b/packages/auth-providers/dbAuth/setup/src/setupHandler.ts index d2cb6143f727..8f6cd61d0ef1 100644 --- a/packages/auth-providers/dbAuth/setup/src/setupHandler.ts +++ b/packages/auth-providers/dbAuth/setup/src/setupHandler.ts @@ -14,11 +14,11 @@ import { apiPackages as webAuthnApiPackages, } from './webAuthn.setupData' -const { version } = JSON.parse( - fs.readFileSync(path.resolve(__dirname, '../package.json'), 'utf-8'), -) - export async function handler({ webauthn, force: forceArg }: Args) { + const { version } = JSON.parse( + fs.readFileSync(path.resolve(__dirname, '../package.json'), 'utf-8'), + ) + const webAuthn = await shouldIncludeWebAuthn(webauthn) standardAuthHandler({ @@ -72,18 +72,29 @@ export const createAuthDecoderFunction = { throw new Error('Could not find your graphql file path') } + const authDecoderCreation = + 'const authDecoder = createAuthDecoder(cookieName)' + const content = fs.readFileSync(graphqlPath, 'utf-8') - const newContent = content - .replace( - 'import { getCurrentUser } from', - 'import { cookieName, getCurrentUser } from', - ) - .replace( + let newContent = content.replace( + 'import { getCurrentUser } from', + 'import { cookieName, getCurrentUser } from', + ) + + const authDecoderCreationRegexp = new RegExp( + '^' + escapeRegExp(authDecoderCreation), + 'm', + ) + + if (!authDecoderCreationRegexp.test(newContent)) { + newContent = newContent.replace( 'export const handler = createGraphQLHandler({', - 'const authDecoder = createAuthDecoder(cookieName)\n\n' + + authDecoderCreation + + '\n\n' + 'export const handler = createGraphQLHandler({', ) + } if (!newContent.includes('import { cookieName')) { throw new Error('Failed to import cookieName') @@ -92,3 +103,8 @@ export const createAuthDecoderFunction = { fs.writeFileSync(graphqlPath, newContent) }, } + +// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions#escaping +function escapeRegExp(str: string) { + return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&') // $& means the whole matched string +} diff --git a/yarn.lock b/yarn.lock index b8c5e6d54369..bf045ab1936f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7599,6 +7599,8 @@ __metadata: "@simplewebauthn/typescript-types": "npm:7.4.0" "@types/yargs": "npm:17.0.32" core-js: "npm:3.37.1" + jest: "npm:29.7.0" + jest-environment-node: "npm:29.7.0" prompts: "npm:2.4.2" terminal-link: "npm:2.1.1" typescript: "npm:5.4.5" @@ -21128,7 +21130,7 @@ __metadata: languageName: node linkType: hard -"jest-environment-node@npm:^29.7.0": +"jest-environment-node@npm:29.7.0, jest-environment-node@npm:^29.7.0": version: 29.7.0 resolution: "jest-environment-node@npm:29.7.0" dependencies: From d850f3621eaaca1358809cbf89aa40855a07cbe4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Jun 2024 17:25:51 +0100 Subject: [PATCH 42/66] chore(deps): bump @grpc/grpc-js from 1.8.20 to 1.8.22 (#10792) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [@grpc/grpc-js](https://github.com/grpc/grpc-node) from 1.8.20 to 1.8.22.
Release notes

Sourced from @​grpc/grpc-js's releases.

@​grpc/grpc-js 1.8.22

  • Avoid buffering significantly more than grpc.max_receive_message_size per received message.

@​grpc/grpc-js@​1.8.21

  • Fix propagation of UNIMPLEMENTED error messages (#2528)
Commits
  • a8a0203 Merge pull request from GHSA-7v5v-9h63-cj86
  • 3b110cd grpc-js: Bump to 1.8.22
  • 8e62222 grpc-js: Avoid buffering significantly more than max_receive_message_size per...
  • 9d83947 Merge pull request #2742 from sergiitk/backport-1.8-psm-interop-common-prod-t...
  • 00f348c Merge pull request #2729 from sergiitk/psm-interop-common-prod-tests
  • 36d105b Merge pull request #2737 from murgatroid99/backport-1.8-grpc-js_linkify-it_fix
  • 969e305 Merge pull request #2735 from murgatroid99/grpc-js_linkify-it_fix
  • d78216f Merge pull request #2715 from sergiitk/backport-1.8-psm-interop-pkg-dev
  • f38966a Merge pull request #2712 from sergiitk/psm-interop-pkg-dev
  • ffefff2 Merge pull request #2640 from XuanWang-Amos/backport-1.8-psm-interop-shared-b...
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=@grpc/grpc-js&package-manager=npm_and_yarn&previous-version=1.8.20&new-version=1.8.22)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/redwoodjs/redwood/network/alerts).
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index bf045ab1936f..29a90b0bce35 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4831,12 +4831,12 @@ __metadata: linkType: hard "@grpc/grpc-js@npm:~1.8.0": - version: 1.8.20 - resolution: "@grpc/grpc-js@npm:1.8.20" + version: 1.8.22 + resolution: "@grpc/grpc-js@npm:1.8.22" dependencies: "@grpc/proto-loader": "npm:^0.7.0" "@types/node": "npm:>=12.12.47" - checksum: 10c0/296c415afedc2ae27e3741472df8520223e97d10c63a2a9fc482357e3f735430b4fc6e493ccf7efcc440ec7f752ce9f041b195d3b35a741f356a9e594113d175 + checksum: 10c0/417c03f6fbb6d342165a8940acd6f5df1cc54a9944266dfc6fadf012730e010ee48e98aa0f7b5ce049420d04b8763ff2979251f92e424c000c35d060ee6863aa languageName: node linkType: hard From 751d9e0aa2b6fa711dd95725ef66f80dedf49a0e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 11 Jun 2024 19:14:28 +0100 Subject: [PATCH 43/66] chore(deps): update dependency @azure/msal-browser to v2.39.0 (#10806) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [@azure/msal-browser](https://togithub.com/AzureAD/microsoft-authentication-library-for-js) | [`2.38.4` -> `2.39.0`](https://renovatebot.com/diffs/npm/@azure%2fmsal-browser/2.38.4/2.39.0) | [![age](https://developer.mend.io/api/mc/badges/age/npm/@azure%2fmsal-browser/2.39.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/@azure%2fmsal-browser/2.39.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/@azure%2fmsal-browser/2.38.4/2.39.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@azure%2fmsal-browser/2.38.4/2.39.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/redwoodjs/redwood). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .../azureActiveDirectory/web/package.json | 4 ++-- yarn.lock | 22 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/packages/auth-providers/azureActiveDirectory/web/package.json b/packages/auth-providers/azureActiveDirectory/web/package.json index f288fe0cff91..0afd4c3fdfbd 100644 --- a/packages/auth-providers/azureActiveDirectory/web/package.json +++ b/packages/auth-providers/azureActiveDirectory/web/package.json @@ -28,7 +28,7 @@ "core-js": "3.37.1" }, "devDependencies": { - "@azure/msal-browser": "2.38.4", + "@azure/msal-browser": "2.39.0", "@babel/cli": "7.24.5", "@babel/core": "^7.22.20", "@types/netlify-identity-widget": "1.9.6", @@ -38,7 +38,7 @@ "vitest": "1.6.0" }, "peerDependencies": { - "@azure/msal-browser": "2.38.4" + "@azure/msal-browser": "2.39.0" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" } diff --git a/yarn.lock b/yarn.lock index 29a90b0bce35..977ff28b1a8b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -323,19 +323,19 @@ __metadata: languageName: node linkType: hard -"@azure/msal-browser@npm:2.38.4": - version: 2.38.4 - resolution: "@azure/msal-browser@npm:2.38.4" +"@azure/msal-browser@npm:2.39.0": + version: 2.39.0 + resolution: "@azure/msal-browser@npm:2.39.0" dependencies: - "@azure/msal-common": "npm:13.3.1" - checksum: 10c0/037dee306bf4bc65d599466d4fe5e0288b6df259f0fc515b65e427a2d72d9f5c89092760804679659787e9e33008bd6e0eb28a4bfca5444580e729b7faca53fa + "@azure/msal-common": "npm:13.3.3" + checksum: 10c0/b50a94afa0de3c27f469989177f75737a3169380c12889f9d09e8facf50c76e8e6f41634c01ae2a1b03e7af22208cd2004d0bb4eee69695d1b5dbeac6eab2b84 languageName: node linkType: hard -"@azure/msal-common@npm:13.3.1": - version: 13.3.1 - resolution: "@azure/msal-common@npm:13.3.1" - checksum: 10c0/a5827105e42483ae66736cc541e33a9df7e860b9100d2bb395ef4e0bd082a9d1c574d81147b8bfa7c68a004f0c92d2da6988c6f71033e729178721acf6cbf3c8 +"@azure/msal-common@npm:13.3.3": + version: 13.3.3 + resolution: "@azure/msal-common@npm:13.3.3" + checksum: 10c0/3001b16077c11026aa8cd19a8c376d754ebe8ddd87309312799c2c9ef11f35b8dcdc454b1b45f6cf8eb2179c7ee5670ad056e961a1f03d59952bcd359b8383fa languageName: node linkType: hard @@ -7468,7 +7468,7 @@ __metadata: version: 0.0.0-use.local resolution: "@redwoodjs/auth-azure-active-directory-web@workspace:packages/auth-providers/azureActiveDirectory/web" dependencies: - "@azure/msal-browser": "npm:2.38.4" + "@azure/msal-browser": "npm:2.39.0" "@babel/cli": "npm:7.24.5" "@babel/core": "npm:^7.22.20" "@babel/runtime-corejs3": "npm:7.24.5" @@ -7480,7 +7480,7 @@ __metadata: typescript: "npm:5.4.5" vitest: "npm:1.6.0" peerDependencies: - "@azure/msal-browser": 2.38.4 + "@azure/msal-browser": 2.39.0 languageName: unknown linkType: soft From efd87194362a42772ce4c2e033af9fa7896121d4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 11 Jun 2024 18:19:09 +0000 Subject: [PATCH 44/66] fix(deps): update dependency systeminformation to v5.22.11 (#10804) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [systeminformation](https://systeminformation.io) ([source](https://togithub.com/sebhildebrandt/systeminformation)) | [`5.22.10` -> `5.22.11`](https://renovatebot.com/diffs/npm/systeminformation/5.22.10/5.22.11) | [![age](https://developer.mend.io/api/mc/badges/age/npm/systeminformation/5.22.11?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/systeminformation/5.22.11?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/systeminformation/5.22.10/5.22.11?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/systeminformation/5.22.10/5.22.11?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
sebhildebrandt/systeminformation (systeminformation) ### [`v5.22.11`](https://togithub.com/sebhildebrandt/systeminformation/compare/v5.22.10...v5.22.11) [Compare Source](https://togithub.com/sebhildebrandt/systeminformation/compare/v5.22.10...v5.22.11)
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/redwoodjs/redwood). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- packages/cli/package.json | 2 +- packages/create-redwood-app/package.json | 2 +- packages/internal/package.json | 2 +- packages/telemetry/package.json | 2 +- yarn.lock | 16 ++++++++-------- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/cli/package.json b/packages/cli/package.json index cc4bd3bc6d74..140102bb84c7 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -76,7 +76,7 @@ "semver": "7.6.2", "smol-toml": "1.2.1", "string-env-interpolation": "1.0.1", - "systeminformation": "5.22.10", + "systeminformation": "5.22.11", "terminal-link": "2.1.1", "title-case": "3.0.3", "uuid": "9.0.1", diff --git a/packages/create-redwood-app/package.json b/packages/create-redwood-app/package.json index a6c12296d300..e04b38631b72 100644 --- a/packages/create-redwood-app/package.json +++ b/packages/create-redwood-app/package.json @@ -42,7 +42,7 @@ "fs-extra": "11.2.0", "klaw-sync": "6.0.0", "semver": "7.6.2", - "systeminformation": "5.22.10", + "systeminformation": "5.22.11", "terminal-link": "2.1.1", "tsx": "4.10.3", "untildify": "4.0.0", diff --git a/packages/internal/package.json b/packages/internal/package.json index 045169c50d7c..a3440c574084 100644 --- a/packages/internal/package.json +++ b/packages/internal/package.json @@ -64,7 +64,7 @@ "rimraf": "5.0.7", "source-map": "0.7.4", "string-env-interpolation": "1.0.1", - "systeminformation": "5.22.10", + "systeminformation": "5.22.11", "terminal-link": "2.1.1", "ts-node": "10.9.2", "typescript": "5.4.5" diff --git a/packages/telemetry/package.json b/packages/telemetry/package.json index 5d86e08aae19..0a0e9e4be48c 100644 --- a/packages/telemetry/package.json +++ b/packages/telemetry/package.json @@ -26,7 +26,7 @@ "@whatwg-node/fetch": "0.9.17", "ci-info": "4.0.0", "envinfo": "7.13.0", - "systeminformation": "5.22.10", + "systeminformation": "5.22.11", "uuid": "9.0.1", "yargs": "17.7.2" }, diff --git a/yarn.lock b/yarn.lock index 977ff28b1a8b..aff8d5943e3e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8057,7 +8057,7 @@ __metadata: semver: "npm:7.6.2" smol-toml: "npm:1.2.1" string-env-interpolation: "npm:1.0.1" - systeminformation: "npm:5.22.10" + systeminformation: "npm:5.22.11" terminal-link: "npm:2.1.1" title-case: "npm:3.0.3" tsx: "npm:4.10.3" @@ -8384,7 +8384,7 @@ __metadata: rimraf: "npm:5.0.7" source-map: "npm:0.7.4" string-env-interpolation: "npm:1.0.1" - systeminformation: "npm:5.22.10" + systeminformation: "npm:5.22.11" terminal-link: "npm:2.1.1" ts-node: "npm:10.9.2" tsx: "npm:4.10.3" @@ -8686,7 +8686,7 @@ __metadata: "@whatwg-node/fetch": "npm:0.9.17" ci-info: "npm:4.0.0" envinfo: "npm:7.13.0" - systeminformation: "npm:5.22.10" + systeminformation: "npm:5.22.11" tsx: "npm:4.10.3" typescript: "npm:5.4.5" uuid: "npm:9.0.1" @@ -15184,7 +15184,7 @@ __metadata: fs-extra: "npm:11.2.0" klaw-sync: "npm:6.0.0" semver: "npm:7.6.2" - systeminformation: "npm:5.22.10" + systeminformation: "npm:5.22.11" terminal-link: "npm:2.1.1" tsx: "npm:4.10.3" untildify: "npm:4.0.0" @@ -29730,12 +29730,12 @@ __metadata: languageName: node linkType: hard -"systeminformation@npm:5.22.10": - version: 5.22.10 - resolution: "systeminformation@npm:5.22.10" +"systeminformation@npm:5.22.11": + version: 5.22.11 + resolution: "systeminformation@npm:5.22.11" bin: systeminformation: lib/cli.js - checksum: 10c0/ffe7774acdb04a21a10651c227f8d319b7798dbe4cbb21e473e183511b59e2c2ca14a33e3acb89030e74380e758e2c38d4289104fc5596e5970e19b6a6dab113 + checksum: 10c0/9817a48a4ab3584b575a796e27f8e898aa87834aa4b566ea2c6cfc637b42f156e1500f6c366db4e2339da1339d8ba08d978e73f0dc70450c482734ede7a45510 conditions: (os=darwin | os=linux | os=win32 | os=freebsd | os=openbsd | os=netbsd | os=sunos | os=android) languageName: node linkType: hard From 858bb612d7eef89f4fd648d4e18dc72183d81869 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 11 Jun 2024 18:19:34 +0000 Subject: [PATCH 45/66] chore(deps): update dependency nodemon to v3.1.3 (#10803) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [nodemon](https://nodemon.io) ([source](https://togithub.com/remy/nodemon)) | [`3.1.0` -> `3.1.3`](https://renovatebot.com/diffs/npm/nodemon/3.1.0/3.1.3) | [![age](https://developer.mend.io/api/mc/badges/age/npm/nodemon/3.1.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/nodemon/3.1.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/nodemon/3.1.0/3.1.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/nodemon/3.1.0/3.1.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
remy/nodemon (nodemon) ### [`v3.1.3`](https://togithub.com/remy/nodemon/releases/tag/v3.1.3) [Compare Source](https://togithub.com/remy/nodemon/compare/v3.1.2...v3.1.3) ##### Bug Fixes - cast the nodemon function as Nodemon type ([eaa1d54](https://togithub.com/remy/nodemon/commit/eaa1d54f69fb2a4160533b6ba9178b9a09fa9cdf)), closes [#​2206](https://togithub.com/remy/nodemon/issues/2206) ### [`v3.1.2`](https://togithub.com/remy/nodemon/compare/v3.1.1...789663c335be5e79f5b8a2248de9729c24e4093b) [Compare Source](https://togithub.com/remy/nodemon/compare/v3.1.1...v3.1.2) ### [`v3.1.1`](https://togithub.com/remy/nodemon/releases/tag/v3.1.1) [Compare Source](https://togithub.com/remy/nodemon/compare/v3.1.0...v3.1.1) ##### Bug Fixes - add types to help with required nodemon usage ([#​2204](https://togithub.com/remy/nodemon/issues/2204)) ([cd27c0b](https://togithub.com/remy/nodemon/commit/cd27c0b50584e078a10338ef0c37282255f3f9ca))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/redwoodjs/redwood). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- packages/core/package.json | 2 +- packages/forms/package.json | 2 +- packages/realtime/package.json | 2 +- packages/web/package.json | 2 +- yarn.lock | 18 +++++++++--------- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index 0a8cbb21b205..003f4c5e34ad 100644 --- a/package.json +++ b/package.json @@ -98,7 +98,7 @@ "make-dir-cli": "3.1.0", "msw": "1.3.3", "ncp": "2.0.0", - "nodemon": "3.1.0", + "nodemon": "3.1.3", "npm-packlist": "8.0.2", "nx": "19.0.4", "ora": "7.0.1", diff --git a/packages/core/package.json b/packages/core/package.json index a1aa9e32bacf..2a8dcc6a2d57 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -57,7 +57,7 @@ "html-webpack-plugin": "5.6.0", "lodash": "4.17.21", "mini-css-extract-plugin": "2.9.0", - "nodemon": "3.1.0", + "nodemon": "3.1.3", "null-loader": "4.0.1", "react-refresh": "0.14.0", "resolve-url-loader": "5.0.0", diff --git a/packages/forms/package.json b/packages/forms/package.json index 6dea922805c8..79220df5f075 100644 --- a/packages/forms/package.json +++ b/packages/forms/package.json @@ -39,7 +39,7 @@ "@types/pascalcase": "1.0.3", "@types/react": "^18.2.55", "@types/react-dom": "^18.2.19", - "nodemon": "3.1.0", + "nodemon": "3.1.3", "react": "19.0.0-beta-04b058868c-20240508", "react-dom": "19.0.0-beta-04b058868c-20240508", "typescript": "5.4.5", diff --git a/packages/realtime/package.json b/packages/realtime/package.json index 1fdeb13ce8cc..410f0bd0b76b 100644 --- a/packages/realtime/package.json +++ b/packages/realtime/package.json @@ -39,7 +39,7 @@ "@envelop/types": "5.0.0", "@redwoodjs/framework-tools": "workspace:*", "ioredis": "^5.3.2", - "nodemon": "3.1.0", + "nodemon": "3.1.3", "tsx": "4.10.3", "typescript": "5.4.5", "vitest": "1.6.0" diff --git a/packages/web/package.json b/packages/web/package.json index 449aa192ea4d..5dc249b1310f 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -60,7 +60,7 @@ "@testing-library/react": "14.3.1", "@types/react": "^18.2.55", "@types/react-dom": "^18.2.19", - "nodemon": "3.1.0", + "nodemon": "3.1.3", "react": "19.0.0-beta-04b058868c-20240508", "react-dom": "19.0.0-beta-04b058868c-20240508", "tstyche": "2.0.0", diff --git a/yarn.lock b/yarn.lock index aff8d5943e3e..42070f195a8f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8161,7 +8161,7 @@ __metadata: jest: "npm:29.7.0" lodash: "npm:4.17.21" mini-css-extract-plugin: "npm:2.9.0" - nodemon: "npm:3.1.0" + nodemon: "npm:3.1.3" null-loader: "npm:4.0.1" react-refresh: "npm:0.14.0" resolve-url-loader: "npm:5.0.0" @@ -8274,7 +8274,7 @@ __metadata: "@types/react-dom": "npm:^18.2.19" core-js: "npm:3.37.1" graphql: "npm:16.8.1" - nodemon: "npm:3.1.0" + nodemon: "npm:3.1.3" pascalcase: "npm:1.0.0" react: "npm:19.0.0-beta-04b058868c-20240508" react-dom: "npm:19.0.0-beta-04b058868c-20240508" @@ -8567,7 +8567,7 @@ __metadata: "@redwoodjs/framework-tools": "workspace:*" graphql: "npm:16.8.1" ioredis: "npm:^5.3.2" - nodemon: "npm:3.1.0" + nodemon: "npm:3.1.3" tsx: "npm:4.10.3" typescript: "npm:5.4.5" vitest: "npm:1.6.0" @@ -8839,7 +8839,7 @@ __metadata: graphql: "npm:16.8.1" graphql-sse: "npm:2.5.3" graphql-tag: "npm:2.12.6" - nodemon: "npm:3.1.0" + nodemon: "npm:3.1.3" react: "npm:19.0.0-beta-04b058868c-20240508" react-dom: "npm:19.0.0-beta-04b058868c-20240508" react-helmet-async: "npm:2.0.5" @@ -24384,9 +24384,9 @@ __metadata: languageName: node linkType: hard -"nodemon@npm:3.1.0": - version: 3.1.0 - resolution: "nodemon@npm:3.1.0" +"nodemon@npm:3.1.3": + version: 3.1.3 + resolution: "nodemon@npm:3.1.3" dependencies: chokidar: "npm:^3.5.2" debug: "npm:^4" @@ -24400,7 +24400,7 @@ __metadata: undefsafe: "npm:^2.0.5" bin: nodemon: bin/nodemon.js - checksum: 10c0/3aeb50105ecae31ce4d0a5cd464011d4aa0dc15419e39ac0fd203d784e38940e1436f4ed96adbaa0f9614ee0644f91e3cf38f2afae8d3918ae7afc51c7e2116b + checksum: 10c0/0cee93b3c68ab5c1a286b2e94b6e75d0e2ba1fc5d085fc3401d9aca4515617afd2d528fc4a482773b6eb8de449032b4ab326c9599f8cee3099a79430fd9f4ee4 languageName: node linkType: hard @@ -28169,7 +28169,7 @@ __metadata: make-dir-cli: "npm:3.1.0" msw: "npm:1.3.3" ncp: "npm:2.0.0" - nodemon: "npm:3.1.0" + nodemon: "npm:3.1.3" npm-packlist: "npm:8.0.2" nx: "npm:19.0.4" ora: "npm:7.0.1" From a4d6e8536c27e352f7c1c8ef7b6a167199b85b1e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 11 Jun 2024 18:20:38 +0000 Subject: [PATCH 46/66] chore(deps): update dependency ioredis to v5.4.1 (#10797) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [ioredis](https://togithub.com/luin/ioredis) | [`5.3.2` -> `5.4.1`](https://renovatebot.com/diffs/npm/ioredis/5.3.2/5.4.1) | [![age](https://developer.mend.io/api/mc/badges/age/npm/ioredis/5.4.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/ioredis/5.4.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/ioredis/5.3.2/5.4.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/ioredis/5.3.2/5.4.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
luin/ioredis (ioredis) ### [`v5.4.1`](https://togithub.com/luin/ioredis/blob/HEAD/CHANGELOG.md#541-2024-04-17) [Compare Source](https://togithub.com/luin/ioredis/compare/v5.4.0...v5.4.1) ##### Bug Fixes - remove console.log ([558497c](https://togithub.com/luin/ioredis/commit/558497cba8dc7487c06c7765ddbe12b479bd9b9b)) ### [`v5.4.0`](https://togithub.com/luin/ioredis/blob/HEAD/CHANGELOG.md#540-2024-04-16) [Compare Source](https://togithub.com/luin/ioredis/compare/v5.3.2...v5.4.0) ##### Bug Fixes - when `refreshSlotsCache` is callback concurrently, call the callback only when the refresh process is done ([#​1881](https://togithub.com/luin/ioredis/issues/1881)) ([804ee07](https://togithub.com/luin/ioredis/commit/804ee071cab4326d1d69eec0e9d156aac4aa89f4)) ##### Features - add support for `socketTimeout` in `Redis` ([#​1882](https://togithub.com/luin/ioredis/issues/1882)) ([673ac77](https://togithub.com/luin/ioredis/commit/673ac77d9d88bd461110da7b4a8b2b98fb45f845)) #### [5.3.2](https://togithub.com/luin/ioredis/compare/v5.3.1...v5.3.2) (2023-04-15) ##### Bug Fixes - add types for known events ([#​1694](https://togithub.com/luin/ioredis/issues/1694)) ([1a87b23](https://togithub.com/luin/ioredis/commit/1a87b237e8f43f1dee44dcab8e9da6855bbf772a)) #### [5.3.1](https://togithub.com/luin/ioredis/compare/v5.3.0...v5.3.1) (2023-02-12) ##### Bug Fixes - Fix commands not resend on reconnect in edge cases ([#​1720](https://togithub.com/luin/ioredis/issues/1720)) ([fe52ff1](https://togithub.com/luin/ioredis/commit/fe52ff1c6f4cb1beb0c9e999299248ba380d5cde)), closes [#​1718](https://togithub.com/luin/ioredis/issues/1718) - Fix db parameter not working with auto pipelining ([#​1721](https://togithub.com/luin/ioredis/issues/1721)) ([d9b1bf1](https://togithub.com/luin/ioredis/commit/d9b1bf1a2868344eaff71cc39c790e98043fff53))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/redwoodjs/redwood). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 42070f195a8f..5a281a0034b4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -20159,8 +20159,8 @@ __metadata: linkType: hard "ioredis@npm:^5.3.2": - version: 5.3.2 - resolution: "ioredis@npm:5.3.2" + version: 5.4.1 + resolution: "ioredis@npm:5.4.1" dependencies: "@ioredis/commands": "npm:^1.1.1" cluster-key-slot: "npm:^1.1.0" @@ -20171,7 +20171,7 @@ __metadata: redis-errors: "npm:^1.2.0" redis-parser: "npm:^3.0.0" standard-as-callback: "npm:^2.1.0" - checksum: 10c0/0dd2b5b8004e891f5b62edf18ac223194f1f5204698ec827c903e789ea05b0b36f73395491749ec63c66470485bdfb228ccdf1714fbf631a0f78f33211f2c883 + checksum: 10c0/5d28b7c89a3cab5b76d75923d7d4ce79172b3a1ca9be690133f6e8e393a7a4b4ffd55513e618bbb5504fed80d9e1395c9d9531a7c5c5c84aa4c4e765cca75456 languageName: node linkType: hard From 7eadccbf5b751f02373cf4c0349fe6b2af1447da Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 11 Jun 2024 18:20:52 +0000 Subject: [PATCH 47/66] chore(deps): update dependency @clerk/clerk-react to v4.32.2 (#10794) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [@clerk/clerk-react](https://clerk.com/) ([source](https://togithub.com/clerk/javascript/tree/HEAD/packages/react)) | [`4.31.1` -> `4.32.2`](https://renovatebot.com/diffs/npm/@clerk%2fclerk-react/4.31.1/4.32.2) | [![age](https://developer.mend.io/api/mc/badges/age/npm/@clerk%2fclerk-react/4.32.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/@clerk%2fclerk-react/4.32.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/@clerk%2fclerk-react/4.31.1/4.32.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@clerk%2fclerk-react/4.31.1/4.32.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
clerk/javascript (@​clerk/clerk-react) ### [`v4.32.2`](https://togithub.com/clerk/javascript/releases/tag/%40clerk/clerk-react%404.32.2) [Compare Source](https://togithub.com/clerk/javascript/compare/@clerk/clerk-react@4.32.1...@clerk/clerk-react@4.32.2) ##### Patch Changes - Updated dependencies \[[`76a1087c3`](https://togithub.com/clerk/javascript/commit/76a1087c372d16dd2ab3b6f0b6f4961c00448a52)]: - [@​clerk/types](https://togithub.com/clerk/types)[@​3](https://togithub.com/3).65.2 ### [`v4.32.1`](https://togithub.com/clerk/javascript/releases/tag/%40clerk/clerk-react%404.32.1) [Compare Source](https://togithub.com/clerk/javascript/compare/@clerk/clerk-react@4.32.0...@clerk/clerk-react@4.32.1) ##### Patch Changes - Updated dependencies \[[`a8c0128be`](https://togithub.com/clerk/javascript/commit/a8c0128beb404d6c6e707b0735b439af6efdd076)]: - [@​clerk/types](https://togithub.com/clerk/types)[@​3](https://togithub.com/3).65.1 ### [`v4.32.0`](https://togithub.com/clerk/javascript/releases/tag/%40clerk/clerk-react%404.32.0) [Compare Source](https://togithub.com/clerk/javascript/compare/@clerk/clerk-react@4.31.1...@clerk/clerk-react@4.32.0) ##### Minor Changes - Add support for GoogleOneTap ([#​3409](https://togithub.com/clerk/javascript/pull/3409)) by [@​panteliselef](https://togithub.com/panteliselef) ##### React component - `` Customize the UX of the prompt ```tsx ``` ##### Patch Changes - Updated dependencies \[[`fcc349cb5`](https://togithub.com/clerk/javascript/commit/fcc349cb59e4bfdf82165144ca5509a8c73d1325)]: - [@​clerk/types](https://togithub.com/clerk/types)[@​3](https://togithub.com/3).65.0
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/redwoodjs/redwood). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- packages/auth-providers/clerk/web/package.json | 4 ++-- yarn.lock | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/auth-providers/clerk/web/package.json b/packages/auth-providers/clerk/web/package.json index 61345893c11c..247edab9fbdc 100644 --- a/packages/auth-providers/clerk/web/package.json +++ b/packages/auth-providers/clerk/web/package.json @@ -30,7 +30,7 @@ "devDependencies": { "@babel/cli": "7.24.5", "@babel/core": "^7.22.20", - "@clerk/clerk-react": "4.31.1", + "@clerk/clerk-react": "4.32.2", "@clerk/types": "3.64.1", "@types/react": "^18.2.55", "react": "19.0.0-beta-04b058868c-20240508", @@ -38,7 +38,7 @@ "vitest": "1.6.0" }, "peerDependencies": { - "@clerk/clerk-react": "4.31.1" + "@clerk/clerk-react": "4.32.2" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" } diff --git a/yarn.lock b/yarn.lock index 5a281a0034b4..d66383771a1c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2156,16 +2156,16 @@ __metadata: languageName: node linkType: hard -"@clerk/clerk-react@npm:4.31.1": - version: 4.31.1 - resolution: "@clerk/clerk-react@npm:4.31.1" +"@clerk/clerk-react@npm:4.32.2": + version: 4.32.2 + resolution: "@clerk/clerk-react@npm:4.32.2" dependencies: "@clerk/shared": "npm:1.4.1" - "@clerk/types": "npm:3.64.1" + "@clerk/types": "npm:3.65.2" tslib: "npm:2.4.1" peerDependencies: react: ">=16" - checksum: 10c0/a8ff8177a6c8dd5239bf71a9bc654bd3feec620d43b9246b53f261c0a6bfd9771e809796002849843d75f2ceba379c21d5aa73294003c39efe72b46d4a5605cb + checksum: 10c0/ef8ea477bfbc834939a47bf22e3a5724c2a8c4ce8d5135645828bf2d0f117bbb2a30c6ae0ed99e1812beda4349fbbc34d20f21b2bb100d6fd4ebceb0fe511fd7 languageName: node linkType: hard @@ -7521,7 +7521,7 @@ __metadata: "@babel/cli": "npm:7.24.5" "@babel/core": "npm:^7.22.20" "@babel/runtime-corejs3": "npm:7.24.5" - "@clerk/clerk-react": "npm:4.31.1" + "@clerk/clerk-react": "npm:4.32.2" "@clerk/types": "npm:3.64.1" "@redwoodjs/auth": "workspace:*" "@types/react": "npm:^18.2.55" @@ -7530,7 +7530,7 @@ __metadata: typescript: "npm:5.4.5" vitest: "npm:1.6.0" peerDependencies: - "@clerk/clerk-react": 4.31.1 + "@clerk/clerk-react": 4.32.2 languageName: unknown linkType: soft From 98528ceefb1c4f34e06c958eff4041d9d8cb5c90 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 11 Jun 2024 18:22:13 +0000 Subject: [PATCH 48/66] chore(deps): update dependency @types/vscode to v1.90.0 (#10796) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [@types/vscode](https://togithub.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/vscode) ([source](https://togithub.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/vscode)) | [`1.89.0` -> `1.90.0`](https://renovatebot.com/diffs/npm/@types%2fvscode/1.89.0/1.90.0) | [![age](https://developer.mend.io/api/mc/badges/age/npm/@types%2fvscode/1.90.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/@types%2fvscode/1.90.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/@types%2fvscode/1.89.0/1.90.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@types%2fvscode/1.89.0/1.90.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/redwoodjs/redwood). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- packages/structure/package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/structure/package.json b/packages/structure/package.json index b07def80d6ce..10bca0f716b4 100644 --- a/packages/structure/package.json +++ b/packages/structure/package.json @@ -56,7 +56,7 @@ "@types/fs-extra": "11.0.4", "@types/lodash": "4.17.5", "@types/node": "20.12.12", - "@types/vscode": "1.89.0", + "@types/vscode": "1.90.0", "typescript": "5.4.5", "vitest": "1.6.0" }, diff --git a/yarn.lock b/yarn.lock index d66383771a1c..75dbab0e688b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8648,7 +8648,7 @@ __metadata: "@types/line-column": "npm:1.0.2" "@types/lodash": "npm:4.17.5" "@types/node": "npm:20.12.12" - "@types/vscode": "npm:1.89.0" + "@types/vscode": "npm:1.90.0" camelcase: "npm:6.3.0" core-js: "npm:3.37.1" deepmerge: "npm:4.3.1" @@ -11577,10 +11577,10 @@ __metadata: languageName: node linkType: hard -"@types/vscode@npm:1.89.0": - version: 1.89.0 - resolution: "@types/vscode@npm:1.89.0" - checksum: 10c0/b44a80fc3ef66223a5adcb790f1cca23d698b51b27bd934a38cc809c104d5028e1167cf5b91ed3375fb3c169e88d793952a855b991a6c22d15bc9bee0a846902 +"@types/vscode@npm:1.90.0": + version: 1.90.0 + resolution: "@types/vscode@npm:1.90.0" + checksum: 10c0/6f18c57feca20b9ec12cb63a8c192bbf8b5138da078771af8f944fc193084565124626dde31f7ff16e7000ed2a12dde963542e2d2fe965bd24f94cdd4397e9a2 languageName: node linkType: hard From be29cbbcf3a227cddc22f0af0ecaea083a153200 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 11 Jun 2024 19:19:25 +0000 Subject: [PATCH 49/66] chore(deps): update dependency jsdom to v24.1.0 (#10798) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [jsdom](https://togithub.com/jsdom/jsdom) | [`24.0.0` -> `24.1.0`](https://renovatebot.com/diffs/npm/jsdom/24.0.0/24.1.0) | [![age](https://developer.mend.io/api/mc/badges/age/npm/jsdom/24.1.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/jsdom/24.1.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/jsdom/24.0.0/24.1.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/jsdom/24.0.0/24.1.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
jsdom/jsdom (jsdom) ### [`v24.1.0`](https://togithub.com/jsdom/jsdom/blob/HEAD/Changelog.md#2410) [Compare Source](https://togithub.com/jsdom/jsdom/compare/24.0.0...24.1.0) - Added the `getSetCookie()` method to the `Headers` class. (ushiboy) - Fixed the creation and parsing of elements with names from `Object.prototype`, like `"constructor"` or `"toString"`. - Updated `rweb-cssom`, which can now parse additional CSS constructs.
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/redwoodjs/redwood). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- packages/testing/package.json | 2 +- yarn.lock | 69 +++++++++++++++++++---------------- 2 files changed, 39 insertions(+), 32 deletions(-) diff --git a/packages/testing/package.json b/packages/testing/package.json index 7270ba61854b..c21fc42025a8 100644 --- a/packages/testing/package.json +++ b/packages/testing/package.json @@ -58,7 +58,7 @@ "devDependencies": { "@babel/cli": "7.24.5", "@babel/core": "^7.22.20", - "jsdom": "24.0.0", + "jsdom": "24.1.0", "typescript": "5.4.5", "vitest": "1.6.0" }, diff --git a/yarn.lock b/yarn.lock index 75dbab0e688b..956f7c46c2a0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8724,7 +8724,7 @@ __metadata: jest: "npm:29.7.0" jest-environment-jsdom: "npm:29.7.0" jest-watch-typeahead: "npm:2.2.2" - jsdom: "npm:24.0.0" + jsdom: "npm:24.1.0" msw: "npm:1.3.3" ts-toolbelt: "npm:9.6.0" typescript: "npm:5.4.5" @@ -19745,13 +19745,13 @@ __metadata: languageName: node linkType: hard -"http-proxy-agent@npm:^7.0.0": - version: 7.0.0 - resolution: "http-proxy-agent@npm:7.0.0" +"http-proxy-agent@npm:^7.0.0, http-proxy-agent@npm:^7.0.2": + version: 7.0.2 + resolution: "http-proxy-agent@npm:7.0.2" dependencies: agent-base: "npm:^7.1.0" debug: "npm:^4.3.4" - checksum: 10c0/a11574ff39436cee3c7bc67f259444097b09474605846ddd8edf0bf4ad8644be8533db1aa463426e376865047d05dc22755e638632819317c0c2f1b2196657c8 + checksum: 10c0/4207b06a4580fb85dd6dff521f0abf6db517489e70863dca1a0291daa7f2d3d2d6015a57bd702af068ea5cf9f1f6ff72314f5f5b4228d299c0904135d2aef921 languageName: node linkType: hard @@ -19825,13 +19825,13 @@ __metadata: languageName: node linkType: hard -"https-proxy-agent@npm:^7.0.1, https-proxy-agent@npm:^7.0.2": - version: 7.0.2 - resolution: "https-proxy-agent@npm:7.0.2" +"https-proxy-agent@npm:^7.0.1, https-proxy-agent@npm:^7.0.2, https-proxy-agent@npm:^7.0.4": + version: 7.0.4 + resolution: "https-proxy-agent@npm:7.0.4" dependencies: agent-base: "npm:^7.0.2" debug: "npm:4" - checksum: 10c0/7735eb90073db087e7e79312e3d97c8c04baf7ea7ca7b013382b6a45abbaa61b281041a98f4e13c8c80d88f843785bcc84ba189165b4b4087b1e3496ba656d77 + checksum: 10c0/bc4f7c38da32a5fc622450b6cb49a24ff596f9bd48dcedb52d2da3fa1c1a80e100fb506bd59b326c012f21c863c69b275c23de1a01d0b84db396822fdf25e52b languageName: node linkType: hard @@ -21670,37 +21670,37 @@ __metadata: languageName: node linkType: hard -"jsdom@npm:24.0.0": - version: 24.0.0 - resolution: "jsdom@npm:24.0.0" +"jsdom@npm:24.1.0": + version: 24.1.0 + resolution: "jsdom@npm:24.1.0" dependencies: cssstyle: "npm:^4.0.1" data-urls: "npm:^5.0.0" decimal.js: "npm:^10.4.3" form-data: "npm:^4.0.0" html-encoding-sniffer: "npm:^4.0.0" - http-proxy-agent: "npm:^7.0.0" - https-proxy-agent: "npm:^7.0.2" + http-proxy-agent: "npm:^7.0.2" + https-proxy-agent: "npm:^7.0.4" is-potential-custom-element-name: "npm:^1.0.1" - nwsapi: "npm:^2.2.7" + nwsapi: "npm:^2.2.10" parse5: "npm:^7.1.2" - rrweb-cssom: "npm:^0.6.0" + rrweb-cssom: "npm:^0.7.0" saxes: "npm:^6.0.0" symbol-tree: "npm:^3.2.4" - tough-cookie: "npm:^4.1.3" + tough-cookie: "npm:^4.1.4" w3c-xmlserializer: "npm:^5.0.0" webidl-conversions: "npm:^7.0.0" whatwg-encoding: "npm:^3.1.1" whatwg-mimetype: "npm:^4.0.0" whatwg-url: "npm:^14.0.0" - ws: "npm:^8.16.0" + ws: "npm:^8.17.0" xml-name-validator: "npm:^5.0.0" peerDependencies: canvas: ^2.11.2 peerDependenciesMeta: canvas: optional: true - checksum: 10c0/7b35043d7af39ad6dcaef0fa5679d8c8a94c6c9b6cc4a79222b7c9987d57ab7150c50856684ae56b473ab28c7d82aec0fb7ca19dcbd4c3f46683c807d717a3af + checksum: 10c0/34eadd8a7ae20c1505abe7a0f3988b2f0881cce7e27d75c4f5224f440f81f8ac08f4f449695b0f4178f048ed1c1709f3594e9d3f2fe0406c28e8da6eddd44f5a languageName: node linkType: hard @@ -24723,10 +24723,10 @@ __metadata: languageName: node linkType: hard -"nwsapi@npm:^2.2.2, nwsapi@npm:^2.2.7": - version: 2.2.7 - resolution: "nwsapi@npm:2.2.7" - checksum: 10c0/44be198adae99208487a1c886c0a3712264f7bbafa44368ad96c003512fed2753d4e22890ca1e6edb2690c3456a169f2a3c33bfacde1905cf3bf01c7722464db +"nwsapi@npm:^2.2.10, nwsapi@npm:^2.2.2": + version: 2.2.10 + resolution: "nwsapi@npm:2.2.10" + checksum: 10c0/43dfa150387bd2a578e37556d0ae3330d5617f99e5a7b64e3400d4c2785620762aa6169caf8f5fbce17b7ef29c372060b602594320c374fba0a39da4163d77ed languageName: node linkType: hard @@ -28191,6 +28191,13 @@ __metadata: languageName: node linkType: hard +"rrweb-cssom@npm:^0.7.0": + version: 0.7.1 + resolution: "rrweb-cssom@npm:0.7.1" + checksum: 10c0/127b8ca6c8aac45e2755abbae6138d4a813b1bedc2caabf79466ae83ab3cfc84b5bfab513b7033f0aa4561c7753edf787d0dd01163ceacdee2e8eb1b6bf7237e + languageName: node + linkType: hard + "run-async@npm:^2.4.0": version: 2.4.1 resolution: "run-async@npm:2.4.1" @@ -30156,15 +30163,15 @@ __metadata: languageName: node linkType: hard -"tough-cookie@npm:^4.1.2, tough-cookie@npm:^4.1.3": - version: 4.1.3 - resolution: "tough-cookie@npm:4.1.3" +"tough-cookie@npm:^4.1.2, tough-cookie@npm:^4.1.3, tough-cookie@npm:^4.1.4": + version: 4.1.4 + resolution: "tough-cookie@npm:4.1.4" dependencies: psl: "npm:^1.1.33" punycode: "npm:^2.1.1" universalify: "npm:^0.2.0" url-parse: "npm:^1.5.3" - checksum: 10c0/4fc0433a0cba370d57c4b240f30440c848906dee3180bb6e85033143c2726d322e7e4614abb51d42d111ebec119c4876ed8d7247d4113563033eebbc1739c831 + checksum: 10c0/aca7ff96054f367d53d1e813e62ceb7dd2eda25d7752058a74d64b7266fd07be75908f3753a32ccf866a2f997604b414cfb1916d6e7f69bc64d9d9939b0d6c45 languageName: node linkType: hard @@ -32157,9 +32164,9 @@ __metadata: languageName: node linkType: hard -"ws@npm:^8.11.0, ws@npm:^8.12.0, ws@npm:^8.13.0, ws@npm:^8.14.2, ws@npm:^8.16.0, ws@npm:^8.2.3, ws@npm:^8.4.2": - version: 8.16.0 - resolution: "ws@npm:8.16.0" +"ws@npm:^8.11.0, ws@npm:^8.12.0, ws@npm:^8.13.0, ws@npm:^8.14.2, ws@npm:^8.17.0, ws@npm:^8.2.3, ws@npm:^8.4.2": + version: 8.17.0 + resolution: "ws@npm:8.17.0" peerDependencies: bufferutil: ^4.0.1 utf-8-validate: ">=5.0.2" @@ -32168,7 +32175,7 @@ __metadata: optional: true utf-8-validate: optional: true - checksum: 10c0/a7783bb421c648b1e622b423409cb2a58ac5839521d2f689e84bc9dc41d59379c692dd405b15a997ea1d4c0c2e5314ad707332d0c558f15232d2bc07c0b4618a + checksum: 10c0/55241ec93a66fdfc4bf4f8bc66c8eb038fda2c7a4ee8f6f157f2ca7dc7aa76aea0c0da0bf3adb2af390074a70a0e45456a2eaf80e581e630b75df10a64b0a990 languageName: node linkType: hard From 627ef2ccb4f952fd57c69f10de3cd632a6025653 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 11 Jun 2024 19:24:33 +0000 Subject: [PATCH 50/66] chore(deps): update dependency rollup to v4.18.0 (#10799) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [rollup](https://rollupjs.org/) ([source](https://togithub.com/rollup/rollup)) | [`4.17.2` -> `4.18.0`](https://renovatebot.com/diffs/npm/rollup/4.17.2/4.18.0) | [![age](https://developer.mend.io/api/mc/badges/age/npm/rollup/4.18.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/rollup/4.18.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/rollup/4.17.2/4.18.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/rollup/4.17.2/4.18.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
rollup/rollup (rollup) ### [`v4.18.0`](https://togithub.com/rollup/rollup/blob/HEAD/CHANGELOG.md#4180) [Compare Source](https://togithub.com/rollup/rollup/compare/v4.17.2...v4.18.0) *2024-05-22* ##### Features - Resolve import.meta.filename and .dirname in transpiled plugins ([#​5520](https://togithub.com/rollup/rollup/issues/5520)) ##### Pull Requests - [#​5504](https://togithub.com/rollup/rollup/pull/5504): Auto generate node index ([@​lukastaegert](https://togithub.com/lukastaegert)) - [#​5507](https://togithub.com/rollup/rollup/pull/5507): chore(deps): lock file maintenance minor/patch updates ([@​renovate](https://togithub.com/renovate)\[bot]) - [#​5508](https://togithub.com/rollup/rollup/pull/5508): chore(deps): lock file maintenance ([@​renovate](https://togithub.com/renovate)\[bot]) - [#​5510](https://togithub.com/rollup/rollup/pull/5510): Split up converter.rs into AST nodes ([@​lukastaegert](https://togithub.com/lukastaegert)) - [#​5512](https://togithub.com/rollup/rollup/pull/5512): chore(deps): update dependency builtin-modules to v4 ([@​renovate](https://togithub.com/renovate)\[bot], [@​lukastaegert](https://togithub.com/lukastaegert)) - [#​5514](https://togithub.com/rollup/rollup/pull/5514): chore(deps): lock file maintenance minor/patch updates ([@​renovate](https://togithub.com/renovate)\[bot]) - [#​5518](https://togithub.com/rollup/rollup/pull/5518): chore(deps): update dependency eslint-plugin-unicorn to v53 ([@​renovate](https://togithub.com/renovate)\[bot], [@​lukastaegert](https://togithub.com/lukastaegert)) - [#​5519](https://togithub.com/rollup/rollup/pull/5519): chore(deps): lock file maintenance minor/patch updates ([@​renovate](https://togithub.com/renovate)\[bot], [@​lukastaegert](https://togithub.com/lukastaegert)) - [#​5520](https://togithub.com/rollup/rollup/pull/5520): Resolve import.meta.{filename,dirname} in files imported from config ([@​BPScott](https://togithub.com/BPScott)) - [#​5521](https://togithub.com/rollup/rollup/pull/5521): docs: correct base32 to base36 in documentation ([@​highcastlee](https://togithub.com/highcastlee))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/redwoodjs/redwood). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- packages/vite/package.json | 2 +- yarn.lock | 140 ++++++++++++++++++------------------- 2 files changed, 71 insertions(+), 71 deletions(-) diff --git a/packages/vite/package.json b/packages/vite/package.json index f4d20ad42e86..5644fa7926da 100644 --- a/packages/vite/package.json +++ b/packages/vite/package.json @@ -103,7 +103,7 @@ "@types/react": "^18.2.55", "@types/yargs-parser": "21.0.3", "glob": "10.3.15", - "rollup": "4.17.2", + "rollup": "4.18.0", "tsx": "4.10.3", "typescript": "5.4.5", "vitest": "1.6.0" diff --git a/yarn.lock b/yarn.lock index 956f7c46c2a0..313146fd24a7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8783,7 +8783,7 @@ __metadata: isbot: "npm:5.1.9" react: "npm:19.0.0-beta-04b058868c-20240508" react-server-dom-webpack: "npm:19.0.0-beta-04b058868c-20240508" - rollup: "npm:4.17.2" + rollup: "npm:4.18.0" tsx: "npm:4.10.3" typescript: "npm:5.4.5" vite: "npm:5.2.13" @@ -8906,114 +8906,114 @@ __metadata: languageName: node linkType: hard -"@rollup/rollup-android-arm-eabi@npm:4.17.2": - version: 4.17.2 - resolution: "@rollup/rollup-android-arm-eabi@npm:4.17.2" +"@rollup/rollup-android-arm-eabi@npm:4.18.0": + version: 4.18.0 + resolution: "@rollup/rollup-android-arm-eabi@npm:4.18.0" conditions: os=android & cpu=arm languageName: node linkType: hard -"@rollup/rollup-android-arm64@npm:4.17.2": - version: 4.17.2 - resolution: "@rollup/rollup-android-arm64@npm:4.17.2" +"@rollup/rollup-android-arm64@npm:4.18.0": + version: 4.18.0 + resolution: "@rollup/rollup-android-arm64@npm:4.18.0" conditions: os=android & cpu=arm64 languageName: node linkType: hard -"@rollup/rollup-darwin-arm64@npm:4.17.2": - version: 4.17.2 - resolution: "@rollup/rollup-darwin-arm64@npm:4.17.2" +"@rollup/rollup-darwin-arm64@npm:4.18.0": + version: 4.18.0 + resolution: "@rollup/rollup-darwin-arm64@npm:4.18.0" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"@rollup/rollup-darwin-x64@npm:4.17.2": - version: 4.17.2 - resolution: "@rollup/rollup-darwin-x64@npm:4.17.2" +"@rollup/rollup-darwin-x64@npm:4.18.0": + version: 4.18.0 + resolution: "@rollup/rollup-darwin-x64@npm:4.18.0" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"@rollup/rollup-linux-arm-gnueabihf@npm:4.17.2": - version: 4.17.2 - resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.17.2" +"@rollup/rollup-linux-arm-gnueabihf@npm:4.18.0": + version: 4.18.0 + resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.18.0" conditions: os=linux & cpu=arm & libc=glibc languageName: node linkType: hard -"@rollup/rollup-linux-arm-musleabihf@npm:4.17.2": - version: 4.17.2 - resolution: "@rollup/rollup-linux-arm-musleabihf@npm:4.17.2" +"@rollup/rollup-linux-arm-musleabihf@npm:4.18.0": + version: 4.18.0 + resolution: "@rollup/rollup-linux-arm-musleabihf@npm:4.18.0" conditions: os=linux & cpu=arm & libc=musl languageName: node linkType: hard -"@rollup/rollup-linux-arm64-gnu@npm:4.17.2": - version: 4.17.2 - resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.17.2" +"@rollup/rollup-linux-arm64-gnu@npm:4.18.0": + version: 4.18.0 + resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.18.0" conditions: os=linux & cpu=arm64 & libc=glibc languageName: node linkType: hard -"@rollup/rollup-linux-arm64-musl@npm:4.17.2": - version: 4.17.2 - resolution: "@rollup/rollup-linux-arm64-musl@npm:4.17.2" +"@rollup/rollup-linux-arm64-musl@npm:4.18.0": + version: 4.18.0 + resolution: "@rollup/rollup-linux-arm64-musl@npm:4.18.0" conditions: os=linux & cpu=arm64 & libc=musl languageName: node linkType: hard -"@rollup/rollup-linux-powerpc64le-gnu@npm:4.17.2": - version: 4.17.2 - resolution: "@rollup/rollup-linux-powerpc64le-gnu@npm:4.17.2" +"@rollup/rollup-linux-powerpc64le-gnu@npm:4.18.0": + version: 4.18.0 + resolution: "@rollup/rollup-linux-powerpc64le-gnu@npm:4.18.0" conditions: os=linux & cpu=ppc64 & libc=glibc languageName: node linkType: hard -"@rollup/rollup-linux-riscv64-gnu@npm:4.17.2": - version: 4.17.2 - resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.17.2" +"@rollup/rollup-linux-riscv64-gnu@npm:4.18.0": + version: 4.18.0 + resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.18.0" conditions: os=linux & cpu=riscv64 & libc=glibc languageName: node linkType: hard -"@rollup/rollup-linux-s390x-gnu@npm:4.17.2": - version: 4.17.2 - resolution: "@rollup/rollup-linux-s390x-gnu@npm:4.17.2" +"@rollup/rollup-linux-s390x-gnu@npm:4.18.0": + version: 4.18.0 + resolution: "@rollup/rollup-linux-s390x-gnu@npm:4.18.0" conditions: os=linux & cpu=s390x & libc=glibc languageName: node linkType: hard -"@rollup/rollup-linux-x64-gnu@npm:4.17.2": - version: 4.17.2 - resolution: "@rollup/rollup-linux-x64-gnu@npm:4.17.2" +"@rollup/rollup-linux-x64-gnu@npm:4.18.0": + version: 4.18.0 + resolution: "@rollup/rollup-linux-x64-gnu@npm:4.18.0" conditions: os=linux & cpu=x64 & libc=glibc languageName: node linkType: hard -"@rollup/rollup-linux-x64-musl@npm:4.17.2": - version: 4.17.2 - resolution: "@rollup/rollup-linux-x64-musl@npm:4.17.2" +"@rollup/rollup-linux-x64-musl@npm:4.18.0": + version: 4.18.0 + resolution: "@rollup/rollup-linux-x64-musl@npm:4.18.0" conditions: os=linux & cpu=x64 & libc=musl languageName: node linkType: hard -"@rollup/rollup-win32-arm64-msvc@npm:4.17.2": - version: 4.17.2 - resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.17.2" +"@rollup/rollup-win32-arm64-msvc@npm:4.18.0": + version: 4.18.0 + resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.18.0" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"@rollup/rollup-win32-ia32-msvc@npm:4.17.2": - version: 4.17.2 - resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.17.2" +"@rollup/rollup-win32-ia32-msvc@npm:4.18.0": + version: 4.18.0 + resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.18.0" conditions: os=win32 & cpu=ia32 languageName: node linkType: hard -"@rollup/rollup-win32-x64-msvc@npm:4.17.2": - version: 4.17.2 - resolution: "@rollup/rollup-win32-x64-msvc@npm:4.17.2" +"@rollup/rollup-win32-x64-msvc@npm:4.18.0": + version: 4.18.0 + resolution: "@rollup/rollup-win32-x64-msvc@npm:4.18.0" conditions: os=win32 & cpu=x64 languageName: node linkType: hard @@ -28034,26 +28034,26 @@ __metadata: languageName: node linkType: hard -"rollup@npm:4.17.2, rollup@npm:^4.13.0": - version: 4.17.2 - resolution: "rollup@npm:4.17.2" - dependencies: - "@rollup/rollup-android-arm-eabi": "npm:4.17.2" - "@rollup/rollup-android-arm64": "npm:4.17.2" - "@rollup/rollup-darwin-arm64": "npm:4.17.2" - "@rollup/rollup-darwin-x64": "npm:4.17.2" - "@rollup/rollup-linux-arm-gnueabihf": "npm:4.17.2" - "@rollup/rollup-linux-arm-musleabihf": "npm:4.17.2" - "@rollup/rollup-linux-arm64-gnu": "npm:4.17.2" - "@rollup/rollup-linux-arm64-musl": "npm:4.17.2" - "@rollup/rollup-linux-powerpc64le-gnu": "npm:4.17.2" - "@rollup/rollup-linux-riscv64-gnu": "npm:4.17.2" - "@rollup/rollup-linux-s390x-gnu": "npm:4.17.2" - "@rollup/rollup-linux-x64-gnu": "npm:4.17.2" - "@rollup/rollup-linux-x64-musl": "npm:4.17.2" - "@rollup/rollup-win32-arm64-msvc": "npm:4.17.2" - "@rollup/rollup-win32-ia32-msvc": "npm:4.17.2" - "@rollup/rollup-win32-x64-msvc": "npm:4.17.2" +"rollup@npm:4.18.0, rollup@npm:^4.13.0": + version: 4.18.0 + resolution: "rollup@npm:4.18.0" + dependencies: + "@rollup/rollup-android-arm-eabi": "npm:4.18.0" + "@rollup/rollup-android-arm64": "npm:4.18.0" + "@rollup/rollup-darwin-arm64": "npm:4.18.0" + "@rollup/rollup-darwin-x64": "npm:4.18.0" + "@rollup/rollup-linux-arm-gnueabihf": "npm:4.18.0" + "@rollup/rollup-linux-arm-musleabihf": "npm:4.18.0" + "@rollup/rollup-linux-arm64-gnu": "npm:4.18.0" + "@rollup/rollup-linux-arm64-musl": "npm:4.18.0" + "@rollup/rollup-linux-powerpc64le-gnu": "npm:4.18.0" + "@rollup/rollup-linux-riscv64-gnu": "npm:4.18.0" + "@rollup/rollup-linux-s390x-gnu": "npm:4.18.0" + "@rollup/rollup-linux-x64-gnu": "npm:4.18.0" + "@rollup/rollup-linux-x64-musl": "npm:4.18.0" + "@rollup/rollup-win32-arm64-msvc": "npm:4.18.0" + "@rollup/rollup-win32-ia32-msvc": "npm:4.18.0" + "@rollup/rollup-win32-x64-msvc": "npm:4.18.0" "@types/estree": "npm:1.0.5" fsevents: "npm:~2.3.2" dependenciesMeta: @@ -28093,7 +28093,7 @@ __metadata: optional: true bin: rollup: dist/bin/rollup - checksum: 10c0/4fa6644e5c7fc4a34f654ea7e209be6c2c5897ed9dd43e7135230137204df748a795c7553804130f6c41da0b71e83f8c35a4a7881d385a77996adee50b609a6e + checksum: 10c0/7d0239f029c48d977e0d0b942433bed9ca187d2328b962fc815fc775d0fdf1966ffcd701fef265477e999a1fb01bddcc984fc675d1b9d9864bf8e1f1f487e23e languageName: node linkType: hard From a71b1a0856d499cc1df5100378a452360be07065 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 11 Jun 2024 19:25:00 +0000 Subject: [PATCH 51/66] chore(deps): update dependency firebase to v10.12.2 (#10802) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [firebase](https://firebase.google.com/) ([source](https://togithub.com/firebase/firebase-js-sdk), [changelog](https://firebase.google.com/support/release-notes/js)) | [`10.12.0` -> `10.12.2`](https://renovatebot.com/diffs/npm/firebase/10.12.0/10.12.2) | [![age](https://developer.mend.io/api/mc/badges/age/npm/firebase/10.12.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/firebase/10.12.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/firebase/10.12.0/10.12.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/firebase/10.12.0/10.12.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
firebase/firebase-js-sdk (firebase) ### [`v10.12.2`](https://togithub.com/firebase/firebase-js-sdk/compare/firebase@10.12.1...d92d01e6fead202924f5745d6586ccfb6a5445e5) [Compare Source](https://togithub.com/firebase/firebase-js-sdk/compare/firebase@10.12.1...firebase@10.12.2) ### [`v10.12.1`](https://togithub.com/firebase/firebase-js-sdk/releases/tag/firebase%4010.12.1) [Compare Source](https://togithub.com/firebase/firebase-js-sdk/compare/firebase@10.12.0...firebase@10.12.1) For more detailed release notes, see [Firebase JavaScript SDK Release Notes](https://firebase.google.com/support/release-notes/js). ### What's Changed #### [@​firebase/analytics](https://togithub.com/firebase/analytics)[@​0](https://togithub.com/0).10.4 ##### Patch Changes - [`f66769cca`](https://togithub.com/firebase/firebase-js-sdk/commit/f66769cca243019354f88ac9dc8de07caf9de56e) [#​8243](https://togithub.com/firebase/firebase-js-sdk/pull/8243) (fixes [#​8210](https://togithub.com/firebase/firebase-js-sdk/issues/8210)) - Analytics - fixed an issue where setConsent was clobbering the consentSettings before passing them to the gtag implementation. #### [@​firebase/analytics-compat](https://togithub.com/firebase/analytics-compat)[@​0](https://togithub.com/0).2.10 ##### Patch Changes - Updated dependencies \[[`f66769cca`](https://togithub.com/firebase/firebase-js-sdk/commit/f66769cca243019354f88ac9dc8de07caf9de56e)]: - [@​firebase/analytics](https://togithub.com/firebase/analytics)[@​0](https://togithub.com/0).10.4 #### [@​firebase/app](https://togithub.com/firebase/app)[@​0](https://togithub.com/0).10.4 ##### Patch Changes - Update SDK_VERSION. #### [@​firebase/app-compat](https://togithub.com/firebase/app-compat)[@​0](https://togithub.com/0).2.34 ##### Patch Changes - Updated dependencies \[]: - [@​firebase/app](https://togithub.com/firebase/app)[@​0](https://togithub.com/0).10.4 #### firebase@10.12.1 ##### Patch Changes - [`2ce95696f`](https://togithub.com/firebase/firebase-js-sdk/commit/2ce95696fe01f8c0fde08daa4359e39917654441) [#​8247](https://togithub.com/firebase/firebase-js-sdk/pull/8247) - Fix multi-tab persistence raising empty snapshot issue - Updated dependencies \[[`f66769cca`](https://togithub.com/firebase/firebase-js-sdk/commit/f66769cca243019354f88ac9dc8de07caf9de56e), [`2ce95696f`](https://togithub.com/firebase/firebase-js-sdk/commit/2ce95696fe01f8c0fde08daa4359e39917654441)]: - [@​firebase/app](https://togithub.com/firebase/app)[@​0](https://togithub.com/0).10.4 - [@​firebase/analytics](https://togithub.com/firebase/analytics)[@​0](https://togithub.com/0).10.4 - [@​firebase/firestore](https://togithub.com/firebase/firestore)[@​4](https://togithub.com/4).6.3 - [@​firebase/app-compat](https://togithub.com/firebase/app-compat)[@​0](https://togithub.com/0).2.34 - [@​firebase/analytics-compat](https://togithub.com/firebase/analytics-compat)[@​0](https://togithub.com/0).2.10 - [@​firebase/firestore-compat](https://togithub.com/firebase/firestore-compat)[@​0](https://togithub.com/0).3.32 #### [@​firebase/firestore](https://togithub.com/firebase/firestore)[@​4](https://togithub.com/4).6.3 ##### Patch Changes - [`2ce95696f`](https://togithub.com/firebase/firebase-js-sdk/commit/2ce95696fe01f8c0fde08daa4359e39917654441) [#​8247](https://togithub.com/firebase/firebase-js-sdk/pull/8247) - Fix multi-tab persistence raising empty snapshot issue #### [@​firebase/firestore-compat](https://togithub.com/firebase/firestore-compat)[@​0](https://togithub.com/0).3.32 ##### Patch Changes - Updated dependencies \[[`2ce95696f`](https://togithub.com/firebase/firebase-js-sdk/commit/2ce95696fe01f8c0fde08daa4359e39917654441)]: - [@​firebase/firestore](https://togithub.com/firebase/firestore)[@​4](https://togithub.com/4).6.3
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/redwoodjs/redwood). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .../auth-providers/firebase/web/package.json | 4 +- yarn.lock | 110 +++++++++--------- 2 files changed, 57 insertions(+), 57 deletions(-) diff --git a/packages/auth-providers/firebase/web/package.json b/packages/auth-providers/firebase/web/package.json index b5281052c170..a820a81e4d72 100644 --- a/packages/auth-providers/firebase/web/package.json +++ b/packages/auth-providers/firebase/web/package.json @@ -31,14 +31,14 @@ "@babel/cli": "7.24.5", "@babel/core": "^7.22.20", "@types/react": "^18.2.55", - "firebase": "10.12.0", + "firebase": "10.12.2", "jest": "29.7.0", "jest-environment-jsdom": "29.7.0", "react": "19.0.0-beta-04b058868c-20240508", "typescript": "5.4.5" }, "peerDependencies": { - "firebase": "10.12.0" + "firebase": "10.12.2" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" } diff --git a/yarn.lock b/yarn.lock index 313146fd24a7..ced28e48cab4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3197,18 +3197,18 @@ __metadata: languageName: node linkType: hard -"@firebase/analytics-compat@npm:0.2.9": - version: 0.2.9 - resolution: "@firebase/analytics-compat@npm:0.2.9" +"@firebase/analytics-compat@npm:0.2.10": + version: 0.2.10 + resolution: "@firebase/analytics-compat@npm:0.2.10" dependencies: - "@firebase/analytics": "npm:0.10.3" + "@firebase/analytics": "npm:0.10.4" "@firebase/analytics-types": "npm:0.8.2" "@firebase/component": "npm:0.6.7" "@firebase/util": "npm:1.9.6" tslib: "npm:^2.1.0" peerDependencies: "@firebase/app-compat": 0.x - checksum: 10c0/a4a4a3d5a93e09fdc3f13da5bf2096a6874a2115b86ad6f75075e7fb699aca9745e8587cd3a2eb2ab9e5c88f2b2adc443194647f04f04b7d05086448e272aca7 + checksum: 10c0/f7852d291d73178072e1b6bac50d744d49fc4770bbcb1a2cb8c1b36f4a54a8d6ca1c278e0e9ae46a7cb4658e0bc9427163b302101d80dbf2f4517cb95156cd7f languageName: node linkType: hard @@ -3219,9 +3219,9 @@ __metadata: languageName: node linkType: hard -"@firebase/analytics@npm:0.10.3": - version: 0.10.3 - resolution: "@firebase/analytics@npm:0.10.3" +"@firebase/analytics@npm:0.10.4": + version: 0.10.4 + resolution: "@firebase/analytics@npm:0.10.4" dependencies: "@firebase/component": "npm:0.6.7" "@firebase/installations": "npm:0.6.7" @@ -3230,7 +3230,7 @@ __metadata: tslib: "npm:^2.1.0" peerDependencies: "@firebase/app": 0.x - checksum: 10c0/5325545097c6de4a9063999b76e733f115c18debdb03b10a04a11267aed4a8ce2552ee7e39f7b85ba7c7500e1a6a5975a98b799955b1d44bf1800c736e520774 + checksum: 10c0/efbdde44ad800ee803508110337e66a13bfcbc46a3892c8a86f4ccf92f5c482cdd4ff2e7b61a280ab849804066b762d5859e2a4d06c9cb383f1363f2366d0b67 languageName: node linkType: hard @@ -3278,16 +3278,16 @@ __metadata: languageName: node linkType: hard -"@firebase/app-compat@npm:0.2.33": - version: 0.2.33 - resolution: "@firebase/app-compat@npm:0.2.33" +"@firebase/app-compat@npm:0.2.35": + version: 0.2.35 + resolution: "@firebase/app-compat@npm:0.2.35" dependencies: - "@firebase/app": "npm:0.10.3" + "@firebase/app": "npm:0.10.5" "@firebase/component": "npm:0.6.7" "@firebase/logger": "npm:0.4.2" "@firebase/util": "npm:1.9.6" tslib: "npm:^2.1.0" - checksum: 10c0/28db8ad4112ceace1ae113309ef1bf9e9c858d8867024eefd9d0ebba56a92936edf2c2658250d23b5d8e4d42771f80eca1f925db550b5292bee5809bc6667bd5 + checksum: 10c0/f10556a1b64709709edede0d8b0a90e6de19e89ff1fddd8eda1058b7dfbca5c2ccf14ed93c74e441cf6f7f100de2222f963f746b16954d45d3e403f6f8a6a3cb languageName: node linkType: hard @@ -3305,24 +3305,24 @@ __metadata: languageName: node linkType: hard -"@firebase/app@npm:0.10.3": - version: 0.10.3 - resolution: "@firebase/app@npm:0.10.3" +"@firebase/app@npm:0.10.5": + version: 0.10.5 + resolution: "@firebase/app@npm:0.10.5" dependencies: "@firebase/component": "npm:0.6.7" "@firebase/logger": "npm:0.4.2" "@firebase/util": "npm:1.9.6" idb: "npm:7.1.1" tslib: "npm:^2.1.0" - checksum: 10c0/6a779c271c05f0422bcc82622b3f15ad924807672daee0dbd1c7a33fdee9092d23e4d938d2cc0baabb6c103ddbd68acc843e96302d804b9cef527450b531d530 + checksum: 10c0/9c5f2feb0433a200e8586ee8971b713266dcbbed14567647d0ec54397042ee31df9a9e24960445df1a2eae86536f2390f98cf8d8260307391fde4e3e0ab315e8 languageName: node linkType: hard -"@firebase/auth-compat@npm:0.5.8": - version: 0.5.8 - resolution: "@firebase/auth-compat@npm:0.5.8" +"@firebase/auth-compat@npm:0.5.9": + version: 0.5.9 + resolution: "@firebase/auth-compat@npm:0.5.9" dependencies: - "@firebase/auth": "npm:1.7.3" + "@firebase/auth": "npm:1.7.4" "@firebase/auth-types": "npm:0.12.2" "@firebase/component": "npm:0.6.7" "@firebase/util": "npm:1.9.6" @@ -3330,7 +3330,7 @@ __metadata: undici: "npm:5.28.4" peerDependencies: "@firebase/app-compat": 0.x - checksum: 10c0/4a014ae653d639565edb9c9b27f1a459b10d1ac30d0a81c79ed56920d97a578e1042c0066748175d1b3a1cdd72788390750ed90cc9c6303851ec95757a0259bf + checksum: 10c0/15b0d56f92216a1cf29c892ca95f0de18bac3ba03583b36aab5e3c82a684661eeb5f63b1f98536e9b48633c6b8147c457369114715caebd829a1bf0568c816a7 languageName: node linkType: hard @@ -3358,9 +3358,9 @@ __metadata: languageName: node linkType: hard -"@firebase/auth@npm:1.7.3": - version: 1.7.3 - resolution: "@firebase/auth@npm:1.7.3" +"@firebase/auth@npm:1.7.4": + version: 1.7.4 + resolution: "@firebase/auth@npm:1.7.4" dependencies: "@firebase/component": "npm:0.6.7" "@firebase/logger": "npm:0.4.2" @@ -3373,7 +3373,7 @@ __metadata: peerDependenciesMeta: "@react-native-async-storage/async-storage": optional: true - checksum: 10c0/04554ae85466668745e21d03ac13ccf7f4dbb15fa1bddd5e00e815afc26df8cece308827392de7ba770e9dbed093fd0bbaf0c5d9ed668ff2d5846babc8b6ef0b + checksum: 10c0/e36954163af9449626115a418017487dfdf6e66caa1f2575d2dee6384ec7de9be91232a8ef42fa5c0f1f641c10114043b8183b58251ef74105e5efb0262475f0 languageName: node linkType: hard @@ -3474,18 +3474,18 @@ __metadata: languageName: node linkType: hard -"@firebase/firestore-compat@npm:0.3.31": - version: 0.3.31 - resolution: "@firebase/firestore-compat@npm:0.3.31" +"@firebase/firestore-compat@npm:0.3.32": + version: 0.3.32 + resolution: "@firebase/firestore-compat@npm:0.3.32" dependencies: "@firebase/component": "npm:0.6.7" - "@firebase/firestore": "npm:4.6.2" + "@firebase/firestore": "npm:4.6.3" "@firebase/firestore-types": "npm:3.0.2" "@firebase/util": "npm:1.9.6" tslib: "npm:^2.1.0" peerDependencies: "@firebase/app-compat": 0.x - checksum: 10c0/262f051e2f15332e87d5e97541762e6803a82d22f310ebc340a21abb9dca1fabccfcd237432be697229e51392e0a91742f6a73385ef1ee353641af9eae0ddc2a + checksum: 10c0/f57af5be47b4eab587ac3cf614f8537558bd0cd55aae3968fab461227a681017ae45e7f06cd0e23481137e0bfdf576757912fe6b7e32dfe1dd2f28cd5710c450 languageName: node linkType: hard @@ -3499,9 +3499,9 @@ __metadata: languageName: node linkType: hard -"@firebase/firestore@npm:4.6.2": - version: 4.6.2 - resolution: "@firebase/firestore@npm:4.6.2" +"@firebase/firestore@npm:4.6.3": + version: 4.6.3 + resolution: "@firebase/firestore@npm:4.6.3" dependencies: "@firebase/component": "npm:0.6.7" "@firebase/logger": "npm:0.4.2" @@ -3513,7 +3513,7 @@ __metadata: undici: "npm:5.28.4" peerDependencies: "@firebase/app": 0.x - checksum: 10c0/b836169290bc35ad0e31b7c77b677cdda2ed7efe7d9c94be69942bb719a74fea749660cfcd87c58f021aa65cb30b18437cc2639c0adf7f17fbd360dc9d3a3164 + checksum: 10c0/77d21d6736a20bd2fbc0707178c342b6e73235fa1d51059535c29c463249006d8fa5c06714b8240a72892be2d1d9e6c5e1666a8569ad131453be6b988ed03c2e languageName: node linkType: hard @@ -3782,9 +3782,9 @@ __metadata: languageName: node linkType: hard -"@firebase/vertexai-preview@npm:0.0.1": - version: 0.0.1 - resolution: "@firebase/vertexai-preview@npm:0.0.1" +"@firebase/vertexai-preview@npm:0.0.2": + version: 0.0.2 + resolution: "@firebase/vertexai-preview@npm:0.0.2" dependencies: "@firebase/app-check-interop-types": "npm:0.3.2" "@firebase/component": "npm:0.6.7" @@ -3794,7 +3794,7 @@ __metadata: peerDependencies: "@firebase/app": 0.x "@firebase/app-types": 0.x - checksum: 10c0/0b5b15d57becebcd69728610c2691bca90e8ce1a22c810d2d674559e1584f2df0f5e772982fbe8a18f2817b50e0283c8a3b1371d9c66c5b08bf0b9a1b1f9c553 + checksum: 10c0/d830a110d7f87b16bfd590629116fcee11e9069a20584f26899de9d8dfbd87c9655f679a448f1079ea32225ae157dc8b954ec9c655275c6624240627bb2bfad8 languageName: node linkType: hard @@ -7667,13 +7667,13 @@ __metadata: "@redwoodjs/auth": "workspace:*" "@types/react": "npm:^18.2.55" core-js: "npm:3.37.1" - firebase: "npm:10.12.0" + firebase: "npm:10.12.2" jest: "npm:29.7.0" jest-environment-jsdom: "npm:29.7.0" react: "npm:19.0.0-beta-04b058868c-20240508" typescript: "npm:5.4.5" peerDependencies: - firebase: 10.12.0 + firebase: 10.12.2 languageName: unknown linkType: soft @@ -18237,23 +18237,23 @@ __metadata: languageName: node linkType: hard -"firebase@npm:10.12.0": - version: 10.12.0 - resolution: "firebase@npm:10.12.0" +"firebase@npm:10.12.2": + version: 10.12.2 + resolution: "firebase@npm:10.12.2" dependencies: - "@firebase/analytics": "npm:0.10.3" - "@firebase/analytics-compat": "npm:0.2.9" - "@firebase/app": "npm:0.10.3" + "@firebase/analytics": "npm:0.10.4" + "@firebase/analytics-compat": "npm:0.2.10" + "@firebase/app": "npm:0.10.5" "@firebase/app-check": "npm:0.8.4" "@firebase/app-check-compat": "npm:0.3.11" - "@firebase/app-compat": "npm:0.2.33" + "@firebase/app-compat": "npm:0.2.35" "@firebase/app-types": "npm:0.9.2" - "@firebase/auth": "npm:1.7.3" - "@firebase/auth-compat": "npm:0.5.8" + "@firebase/auth": "npm:1.7.4" + "@firebase/auth-compat": "npm:0.5.9" "@firebase/database": "npm:1.0.5" "@firebase/database-compat": "npm:1.0.5" - "@firebase/firestore": "npm:4.6.2" - "@firebase/firestore-compat": "npm:0.3.31" + "@firebase/firestore": "npm:4.6.3" + "@firebase/firestore-compat": "npm:0.3.32" "@firebase/functions": "npm:0.11.5" "@firebase/functions-compat": "npm:0.3.11" "@firebase/installations": "npm:0.6.7" @@ -18267,8 +18267,8 @@ __metadata: "@firebase/storage": "npm:0.12.5" "@firebase/storage-compat": "npm:0.3.8" "@firebase/util": "npm:1.9.6" - "@firebase/vertexai-preview": "npm:0.0.1" - checksum: 10c0/e6f1f106e405bd4d8b3927ed429ea7bd17b8520cf0010ced555c3ad7fba79d4012575c27375f952e8de1a31ca45b2cac8a03c4114a55d9b3b70b5eee409422b4 + "@firebase/vertexai-preview": "npm:0.0.2" + checksum: 10c0/8b8162207e82a13819e2b70e9c63ed18614f3786249709e3837b6324c054144c8e1d957db513e3075d9a1c659544c9de353dd3ae9bdd111861c1ea00b04b1e10 languageName: node linkType: hard From afaa67c0e717820e9adaca1b9200d8c70b9de7ac Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 11 Jun 2024 19:31:55 +0000 Subject: [PATCH 52/66] chore(deps): update dependency @clerk/types to v3.65.2 (#10795) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [@clerk/types](https://clerk.com/) ([source](https://togithub.com/clerk/javascript/tree/HEAD/packages/types)) | [`3.64.1` -> `3.65.2`](https://renovatebot.com/diffs/npm/@clerk%2ftypes/3.64.1/3.65.2) | [![age](https://developer.mend.io/api/mc/badges/age/npm/@clerk%2ftypes/3.65.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/@clerk%2ftypes/3.65.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/@clerk%2ftypes/3.64.1/3.65.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@clerk%2ftypes/3.64.1/3.65.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
clerk/javascript (@​clerk/types) ### [`v3.65.2`](https://togithub.com/clerk/javascript/releases/tag/%40clerk/types%403.65.2) [Compare Source](https://togithub.com/clerk/javascript/compare/@clerk/types@3.65.1...@clerk/types@3.65.2) ##### Patch Changes - Add support for Enstall OAuth provider ([#​3467](https://togithub.com/clerk/javascript/pull/3467)) by [@​Nikpolik](https://togithub.com/Nikpolik) ### [`v3.65.1`](https://togithub.com/clerk/javascript/releases/tag/%40clerk/types%403.65.1) [Compare Source](https://togithub.com/clerk/javascript/compare/@clerk/types@3.65.0...@clerk/types@3.65.1) ##### Patch Changes - Add experimental support for hCaptcha captcha provider ([#​3451](https://togithub.com/clerk/javascript/pull/3451)) by [@​anagstef](https://togithub.com/anagstef) ### [`v3.65.0`](https://togithub.com/clerk/javascript/releases/tag/%40clerk/types%403.65.0) [Compare Source](https://togithub.com/clerk/javascript/compare/@clerk/types@3.64.1...@clerk/types@3.65.0) ##### Minor Changes - Added the following types ([#​3409](https://togithub.com/clerk/javascript/pull/3409)) by [@​panteliselef](https://togithub.com/panteliselef) ```tsx interface Clerk { ... openGoogleOneTap: (props?: GoogleOneTapProps) => void; closeGoogleOneTap: () => void; authenticateWithGoogleOneTap: (params: AuthenticateWithGoogleOneTapParams) => Promise; handleGoogleOneTapCallback: ( signInOrUp: SignInResource | SignUpResource, params: HandleOAuthCallbackParams, customNavigate?: (to: string) => Promise, ) => Promise; ... } type GoogleOneTapStrategy = 'google_one_tap' ```
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/redwoodjs/redwood). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- packages/auth-providers/clerk/web/package.json | 2 +- yarn.lock | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/packages/auth-providers/clerk/web/package.json b/packages/auth-providers/clerk/web/package.json index 247edab9fbdc..191acfa90b5d 100644 --- a/packages/auth-providers/clerk/web/package.json +++ b/packages/auth-providers/clerk/web/package.json @@ -31,7 +31,7 @@ "@babel/cli": "7.24.5", "@babel/core": "^7.22.20", "@clerk/clerk-react": "4.32.2", - "@clerk/types": "3.64.1", + "@clerk/types": "3.65.2", "@types/react": "^18.2.55", "react": "19.0.0-beta-04b058868c-20240508", "typescript": "5.4.5", diff --git a/yarn.lock b/yarn.lock index ced28e48cab4..64e48568f864 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2202,15 +2202,6 @@ __metadata: languageName: node linkType: hard -"@clerk/types@npm:3.64.1": - version: 3.64.1 - resolution: "@clerk/types@npm:3.64.1" - dependencies: - csstype: "npm:3.1.1" - checksum: 10c0/a9b17307324ccfef782a09aa43f4db1cc396ccb17cc75bad0111f2904c895b11184f84edaf11dbd1a1f85fb69e889d669e2c25da0b1346c351cc2e1693036279 - languageName: node - linkType: hard - "@clerk/types@npm:3.65.2": version: 3.65.2 resolution: "@clerk/types@npm:3.65.2" @@ -7522,7 +7513,7 @@ __metadata: "@babel/core": "npm:^7.22.20" "@babel/runtime-corejs3": "npm:7.24.5" "@clerk/clerk-react": "npm:4.32.2" - "@clerk/types": "npm:3.64.1" + "@clerk/types": "npm:3.65.2" "@redwoodjs/auth": "workspace:*" "@types/react": "npm:^18.2.55" core-js: "npm:3.37.1" From ad949c023f7aaa22c6c7fa36b201d1b1af26c4fe Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 11 Jun 2024 20:04:13 +0000 Subject: [PATCH 53/66] chore(deps): update dependency tsx to v4.15.2 (#10800) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [tsx](https://togithub.com/privatenumber/tsx) | [`4.10.3` -> `4.15.2`](https://renovatebot.com/diffs/npm/tsx/4.10.3/4.15.2) | [![age](https://developer.mend.io/api/mc/badges/age/npm/tsx/4.15.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/tsx/4.15.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/tsx/4.10.3/4.15.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/tsx/4.10.3/4.15.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
privatenumber/tsx (tsx) ### [`v4.15.2`](https://togithub.com/privatenumber/tsx/releases/tag/v4.15.2) [Compare Source](https://togithub.com/privatenumber/tsx/compare/v4.15.1...v4.15.2) ##### Bug Fixes - **esm:** resolve implicit extension in package subpath ([7e1fe22](https://togithub.com/privatenumber/tsx/commit/7e1fe22e142643afc2226a2f1c0d1579c949f0c6)) *** This release is also available on: - [npm package (@​latest dist-tag)](https://www.npmjs.com/package/tsx/v/4.15.2) ### [`v4.15.1`](https://togithub.com/privatenumber/tsx/compare/v4.15.0...fb247eb0313a191ba13fb682857309d8c588856a) [Compare Source](https://togithub.com/privatenumber/tsx/compare/v4.15.0...v4.15.1) ### [`v4.15.0`](https://togithub.com/privatenumber/tsx/releases/tag/v4.15.0) [Compare Source](https://togithub.com/privatenumber/tsx/compare/v4.14.1...v4.15.0) ##### Features - esbuild 0.21 ([#​19](https://togithub.com/privatenumber/tsx/issues/19)) ([6f1d305](https://togithub.com/privatenumber/tsx/commit/6f1d305d4a862811ccd9721d78ace195d10a713f)) - esbuild 0.21.3 ([edbdfdf](https://togithub.com/privatenumber/tsx/commit/edbdfdfbc4e01ec57d335d00c04ae11c374e55e8)) - esbuild 0.21.4 ([c67d746](https://togithub.com/privatenumber/tsx/commit/c67d7468074d023b5c3abfb4b3ebd58484318e24)) *** This release is also available on: - [npm package (@​latest dist-tag)](https://www.npmjs.com/package/tsx/v/4.15.0) ### [`v4.14.1`](https://togithub.com/privatenumber/tsx/releases/tag/v4.14.1) [Compare Source](https://togithub.com/privatenumber/tsx/compare/v4.14.0...v4.14.1) ##### Bug Fixes - **cjs:** only hide transformers when namespaced ([9e647a5](https://togithub.com/privatenumber/tsx/commit/9e647a58eeb635cef85063c80635655776bfe9b6)) *** This release is also available on: - [npm package (@​latest dist-tag)](https://www.npmjs.com/package/tsx/v/4.14.1) ### [`v4.14.0`](https://togithub.com/privatenumber/tsx/releases/tag/v4.14.0) [Compare Source](https://togithub.com/privatenumber/tsx/compare/v4.13.3...v4.14.0) ##### Features - resolve .js → .ts in `package.json` exports & main ([4503421](https://togithub.com/privatenumber/tsx/commit/4503421e601b05078e1adb13b86a1a4619c9805d)) *** This release is also available on: - [npm package (@​latest dist-tag)](https://www.npmjs.com/package/tsx/v/4.14.0) ### [`v4.13.3`](https://togithub.com/privatenumber/tsx/releases/tag/v4.13.3) [Compare Source](https://togithub.com/privatenumber/tsx/compare/v4.13.2...v4.13.3) ##### Bug Fixes - **cjs:** resolve directory import relative to parent ([#​42](https://togithub.com/privatenumber/tsx/issues/42)) ([02d3856](https://togithub.com/privatenumber/tsx/commit/02d3856371794ea16c6dec27489e24f2b1b5249a)) - **esm:** cjs interop to support decorators ([807f467](https://togithub.com/privatenumber/tsx/commit/807f467299c20ead6d8629b055f5cb695284a526)) - **esm:** resolve .ts extension in imports map ([89621bf](https://togithub.com/privatenumber/tsx/commit/89621bf3ada0df8dd44c140991008d5d9e598fb6)) *** This release is also available on: - [npm package (@​latest dist-tag)](https://www.npmjs.com/package/tsx/v/4.13.3) ### [`v4.13.2`](https://togithub.com/privatenumber/tsx/releases/tag/v4.13.2) [Compare Source](https://togithub.com/privatenumber/tsx/compare/v4.13.1...v4.13.2) ##### Bug Fixes - **esm:** ignore transforming .js files with CJS syntax ([#​40](https://togithub.com/privatenumber/tsx/issues/40)) ([87a7683](https://togithub.com/privatenumber/tsx/commit/87a7683ab3d686918ec8f23b43df2961067fc1e0)) *** This release is also available on: - [npm package (@​latest dist-tag)](https://www.npmjs.com/package/tsx/v/4.13.2) ### [`v4.13.1`](https://togithub.com/privatenumber/tsx/releases/tag/v4.13.1) [Compare Source](https://togithub.com/privatenumber/tsx/compare/v4.13.0...v4.13.1) ##### Bug Fixes - **esm/api:** `tsImport()` to parse CJS exports ([0a78bfd](https://togithub.com/privatenumber/tsx/commit/0a78bfd11b20fcb6460fdcdea7d3b1daebfe3ad0)) *** This release is also available on: - [npm package (@​latest dist-tag)](https://www.npmjs.com/package/tsx/v/4.13.1) ### [`v4.13.0`](https://togithub.com/privatenumber/tsx/releases/tag/v4.13.0) [Compare Source](https://togithub.com/privatenumber/tsx/compare/v4.12.1...v4.13.0) ##### Features - **cjs/api:** `register()` to support namespace ([#​35](https://togithub.com/privatenumber/tsx/issues/35)) ([c703300](https://togithub.com/privatenumber/tsx/commit/c7033008467ed87310445138420664ac53404263)) - **esm/api:** `tsImport()` to support loading CommonJS files ([0eb4e91](https://togithub.com/privatenumber/tsx/commit/0eb4e911f31c478400c7f31027f218123450d108)) *** This release is also available on: - [npm package (@​latest dist-tag)](https://www.npmjs.com/package/tsx/v/4.13.0) ### [`v4.12.1`](https://togithub.com/privatenumber/tsx/releases/tag/v4.12.1) [Compare Source](https://togithub.com/privatenumber/tsx/compare/v4.12.0...v4.12.1) ##### Bug Fixes - **esm:** resolve implicit ts paths in packages ([de900a1](https://togithub.com/privatenumber/tsx/commit/de900a196a5a66f5363f40fd6d38b879aee96875)) *** This release is also available on: - [npm package (@​latest dist-tag)](https://www.npmjs.com/package/tsx/v/4.12.1) ### [`v4.12.0`](https://togithub.com/privatenumber/tsx/releases/tag/v4.12.0) [Compare Source](https://togithub.com/privatenumber/tsx/compare/v4.11.2...v4.12.0) ##### Bug Fixes - **cjs:** make resolver chainable ([585f117](https://togithub.com/privatenumber/tsx/commit/585f11727c1d4ec712b801359fa43a1ad93a65f3)) - **esm:** named import from CommonJS file ([#​33](https://togithub.com/privatenumber/tsx/issues/33)) ([7c85303](https://togithub.com/privatenumber/tsx/commit/7c85303b6f049eaa6bad0e75c26c03348049bfcd)) ##### Features - **cjs:** support query for cache busting ([#​37](https://togithub.com/privatenumber/tsx/issues/37)) ([e1464cf](https://togithub.com/privatenumber/tsx/commit/e1464cf7c4d4105d4d9b1eae39f95f3b70be6810)) ##### Performance Improvements - **esm:** only try extensions if file path ([72d0896](https://togithub.com/privatenumber/tsx/commit/72d08965f9f1dd348b6017520ad63bc8373edc72)) *** This release is also available on: - [npm package (@​latest dist-tag)](https://www.npmjs.com/package/tsx/v/4.12.0) ### [`v4.11.2`](https://togithub.com/privatenumber/tsx/releases/tag/v4.11.2) [Compare Source](https://togithub.com/privatenumber/tsx/compare/v4.11.1...v4.11.2) ##### Bug Fixes - **cjs:** esm interop in `.mjs` files ([#​32](https://togithub.com/privatenumber/tsx/issues/32)) ([aa2b639](https://togithub.com/privatenumber/tsx/commit/aa2b639a9bac8ae28a46b847013fda7f5cd4466b)) *** This release is also available on: - [npm package (@​latest dist-tag)](https://www.npmjs.com/package/tsx/v/4.11.2) ### [`v4.11.1`](https://togithub.com/privatenumber/tsx/releases/tag/v4.11.1) [Compare Source](https://togithub.com/privatenumber/tsx/compare/v4.11.0...v4.11.1) ##### Bug Fixes - **cjs/api:** resolve correct module and types when imported ([#​566](https://togithub.com/privatenumber/tsx/issues/566)) ([5e70105](https://togithub.com/privatenumber/tsx/commit/5e701051c4eb639bfd204c805310777789907a55)) *** This release is also available on: - [npm package (@​latest dist-tag)](https://www.npmjs.com/package/tsx/v/4.11.1) ### [`v4.11.0`](https://togithub.com/privatenumber/tsx/releases/tag/v4.11.0) [Compare Source](https://togithub.com/privatenumber/tsx/compare/v4.10.5...v4.11.0) ##### Bug Fixes - only error on invalid tsconfig if explicitly passed in ([#​30](https://togithub.com/privatenumber/tsx/issues/30)) ([b6bf39b](https://togithub.com/privatenumber/tsx/commit/b6bf39b1cc4ca037a16f5b02c619ed5c36e6d598)) ##### Features - **esm api:** configurable `tsconfig` ([3f42ae3](https://togithub.com/privatenumber/tsx/commit/3f42ae3dfc666cd4a6de7376ab051840e18c8c05)) *** This release is also available on: - [npm package (@​latest dist-tag)](https://www.npmjs.com/package/tsx/v/4.11.0) ### [`v4.10.5`](https://togithub.com/privatenumber/tsx/releases/tag/v4.10.5) [Compare Source](https://togithub.com/privatenumber/tsx/compare/v4.10.4...v4.10.5) ##### Bug Fixes - handle parsing variable `of` ([86cf87c](https://togithub.com/privatenumber/tsx/commit/86cf87c861991eddb39cf8ea88b2870b9f536ff5)), closes [#​556](https://togithub.com/privatenumber/tsx/issues/556) *** This release is also available on: - [npm package (@​latest dist-tag)](https://www.npmjs.com/package/tsx/v/4.10.5) ### [`v4.10.4`](https://togithub.com/privatenumber/tsx/compare/v4.10.3...4a8a2dcce25e1223dec65219659065901fd7620f) [Compare Source](https://togithub.com/privatenumber/tsx/compare/v4.10.3...v4.10.4)
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/redwoodjs/redwood). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- packages/adapters/fastify/web/package.json | 2 +- packages/api-server/package.json | 2 +- .../dbAuth/middleware/package.json | 2 +- .../supabase/middleware/package.json | 2 +- packages/auth/package.json | 2 +- packages/babel-config/package.json | 2 +- packages/cli-helpers/package.json | 2 +- .../cli-packages/dataMigrate/package.json | 2 +- .../cli-packages/storybook-vite/package.json | 2 +- packages/cli-packages/storybook/package.json | 2 +- packages/cli/package.json | 2 +- packages/context/package.json | 2 +- packages/cookie-jar/package.json | 2 +- packages/create-redwood-app/package.json | 2 +- packages/eslint-plugin/package.json | 2 +- packages/framework-tools/package.json | 2 +- packages/graphql-server/package.json | 2 +- packages/internal/package.json | 2 +- packages/mailer/core/package.json | 2 +- .../mailer/handlers/in-memory/package.json | 2 +- .../mailer/handlers/nodemailer/package.json | 2 +- packages/mailer/handlers/resend/package.json | 2 +- packages/mailer/handlers/studio/package.json | 2 +- .../mailer/renderers/mjml-react/package.json | 2 +- .../mailer/renderers/react-email/package.json | 2 +- packages/ogimage-gen/package.json | 2 +- packages/project-config/package.json | 2 +- packages/realtime/package.json | 2 +- packages/server-store/package.json | 2 +- packages/storybook/package.json | 2 +- packages/telemetry/package.json | 2 +- packages/tui/package.json | 2 +- packages/vite/package.json | 2 +- packages/web-server/package.json | 2 +- yarn.lock | 323 +++++++++++++++--- 36 files changed, 317 insertions(+), 76 deletions(-) diff --git a/package.json b/package.json index 003f4c5e34ad..1f814dadb051 100644 --- a/package.json +++ b/package.json @@ -105,7 +105,7 @@ "prompts": "2.4.2", "rimraf": "5.0.7", "tstyche": "2.0.0", - "tsx": "4.10.3", + "tsx": "4.15.2", "typescript": "5.4.5", "vitest": "1.6.0", "yargs": "17.7.2", diff --git a/packages/adapters/fastify/web/package.json b/packages/adapters/fastify/web/package.json index c79d2ef18aa1..07e8709c7af6 100644 --- a/packages/adapters/fastify/web/package.json +++ b/packages/adapters/fastify/web/package.json @@ -30,7 +30,7 @@ "devDependencies": { "@redwoodjs/framework-tools": "workspace:*", "fastify": "4.27.0", - "tsx": "4.10.3", + "tsx": "4.15.2", "typescript": "5.4.5", "vitest": "1.6.0" }, diff --git a/packages/api-server/package.json b/packages/api-server/package.json index 7ecc64cf2155..f269aa80a64d 100644 --- a/packages/api-server/package.json +++ b/packages/api-server/package.json @@ -56,7 +56,7 @@ "@types/split2": "4.2.3", "@types/yargs": "17.0.32", "pino-abstract-transport": "1.2.0", - "tsx": "4.10.3", + "tsx": "4.15.2", "typescript": "5.4.5", "vitest": "1.6.0" }, diff --git a/packages/auth-providers/dbAuth/middleware/package.json b/packages/auth-providers/dbAuth/middleware/package.json index 7c52bb662708..091bbb7a098e 100644 --- a/packages/auth-providers/dbAuth/middleware/package.json +++ b/packages/auth-providers/dbAuth/middleware/package.json @@ -40,7 +40,7 @@ "@redwoodjs/vite": "workspace:*", "@types/aws-lambda": "8.10.138", "ts-toolbelt": "9.6.0", - "tsx": "4.10.3", + "tsx": "4.15.2", "typescript": "5.4.5", "vitest": "1.6.0" }, diff --git a/packages/auth-providers/supabase/middleware/package.json b/packages/auth-providers/supabase/middleware/package.json index 074c2bca17f6..54ad45759617 100644 --- a/packages/auth-providers/supabase/middleware/package.json +++ b/packages/auth-providers/supabase/middleware/package.json @@ -42,7 +42,7 @@ "@redwoodjs/vite": "workspace:*", "@types/aws-lambda": "8.10.138", "ts-toolbelt": "9.6.0", - "tsx": "4.10.3", + "tsx": "4.15.2", "typescript": "5.4.5", "vitest": "1.6.0" }, diff --git a/packages/auth/package.json b/packages/auth/package.json index 3f169c25a942..fbafd4161f1c 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -62,7 +62,7 @@ "@testing-library/jest-dom": "6.4.5", "@testing-library/react": "14.3.1", "msw": "1.3.3", - "tsx": "4.10.3", + "tsx": "4.15.2", "typescript": "5.4.5", "vitest": "1.6.0" }, diff --git a/packages/babel-config/package.json b/packages/babel-config/package.json index 684ddff8f73a..ab3c59de34b3 100644 --- a/packages/babel-config/package.json +++ b/packages/babel-config/package.json @@ -50,7 +50,7 @@ "@types/babel__core": "7.20.5", "@types/node": "20.12.12", "babel-plugin-tester": "11.0.4", - "tsx": "4.10.3", + "tsx": "4.15.2", "vitest": "1.6.0" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" diff --git a/packages/cli-helpers/package.json b/packages/cli-helpers/package.json index 0c9b09d39024..bbffa3681405 100644 --- a/packages/cli-helpers/package.json +++ b/packages/cli-helpers/package.json @@ -46,7 +46,7 @@ "@types/lodash": "4.17.5", "@types/pascalcase": "1.0.3", "@types/yargs": "17.0.32", - "tsx": "4.10.3", + "tsx": "4.15.2", "typescript": "5.4.5", "vitest": "1.6.0" }, diff --git a/packages/cli-packages/dataMigrate/package.json b/packages/cli-packages/dataMigrate/package.json index 2037a51a69e8..df6ee992d994 100644 --- a/packages/cli-packages/dataMigrate/package.json +++ b/packages/cli-packages/dataMigrate/package.json @@ -42,7 +42,7 @@ "@types/yargs": "17.0.32", "jest": "29.7.0", "memfs": "4.9.2", - "tsx": "4.10.3", + "tsx": "4.15.2", "typescript": "5.4.5" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" diff --git a/packages/cli-packages/storybook-vite/package.json b/packages/cli-packages/storybook-vite/package.json index 29f099afc0ce..001e82796e83 100644 --- a/packages/cli-packages/storybook-vite/package.json +++ b/packages/cli-packages/storybook-vite/package.json @@ -33,7 +33,7 @@ "devDependencies": { "@redwoodjs/framework-tools": "workspace:*", "@types/yargs": "17.0.32", - "tsx": "4.10.3", + "tsx": "4.15.2", "typescript": "5.4.5" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" diff --git a/packages/cli-packages/storybook/package.json b/packages/cli-packages/storybook/package.json index eea3ec92ece6..4a7529d765e9 100644 --- a/packages/cli-packages/storybook/package.json +++ b/packages/cli-packages/storybook/package.json @@ -36,7 +36,7 @@ "devDependencies": { "@redwoodjs/framework-tools": "workspace:*", "@types/yargs": "17.0.32", - "tsx": "4.10.3", + "tsx": "4.15.2", "typescript": "5.4.5" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" diff --git a/packages/cli/package.json b/packages/cli/package.json index 140102bb84c7..53de991589bb 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -87,7 +87,7 @@ "@babel/core": "^7.22.20", "@types/archiver": "^6", "memfs": "4.9.2", - "tsx": "4.10.3", + "tsx": "4.15.2", "typescript": "5.4.5", "vitest": "1.6.0" }, diff --git a/packages/context/package.json b/packages/context/package.json index 697fb7380286..3690cb19c18a 100644 --- a/packages/context/package.json +++ b/packages/context/package.json @@ -21,7 +21,7 @@ }, "devDependencies": { "@redwoodjs/framework-tools": "workspace:*", - "tsx": "4.10.3", + "tsx": "4.15.2", "typescript": "5.4.5" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" diff --git a/packages/cookie-jar/package.json b/packages/cookie-jar/package.json index b8e6a16c0a83..ad1794814eec 100644 --- a/packages/cookie-jar/package.json +++ b/packages/cookie-jar/package.json @@ -30,7 +30,7 @@ "devDependencies": { "@redwoodjs/framework-tools": "workspace:*", "@types/fs-extra": "11.0.4", - "tsx": "4.10.3", + "tsx": "4.15.2", "typescript": "5.4.5" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" diff --git a/packages/create-redwood-app/package.json b/packages/create-redwood-app/package.json index e04b38631b72..b58993bc1b9c 100644 --- a/packages/create-redwood-app/package.json +++ b/packages/create-redwood-app/package.json @@ -44,7 +44,7 @@ "semver": "7.6.2", "systeminformation": "5.22.11", "terminal-link": "2.1.1", - "tsx": "4.10.3", + "tsx": "4.15.2", "untildify": "4.0.0", "uuid": "9.0.1", "vitest": "1.6.0", diff --git a/packages/eslint-plugin/package.json b/packages/eslint-plugin/package.json index 1fef357e70f1..09a32102971c 100644 --- a/packages/eslint-plugin/package.json +++ b/packages/eslint-plugin/package.json @@ -31,7 +31,7 @@ "@types/estree": "1.0.5", "@typescript-eslint/parser": "7.3.1", "@typescript-eslint/rule-tester": "7.3.1", - "tsx": "4.10.3", + "tsx": "4.15.2", "typescript": "5.4.5", "vitest": "1.6.0" }, diff --git a/packages/framework-tools/package.json b/packages/framework-tools/package.json index df46993b018c..2345a0800ef1 100644 --- a/packages/framework-tools/package.json +++ b/packages/framework-tools/package.json @@ -28,7 +28,7 @@ }, "devDependencies": { "@types/fs-extra": "11.0.4", - "tsx": "4.10.3", + "tsx": "4.15.2", "typescript": "5.4.5" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" diff --git a/packages/graphql-server/package.json b/packages/graphql-server/package.json index 6aa7896367c2..e9ace023b198 100644 --- a/packages/graphql-server/package.json +++ b/packages/graphql-server/package.json @@ -58,7 +58,7 @@ "@whatwg-node/fetch": "0.9.17", "jest": "29.7.0", "jsonwebtoken": "9.0.2", - "tsx": "4.10.3", + "tsx": "4.15.2", "typescript": "5.4.5" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" diff --git a/packages/internal/package.json b/packages/internal/package.json index a3440c574084..471447bca8ef 100644 --- a/packages/internal/package.json +++ b/packages/internal/package.json @@ -73,7 +73,7 @@ "@babel/cli": "7.24.5", "@types/fs-extra": "11.0.4", "graphql-tag": "2.12.6", - "tsx": "4.10.3", + "tsx": "4.15.2", "vitest": "1.6.0" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" diff --git a/packages/mailer/core/package.json b/packages/mailer/core/package.json index abd1864c5068..d14afc0359ba 100644 --- a/packages/mailer/core/package.json +++ b/packages/mailer/core/package.json @@ -24,7 +24,7 @@ "devDependencies": { "@redwoodjs/api": "workspace:*", "@redwoodjs/framework-tools": "workspace:*", - "tsx": "4.10.3", + "tsx": "4.15.2", "typescript": "5.4.5", "vitest": "1.6.0" }, diff --git a/packages/mailer/handlers/in-memory/package.json b/packages/mailer/handlers/in-memory/package.json index aba443ef53e6..2b8c60d6fd88 100644 --- a/packages/mailer/handlers/in-memory/package.json +++ b/packages/mailer/handlers/in-memory/package.json @@ -24,7 +24,7 @@ }, "devDependencies": { "@redwoodjs/framework-tools": "workspace:*", - "tsx": "4.10.3", + "tsx": "4.15.2", "typescript": "5.4.5" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" diff --git a/packages/mailer/handlers/nodemailer/package.json b/packages/mailer/handlers/nodemailer/package.json index 013a61890a0f..8d900d21902c 100644 --- a/packages/mailer/handlers/nodemailer/package.json +++ b/packages/mailer/handlers/nodemailer/package.json @@ -26,7 +26,7 @@ "devDependencies": { "@redwoodjs/framework-tools": "workspace:*", "@types/nodemailer": "^6", - "tsx": "4.10.3", + "tsx": "4.15.2", "typescript": "5.4.5" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" diff --git a/packages/mailer/handlers/resend/package.json b/packages/mailer/handlers/resend/package.json index 4d57a1102b7e..65befb3a1b65 100644 --- a/packages/mailer/handlers/resend/package.json +++ b/packages/mailer/handlers/resend/package.json @@ -25,7 +25,7 @@ }, "devDependencies": { "@redwoodjs/framework-tools": "workspace:*", - "tsx": "4.10.3", + "tsx": "4.15.2", "typescript": "5.4.5" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" diff --git a/packages/mailer/handlers/studio/package.json b/packages/mailer/handlers/studio/package.json index dc686f28623e..226bd4edc8c1 100644 --- a/packages/mailer/handlers/studio/package.json +++ b/packages/mailer/handlers/studio/package.json @@ -26,7 +26,7 @@ "devDependencies": { "@redwoodjs/framework-tools": "workspace:*", "@types/nodemailer": "^6", - "tsx": "4.10.3", + "tsx": "4.15.2", "typescript": "5.4.5" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" diff --git a/packages/mailer/renderers/mjml-react/package.json b/packages/mailer/renderers/mjml-react/package.json index 0be035e6cddf..eeb13183b755 100644 --- a/packages/mailer/renderers/mjml-react/package.json +++ b/packages/mailer/renderers/mjml-react/package.json @@ -27,7 +27,7 @@ "devDependencies": { "@redwoodjs/framework-tools": "workspace:*", "@types/mjml": "4", - "tsx": "4.10.3", + "tsx": "4.15.2", "typescript": "5.4.5" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" diff --git a/packages/mailer/renderers/react-email/package.json b/packages/mailer/renderers/react-email/package.json index 6b9dfdcc2d14..f0929abd28a0 100644 --- a/packages/mailer/renderers/react-email/package.json +++ b/packages/mailer/renderers/react-email/package.json @@ -25,7 +25,7 @@ }, "devDependencies": { "@redwoodjs/framework-tools": "workspace:*", - "tsx": "4.10.3", + "tsx": "4.15.2", "typescript": "5.4.5" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" diff --git a/packages/ogimage-gen/package.json b/packages/ogimage-gen/package.json index da3a6ad76693..1ab47f469d03 100644 --- a/packages/ogimage-gen/package.json +++ b/packages/ogimage-gen/package.json @@ -51,7 +51,7 @@ "@playwright/test": "1.44.1", "@redwoodjs/framework-tools": "workspace:*", "ts-toolbelt": "9.6.0", - "tsx": "4.10.3", + "tsx": "4.15.2", "typescript": "5.4.5", "vite": "5.2.13", "vitest": "1.6.0" diff --git a/packages/project-config/package.json b/packages/project-config/package.json index 04cb782ec11c..c524116931af 100644 --- a/packages/project-config/package.json +++ b/packages/project-config/package.json @@ -35,7 +35,7 @@ "devDependencies": { "@redwoodjs/framework-tools": "workspace:*", "rimraf": "5.0.7", - "tsx": "4.10.3", + "tsx": "4.15.2", "typescript": "5.4.5", "vitest": "1.6.0" }, diff --git a/packages/realtime/package.json b/packages/realtime/package.json index 410f0bd0b76b..fa819a204104 100644 --- a/packages/realtime/package.json +++ b/packages/realtime/package.json @@ -40,7 +40,7 @@ "@redwoodjs/framework-tools": "workspace:*", "ioredis": "^5.3.2", "nodemon": "3.1.3", - "tsx": "4.10.3", + "tsx": "4.15.2", "typescript": "5.4.5", "vitest": "1.6.0" }, diff --git a/packages/server-store/package.json b/packages/server-store/package.json index 7452b418d15c..0ec975207bf7 100644 --- a/packages/server-store/package.json +++ b/packages/server-store/package.json @@ -31,7 +31,7 @@ "devDependencies": { "@redwoodjs/framework-tools": "workspace:*", "@types/fs-extra": "11.0.4", - "tsx": "4.10.3", + "tsx": "4.15.2", "typescript": "5.4.5" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" diff --git a/packages/storybook/package.json b/packages/storybook/package.json index b8c7765f21b1..76076164a517 100644 --- a/packages/storybook/package.json +++ b/packages/storybook/package.json @@ -61,7 +61,7 @@ }, "devDependencies": { "@types/node": "20.12.12", - "tsx": "4.10.3", + "tsx": "4.15.2", "typescript": "5.4.5", "vite": "5.2.13" }, diff --git a/packages/telemetry/package.json b/packages/telemetry/package.json index 0a0e9e4be48c..ac73715c946f 100644 --- a/packages/telemetry/package.json +++ b/packages/telemetry/package.json @@ -34,7 +34,7 @@ "@types/envinfo": "7.8.4", "@types/uuid": "9.0.8", "@types/yargs": "17.0.32", - "tsx": "4.10.3", + "tsx": "4.15.2", "typescript": "5.4.5", "vitest": "1.6.0" }, diff --git a/packages/tui/package.json b/packages/tui/package.json index 602d1e6798b9..5fd235c8f216 100644 --- a/packages/tui/package.json +++ b/packages/tui/package.json @@ -27,7 +27,7 @@ }, "devDependencies": { "@redwoodjs/framework-tools": "workspace:*", - "tsx": "4.10.3", + "tsx": "4.15.2", "typescript": "5.4.5" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" diff --git a/packages/vite/package.json b/packages/vite/package.json index 5644fa7926da..536b536a1efe 100644 --- a/packages/vite/package.json +++ b/packages/vite/package.json @@ -104,7 +104,7 @@ "@types/yargs-parser": "21.0.3", "glob": "10.3.15", "rollup": "4.18.0", - "tsx": "4.10.3", + "tsx": "4.15.2", "typescript": "5.4.5", "vitest": "1.6.0" }, diff --git a/packages/web-server/package.json b/packages/web-server/package.json index 1a821fba135a..30281728afd4 100644 --- a/packages/web-server/package.json +++ b/packages/web-server/package.json @@ -35,7 +35,7 @@ }, "devDependencies": { "@redwoodjs/framework-tools": "workspace:*", - "tsx": "4.10.3", + "tsx": "4.15.2", "typescript": "5.4.5" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" diff --git a/yarn.lock b/yarn.lock index 64e48568f864..9ac84ed35a11 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2408,6 +2408,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/aix-ppc64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/aix-ppc64@npm:0.21.5" + conditions: os=aix & cpu=ppc64 + languageName: node + linkType: hard + "@esbuild/android-arm64@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/android-arm64@npm:0.18.20" @@ -2429,6 +2436,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/android-arm64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/android-arm64@npm:0.21.5" + conditions: os=android & cpu=arm64 + languageName: node + linkType: hard + "@esbuild/android-arm@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/android-arm@npm:0.18.20" @@ -2450,6 +2464,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/android-arm@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/android-arm@npm:0.21.5" + conditions: os=android & cpu=arm + languageName: node + linkType: hard + "@esbuild/android-x64@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/android-x64@npm:0.18.20" @@ -2471,6 +2492,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/android-x64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/android-x64@npm:0.21.5" + conditions: os=android & cpu=x64 + languageName: node + linkType: hard + "@esbuild/darwin-arm64@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/darwin-arm64@npm:0.18.20" @@ -2492,6 +2520,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/darwin-arm64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/darwin-arm64@npm:0.21.5" + conditions: os=darwin & cpu=arm64 + languageName: node + linkType: hard + "@esbuild/darwin-x64@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/darwin-x64@npm:0.18.20" @@ -2513,6 +2548,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/darwin-x64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/darwin-x64@npm:0.21.5" + conditions: os=darwin & cpu=x64 + languageName: node + linkType: hard + "@esbuild/freebsd-arm64@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/freebsd-arm64@npm:0.18.20" @@ -2534,6 +2576,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/freebsd-arm64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/freebsd-arm64@npm:0.21.5" + conditions: os=freebsd & cpu=arm64 + languageName: node + linkType: hard + "@esbuild/freebsd-x64@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/freebsd-x64@npm:0.18.20" @@ -2555,6 +2604,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/freebsd-x64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/freebsd-x64@npm:0.21.5" + conditions: os=freebsd & cpu=x64 + languageName: node + linkType: hard + "@esbuild/linux-arm64@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/linux-arm64@npm:0.18.20" @@ -2576,6 +2632,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-arm64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/linux-arm64@npm:0.21.5" + conditions: os=linux & cpu=arm64 + languageName: node + linkType: hard + "@esbuild/linux-arm@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/linux-arm@npm:0.18.20" @@ -2597,6 +2660,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-arm@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/linux-arm@npm:0.21.5" + conditions: os=linux & cpu=arm + languageName: node + linkType: hard + "@esbuild/linux-ia32@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/linux-ia32@npm:0.18.20" @@ -2618,6 +2688,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-ia32@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/linux-ia32@npm:0.21.5" + conditions: os=linux & cpu=ia32 + languageName: node + linkType: hard + "@esbuild/linux-loong64@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/linux-loong64@npm:0.18.20" @@ -2639,6 +2716,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-loong64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/linux-loong64@npm:0.21.5" + conditions: os=linux & cpu=loong64 + languageName: node + linkType: hard + "@esbuild/linux-mips64el@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/linux-mips64el@npm:0.18.20" @@ -2660,6 +2744,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-mips64el@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/linux-mips64el@npm:0.21.5" + conditions: os=linux & cpu=mips64el + languageName: node + linkType: hard + "@esbuild/linux-ppc64@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/linux-ppc64@npm:0.18.20" @@ -2681,6 +2772,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-ppc64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/linux-ppc64@npm:0.21.5" + conditions: os=linux & cpu=ppc64 + languageName: node + linkType: hard + "@esbuild/linux-riscv64@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/linux-riscv64@npm:0.18.20" @@ -2702,6 +2800,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-riscv64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/linux-riscv64@npm:0.21.5" + conditions: os=linux & cpu=riscv64 + languageName: node + linkType: hard + "@esbuild/linux-s390x@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/linux-s390x@npm:0.18.20" @@ -2723,6 +2828,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-s390x@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/linux-s390x@npm:0.21.5" + conditions: os=linux & cpu=s390x + languageName: node + linkType: hard + "@esbuild/linux-x64@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/linux-x64@npm:0.18.20" @@ -2744,6 +2856,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-x64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/linux-x64@npm:0.21.5" + conditions: os=linux & cpu=x64 + languageName: node + linkType: hard + "@esbuild/netbsd-x64@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/netbsd-x64@npm:0.18.20" @@ -2765,6 +2884,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/netbsd-x64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/netbsd-x64@npm:0.21.5" + conditions: os=netbsd & cpu=x64 + languageName: node + linkType: hard + "@esbuild/openbsd-x64@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/openbsd-x64@npm:0.18.20" @@ -2786,6 +2912,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/openbsd-x64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/openbsd-x64@npm:0.21.5" + conditions: os=openbsd & cpu=x64 + languageName: node + linkType: hard + "@esbuild/sunos-x64@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/sunos-x64@npm:0.18.20" @@ -2807,6 +2940,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/sunos-x64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/sunos-x64@npm:0.21.5" + conditions: os=sunos & cpu=x64 + languageName: node + linkType: hard + "@esbuild/win32-arm64@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/win32-arm64@npm:0.18.20" @@ -2828,6 +2968,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/win32-arm64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/win32-arm64@npm:0.21.5" + conditions: os=win32 & cpu=arm64 + languageName: node + linkType: hard + "@esbuild/win32-ia32@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/win32-ia32@npm:0.18.20" @@ -2849,6 +2996,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/win32-ia32@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/win32-ia32@npm:0.21.5" + conditions: os=win32 & cpu=ia32 + languageName: node + linkType: hard + "@esbuild/win32-x64@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/win32-x64@npm:0.18.20" @@ -2870,6 +3024,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/win32-x64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/win32-x64@npm:0.21.5" + conditions: os=win32 & cpu=x64 + languageName: node + linkType: hard + "@escape.tech/graphql-armor-block-field-suggestions@npm:2.1.0": version: 2.1.0 resolution: "@escape.tech/graphql-armor-block-field-suggestions@npm:2.1.0" @@ -7312,7 +7473,7 @@ __metadata: pretty-ms: "npm:7.0.1" qs: "npm:6.12.1" split2: "npm:4.2.0" - tsx: "npm:4.10.3" + tsx: "npm:4.15.2" typescript: "npm:5.4.5" vitest: "npm:1.6.0" yargs: "npm:17.7.2" @@ -7572,7 +7733,7 @@ __metadata: "@redwoodjs/vite": "workspace:*" "@types/aws-lambda": "npm:8.10.138" ts-toolbelt: "npm:9.6.0" - tsx: "npm:4.10.3" + tsx: "npm:4.15.2" typescript: "npm:5.4.5" vitest: "npm:1.6.0" languageName: unknown @@ -7750,7 +7911,7 @@ __metadata: "@supabase/ssr": "npm:0.3.0" "@types/aws-lambda": "npm:8.10.138" ts-toolbelt: "npm:9.6.0" - tsx: "npm:4.10.3" + tsx: "npm:4.15.2" typescript: "npm:5.4.5" vitest: "npm:1.6.0" languageName: unknown @@ -7854,7 +8015,7 @@ __metadata: core-js: "npm:3.37.1" msw: "npm:1.3.3" react: "npm:19.0.0-beta-04b058868c-20240508" - tsx: "npm:4.10.3" + tsx: "npm:4.15.2" typescript: "npm:5.4.5" vitest: "npm:1.6.0" languageName: unknown @@ -7889,7 +8050,7 @@ __metadata: core-js: "npm:3.37.1" fast-glob: "npm:3.3.2" graphql: "npm:16.8.1" - tsx: "npm:4.10.3" + tsx: "npm:4.15.2" typescript: "npm:5.4.5" vitest: "npm:1.6.0" languageName: unknown @@ -7913,7 +8074,7 @@ __metadata: listr2: "npm:6.6.1" memfs: "npm:4.9.2" terminal-link: "npm:2.1.1" - tsx: "npm:4.10.3" + tsx: "npm:4.15.2" typescript: "npm:5.4.5" yargs: "npm:17.7.2" bin: @@ -7942,7 +8103,7 @@ __metadata: prompts: "npm:2.4.2" smol-toml: "npm:1.2.1" terminal-link: "npm:2.1.1" - tsx: "npm:4.10.3" + tsx: "npm:4.15.2" typescript: "npm:5.4.5" vitest: "npm:1.6.0" languageName: unknown @@ -7962,7 +8123,7 @@ __metadata: storybook: "npm:7.6.17" storybook-framework-redwoodjs-vite: "workspace:*" terminal-link: "npm:2.1.1" - tsx: "npm:4.10.3" + tsx: "npm:4.15.2" typescript: "npm:5.4.5" yargs: "npm:17.7.2" languageName: unknown @@ -7985,7 +8146,7 @@ __metadata: execa: "npm:5.1.1" storybook: "npm:7.6.17" terminal-link: "npm:2.1.1" - tsx: "npm:4.10.3" + tsx: "npm:4.15.2" typescript: "npm:5.4.5" yargs: "npm:17.7.2" languageName: unknown @@ -8051,7 +8212,7 @@ __metadata: systeminformation: "npm:5.22.11" terminal-link: "npm:2.1.1" title-case: "npm:3.0.3" - tsx: "npm:4.10.3" + tsx: "npm:4.15.2" typescript: "npm:5.4.5" uuid: "npm:9.0.1" vitest: "npm:1.6.0" @@ -8107,7 +8268,7 @@ __metadata: resolution: "@redwoodjs/context@workspace:packages/context" dependencies: "@redwoodjs/framework-tools": "workspace:*" - tsx: "npm:4.10.3" + tsx: "npm:4.15.2" typescript: "npm:5.4.5" languageName: unknown linkType: soft @@ -8122,7 +8283,7 @@ __metadata: esbuild: "npm:0.21.3" fast-glob: "npm:3.3.2" fs-extra: "npm:11.2.0" - tsx: "npm:4.10.3" + tsx: "npm:4.15.2" typescript: "npm:5.4.5" languageName: unknown linkType: soft @@ -8226,7 +8387,7 @@ __metadata: "@typescript-eslint/rule-tester": "npm:7.3.1" "@typescript-eslint/utils": "npm:7.3.1" eslint: "npm:8.57.0" - tsx: "npm:4.10.3" + tsx: "npm:4.15.2" typescript: "npm:5.4.5" vitest: "npm:1.6.0" languageName: unknown @@ -8243,7 +8404,7 @@ __metadata: "@redwoodjs/project-config": "workspace:*" fast-glob: "npm:3.3.2" fastify: "npm:4.27.0" - tsx: "npm:4.10.3" + tsx: "npm:4.15.2" typescript: "npm:5.4.5" vitest: "npm:1.6.0" languageName: unknown @@ -8285,7 +8446,7 @@ __metadata: esbuild: "npm:0.21.3" fast-glob: "npm:3.3.2" fs-extra: "npm:11.2.0" - tsx: "npm:4.10.3" + tsx: "npm:4.15.2" typescript: "npm:5.4.5" languageName: unknown linkType: soft @@ -8327,7 +8488,7 @@ __metadata: jest: "npm:29.7.0" jsonwebtoken: "npm:9.0.2" lodash: "npm:4.17.21" - tsx: "npm:4.10.3" + tsx: "npm:4.15.2" typescript: "npm:5.4.5" uuid: "npm:9.0.1" languageName: unknown @@ -8378,7 +8539,7 @@ __metadata: systeminformation: "npm:5.22.11" terminal-link: "npm:2.1.1" ts-node: "npm:10.9.2" - tsx: "npm:4.10.3" + tsx: "npm:4.15.2" typescript: "npm:5.4.5" vitest: "npm:1.6.0" bin: @@ -8393,7 +8554,7 @@ __metadata: dependencies: "@redwoodjs/api": "workspace:*" "@redwoodjs/framework-tools": "workspace:*" - tsx: "npm:4.10.3" + tsx: "npm:4.15.2" typescript: "npm:5.4.5" vitest: "npm:1.6.0" languageName: unknown @@ -8405,7 +8566,7 @@ __metadata: dependencies: "@redwoodjs/framework-tools": "workspace:*" "@redwoodjs/mailer-core": "workspace:*" - tsx: "npm:4.10.3" + tsx: "npm:4.15.2" typescript: "npm:5.4.5" languageName: unknown linkType: soft @@ -8418,7 +8579,7 @@ __metadata: "@redwoodjs/mailer-core": "workspace:*" "@types/nodemailer": "npm:^6" nodemailer: "npm:6.9.13" - tsx: "npm:4.10.3" + tsx: "npm:4.15.2" typescript: "npm:5.4.5" languageName: unknown linkType: soft @@ -8430,7 +8591,7 @@ __metadata: "@redwoodjs/framework-tools": "workspace:*" "@redwoodjs/mailer-core": "workspace:*" resend: "npm:1.1.0" - tsx: "npm:4.10.3" + tsx: "npm:4.15.2" typescript: "npm:5.4.5" languageName: unknown linkType: soft @@ -8443,7 +8604,7 @@ __metadata: "@redwoodjs/mailer-core": "workspace:*" "@redwoodjs/mailer-handler-nodemailer": "workspace:*" "@types/nodemailer": "npm:^6" - tsx: "npm:4.10.3" + tsx: "npm:4.15.2" typescript: "npm:5.4.5" languageName: unknown linkType: soft @@ -8457,7 +8618,7 @@ __metadata: "@redwoodjs/mailer-core": "workspace:*" "@types/mjml": "npm:4" mjml: "npm:4.15.3" - tsx: "npm:4.10.3" + tsx: "npm:4.15.2" typescript: "npm:5.4.5" languageName: unknown linkType: soft @@ -8469,7 +8630,7 @@ __metadata: "@react-email/render": "npm:0.0.13" "@redwoodjs/framework-tools": "workspace:*" "@redwoodjs/mailer-core": "workspace:*" - tsx: "npm:4.10.3" + tsx: "npm:4.15.2" typescript: "npm:5.4.5" languageName: unknown linkType: soft @@ -8489,7 +8650,7 @@ __metadata: react: "npm:19.0.0-beta-04b058868c-20240508" react-dom: "npm:19.0.0-beta-04b058868c-20240508" ts-toolbelt: "npm:9.6.0" - tsx: "npm:4.10.3" + tsx: "npm:4.15.2" typescript: "npm:5.4.5" vite: "npm:5.2.13" vitest: "npm:1.6.0" @@ -8533,7 +8694,7 @@ __metadata: rimraf: "npm:5.0.7" smol-toml: "npm:1.2.1" string-env-interpolation: "npm:1.0.1" - tsx: "npm:4.10.3" + tsx: "npm:4.15.2" typescript: "npm:5.4.5" vitest: "npm:1.6.0" languageName: unknown @@ -8559,7 +8720,7 @@ __metadata: graphql: "npm:16.8.1" ioredis: "npm:^5.3.2" nodemon: "npm:3.1.3" - tsx: "npm:4.10.3" + tsx: "npm:4.15.2" typescript: "npm:5.4.5" vitest: "npm:1.6.0" peerDependencies: @@ -8621,7 +8782,7 @@ __metadata: esbuild: "npm:0.21.3" fast-glob: "npm:3.3.2" fs-extra: "npm:11.2.0" - tsx: "npm:4.10.3" + tsx: "npm:4.15.2" typescript: "npm:5.4.5" languageName: unknown linkType: soft @@ -8678,7 +8839,7 @@ __metadata: ci-info: "npm:4.0.0" envinfo: "npm:7.13.0" systeminformation: "npm:5.22.11" - tsx: "npm:4.10.3" + tsx: "npm:4.15.2" typescript: "npm:5.4.5" uuid: "npm:9.0.1" vitest: "npm:1.6.0" @@ -8733,7 +8894,7 @@ __metadata: chalk: "npm:4.1.2" enquirer: "npm:2.4.1" stdout-update: "npm:1.6.8" - tsx: "npm:4.10.3" + tsx: "npm:4.15.2" typescript: "npm:5.4.5" languageName: unknown linkType: soft @@ -8775,7 +8936,7 @@ __metadata: react: "npm:19.0.0-beta-04b058868c-20240508" react-server-dom-webpack: "npm:19.0.0-beta-04b058868c-20240508" rollup: "npm:4.18.0" - tsx: "npm:4.10.3" + tsx: "npm:4.15.2" typescript: "npm:5.4.5" vite: "npm:5.2.13" vite-plugin-cjs-interop: "npm:2.1.1" @@ -8801,7 +8962,7 @@ __metadata: dotenv-defaults: "npm:5.0.2" fastify: "npm:4.27.0" fs-extra: "npm:11.2.0" - tsx: "npm:4.10.3" + tsx: "npm:4.15.2" typescript: "npm:5.4.5" yargs: "npm:17.7.2" bin: @@ -15177,7 +15338,7 @@ __metadata: semver: "npm:7.6.2" systeminformation: "npm:5.22.11" terminal-link: "npm:2.1.1" - tsx: "npm:4.10.3" + tsx: "npm:4.15.2" untildify: "npm:4.0.0" uuid: "npm:9.0.1" vitest: "npm:1.6.0" @@ -17011,7 +17172,7 @@ __metadata: languageName: node linkType: hard -"esbuild@npm:^0.20.1, esbuild@npm:~0.20.2": +"esbuild@npm:^0.20.1": version: 0.20.2 resolution: "esbuild@npm:0.20.2" dependencies: @@ -17091,6 +17252,86 @@ __metadata: languageName: node linkType: hard +"esbuild@npm:~0.21.4": + version: 0.21.5 + resolution: "esbuild@npm:0.21.5" + dependencies: + "@esbuild/aix-ppc64": "npm:0.21.5" + "@esbuild/android-arm": "npm:0.21.5" + "@esbuild/android-arm64": "npm:0.21.5" + "@esbuild/android-x64": "npm:0.21.5" + "@esbuild/darwin-arm64": "npm:0.21.5" + "@esbuild/darwin-x64": "npm:0.21.5" + "@esbuild/freebsd-arm64": "npm:0.21.5" + "@esbuild/freebsd-x64": "npm:0.21.5" + "@esbuild/linux-arm": "npm:0.21.5" + "@esbuild/linux-arm64": "npm:0.21.5" + "@esbuild/linux-ia32": "npm:0.21.5" + "@esbuild/linux-loong64": "npm:0.21.5" + "@esbuild/linux-mips64el": "npm:0.21.5" + "@esbuild/linux-ppc64": "npm:0.21.5" + "@esbuild/linux-riscv64": "npm:0.21.5" + "@esbuild/linux-s390x": "npm:0.21.5" + "@esbuild/linux-x64": "npm:0.21.5" + "@esbuild/netbsd-x64": "npm:0.21.5" + "@esbuild/openbsd-x64": "npm:0.21.5" + "@esbuild/sunos-x64": "npm:0.21.5" + "@esbuild/win32-arm64": "npm:0.21.5" + "@esbuild/win32-ia32": "npm:0.21.5" + "@esbuild/win32-x64": "npm:0.21.5" + dependenciesMeta: + "@esbuild/aix-ppc64": + optional: true + "@esbuild/android-arm": + optional: true + "@esbuild/android-arm64": + optional: true + "@esbuild/android-x64": + optional: true + "@esbuild/darwin-arm64": + optional: true + "@esbuild/darwin-x64": + optional: true + "@esbuild/freebsd-arm64": + optional: true + "@esbuild/freebsd-x64": + optional: true + "@esbuild/linux-arm": + optional: true + "@esbuild/linux-arm64": + optional: true + "@esbuild/linux-ia32": + optional: true + "@esbuild/linux-loong64": + optional: true + "@esbuild/linux-mips64el": + optional: true + "@esbuild/linux-ppc64": + optional: true + "@esbuild/linux-riscv64": + optional: true + "@esbuild/linux-s390x": + optional: true + "@esbuild/linux-x64": + optional: true + "@esbuild/netbsd-x64": + optional: true + "@esbuild/openbsd-x64": + optional: true + "@esbuild/sunos-x64": + optional: true + "@esbuild/win32-arm64": + optional: true + "@esbuild/win32-ia32": + optional: true + "@esbuild/win32-x64": + optional: true + bin: + esbuild: bin/esbuild + checksum: 10c0/fa08508adf683c3f399e8a014a6382a6b65542213431e26206c0720e536b31c09b50798747c2a105a4bbba1d9767b8d3615a74c2f7bf1ddf6d836cd11eb672de + languageName: node + linkType: hard + "escalade@npm:^3.1.1": version: 3.1.1 resolution: "escalade@npm:3.1.1" @@ -28167,7 +28408,7 @@ __metadata: prompts: "npm:2.4.2" rimraf: "npm:5.0.7" tstyche: "npm:2.0.0" - tsx: "npm:4.10.3" + tsx: "npm:4.15.2" typescript: "npm:5.4.5" vitest: "npm:1.6.0" yargs: "npm:17.7.2" @@ -29214,7 +29455,7 @@ __metadata: "@types/node": "npm:20.12.12" magic-string: "npm:^0.30.0" react-docgen: "npm:^7.0.0" - tsx: "npm:4.10.3" + tsx: "npm:4.15.2" typescript: "npm:5.4.5" unplugin-auto-import: "npm:^0.17.5" vite: "npm:5.2.13" @@ -30403,11 +30644,11 @@ __metadata: languageName: node linkType: hard -"tsx@npm:4.10.3": - version: 4.10.3 - resolution: "tsx@npm:4.10.3" +"tsx@npm:4.15.2": + version: 4.15.2 + resolution: "tsx@npm:4.15.2" dependencies: - esbuild: "npm:~0.20.2" + esbuild: "npm:~0.21.4" fsevents: "npm:~2.3.3" get-tsconfig: "npm:^4.7.5" dependenciesMeta: @@ -30415,7 +30656,7 @@ __metadata: optional: true bin: tsx: dist/cli.mjs - checksum: 10c0/0036641dcc4d7970b5aa8e9db1a3365ec615d32e2b9b26e762e24c0588e79bc80c96639eb9b1c08b16befee75add0e527d8c24cfa4e519f1bf5805b95769eba5 + checksum: 10c0/6349ac29c13b567ece91d38e239606c0a8655ddbbdfab7250c04d7f9d5c447ff28f8dc7db62eaa16cafaff9cb5194c2a511d618cbfd4909e76cc54f07bc22424 languageName: node linkType: hard From 0f5bd0ff1107a656d40b15465eceb5fdc9b97f05 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 11 Jun 2024 20:26:38 +0000 Subject: [PATCH 54/66] chore(deps): update yarn to v4.3.0 (#10801) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [yarn](https://togithub.com/yarnpkg/berry) ([source](https://togithub.com/yarnpkg/berry/tree/HEAD/packages/yarnpkg-cli)) | [`4.2.2` -> `4.3.0`](https://renovatebot.com/diffs/npm/yarn/4.2.2/4.3.0) | [![age](https://developer.mend.io/api/mc/badges/age/npm/yarn/4.3.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/yarn/4.3.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/yarn/4.2.2/4.3.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/yarn/4.2.2/4.3.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
yarnpkg/berry (yarn) ### [`v4.3.0`](https://togithub.com/yarnpkg/berry/compare/effc932614d5351bbfeed8e0e6aa4b2c6c52821d...b2eb9dce084f1a892101d1b693fea25f05428ff8) [Compare Source](https://togithub.com/yarnpkg/berry/compare/effc932614d5351bbfeed8e0e6aa4b2c6c52821d...b2eb9dce084f1a892101d1b693fea25f05428ff8)
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/redwoodjs/redwood). --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Josh GM Walker <56300765+Josh-Walker-GM@users.noreply.github.com> --- .github/actions/check_changesets/package.json | 2 +- .github/actions/check_create_redwood_app/package.json | 2 +- .github/actions/detect-changes/package.json | 2 +- __fixtures__/test-project/package.json | 2 +- docs/package.json | 2 +- package.json | 2 +- packages/create-redwood-app/templates/js/package.json | 2 +- packages/create-redwood-app/templates/ts/package.json | 2 +- tasks/check/package.json | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/actions/check_changesets/package.json b/.github/actions/check_changesets/package.json index 685c195e79d4..5ec0617efd18 100644 --- a/.github/actions/check_changesets/package.json +++ b/.github/actions/check_changesets/package.json @@ -6,5 +6,5 @@ "@actions/exec": "1.1.1", "@actions/github": "6.0.0" }, - "packageManager": "yarn@4.2.2" + "packageManager": "yarn@4.3.0" } diff --git a/.github/actions/check_create_redwood_app/package.json b/.github/actions/check_create_redwood_app/package.json index 7760f06859b0..01416c0c0d87 100644 --- a/.github/actions/check_create_redwood_app/package.json +++ b/.github/actions/check_create_redwood_app/package.json @@ -5,5 +5,5 @@ "@actions/core": "1.10.1", "@actions/exec": "1.1.1" }, - "packageManager": "yarn@4.2.2" + "packageManager": "yarn@4.3.0" } diff --git a/.github/actions/detect-changes/package.json b/.github/actions/detect-changes/package.json index f3d13354eedc..6d248a2187e0 100644 --- a/.github/actions/detect-changes/package.json +++ b/.github/actions/detect-changes/package.json @@ -5,5 +5,5 @@ "@actions/core": "1.10.1", "@actions/exec": "1.1.1" }, - "packageManager": "yarn@4.2.2" + "packageManager": "yarn@4.3.0" } diff --git a/__fixtures__/test-project/package.json b/__fixtures__/test-project/package.json index a6d7487eac46..c087ce37fe28 100644 --- a/__fixtures__/test-project/package.json +++ b/__fixtures__/test-project/package.json @@ -20,7 +20,7 @@ "prisma": { "seed": "yarn rw exec seed" }, - "packageManager": "yarn@4.2.2", + "packageManager": "yarn@4.3.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", diff --git a/docs/package.json b/docs/package.json index 8f2fa72800a3..79bb45a02ac9 100644 --- a/docs/package.json +++ b/docs/package.json @@ -40,5 +40,5 @@ "@docusaurus/tsconfig": "3.3.2", "typescript": "5.4.5" }, - "packageManager": "yarn@4.2.2" + "packageManager": "yarn@4.3.0" } diff --git a/package.json b/package.json index 1f814dadb051..c1863b1b1ea5 100644 --- a/package.json +++ b/package.json @@ -111,6 +111,6 @@ "yargs": "17.7.2", "zx": "8.1.0" }, - "packageManager": "yarn@4.2.2", + "packageManager": "yarn@4.3.0", "npmClient": "yarn" } diff --git a/packages/create-redwood-app/templates/js/package.json b/packages/create-redwood-app/templates/js/package.json index a6d7487eac46..c087ce37fe28 100644 --- a/packages/create-redwood-app/templates/js/package.json +++ b/packages/create-redwood-app/templates/js/package.json @@ -20,7 +20,7 @@ "prisma": { "seed": "yarn rw exec seed" }, - "packageManager": "yarn@4.2.2", + "packageManager": "yarn@4.3.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", diff --git a/packages/create-redwood-app/templates/ts/package.json b/packages/create-redwood-app/templates/ts/package.json index a6d7487eac46..c087ce37fe28 100644 --- a/packages/create-redwood-app/templates/ts/package.json +++ b/packages/create-redwood-app/templates/ts/package.json @@ -20,7 +20,7 @@ "prisma": { "seed": "yarn rw exec seed" }, - "packageManager": "yarn@4.2.2", + "packageManager": "yarn@4.3.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", diff --git a/tasks/check/package.json b/tasks/check/package.json index 6b53b5c6278b..8e4951e951f6 100644 --- a/tasks/check/package.json +++ b/tasks/check/package.json @@ -6,5 +6,5 @@ "@actions/exec": "1.1.1", "sort-package-json": "2.10.0" }, - "packageManager": "yarn@4.2.2" + "packageManager": "yarn@4.3.0" } From f7cdc6bfa0d0cb26c5dd47e2bfd4193750430d7a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 16:10:36 +0100 Subject: [PATCH 55/66] chore(deps): bump braces from 3.0.2 to 3.0.3 in /tasks/check (#10808) Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3.
Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=braces&package-manager=npm_and_yarn&previous-version=3.0.2&new-version=3.0.3)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/redwoodjs/redwood/network/alerts).
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- tasks/check/yarn.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tasks/check/yarn.lock b/tasks/check/yarn.lock index cd0cfe8d637e..a7af630cb5d9 100644 --- a/tasks/check/yarn.lock +++ b/tasks/check/yarn.lock @@ -68,11 +68,11 @@ __metadata: linkType: hard "braces@npm:^3.0.2": - version: 3.0.2 - resolution: "braces@npm:3.0.2" + version: 3.0.3 + resolution: "braces@npm:3.0.3" dependencies: - fill-range: "npm:^7.0.1" - checksum: 10c0/321b4d675791479293264019156ca322163f02dc06e3c4cab33bb15cd43d80b51efef69b0930cfde3acd63d126ebca24cd0544fa6f261e093a0fb41ab9dda381 + fill-range: "npm:^7.1.1" + checksum: 10c0/7c6dfd30c338d2997ba77500539227b9d1f85e388a5f43220865201e407e076783d0881f2d297b9f80951b4c957fcf0b51c1d2d24227631643c3f7c284b0aa04 languageName: node linkType: hard @@ -131,12 +131,12 @@ __metadata: languageName: node linkType: hard -"fill-range@npm:^7.0.1": - version: 7.0.1 - resolution: "fill-range@npm:7.0.1" +"fill-range@npm:^7.1.1": + version: 7.1.1 + resolution: "fill-range@npm:7.1.1" dependencies: to-regex-range: "npm:^5.0.1" - checksum: 10c0/7cdad7d426ffbaadf45aeb5d15ec675bbd77f7597ad5399e3d2766987ed20bda24d5fac64b3ee79d93276f5865608bb22344a26b9b1ae6c4d00bd94bf611623f + checksum: 10c0/b75b691bbe065472f38824f694c2f7449d7f5004aa950426a2c28f0306c60db9b880c0b0e4ed819997ffb882d1da02cfcfc819bddc94d71627f5269682edf018 languageName: node linkType: hard From dda2a7c1e09c272deb6a55f870eee4d5c894d638 Mon Sep 17 00:00:00 2001 From: Josh GM Walker <56300765+Josh-Walker-GM@users.noreply.github.com> Date: Wed, 12 Jun 2024 16:30:47 +0100 Subject: [PATCH 56/66] deps(docs): update braces package (#10809) Fixes a security advisory by bumping up the resolution for the braces package. --- docs/yarn.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/yarn.lock b/docs/yarn.lock index 887c2595d341..4a5f39624630 100644 --- a/docs/yarn.lock +++ b/docs/yarn.lock @@ -3833,11 +3833,11 @@ __metadata: linkType: hard "braces@npm:^3.0.2, braces@npm:~3.0.2": - version: 3.0.2 - resolution: "braces@npm:3.0.2" + version: 3.0.3 + resolution: "braces@npm:3.0.3" dependencies: - fill-range: "npm:^7.0.1" - checksum: 10c0/321b4d675791479293264019156ca322163f02dc06e3c4cab33bb15cd43d80b51efef69b0930cfde3acd63d126ebca24cd0544fa6f261e093a0fb41ab9dda381 + fill-range: "npm:^7.1.1" + checksum: 10c0/7c6dfd30c338d2997ba77500539227b9d1f85e388a5f43220865201e407e076783d0881f2d297b9f80951b4c957fcf0b51c1d2d24227631643c3f7c284b0aa04 languageName: node linkType: hard @@ -5550,12 +5550,12 @@ __metadata: languageName: node linkType: hard -"fill-range@npm:^7.0.1": - version: 7.0.1 - resolution: "fill-range@npm:7.0.1" +"fill-range@npm:^7.1.1": + version: 7.1.1 + resolution: "fill-range@npm:7.1.1" dependencies: to-regex-range: "npm:^5.0.1" - checksum: 10c0/7cdad7d426ffbaadf45aeb5d15ec675bbd77f7597ad5399e3d2766987ed20bda24d5fac64b3ee79d93276f5865608bb22344a26b9b1ae6c4d00bd94bf611623f + checksum: 10c0/b75b691bbe065472f38824f694c2f7449d7f5004aa950426a2c28f0306c60db9b880c0b0e4ed819997ffb882d1da02cfcfc819bddc94d71627f5269682edf018 languageName: node linkType: hard From bfc8eb4c4c2cd6ac0cd584f032eec8853df957c1 Mon Sep 17 00:00:00 2001 From: Tobbe Lundberg Date: Thu, 13 Jun 2024 08:47:21 -0400 Subject: [PATCH 57/66] fix(dbauth): Fix spacing issue in task titles (#10811) --- .changesets/10811.md | 3 + .../dbAuth/__tests__/dbAuth.mockListr.test.js | 184 ++++++++++++++++++ .../src/commands/generate/dbAuth/dbAuth.js | 8 +- 3 files changed, 191 insertions(+), 4 deletions(-) create mode 100644 .changesets/10811.md create mode 100644 packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.mockListr.test.js diff --git a/.changesets/10811.md b/.changesets/10811.md new file mode 100644 index 000000000000..dd22acbb74cb --- /dev/null +++ b/.changesets/10811.md @@ -0,0 +1,3 @@ +- fix(dbauth): Fix spacing issue in task titles (#10811) by @Tobbe + +Fix double space issue in `yarn rw generate dbAuth` output diff --git a/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.mockListr.test.js b/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.mockListr.test.js new file mode 100644 index 000000000000..6990846b9394 --- /dev/null +++ b/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.mockListr.test.js @@ -0,0 +1,184 @@ +let mockExecutedTaskTitles = [] +let mockSkippedTaskTitles = [] + +global.__dirname = __dirname + +vi.mock('fs-extra') + +import path from 'path' + +// Load mocks +import '../../../../lib/test' + +const actualFs = await vi.importActual('fs-extra') +import Enquirer from 'enquirer' +import { vol } from 'memfs' +import { vi, describe, it, expect, beforeEach } from 'vitest' + +import { getPaths } from '../../../../lib' +import * as dbAuth from '../dbAuth' + +vi.mock('listr2', async () => { + const listrImpl = (tasks) => { + return { + run: async () => { + mockExecutedTaskTitles = [] + mockSkippedTaskTitles = [] + + for (const task of tasks) { + const skip = + typeof task.skip === 'function' ? task.skip : () => task.skip + + if (skip()) { + mockSkippedTaskTitles.push(task.title) + } else { + const augmentedTask = { + ...task, + newListr: listrImpl, + prompt: () => {}, + skip: (msg) => { + mockSkippedTaskTitles.push(msg || task.title) + }, + } + await task.task({}, augmentedTask) + + // storing the title after running the task in case the task + // modifies its own title + mockExecutedTaskTitles.push(augmentedTask.title) + } + } + }, + } + } + + return { + // Return a constructor function, since we're calling `new` on Listr + Listr: vi.fn().mockImplementation(listrImpl), + } +}) + +// Mock files needed for each test +const mockFiles = {} + +const dbAuthTemplateFiles = [ + 'forgotPassword.tsx.template', + 'login.tsx.template', + 'login.webAuthn.tsx.template', + 'resetPassword.tsx.template', + 'signup.tsx.template', +] +dbAuthTemplateFiles.forEach((templateFilename) => { + mockFiles[path.join(__dirname, `../templates/${templateFilename}`)] = actualFs + .readFileSync(path.join(__dirname, `../templates/${templateFilename}`)) + .toString() +}) + +mockFiles[ + path.join(__dirname, `../../scaffold/templates/assets/scaffold.css.template`) +] = actualFs + .readFileSync( + path.join( + __dirname, + `../../scaffold/templates/assets/scaffold.css.template`, + ), + ) + .toString() + +mockFiles[getPaths().web.routes] = actualFs + .readFileSync( + path.join( + __dirname, + `../../../../../../../__fixtures__/example-todo-main/web/src/Routes.js`, + ), + ) + .toString() + +mockFiles[getPaths().web.app] = actualFs + .readFileSync( + path.join( + __dirname, + `../../../../../../../__fixtures__/example-todo-main/web/src/App.js`, + ), + ) + .toString() + +describe('dbAuth', () => { + beforeEach(() => { + vol.reset() + vol.fromJSON(mockFiles) + }) + + it('creates a login page', async () => { + expect(await dbAuth.files(true, false)).toHaveProperty([ + path.normalize('/path/to/project/web/src/pages/LoginPage/LoginPage.jsx'), + ]) + }) + + it('creates a signup page', async () => { + expect(await dbAuth.files(true, false)).toHaveProperty([ + path.normalize( + '/path/to/project/web/src/pages/SignupPage/SignupPage.jsx', + ), + ]) + }) + + it('creates a scaffold CSS file', async () => { + expect(await dbAuth.files(true, false)).toHaveProperty([ + path.normalize('/path/to/project/web/src/scaffold.css'), + ]) + }) + + describe('handler', () => { + describe('WebAuthn task title', () => { + it('is correct after prompting', async () => { + const customEnquirer = new Enquirer({ show: false }) + customEnquirer.on('prompt', (prompt) => { + prompt.submit() + }) + + await dbAuth.handler({ + enquirer: customEnquirer, + listr2: { silentRendererCondition: true }, + }) + + expect(mockExecutedTaskTitles[1]).toEqual( + 'Querying WebAuthn addition: WebAuthn addition not included', + ) + }) + + it('is correct after providing cli flag value `true`', async () => { + const customEnquirer = new Enquirer({ show: false }) + customEnquirer.on('prompt', (prompt) => { + prompt.submit() + }) + + await dbAuth.handler({ + enquirer: customEnquirer, + listr2: { silentRendererCondition: true }, + webauthn: true, + }) + + expect(mockSkippedTaskTitles[0]).toEqual( + 'Querying WebAuthn addition: argument webauthn passed, WebAuthn included', + ) + }) + + it('is correct after providing cli flag value `false`', async () => { + const customEnquirer = new Enquirer({ show: false }) + customEnquirer.on('prompt', (prompt) => { + prompt.submit() + }) + + await dbAuth.handler({ + enquirer: customEnquirer, + listr2: { silentRendererCondition: true }, + webauthn: false, + }) + + expect(mockSkippedTaskTitles[0]).toEqual( + 'Querying WebAuthn addition: argument webauthn passed, WebAuthn not included', + ) + }) + }) + }) +}) diff --git a/packages/cli/src/commands/generate/dbAuth/dbAuth.js b/packages/cli/src/commands/generate/dbAuth/dbAuth.js index 734a1bc20adc..f95f929312fe 100644 --- a/packages/cli/src/commands/generate/dbAuth/dbAuth.js +++ b/packages/cli/src/commands/generate/dbAuth/dbAuth.js @@ -308,8 +308,8 @@ const tasks = ({ task: async (ctx, task) => { if (webauthn != null) { task.skip( - `Querying WebAuthn addition: argument webauthn passed, WebAuthn ${ - webauthn ? '' : 'not' + `Querying WebAuthn addition: argument webauthn passed, WebAuthn${ + webauthn ? '' : ' not' } included`, ) return @@ -321,8 +321,8 @@ const tasks = ({ default: false, }) webauthn = response - task.title = `Querying WebAuthn addition: WebAuthn addition ${ - webauthn ? '' : 'not' + task.title = `Querying WebAuthn addition: WebAuthn addition${ + webauthn ? '' : ' not' } included` }, }, From 4455a1177ecbee47bc3eebb6a3d7adea646a9378 Mon Sep 17 00:00:00 2001 From: Tobbe Lundberg Date: Thu, 13 Jun 2024 19:07:40 -0400 Subject: [PATCH 58/66] fix(dbAuth): Print the correct "post message" after generation (#10813) --- .changesets/10813.md | 5 +++ .../generate/dbAuth/__tests__/dbAuth.test.js | 37 +++++++++++++++++++ .../src/commands/generate/dbAuth/dbAuth.js | 7 +++- 3 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 .changesets/10813.md diff --git a/.changesets/10813.md b/.changesets/10813.md new file mode 100644 index 000000000000..03ac396f8c0b --- /dev/null +++ b/.changesets/10813.md @@ -0,0 +1,5 @@ +- fix(dbAuth): Print the correct "post message" after setup (#10813) by @Tobbe + +After running `yarn rw generate dbAuth` the correct message describing the +needed manual steps is now printed if the user choses to enable WebAuthn +support diff --git a/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.test.js b/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.test.js index cf7a9a492737..5ae26b7c17d2 100644 --- a/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.test.js +++ b/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.test.js @@ -186,6 +186,9 @@ describe('dbAuth', () => { it('prompt for webauthn', async () => { let correctPrompt = false + const mockConsoleLog = vi + .spyOn(console, 'log') + .mockImplementation(() => {}) const customEnquirer = new Enquirer({ show: false }) customEnquirer.on('prompt', (prompt) => { @@ -200,6 +203,40 @@ describe('dbAuth', () => { listr2: { silentRendererCondition: true }, }) expect(correctPrompt).toBe(true) + + // Verify that the final log message is not the webauthn one + expect(mockConsoleLog.mock.calls.at(-1)[0]).toMatch( + /Look in LoginPage, Sign/, + ) + mockConsoleLog.mockRestore() + }) + + it('prints webauthn message when answering Yes', async () => { + const mockConsoleLog = vi + .spyOn(console, 'log') + .mockImplementation(() => {}) + + const customEnquirer = new Enquirer() + customEnquirer.on('prompt', (prompt) => { + if (prompt.state.message.includes('Enable WebAuthn')) { + prompt.on('run', () => { + return prompt.keypress('y') + }) + } else { + prompt.submit() + } + }) + + await dbAuth.handler({ + enquirer: customEnquirer, + listr2: { silentRendererCondition: true }, + }) + + // Verify that the final log message is the webauthn one + expect(mockConsoleLog.mock.calls.at(-1)[0]).toMatch( + /In LoginPage, look for the `REDIRECT`/, + ) + mockConsoleLog.mockRestore() }) it('does not prompt for webauthn when flag is given', async () => { diff --git a/packages/cli/src/commands/generate/dbAuth/dbAuth.js b/packages/cli/src/commands/generate/dbAuth/dbAuth.js index f95f929312fe..6e3b3cf7fc58 100644 --- a/packages/cli/src/commands/generate/dbAuth/dbAuth.js +++ b/packages/cli/src/commands/generate/dbAuth/dbAuth.js @@ -320,7 +320,7 @@ const tasks = ({ message: `Enable WebAuthn support (TouchID/FaceID) on LoginPage? See https://redwoodjs.com/docs/auth/dbAuth#webAuthn`, default: false, }) - webauthn = response + ctx.webauthn = webauthn = response task.title = `Querying WebAuthn addition: WebAuthn addition${ webauthn ? '' : ' not' } included` @@ -392,8 +392,11 @@ export const handler = async (yargs) => { prepareForRollback(t) } await t.run() + console.log('') - console.log(yargs.webauthn ? WEBAUTHN_POST_INSTALL : POST_INSTALL) + console.log( + yargs.webauthn || t.ctx.webauthn ? WEBAUTHN_POST_INSTALL : POST_INSTALL, + ) } catch (e) { console.log(c.error(e.message)) } From 6c9a379d4cab0b18a340753a265b97ca67bdfa52 Mon Sep 17 00:00:00 2001 From: Tobbe Lundberg Date: Thu, 13 Jun 2024 19:35:34 -0400 Subject: [PATCH 59/66] chore(dbAuth): Fix test for webauthn prompt in `g dbAuth` (#10814) --- .../__snapshots__/dbAuth.test.js.snap | 282 +++++++++++++----- .../generate/dbAuth/__tests__/dbAuth.test.js | 19 +- 2 files changed, 218 insertions(+), 83 deletions(-) diff --git a/packages/cli/src/commands/generate/dbAuth/__tests__/__snapshots__/dbAuth.test.js.snap b/packages/cli/src/commands/generate/dbAuth/__tests__/__snapshots__/dbAuth.test.js.snap index 5dd1f0c07cfa..53e334fbe7db 100644 --- a/packages/cli/src/commands/generate/dbAuth/__tests__/__snapshots__/dbAuth.test.js.snap +++ b/packages/cli/src/commands/generate/dbAuth/__tests__/__snapshots__/dbAuth.test.js.snap @@ -2665,7 +2665,7 @@ export default ForgotPasswordPage `; exports[`dbAuth > handler > produces the correct files with custom username and password set via prompt and with webauthn enabled via prompt 2`] = ` -"import { useEffect, useRef } from 'react' +"import { useEffect, useRef, useState } from 'react' import { Form, @@ -2681,35 +2681,231 @@ import { toast, Toaster } from '@redwoodjs/web/toast' import { useAuth } from 'src/auth' -const LoginPage = () => { - const { isAuthenticated, logIn } = useAuth() +const WELCOME_MESSAGE = 'Welcome back!' +const REDIRECT = routes.home() + +const LoginPage = ({ type }) => { + const { + isAuthenticated, + client: webAuthn, + loading, + logIn, + reauthenticate, + } = useAuth() + const [shouldShowWebAuthn, setShouldShowWebAuthn] = useState(false) + const [showWebAuthn, setShowWebAuthn] = useState( + webAuthn.isEnabled() && type !== 'password' + ) + // should redirect right after login or wait to show the webAuthn prompts? useEffect(() => { - if (isAuthenticated) { - navigate(routes.home()) + if (isAuthenticated && (!shouldShowWebAuthn || webAuthn.isEnabled())) { + navigate(REDIRECT) } - }, [isAuthenticated]) + }, [isAuthenticated, shouldShowWebAuthn]) - const emailRef = useRef(null) + // if WebAuthn is enabled, show the prompt as soon as the page loads useEffect(() => { - emailRef.current?.focus() + if (!loading && !isAuthenticated && showWebAuthn) { + onAuthenticate() + } + }, [loading, isAuthenticated]) + + // focus on the email field as soon as the page loads + const emailRef = useRef() + useEffect(() => { + emailRef.current && emailRef.current.focus() }, []) const onSubmit = async (data) => { + const webAuthnSupported = await webAuthn.isSupported() + + if (webAuthnSupported) { + setShouldShowWebAuthn(true) + } const response = await logIn({ username: data.email, password: data.secret, }) if (response.message) { + // auth details good, but user not logged in toast(response.message) } else if (response.error) { + // error while authenticating toast.error(response.error) } else { - toast.success('Welcome back!') + // user logged in + if (webAuthnSupported) { + setShowWebAuthn(true) + } else { + toast.success(WELCOME_MESSAGE) + } + } + } + + const onAuthenticate = async () => { + try { + await webAuthn.authenticate() + await reauthenticate() + toast.success(WELCOME_MESSAGE) + navigate(REDIRECT) + } catch (e) { + if (e.name === 'WebAuthnDeviceNotFoundError') { + toast.error('Device not found, log in with Email/Secret to continue') + setShowWebAuthn(false) + } else { + toast.error(e.message) + } + } + } + + const onRegister = async () => { + try { + await webAuthn.register() + toast.success(WELCOME_MESSAGE) + navigate(REDIRECT) + } catch (e) { + toast.error(e.message) + } + } + + const onSkip = () => { + toast.success(WELCOME_MESSAGE) + setShouldShowWebAuthn(false) + } + + const AuthWebAuthnPrompt = () => { + return ( +
+

WebAuthn Login Enabled

+

Log in with your fingerprint, face or PIN

+
+ +
+
+ ) + } + + const RegisterWebAuthnPrompt = () => ( +
+

No more Secrets!

+

+ Depending on your device you can log in with your fingerprint, face or + PIN next time. +

+
+ + +
+
+ ) + + const PasswordForm = () => ( +
+ + + + + + + + +
+ + Forgot Secret? + +
+ + + +
+ Login +
+ + ) + + const formToRender = () => { + if (showWebAuthn) { + if (webAuthn.isEnabled()) { + return + } else { + return + } + } else { + return } } + const linkToRender = () => { + if (showWebAuthn) { + if (webAuthn.isEnabled()) { + return ( +
+ or login with {' '} + + email and secret + +
+ ) + } + } else { + return ( +
+ Don't have an account?{' '} + + Sign up! + +
+ ) + } + } + + if (loading) { + return null + } + return ( <> @@ -2723,74 +2919,10 @@ const LoginPage = () => {
-
-
- - - - - - - - -
- - Forgot Secret? - -
- - - -
- Login -
- -
+
{formToRender()}
-
- Don't have an account?{' '} - - Sign up! - -
+ {linkToRender()} diff --git a/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.test.js b/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.test.js index 5ae26b7c17d2..3e27021d875d 100644 --- a/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.test.js +++ b/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.test.js @@ -668,16 +668,19 @@ describe('dbAuth', () => { it('produces the correct files with custom username and password set via prompt and with webauthn enabled via prompt', async () => { const customEnquirer = new Enquirer() customEnquirer.on('prompt', (prompt) => { - if (prompt.state.message.includes('username label')) { - prompt.value = 'Email' - } - if (prompt.state.message.includes('password label')) { - prompt.value = 'Secret' - } if (prompt.state.message.includes('Enable WebAuthn')) { - prompt.value = true + prompt.on('run', () => { + return prompt.keypress('y') + }) + } else { + if (prompt.state.message.includes('username label')) { + prompt.value = 'Email' + } else if (prompt.state.message.includes('password label')) { + prompt.value = 'Secret' + } + + prompt.submit() } - prompt.submit() }) await dbAuth.handler({ From fb1efbc96212decaf696ecda4bf31c5314ff54a9 Mon Sep 17 00:00:00 2001 From: Tobbe Lundberg Date: Fri, 14 Jun 2024 20:52:04 -0400 Subject: [PATCH 60/66] feat(dbAuth): Only suggest dbAuth setup if needed (#10793) This is what we print now image This part is not needed if dbAuth is already setup, which is fairly easy to detect ``` Oh, and if you haven't already, add the necessary dbAuth functions and app setup by running: yarn rw setup auth dbAuth ``` This PR only prints that text if dbAuth isn't detected already --- .changesets/10793.md | 3 + .../dbAuth.postInstallMessage.test.js | 220 ++++++++++++++++++ .../generate/dbAuth/__tests__/dbAuth.test.js | 5 + .../src/commands/generate/dbAuth/dbAuth.js | 103 +++++--- 4 files changed, 297 insertions(+), 34 deletions(-) create mode 100644 .changesets/10793.md create mode 100644 packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.postInstallMessage.test.js diff --git a/.changesets/10793.md b/.changesets/10793.md new file mode 100644 index 000000000000..d4fc2a6e9f9d --- /dev/null +++ b/.changesets/10793.md @@ -0,0 +1,3 @@ +- feat(dbAuth): Only suggest dbAuth setup if needed (#10793) by @Tobbe + +Detect if dbAuth is already setup, and don't suggest setting it up if it is. diff --git a/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.postInstallMessage.test.js b/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.postInstallMessage.test.js new file mode 100644 index 000000000000..3a4442bb4e48 --- /dev/null +++ b/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.postInstallMessage.test.js @@ -0,0 +1,220 @@ +global.__dirname = __dirname + +vi.mock('fs-extra') + +import path from 'path' + +// Load mocks +import '../../../../lib/test' + +const actualFs = await vi.importActual('fs-extra') +import { vol } from 'memfs' +import { afterEach, beforeEach, vi, describe, it, expect } from 'vitest' + +import { getPaths } from '../../../../lib' +import * as dbAuth from '../dbAuth' + +vi.mock('listr2', async () => { + return { + // Return a constructor function, since we're calling `new` on Listr + Listr: vi.fn().mockImplementation(() => ({ + run: () => {}, + ctx: {}, + })), + } +}) + +beforeEach(() => { + vi.spyOn(console, 'log').mockImplementation(() => {}) +}) + +afterEach(() => { + vi.mocked(console).log.mockRestore?.() +}) + +describe('dbAuth', () => { + describe('one more thing... message', () => { + it('does not include setup instructions when dbAuth is already set up in auth.js', async () => { + vol.reset() + vol.fromJSON({ + [path.join(getPaths().web.src, 'auth.js')]: ` +import { createDbAuthClient, createAuth } from '@redwoodjs/auth-dbauth-web' + +const dbAuthClient = createDbAuthClient() + +export const { AuthProvider, useAuth } = createAuth(dbAuthClient) +`, + }) + + await dbAuth.handler({ + webauthn: false, + }) + + expect(vi.mocked(console).log.mock.calls.at(-1)[0]).toMatch( + /Look in LoginPage, Sign/, + ) + expect(vi.mocked(console).log.mock.calls.at(-1)[0]).not.toMatch( + /yarn rw setup auth dbAuth/, + ) + }) + + it('does not include setup instructions when dbAuth is already set up in auth.ts', async () => { + vol.reset() + vol.fromJSON({ + [path.join(getPaths().web.src, 'auth.ts')]: ` +import { createDbAuthClient, createAuth } from '@redwoodjs/auth-dbauth-web' + +const dbAuthClient = createDbAuthClient() + +export const { AuthProvider, useAuth } = createAuth(dbAuthClient) +`, + }) + + await dbAuth.handler({ + webauthn: false, + }) + + expect(vi.mocked(console).log.mock.calls.at(-1)[0]).toMatch( + /Look in LoginPage, Sign/, + ) + expect(vi.mocked(console).log.mock.calls.at(-1)[0]).not.toMatch( + /yarn rw setup auth dbAuth/, + ) + }) + + it('does not include setup instructions when dbAuth is already set up in auth.jsx with a renamed import', async () => { + vol.reset() + vol.fromJSON({ + [path.join(getPaths().web.src, 'auth.jsx')]: ` +import { createDbAuthClient, createAuth: renamedCreateAuth } from '@redwoodjs/auth-dbauth-web' + +const dbAuthClient = createDbAuthClient() + +const { AuthProvider, useAuth } = renamedCreateAuth(dbAuthClient) + +const CustomAuthProvider = ({ children }) => { + return ( +
+ {children} +
+ ) +} + +export const AuthProvider = CustomAuthProvider +export { useAuth } +`, + }) + + await dbAuth.handler({ + webauthn: false, + }) + + expect(vi.mocked(console).log.mock.calls.at(-1)[0]).toMatch( + /Look in LoginPage, Sign/, + ) + expect(vi.mocked(console).log.mock.calls.at(-1)[0]).not.toMatch( + /yarn rw setup auth dbAuth/, + ) + }) + + it("includes dbAuth setup instructions if dbAuth isn't already setup", async () => { + vol.reset() + vol.fromJSON({ + [path.join(getPaths().web.src, 'auth.jsx')]: ` +import React, { useEffect } from 'react' + +import { ClerkProvider, useUser } from '@clerk/clerk-react' + +import { createAuth } from '@redwoodjs/auth-clerk-web' +import { navigate } from '@redwoodjs/router' + +export const { AuthProvider: ClerkRwAuthProvider, useAuth } = createAuth() + +const ClerkProviderWrapper = ({ children, clerkOptions }) => { + const { reauthenticate } = useAuth() + + return ( + reauthenticate().then(() => navigate(to))} + > + {children} + + ) +} + +export const AuthProvider = ({ children }: Props) => { + const publishableKey = process.env.CLERK_PUBLISHABLE_KEY + + return ( + + + {children} + + + ) +} +`, + }) + + await dbAuth.handler({ + webauthn: false, + }) + + expect(vi.mocked(console).log.mock.calls.at(-1)[0]).toMatch( + /Look in LoginPage, Sign/, + ) + expect(vi.mocked(console).log.mock.calls.at(-1)[0]).toMatch( + /yarn rw setup auth dbAuth/, + ) + }) + + it('does not include setup instructions for when generating the pages in the test project', async () => { + vol.reset() + vol.fromJSON({ + [path.join(getPaths().web.src, 'auth.js')]: actualFs.readFileSync( + path.join( + __dirname, + `../../../../../../../__fixtures__/test-project/web/src/auth.ts`, + ), + 'utf-8', + ), + }) + + await dbAuth.handler({ + webauthn: false, + }) + + expect(vi.mocked(console).log.mock.calls.at(-1)[0]).toMatch( + /Look in LoginPage, Sign/, + ) + expect(vi.mocked(console).log.mock.calls.at(-1)[0]).not.toMatch( + /yarn rw setup auth dbAuth/, + ) + }) + + it('is different for when WebAuthn is setup', async () => { + vol.reset() + vol.fromJSON({ + [path.join(getPaths().web.src, 'auth.js')]: ` +import { createDbAuthClient, createAuth } from '@redwoodjs/auth-dbauth-web' + +const dbAuthClient = createDbAuthClient() + +export const { AuthProvider, useAuth } = createAuth(dbAuthClient) +`, + }) + + await dbAuth.handler({ + webauthn: true, + }) + + expect(vi.mocked(console).log.mock.calls.at(-1)[0]).toMatch( + /look for the `REDIRECT`/, + ) + expect(vi.mocked(console).log.mock.calls.at(-1)[0]).not.toMatch( + /yarn rw setup auth dbAuth/, + ) + }) + }) +}) diff --git a/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.test.js b/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.test.js index 3e27021d875d..dc34cc230e2e 100644 --- a/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.test.js +++ b/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.test.js @@ -63,6 +63,11 @@ mockFiles[getPaths().web.app] = realfs describe('dbAuth', () => { beforeEach(() => { + delete mockFiles[path.join(getPaths().web.src, 'auth.ts')] + delete mockFiles[path.join(getPaths().web.src, 'auth.tsx')] + delete mockFiles[path.join(getPaths().web.src, 'auth.js')] + delete mockFiles[path.join(getPaths().web.src, 'auth.jsx')] + vol.reset() vol.fromJSON(mockFiles) }) diff --git a/packages/cli/src/commands/generate/dbAuth/dbAuth.js b/packages/cli/src/commands/generate/dbAuth/dbAuth.js index 6e3b3cf7fc58..ac4d25b2fedc 100644 --- a/packages/cli/src/commands/generate/dbAuth/dbAuth.js +++ b/packages/cli/src/commands/generate/dbAuth/dbAuth.js @@ -29,40 +29,52 @@ const ROUTES = [ ``, ] -const POST_INSTALL = - ` ${c.warning("Pages created! But you're not done yet:")}\n\n` + - ` You'll need to tell your pages where to redirect after a user has logged in,\n` + - ` signed up, or reset their password. Look in LoginPage, SignupPage,\n` + - ` ForgotPasswordPage and ResetPasswordPage for these lines: \n\n` + - ` if (isAuthenticated) {\n` + - ` navigate(routes.home())\n` + - ` }\n\n` + - ` and change the route to where you want them to go if the user is already\n` + - ` logged in. Also take a look in the onSubmit() functions in ForgotPasswordPage\n` + - ` and ResetPasswordPage to change where the user redirects to after submitting\n` + - ` those forms.\n\n` + - ` Oh, and if you haven't already, add the necessary dbAuth functions and\n` + - ` app setup by running:\n\n` + - ` yarn rw setup auth dbAuth\n\n` + - ` Happy authenticating!\n` +function getPostInstallMessage(isDbAuthSetup) { + return [ + ` ${c.warning("Pages created! But you're not done yet:")}\n`, + " You'll need to tell your pages where to redirect after a user has logged in,", + ' signed up, or reset their password. Look in LoginPage, SignupPage,', + ' ForgotPasswordPage and ResetPasswordPage for these lines: \n', + ' if (isAuthenticated) {', + ' navigate(routes.home())', + ' }\n', + ' and change the route to where you want them to go if the user is already', + ' logged in. Also take a look in the onSubmit() functions in ForgotPasswordPage', + ' and ResetPasswordPage to change where the user redirects to after submitting', + ' those forms.\n', + !isDbAuthSetup && + " Oh, and if you haven't already, add the necessary dbAuth functions and\n" + + ' app setup by running:\n\n' + + ' yarn rw setup auth dbAuth\n', + ' Happy authenticating!', + ] + .filter(Boolean) + .join('\n') +} -const WEBAUTHN_POST_INSTALL = - ` ${c.warning("Pages created! But you're not done yet:")}\n\n` + - " You'll need to tell your pages where to redirect after a user has logged in,\n" + - ' signed up, or reset their password. In LoginPage, look for the `REDIRECT`\n' + - ` constant and change the route if it's something other than home().\n` + - ` In SignupPage, ForgotPasswordPage and ResetPasswordPage look for these lines:\n\n` + - ` if (isAuthenticated) {\n` + - ` navigate(routes.home())\n` + - ` }\n\n` + - ` and change the route to where you want them to go if the user is already\n` + - ` logged in. Also take a look in the onSubmit() functions in ForgotPasswordPage\n` + - ` and ResetPasswordPage to change where the user redirects to after submitting\n` + - ` those forms.\n\n` + - ` Oh, and if you haven't already, add the necessary dbAuth functions and\n` + - ` app setup by running:\n\n` + - ` yarn rw setup auth dbAuth\n\n` + - ` Happy authenticating!\n` +function getPostInstallWebauthnMessage(isDbAuthSetup) { + return [ + ` ${c.warning("Pages created! But you're not done yet:")}\n`, + " You'll need to tell your pages where to redirect after a user has logged in,", + ' signed up, or reset their password. In LoginPage, look for the `REDIRECT`', + " constant and change the route if it's something other than home().", + ' In SignupPage, ForgotPasswordPage and ResetPasswordPage look for these lines:\n', + ' if (isAuthenticated) {', + ' navigate(routes.home())', + ' }\n', + ' and change the route to where you want them to go if the user is already', + ' logged in. Also take a look in the onSubmit() functions in ForgotPasswordPage', + ' and ResetPasswordPage to change where the user redirects to after submitting', + ' those forms.\n', + !isDbAuthSetup && + " Oh, and if you haven't already, add the necessary dbAuth functions and\n" + + ' app setup by running:\n\n' + + ' yarn rw setup auth dbAuth\n', + ' Happy authenticating!', + ] + .filter(Boolean) + .join('\n') +} export const command = 'dbAuth' export const description = @@ -395,9 +407,32 @@ export const handler = async (yargs) => { console.log('') console.log( - yargs.webauthn || t.ctx.webauthn ? WEBAUTHN_POST_INSTALL : POST_INSTALL, + yargs.webauthn || t.ctx.webauthn + ? getPostInstallWebauthnMessage(isDbAuthSetup()) + : getPostInstallMessage(isDbAuthSetup()), ) } catch (e) { console.log(c.error(e.message)) } } + +function isDbAuthSetup() { + const extensions = ['ts', 'js', 'tsx', 'jsx'] + const webAuthExtension = extensions.find((ext) => + fs.existsSync(path.join(getPaths().web.src, 'auth.' + ext)), + ) + + // If no `auth.ext` file was found auth is not set up + if (webAuthExtension) { + const webAuthPath = path.join( + getPaths().web.src, + 'auth.' + webAuthExtension, + ) + + return /^import (.*) from ['"]@redwoodjs\/auth-dbauth-web['"]/m.test( + fs.readFileSync(webAuthPath), + ) + } + + return false +} From b75cdc2f563713a2bb611c44f9b449841ff177a6 Mon Sep 17 00:00:00 2001 From: Tobbe Lundberg Date: Fri, 14 Jun 2024 23:02:22 -0400 Subject: [PATCH 61/66] chore(testing dbAuth): provide mock implementations (#10818) When running the dbAuth tests for `yarn rw g dbAuth` you'd get these scary looking red console printouts image This PR adds mock implementations for `process.exit` and `console.info` to silence that output --- .../src/commands/generate/dbAuth/__tests__/dbAuth.test.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.test.js b/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.test.js index dc34cc230e2e..7945bad30ea1 100644 --- a/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.test.js +++ b/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.test.js @@ -94,8 +94,10 @@ describe('dbAuth', () => { describe('handler', () => { it('exits when all files are skipped', async () => { - const mockExit = vi.spyOn(process, 'exit').mockImplementation() - const mockConsoleInfo = vi.spyOn(console, 'info').mockImplementation() + const mockExit = vi.spyOn(process, 'exit').mockImplementation(() => {}) + const mockConsoleInfo = vi + .spyOn(console, 'info') + .mockImplementation(() => {}) await dbAuth.handler({ listr2: { silentRendererCondition: true }, From 9f27e26d0dfc6033c5afd08bb6291d00e7818228 Mon Sep 17 00:00:00 2001 From: Tobbe Lundberg Date: Fri, 14 Jun 2024 23:13:53 -0400 Subject: [PATCH 62/66] chore(testing dbAuth): Consistent naming and fix blue squiggles (#10819) We try to name the variables we assign the return value of `vi.importActual` to `actualWhatever`. So this PR renames `realfs` to `actualFs`, which both makes the code follow that naming convention and also fixes the blue squiggly image --- .../commands/generate/dbAuth/__tests__/dbAuth.test.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.test.js b/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.test.js index 7945bad30ea1..21604e70b8d8 100644 --- a/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.test.js +++ b/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.test.js @@ -7,7 +7,7 @@ import path from 'path' // Load mocks import '../../../../lib/test' -const realfs = await vi.importActual('fs-extra') +const actualFs = await vi.importActual('fs-extra') import Enquirer from 'enquirer' import fs from 'fs-extra' import { vol } from 'memfs' @@ -27,14 +27,14 @@ const dbAuthTemplateFiles = [ 'signup.tsx.template', ] dbAuthTemplateFiles.forEach((templateFilename) => { - mockFiles[path.join(__dirname, `../templates/${templateFilename}`)] = realfs + mockFiles[path.join(__dirname, `../templates/${templateFilename}`)] = actualFs .readFileSync(path.join(__dirname, `../templates/${templateFilename}`)) .toString() }) mockFiles[ path.join(__dirname, `../../scaffold/templates/assets/scaffold.css.template`) -] = realfs +] = actualFs .readFileSync( path.join( __dirname, @@ -43,7 +43,7 @@ mockFiles[ ) .toString() -mockFiles[getPaths().web.routes] = realfs +mockFiles[getPaths().web.routes] = actualFs .readFileSync( path.join( __dirname, @@ -52,7 +52,7 @@ mockFiles[getPaths().web.routes] = realfs ) .toString() -mockFiles[getPaths().web.app] = realfs +mockFiles[getPaths().web.app] = actualFs .readFileSync( path.join( __dirname, From 898e60f7e9b3f2cc5a7728f5f69dd322b875c527 Mon Sep 17 00:00:00 2001 From: Tobbe Lundberg Date: Fri, 14 Jun 2024 23:27:57 -0400 Subject: [PATCH 63/66] chore(testing dbAuth): Remove outdated code (#10820) The tests that used this code were moved to another file (to `packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.postInstallMessage.test.js`). So this code is not needed here anymore --- .../src/commands/generate/dbAuth/__tests__/dbAuth.test.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.test.js b/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.test.js index 21604e70b8d8..6edd4b1be81b 100644 --- a/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.test.js +++ b/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.test.js @@ -63,11 +63,6 @@ mockFiles[getPaths().web.app] = actualFs describe('dbAuth', () => { beforeEach(() => { - delete mockFiles[path.join(getPaths().web.src, 'auth.ts')] - delete mockFiles[path.join(getPaths().web.src, 'auth.tsx')] - delete mockFiles[path.join(getPaths().web.src, 'auth.js')] - delete mockFiles[path.join(getPaths().web.src, 'auth.jsx')] - vol.reset() vol.fromJSON(mockFiles) }) From 9246d53b8ade4ad4d4a92052c1151a99b01e83f3 Mon Sep 17 00:00:00 2001 From: Tobbe Lundberg Date: Fri, 14 Jun 2024 23:51:42 -0400 Subject: [PATCH 64/66] chore(testing dbAuth): Remove duplicated tests (#10822) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These tests accidentally got copied over from the main `dbAuth.test.js` file. No need to have the same tests in two different files 😉 So removing them from the "mockListr" one --- .../dbAuth/__tests__/dbAuth.mockListr.test.js | 118 +++++++----------- 1 file changed, 47 insertions(+), 71 deletions(-) diff --git a/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.mockListr.test.js b/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.mockListr.test.js index 6990846b9394..441aebc81bd7 100644 --- a/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.mockListr.test.js +++ b/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.mockListr.test.js @@ -102,83 +102,59 @@ mockFiles[getPaths().web.app] = actualFs ) .toString() -describe('dbAuth', () => { - beforeEach(() => { - vol.reset() - vol.fromJSON(mockFiles) - }) +beforeEach(() => { + vol.reset() + vol.fromJSON(mockFiles) +}) - it('creates a login page', async () => { - expect(await dbAuth.files(true, false)).toHaveProperty([ - path.normalize('/path/to/project/web/src/pages/LoginPage/LoginPage.jsx'), - ]) - }) +describe('dbAuth handler WebAuthn task title', () => { + it('is correct after prompting', async () => { + const customEnquirer = new Enquirer({ show: false }) + customEnquirer.on('prompt', (prompt) => { + prompt.submit() + }) - it('creates a signup page', async () => { - expect(await dbAuth.files(true, false)).toHaveProperty([ - path.normalize( - '/path/to/project/web/src/pages/SignupPage/SignupPage.jsx', - ), - ]) + await dbAuth.handler({ + enquirer: customEnquirer, + listr2: { silentRendererCondition: true }, + }) + + expect(mockExecutedTaskTitles[1]).toEqual( + 'Querying WebAuthn addition: WebAuthn addition not included', + ) }) - it('creates a scaffold CSS file', async () => { - expect(await dbAuth.files(true, false)).toHaveProperty([ - path.normalize('/path/to/project/web/src/scaffold.css'), - ]) + it('is correct after providing cli flag value `true`', async () => { + const customEnquirer = new Enquirer({ show: false }) + customEnquirer.on('prompt', (prompt) => { + prompt.submit() + }) + + await dbAuth.handler({ + enquirer: customEnquirer, + listr2: { silentRendererCondition: true }, + webauthn: true, + }) + + expect(mockSkippedTaskTitles[0]).toEqual( + 'Querying WebAuthn addition: argument webauthn passed, WebAuthn included', + ) }) - describe('handler', () => { - describe('WebAuthn task title', () => { - it('is correct after prompting', async () => { - const customEnquirer = new Enquirer({ show: false }) - customEnquirer.on('prompt', (prompt) => { - prompt.submit() - }) - - await dbAuth.handler({ - enquirer: customEnquirer, - listr2: { silentRendererCondition: true }, - }) - - expect(mockExecutedTaskTitles[1]).toEqual( - 'Querying WebAuthn addition: WebAuthn addition not included', - ) - }) - - it('is correct after providing cli flag value `true`', async () => { - const customEnquirer = new Enquirer({ show: false }) - customEnquirer.on('prompt', (prompt) => { - prompt.submit() - }) - - await dbAuth.handler({ - enquirer: customEnquirer, - listr2: { silentRendererCondition: true }, - webauthn: true, - }) - - expect(mockSkippedTaskTitles[0]).toEqual( - 'Querying WebAuthn addition: argument webauthn passed, WebAuthn included', - ) - }) - - it('is correct after providing cli flag value `false`', async () => { - const customEnquirer = new Enquirer({ show: false }) - customEnquirer.on('prompt', (prompt) => { - prompt.submit() - }) - - await dbAuth.handler({ - enquirer: customEnquirer, - listr2: { silentRendererCondition: true }, - webauthn: false, - }) - - expect(mockSkippedTaskTitles[0]).toEqual( - 'Querying WebAuthn addition: argument webauthn passed, WebAuthn not included', - ) - }) + it('is correct after providing cli flag value `false`', async () => { + const customEnquirer = new Enquirer({ show: false }) + customEnquirer.on('prompt', (prompt) => { + prompt.submit() }) + + await dbAuth.handler({ + enquirer: customEnquirer, + listr2: { silentRendererCondition: true }, + webauthn: false, + }) + + expect(mockSkippedTaskTitles[0]).toEqual( + 'Querying WebAuthn addition: argument webauthn passed, WebAuthn not included', + ) }) }) From 081c49215729c4f9bc6dbffa42d0ad82c06c53ad Mon Sep 17 00:00:00 2001 From: Tobbe Lundberg Date: Sat, 15 Jun 2024 00:04:29 -0400 Subject: [PATCH 65/66] chore(testing dbAuth): Mock console.log to silence test output (#10821) Mock `console.log` to not spam the console with a bunch of irrelevant output while running tests --- .../dbAuth/__tests__/dbAuth.mockListr.test.js | 18 +++++++++++++++++- .../generate/dbAuth/__tests__/dbAuth.test.js | 18 +++++++++++++++++- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.mockListr.test.js b/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.mockListr.test.js index 441aebc81bd7..8381bae8a2c0 100644 --- a/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.mockListr.test.js +++ b/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.mockListr.test.js @@ -13,7 +13,15 @@ import '../../../../lib/test' const actualFs = await vi.importActual('fs-extra') import Enquirer from 'enquirer' import { vol } from 'memfs' -import { vi, describe, it, expect, beforeEach } from 'vitest' +import { + vi, + describe, + it, + expect, + beforeEach, + beforeAll, + afterAll, +} from 'vitest' import { getPaths } from '../../../../lib' import * as dbAuth from '../dbAuth' @@ -102,6 +110,14 @@ mockFiles[getPaths().web.app] = actualFs ) .toString() +beforeAll(() => { + vi.spyOn(console, 'log').mockImplementation(() => {}) +}) + +afterAll(() => { + vi.mocked(console).log.mockRestore?.() +}) + beforeEach(() => { vol.reset() vol.fromJSON(mockFiles) diff --git a/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.test.js b/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.test.js index 6edd4b1be81b..efac0305d98c 100644 --- a/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.test.js +++ b/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.test.js @@ -11,7 +11,15 @@ const actualFs = await vi.importActual('fs-extra') import Enquirer from 'enquirer' import fs from 'fs-extra' import { vol } from 'memfs' -import { vi, describe, it, expect, beforeEach } from 'vitest' +import { + vi, + describe, + it, + expect, + beforeEach, + afterAll, + beforeAll, +} from 'vitest' import { getPaths } from '../../../../lib' import * as dbAuth from '../dbAuth' @@ -61,6 +69,14 @@ mockFiles[getPaths().web.app] = actualFs ) .toString() +beforeAll(() => { + vi.spyOn(console, 'log').mockImplementation(() => {}) +}) + +afterAll(() => { + vi.mocked(console).log.mockRestore?.() +}) + describe('dbAuth', () => { beforeEach(() => { vol.reset() From 8b40ed24d8386dc42b752cdda25e5f23b5cf9f64 Mon Sep 17 00:00:00 2001 From: Tobbe Lundberg Date: Sat, 15 Jun 2024 00:19:12 -0400 Subject: [PATCH 66/66] chore(testing dbAuth): Add "yes" prompt testing for WebAuthn (#10823) Make sure to test prompt answer "yes" and "no" for the WebAuthn prompt. This required pretty involved mocking of Listr2 that I hope we can reuse for other tests as well in the future --- .../dbAuth/__tests__/dbAuth.mockListr.test.js | 56 +++++++++++++++++-- 1 file changed, 51 insertions(+), 5 deletions(-) diff --git a/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.mockListr.test.js b/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.mockListr.test.js index 8381bae8a2c0..fe067d869746 100644 --- a/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.mockListr.test.js +++ b/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.mockListr.test.js @@ -27,8 +27,10 @@ import { getPaths } from '../../../../lib' import * as dbAuth from '../dbAuth' vi.mock('listr2', async () => { - const listrImpl = (tasks) => { + const ctx = {} + const listrImpl = (tasks, listrOptions) => { return { + ctx, run: async () => { mockExecutedTaskTitles = [] mockSkippedTaskTitles = [] @@ -43,12 +45,28 @@ vi.mock('listr2', async () => { const augmentedTask = { ...task, newListr: listrImpl, - prompt: () => {}, + prompt: async (options) => { + const enquirer = listrOptions?.injectWrapper?.enquirer + + if (enquirer) { + if (!Array.isArray(options)) { + options = [{ ...options, name: 'default' }] + } else if (options.length === 1) { + options[0].name = 'default' + } + + const response = await enquirer.prompt(options) + + if (options.length === 1) { + return response.default + } + } + }, skip: (msg) => { mockSkippedTaskTitles.push(msg || task.title) }, } - await task.task({}, augmentedTask) + await task.task(ctx, augmentedTask) // storing the title after running the task in case the task // modifies its own title @@ -124,10 +142,38 @@ beforeEach(() => { }) describe('dbAuth handler WebAuthn task title', () => { - it('is correct after prompting', async () => { + it('is correct after prompt answer "Yes"', async () => { const customEnquirer = new Enquirer({ show: false }) customEnquirer.on('prompt', (prompt) => { - prompt.submit() + if (prompt.state.message.includes('Enable WebAuthn')) { + prompt.on('run', () => { + return prompt.keypress('y') + }) + } else { + prompt.submit() + } + }) + + await dbAuth.handler({ + enquirer: customEnquirer, + listr2: { silentRendererCondition: true }, + }) + + expect(mockExecutedTaskTitles[1]).toEqual( + 'Querying WebAuthn addition: WebAuthn addition included', + ) + }) + + it('is correct after prompt answer "No"', async () => { + const customEnquirer = new Enquirer({ show: false }) + customEnquirer.on('prompt', (prompt) => { + if (prompt.state.message.includes('Enable WebAuthn')) { + prompt.on('run', () => { + return prompt.keypress('N') + }) + } else { + prompt.submit() + } }) await dbAuth.handler({