From 89a91558f598a0e3ac460ee9599a72140e3c3123 Mon Sep 17 00:00:00 2001 From: Tom Milewski Date: Tue, 2 Jul 2024 11:06:52 -0400 Subject: [PATCH 1/2] chore(repo): Update turbo --- .changeset/forty-pears-lie.md | 2 + package-lock.json | 89 ++++++++++++++++++++++++++++++----- package.json | 2 +- 3 files changed, 81 insertions(+), 12 deletions(-) create mode 100644 .changeset/forty-pears-lie.md diff --git a/.changeset/forty-pears-lie.md b/.changeset/forty-pears-lie.md new file mode 100644 index 00000000000..a845151cc84 --- /dev/null +++ b/.changeset/forty-pears-lie.md @@ -0,0 +1,2 @@ +--- +--- diff --git a/package-lock.json b/package-lock.json index a4c5bc9e3f2..9bd5995a25f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -57,7 +57,7 @@ "tree-kill": "^1.2.2", "ts-jest": "^29.0.3", "tsup": "^8.0.1", - "turbo": "^2.0.3", + "turbo": "^2.0.6", "typescript": "^5.4.5", "verdaccio": "^5.26.3", "zx": "^7.2.3" @@ -41508,33 +41508,100 @@ } }, "node_modules/turbo": { - "version": "2.0.3", + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/turbo/-/turbo-2.0.6.tgz", + "integrity": "sha512-/Ftmxd5Mq//a9yMonvmwENNUN65jOVTwhhBPQjEtNZutYT9YKyzydFGLyVM1nzhpLWahQSMamRc/RDBv5EapzA==", "dev": true, - "license": "MIT", "bin": { "turbo": "bin/turbo" }, "optionalDependencies": { - "turbo-darwin-64": "2.0.3", - "turbo-darwin-arm64": "2.0.3", - "turbo-linux-64": "2.0.3", - "turbo-linux-arm64": "2.0.3", - "turbo-windows-64": "2.0.3", - "turbo-windows-arm64": "2.0.3" + "turbo-darwin-64": "2.0.6", + "turbo-darwin-arm64": "2.0.6", + "turbo-linux-64": "2.0.6", + "turbo-linux-arm64": "2.0.6", + "turbo-windows-64": "2.0.6", + "turbo-windows-arm64": "2.0.6" } }, + "node_modules/turbo-darwin-64": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/turbo-darwin-64/-/turbo-darwin-64-2.0.6.tgz", + "integrity": "sha512-XpgBwWj3Ggmz/gQVqXdMKXHC1iFPMDiuwugLwSzE7Ih0O13JuNtYZKhQnopvbDQnFQCeRq2Vsm5OTWabg/oB/g==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ] + }, "node_modules/turbo-darwin-arm64": { - "version": "2.0.3", + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/turbo-darwin-arm64/-/turbo-darwin-arm64-2.0.6.tgz", + "integrity": "sha512-RfeZYXIAkiA21E8lsvfptGTqz/256YD+eI1x37fedfvnHFWuIMFZGAOwJxtZc6QasQunDZ9TRRREbJNI68tkIw==", "cpu": [ "arm64" ], "dev": true, - "license": "MIT", "optional": true, "os": [ "darwin" ] }, + "node_modules/turbo-linux-64": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/turbo-linux-64/-/turbo-linux-64-2.0.6.tgz", + "integrity": "sha512-92UDa0xNQQbx0HdSp9ag3YSS3xPdavhc7q9q9mxIAcqyjjD6VElA4Y85m4F/DDGE5SolCrvBz2sQhVmkOd6Caw==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/turbo-linux-arm64": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/turbo-linux-arm64/-/turbo-linux-arm64-2.0.6.tgz", + "integrity": "sha512-eQKu6utCVUkIH2kqOzD8OS6E0ba6COjWm6PRDTNCHQRljZW503ycaTUIdMOiJrVg1MkEjDyOReUg8s8D18aJ4Q==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/turbo-windows-64": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/turbo-windows-64/-/turbo-windows-64-2.0.6.tgz", + "integrity": "sha512-+9u4EPrpoeHYCQ46dRcou9kbkSoelhOelHNcbs2d86D6ruYD/oIAHK9qgYK8LeARRz0jxhZIA/dWYdYsxJJWkw==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/turbo-windows-arm64": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/turbo-windows-arm64/-/turbo-windows-arm64-2.0.6.tgz", + "integrity": "sha512-rdrKL+p+EjtdDVg0wQ/7yTbzkIYrnb0Pw4IKcjsy3M0RqUM9UcEi67b94XOAyTa5a0GqJL1+tUj2ebsFGPgZbg==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ] + }, "node_modules/tweetnacl": { "version": "0.14.5", "dev": true, diff --git a/package.json b/package.json index d71961652af..5795594e14d 100644 --- a/package.json +++ b/package.json @@ -96,7 +96,7 @@ "tree-kill": "^1.2.2", "ts-jest": "^29.0.3", "tsup": "^8.0.1", - "turbo": "^2.0.3", + "turbo": "^2.0.6", "typescript": "^5.4.5", "verdaccio": "^5.26.3", "zx": "^7.2.3" From 3071faba0a209457efd2e87738959079ece24014 Mon Sep 17 00:00:00 2001 From: Tom Milewski Date: Tue, 2 Jul 2024 11:43:12 -0400 Subject: [PATCH 2/2] fix(elements): Fix Sign In forgot-password step not rendering [SDK-1866] --- .changeset/wise-rings-switch.md | 5 +++++ packages/elements/src/react/sign-in/choose-strategy.tsx | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 .changeset/wise-rings-switch.md diff --git a/.changeset/wise-rings-switch.md b/.changeset/wise-rings-switch.md new file mode 100644 index 00000000000..c5e316dea93 --- /dev/null +++ b/.changeset/wise-rings-switch.md @@ -0,0 +1,5 @@ +--- +"@clerk/elements": patch +--- + +Fix Sign In forgot-password step not rendering diff --git a/packages/elements/src/react/sign-in/choose-strategy.tsx b/packages/elements/src/react/sign-in/choose-strategy.tsx index 24f3e91103e..e37a54b3b62 100644 --- a/packages/elements/src/react/sign-in/choose-strategy.tsx +++ b/packages/elements/src/react/sign-in/choose-strategy.tsx @@ -66,7 +66,11 @@ export function SignInChooseStrategy({ children, ...props }: SignInChooseStrateg export function SignInForgotPassword({ children, ...props }: SignInForgotPasswordProps) { const routerRef = SignInRouterCtx.useActorRef(); - const activeState = useActiveTags(routerRef, ['step:first-factor', 'step:forgot-password'], ActiveTagsMode.all); + const activeState = useActiveTags( + routerRef, + ['step:verifications', 'step:first-factor', 'step:forgot-password'], + ActiveTagsMode.all, + ); return activeState ? (