From 1913f841464dc65cff5a7d1b4048b1f45e10632d Mon Sep 17 00:00:00 2001 From: Alex Carpenter Date: Wed, 10 Jul 2024 11:07:44 -0400 Subject: [PATCH 1/5] fix package access --- package-lock.json | 166 ++------------------------------------- packages/ui/package.json | 10 +-- 2 files changed, 10 insertions(+), 166 deletions(-) diff --git a/package-lock.json b/package-lock.json index a033541e4f9..9a64fb48c25 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10751,34 +10751,6 @@ } } }, - "node_modules/@radix-ui/react-form": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-form/-/react-form-0.0.3.tgz", - "integrity": "sha512-kgE+Z/haV6fxE5WqIXj05KkaXa3OkZASoTDy25yX2EIp/x0c54rOH/vFr5nOZTg7n7T1z8bSyXmiVIFP9bbhPQ==", - "dependencies": { - "@babel/runtime": "^7.13.10", - "@radix-ui/primitive": "1.0.1", - "@radix-ui/react-compose-refs": "1.0.1", - "@radix-ui/react-context": "1.0.1", - "@radix-ui/react-id": "1.0.1", - "@radix-ui/react-label": "2.0.2", - "@radix-ui/react-primitive": "1.0.3" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0", - "react-dom": "^16.8 || ^17.0 || ^18.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, "node_modules/@radix-ui/react-id": { "version": "1.0.1", "license": "MIT", @@ -10796,29 +10768,6 @@ } } }, - "node_modules/@radix-ui/react-label": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-label/-/react-label-2.0.2.tgz", - "integrity": "sha512-N5ehvlM7qoTLx7nWPodsPYPgMzA5WM8zZChQg8nyFJKnDO5WHdba1vv5/H6IO5LtJMfD2Q3wh1qHFGNtK0w3bQ==", - "dependencies": { - "@babel/runtime": "^7.13.10", - "@radix-ui/react-primitive": "1.0.3" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0", - "react-dom": "^16.8 || ^17.0 || ^18.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, "node_modules/@radix-ui/react-portal": { "version": "1.0.4", "license": "MIT", @@ -51181,94 +51130,21 @@ "version": "0.1.7", "license": "MIT", "dependencies": { - "@clerk/clerk-react": "*", - "@clerk/elements": "*", - "@clerk/shared": "*", - "@clerk/types": "*", + "@clerk/clerk-react": "file:../react", + "@clerk/elements": "file:../elements", + "@clerk/shared": "file:../shared", + "@clerk/types": "file:../types", "@radix-ui/react-slot": "^1.1.0", "cmdk": "^1.0.0", "cva": "^1.0.0-beta.1", "react-aria-components": "^1.2.1" }, "devDependencies": { - "@clerk/eslint-config-custom": "*", + "@clerk/eslint-config-custom": "^0.0.2", "@clerk/tailwindcss-transformer": "*", "concurrently": "^8.2.2" } }, - "packages/ui/node_modules/@clerk/clerk-react": { - "version": "5.2.5", - "resolved": "https://registry.npmjs.org/@clerk/clerk-react/-/clerk-react-5.2.5.tgz", - "integrity": "sha512-Ihf1t2LdWTagW3U5BH5KRwQ8i+ECaZGEUymhJ89eZA+Ux5iXwLfOIBdwCIs45gbVuFiQ8WK0W00eaDgsNaf1mw==", - "dependencies": { - "@clerk/shared": "2.3.1", - "@clerk/types": "4.6.1", - "tslib": "2.4.1" - }, - "engines": { - "node": ">=18.17.0" - }, - "peerDependencies": { - "react": ">=18 || >=19.0.0-beta", - "react-dom": ">=18 || >=19.0.0-beta" - } - }, - "packages/ui/node_modules/@clerk/elements": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/@clerk/elements/-/elements-0.8.0.tgz", - "integrity": "sha512-v8eXIWkrqKhLusN755KX86X6G1hFUWOjwCXJWY6OSHW3L67ZzxGqz4rSoqun8cj5/78QMQ2i2cpCFGOFrxj41A==", - "dependencies": { - "@clerk/types": "^4.6.1", - "@radix-ui/react-form": "^0.0.3", - "@radix-ui/react-slot": "^1.0.2", - "@xstate/react": "^4.1.1", - "client-only": "^0.0.1", - "xstate": "^5.13.0" - }, - "engines": { - "node": ">=18.17.0" - }, - "peerDependencies": { - "@clerk/clerk-react": "^5.0.0", - "@clerk/shared": "^2.0.0", - "next": "^13.5.4 || ^14.0.3 || ^15.0.0-rc", - "react": "^18.0.0 || ^19.0.0-beta", - "react-dom": "^18.0.0 || ^19.0.0-beta" - }, - "peerDependenciesMeta": { - "next": { - "optional": true - } - } - }, - "packages/ui/node_modules/@clerk/shared": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/@clerk/shared/-/shared-2.3.1.tgz", - "integrity": "sha512-WX7cCViYqkNMnbFfT2B93ykNcSseoYM1obMUynO60VBl9Zi6Epde5tn9VRamhuOdojgPR+DyYkH9AzBpXFYnSg==", - "hasInstallScript": true, - "dependencies": { - "@clerk/types": "4.6.1", - "glob-to-regexp": "0.4.1", - "js-cookie": "3.0.5", - "std-env": "^3.7.0", - "swr": "^2.2.0" - }, - "engines": { - "node": ">=18.17.0" - }, - "peerDependencies": { - "react": ">=18 || >=19.0.0-beta", - "react-dom": ">=18 || >=19.0.0-beta" - }, - "peerDependenciesMeta": { - "react": { - "optional": true - }, - "react-dom": { - "optional": true - } - } - }, "packages/ui/node_modules/@clerk/types": { "version": "4.6.1", "resolved": "https://registry.npmjs.org/@clerk/types/-/types-4.6.1.tgz", @@ -51311,43 +51187,11 @@ } } }, - "packages/ui/node_modules/@xstate/react": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@xstate/react/-/react-4.1.1.tgz", - "integrity": "sha512-pFp/Y+bnczfaZ0V8B4LOhx3d6Gd71YKAPbzerGqydC2nsYN/mp7RZu3q/w6/kvI2hwR/jeDeetM7xc3JFZH2NA==", - "dependencies": { - "use-isomorphic-layout-effect": "^1.1.2", - "use-sync-external-store": "^1.2.0" - }, - "peerDependencies": { - "react": "^16.8.0 || ^17.0.0 || ^18.0.0", - "xstate": "^5.11.0" - }, - "peerDependenciesMeta": { - "xstate": { - "optional": true - } - } - }, "packages/ui/node_modules/csstype": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz", "integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==" }, - "packages/ui/node_modules/tslib": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz", - "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==" - }, - "packages/ui/node_modules/xstate": { - "version": "5.13.2", - "resolved": "https://registry.npmjs.org/xstate/-/xstate-5.13.2.tgz", - "integrity": "sha512-cFbFJUuK7n8NGe9rsT9G8QjK/8KQO5WaxCkpl1GxnvSDb9oXM/+cbZbEtLT/YaAjDfaGA2nzOKyw5oev2LuNRw==", - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/xstate" - } - }, "packages/upgrade": { "name": "@clerk/upgrade", "version": "1.0.8", diff --git a/packages/ui/package.json b/packages/ui/package.json index c91cbbef546..96a8f2aad7d 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -36,17 +36,17 @@ "bundlewatch": "npx bundlewatch --config bundlewatch.config.json" }, "dependencies": { - "@clerk/clerk-react": "*", - "@clerk/elements": "*", - "@clerk/shared": "*", - "@clerk/types": "*", + "@clerk/clerk-react": "file:../react", + "@clerk/elements": "file:../elements", + "@clerk/shared": "file:../shared", + "@clerk/types": "file:../types", "@radix-ui/react-slot": "^1.1.0", "cmdk": "^1.0.0", "cva": "^1.0.0-beta.1", "react-aria-components": "^1.2.1" }, "devDependencies": { - "@clerk/eslint-config-custom": "*", + "@clerk/eslint-config-custom": "^0.0.2", "@clerk/tailwindcss-transformer": "*", "concurrently": "^8.2.2" } From 4492cef1b28e8da939c8a70bed03d08046ab5841 Mon Sep 17 00:00:00 2001 From: Alex Carpenter Date: Wed, 10 Jul 2024 11:08:14 -0400 Subject: [PATCH 2/5] enqueue prefilled fields --- .../machines/sign-up/start.machine.ts | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/packages/elements/src/internals/machines/sign-up/start.machine.ts b/packages/elements/src/internals/machines/sign-up/start.machine.ts index 00a20a69368..31110ef9fb9 100644 --- a/packages/elements/src/internals/machines/sign-up/start.machine.ts +++ b/packages/elements/src/internals/machines/sign-up/start.machine.ts @@ -1,5 +1,5 @@ import type { SignUpResource } from '@clerk/types'; -import { fromPromise, not, sendTo, setup } from 'xstate'; +import { enqueueActions, fromPromise, not, sendTo, setup } from 'xstate'; import { SIGN_UP_DEFAULT_BASE_PATH } from '~/internals/constants'; import type { FormFields } from '~/internals/machines/form'; @@ -15,6 +15,12 @@ export type TSignUpStartMachine = typeof SignUpStartMachine; export const SignUpStartMachineId = 'SignUpStart'; +type PrefillFieldsKeys = keyof Pick< + SignUpResource, + 'username' | 'firstName' | 'lastName' | 'emailAddress' | 'phoneNumber' +>; +const PREFILL_FIELDS: PrefillFieldsKeys[] = ['firstName', 'lastName', 'emailAddress', 'username', 'phoneNumber']; + export const SignUpStartMachine = setup({ actors: { attempt: fromPromise( @@ -56,6 +62,19 @@ export const SignUpStartMachine = setup({ Pending: { tags: ['state:pending'], description: 'Waiting for user input', + entry: [ + enqueueActions(({ context, enqueue }) => { + PREFILL_FIELDS.forEach(field => { + enqueue.sendTo(context.formRef, { + type: 'FIELD.ADD', + field: { + name: field, + value: context.parent.getSnapshot().context.clerk?.client?.signUp?.[field] || '', + }, + }); + }); + }), + ], on: { SUBMIT: { guard: not('isExampleMode'), From 0b2d91338613f1ab372b00925b37959118d3be4d Mon Sep 17 00:00:00 2001 From: Alex Carpenter Date: Wed, 10 Jul 2024 11:19:22 -0400 Subject: [PATCH 3/5] add changeset --- .changeset/rich-needles-admire.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/rich-needles-admire.md diff --git a/.changeset/rich-needles-admire.md b/.changeset/rich-needles-admire.md new file mode 100644 index 00000000000..e736969683f --- /dev/null +++ b/.changeset/rich-needles-admire.md @@ -0,0 +1,5 @@ +--- +"@clerk/elements": patch +--- + +Prefill populated fields when navigating back to the start step from the verify step From 8469f677de526c018329598d205270860bcc2cba Mon Sep 17 00:00:00 2001 From: Alex Carpenter Date: Wed, 10 Jul 2024 12:26:01 -0400 Subject: [PATCH 4/5] revert eslint package change --- package-lock.json | 2 +- packages/ui/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9a64fb48c25..58fef2b1756 100644 --- a/package-lock.json +++ b/package-lock.json @@ -51140,7 +51140,7 @@ "react-aria-components": "^1.2.1" }, "devDependencies": { - "@clerk/eslint-config-custom": "^0.0.2", + "@clerk/eslint-config-custom": "*", "@clerk/tailwindcss-transformer": "*", "concurrently": "^8.2.2" } diff --git a/packages/ui/package.json b/packages/ui/package.json index 96a8f2aad7d..9dcb6603305 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -46,7 +46,7 @@ "react-aria-components": "^1.2.1" }, "devDependencies": { - "@clerk/eslint-config-custom": "^0.0.2", + "@clerk/eslint-config-custom": "*", "@clerk/tailwindcss-transformer": "*", "concurrently": "^8.2.2" } From 023db117233e6a4fe8dc89c926f3b4ec1557576f Mon Sep 17 00:00:00 2001 From: Bryce Kalow Date: Wed, 10 Jul 2024 12:24:39 -0500 Subject: [PATCH 5/5] package-lock surgery --- package-lock.json | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index 58fef2b1756..71cfd191826 100644 --- a/package-lock.json +++ b/package-lock.json @@ -51145,17 +51145,6 @@ "concurrently": "^8.2.2" } }, - "packages/ui/node_modules/@clerk/types": { - "version": "4.6.1", - "resolved": "https://registry.npmjs.org/@clerk/types/-/types-4.6.1.tgz", - "integrity": "sha512-QFeNKPYDmTJ88l5QYG0SPwbABk42wRMalW3M/wAtr+wnQxBCXyX2XRZe9h4g2rH1VF+wG4Xe56abeeD+xE4iEw==", - "dependencies": { - "csstype": "3.1.1" - }, - "engines": { - "node": ">=18.17.0" - } - }, "packages/ui/node_modules/@radix-ui/react-compose-refs": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.0.tgz", @@ -51187,11 +51176,6 @@ } } }, - "packages/ui/node_modules/csstype": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz", - "integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==" - }, "packages/upgrade": { "name": "@clerk/upgrade", "version": "1.0.8",