diff --git a/package-lock.json b/package-lock.json index d3f6f35a48f..2cc15265c03 100644 --- a/package-lock.json +++ b/package-lock.json @@ -36654,7 +36654,7 @@ }, "packages/backend-core": { "name": "@clerk/backend-core", - "version": "2.4.0-staging.0", + "version": "2.4.0", "license": "MIT", "dependencies": { "@clerk/types": "^3.4.1", @@ -36684,7 +36684,7 @@ }, "packages/clerk-js": { "name": "@clerk/clerk-js", - "version": "4.3.4-staging.0", + "version": "4.3.4", "license": "MIT", "dependencies": { "@clerk/types": "^3.4.1", @@ -36825,10 +36825,10 @@ }, "packages/edge": { "name": "@clerk/edge", - "version": "1.8.4-staging.0", + "version": "1.8.4", "license": "MIT", "dependencies": { - "@clerk/backend-core": "^2.4.0-staging.0", + "@clerk/backend-core": "^2.4.0", "@clerk/types": "^3.4.1", "@peculiar/webcrypto": "^1.4.0", "@types/node": "^16.11.55", @@ -37117,11 +37117,11 @@ }, "packages/expo": { "name": "@clerk/clerk-expo", - "version": "0.9.51-staging.0", + "version": "0.9.51", "license": "MIT", "dependencies": { - "@clerk/clerk-js": "^4.3.4-staging.0", - "@clerk/clerk-react": "^4.0.9-staging.0", + "@clerk/clerk-js": "^4.3.4", + "@clerk/clerk-react": "^4.0.9", "base-64": "^1.0.0", "react-native-url-polyfill": "^1.3.0" }, @@ -37186,22 +37186,6 @@ "node": ">=14" } }, - "packages/gatsby-plugin-clerk/node_modules/@clerk/clerk-react": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/@clerk/clerk-react/-/clerk-react-4.0.8.tgz", - "integrity": "sha512-BtsXr2EXeXkqmw8yiJVJdtImCtaJySSJeSdaSboCGSE1Id8kwFgvrRsok9k+utXUyE6nhAKAuPp20OnthfnewQ==", - "dependencies": { - "@clerk/types": "^3.4.1", - "swr": "^1.3.0", - "tslib": "^2.3.1" - }, - "engines": { - "node": ">=14" - }, - "peerDependencies": { - "react": ">=16" - } - }, "packages/gatsby-plugin-clerk/node_modules/@clerk/clerk-sdk-node": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/@clerk/clerk-sdk-node/-/clerk-sdk-node-4.1.1.tgz", @@ -37257,12 +37241,12 @@ }, "packages/nextjs": { "name": "@clerk/nextjs", - "version": "4.1.5-staging.0", + "version": "4.1.5", "license": "MIT", "dependencies": { - "@clerk/clerk-react": "^4.0.9-staging.0", - "@clerk/clerk-sdk-node": "^4.1.5-staging.0", - "@clerk/edge": "^1.8.4-staging.0", + "@clerk/clerk-react": "^4.0.9", + "@clerk/clerk-sdk-node": "^4.1.5", + "@clerk/edge": "^1.8.4", "@clerk/types": "^3.4.1", "tslib": "^2.3.1" }, @@ -37589,7 +37573,7 @@ }, "packages/react": { "name": "@clerk/clerk-react", - "version": "4.0.9-staging.0", + "version": "4.0.9", "license": "MIT", "dependencies": { "@clerk/types": "^3.4.1", @@ -37630,11 +37614,11 @@ }, "packages/remix": { "name": "@clerk/remix", - "version": "1.1.5-staging.0", + "version": "1.1.5", "license": "MIT", "dependencies": { - "@clerk/clerk-react": "^4.0.9-staging.0", - "@clerk/clerk-sdk-node": "^4.1.5-staging.0", + "@clerk/clerk-react": "^4.0.9", + "@clerk/clerk-sdk-node": "^4.1.5", "@clerk/types": "^3.4.1", "cookie": "^0.5.0", "tslib": "^2.3.1" @@ -37681,10 +37665,10 @@ }, "packages/sdk-node": { "name": "@clerk/clerk-sdk-node", - "version": "4.1.5-staging.0", + "version": "4.1.5", "license": "MIT", "dependencies": { - "@clerk/backend-core": "^2.4.0-staging.0", + "@clerk/backend-core": "^2.4.0", "@clerk/types": "^3.4.1", "@peculiar/webcrypto": "^1.4.0", "@types/cookies": "^0.7.7", @@ -39298,8 +39282,8 @@ "@clerk/clerk-expo": { "version": "file:packages/expo", "requires": { - "@clerk/clerk-js": "^4.3.4-staging.0", - "@clerk/clerk-react": "^4.0.9-staging.0", + "@clerk/clerk-js": "^4.3.4", + "@clerk/clerk-react": "^4.0.9", "@clerk/types": "^3.4.1", "@types/jest": "^27.4.0", "@types/node": "^16.11.55", @@ -39475,7 +39459,7 @@ "@clerk/clerk-sdk-node": { "version": "file:packages/sdk-node", "requires": { - "@clerk/backend-core": "^2.4.0-staging.0", + "@clerk/backend-core": "^2.4.0", "@clerk/types": "^3.4.1", "@peculiar/webcrypto": "^1.4.0", "@types/cookies": "^0.7.7", @@ -39513,7 +39497,7 @@ "@clerk/edge": { "version": "file:packages/edge", "requires": { - "@clerk/backend-core": "^2.4.0-staging.0", + "@clerk/backend-core": "^2.4.0", "@clerk/types": "^3.4.1", "@peculiar/webcrypto": "^1.4.0", "@types/jest": "^27.4.0", @@ -39655,9 +39639,9 @@ "@clerk/nextjs": { "version": "file:packages/nextjs", "requires": { - "@clerk/clerk-react": "^4.0.9-staging.0", - "@clerk/clerk-sdk-node": "^4.1.5-staging.0", - "@clerk/edge": "^1.8.4-staging.0", + "@clerk/clerk-react": "^4.0.9", + "@clerk/clerk-sdk-node": "^4.1.5", + "@clerk/edge": "^1.8.4", "@clerk/types": "^3.4.1", "@types/jest": "^27.4.0", "@types/node": "^16.11.55", @@ -39823,8 +39807,8 @@ "@clerk/remix": { "version": "file:packages/remix", "requires": { - "@clerk/clerk-react": "^4.0.9-staging.0", - "@clerk/clerk-sdk-node": "^4.1.5-staging.0", + "@clerk/clerk-react": "^4.0.9", + "@clerk/clerk-sdk-node": "^4.1.5", "@clerk/types": "^3.4.1", "@types/cookie": "^0.5.0", "@types/jest": "^27.4.0", @@ -53544,16 +53528,6 @@ "tslib": "^2.3.1" } }, - "@clerk/clerk-react": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/@clerk/clerk-react/-/clerk-react-4.0.8.tgz", - "integrity": "sha512-BtsXr2EXeXkqmw8yiJVJdtImCtaJySSJeSdaSboCGSE1Id8kwFgvrRsok9k+utXUyE6nhAKAuPp20OnthfnewQ==", - "requires": { - "@clerk/types": "^3.4.1", - "swr": "^1.3.0", - "tslib": "^2.3.1" - } - }, "@clerk/clerk-sdk-node": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/@clerk/clerk-sdk-node/-/clerk-sdk-node-4.1.1.tgz", diff --git a/packages/backend-core/CHANGELOG.md b/packages/backend-core/CHANGELOG.md index c7ff5583593..954605dd9d1 100644 --- a/packages/backend-core/CHANGELOG.md +++ b/packages/backend-core/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [2.4.0](https://github.com/clerkinc/javascript/compare/@clerk/backend-core@2.4.0-staging.0...@clerk/backend-core@2.4.0) (2022-09-07) + +**Note:** Version bump only for package @clerk/backend-core + ## [2.3.0](https://github.com/clerkinc/javascript/compare/@clerk/backend-core@2.3.0-staging.0...@clerk/backend-core@2.3.0) (2022-08-29) **Note:** Version bump only for package @clerk/backend-core diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 32f95f8da91..b04a864c97b 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@clerk/backend-core", - "version": "2.4.0-staging.0", + "version": "2.4.0", "license": "MIT", "description": "Clerk Backend API core resources and authentication utilities for JavaScript environments.", "scripts": { diff --git a/packages/clerk-js/CHANGELOG.md b/packages/clerk-js/CHANGELOG.md index f4e4ec58e56..aac84e189c3 100644 --- a/packages/clerk-js/CHANGELOG.md +++ b/packages/clerk-js/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +### [4.3.4](https://github.com/clerkinc/javascript/compare/@clerk/clerk-js@4.3.4-staging.1...@clerk/clerk-js@4.3.4) (2022-09-07) + +**Note:** Version bump only for package @clerk/clerk-js + ### [4.3.3](https://github.com/clerkinc/javascript/compare/@clerk/clerk-js@4.3.3-staging.0...@clerk/clerk-js@4.3.3) (2022-09-03) **Note:** Version bump only for package @clerk/clerk-js diff --git a/packages/clerk-js/package.json b/packages/clerk-js/package.json index 6f924e0b727..93b1d4ce0db 100644 --- a/packages/clerk-js/package.json +++ b/packages/clerk-js/package.json @@ -1,6 +1,6 @@ { "name": "@clerk/clerk-js", - "version": "4.3.4-staging.0", + "version": "4.3.4", "license": "MIT", "description": "Clerk.dev JS library", "keywords": [ diff --git a/packages/clerk-js/src/ui/SignUp/SignUpForm.tsx b/packages/clerk-js/src/ui/SignUp/SignUpForm.tsx index 9425689bd9f..7388b75f278 100644 --- a/packages/clerk-js/src/ui/SignUp/SignUpForm.tsx +++ b/packages/clerk-js/src/ui/SignUp/SignUpForm.tsx @@ -1,9 +1,9 @@ import React from 'react'; -import { ActiveIdentifier, Fields } from 'v4/SignUp/signUpFormHelpers'; import { useAppearance } from '../customizables'; import { Form } from '../elements'; import { FormControlState } from '../utils'; +import { ActiveIdentifier, Fields } from './signUpFormHelpers'; type SignUpFormProps = { handleSubmit: React.FormEventHandler; diff --git a/packages/clerk-js/src/ui/SignUp/SignUpStart.tsx b/packages/clerk-js/src/ui/SignUp/SignUpStart.tsx index 97e86436c2b..8630eef9779 100644 --- a/packages/clerk-js/src/ui/SignUp/SignUpStart.tsx +++ b/packages/clerk-js/src/ui/SignUp/SignUpStart.tsx @@ -5,7 +5,7 @@ import { withRedirectToHome } from '../../ui/common/withRedirectToHome'; import { useCoreClerk, useCoreSignUp, useEnvironment, useSignUpContext } from '../../ui/contexts'; import { useNavigate } from '../../ui/hooks'; import { getClerkQueryParam } from '../../utils/getClerkQueryParam'; -import { descriptors, Flex, Flow } from '../customizables'; +import { descriptors, Flex, Flow, useAppearance } from '../customizables'; import { Card, CardAlert, @@ -34,6 +34,7 @@ function _SignUpStart(): JSX.Element { const card = useCardState(); const status = useLoadingStatus(); const signUp = useCoreSignUp(); + const { showOptionalFields } = useAppearance().parsedLayout; const { userSettings, displayConfig } = useEnvironment(); const { navigate } = useNavigate(); const { attributes } = userSettings; @@ -200,6 +201,9 @@ function _SignUpStart(): JSX.Element { const hasSocialOrWeb3Buttons = !!userSettings.socialProviderStrategies.length || !!userSettings.web3FirstFactors.length; + const visibleFields = Object.entries(fields).filter(([_, opts]) => showOptionalFields || opts?.required); + const shouldShowForm = showFormFields(userSettings) && visibleFields.length > 0; + return ( @@ -215,8 +219,8 @@ function _SignUpStart(): JSX.Element { > {(!hasTicket || missingRequirementsWithTicket) && } - {hasSocialOrWeb3Buttons && showFormFields(userSettings) && } - {showFormFields(userSettings) && ( + {hasSocialOrWeb3Buttons && shouldShowForm && } + {shouldShowForm && (