From f2b692682dda135d909f567261ee0994d63c096a Mon Sep 17 00:00:00 2001 From: Lochie Axon Date: Wed, 2 Apr 2025 17:39:34 +1100 Subject: [PATCH 01/22] update: outdated quality check version (#457) --- .github/workflows/quality.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml index f944a0ec8..e88d0b605 100644 --- a/.github/workflows/quality.yml +++ b/.github/workflows/quality.yml @@ -16,7 +16,7 @@ jobs: node-version: 16 - name: Use node_modules cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: '**/node_modules' key: ${{ runner.os }}-modules-${{ hashFiles('**/pnpm-lock.yaml') }} From 2563679160eaf142225f0a32dca22e23eca5b453 Mon Sep 17 00:00:00 2001 From: Lochie Axon Date: Wed, 2 Apr 2025 17:45:59 +1100 Subject: [PATCH 02/22] update: optimism chain logo (#455) * update chain logos * flag checks * remove --- packages/connectkit/src/assets/chains.tsx | 9 +++++++++ packages/connectkit/src/assets/logos.tsx | 10 ++++++---- packages/connectkit/src/utils/wallets.ts | 2 ++ 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/packages/connectkit/src/assets/chains.tsx b/packages/connectkit/src/assets/chains.tsx index 9821efdc8..0d8f1c268 100644 --- a/packages/connectkit/src/assets/chains.tsx +++ b/packages/connectkit/src/assets/chains.tsx @@ -152,6 +152,15 @@ export const Optimism = ({ testnet, ...props }: Logo) => ( d="M22.8188 27.6815C22.6977 27.6815 22.6041 27.6429 22.5381 27.5659C22.483 27.4778 22.4665 27.3788 22.4885 27.2687L24.7672 16.5358C24.7892 16.4147 24.8498 16.3156 24.9489 16.2385C25.0479 16.1615 25.1525 16.1229 25.2626 16.1229H29.6548C30.8767 16.1229 31.8564 16.3761 32.5939 16.8825C33.3426 17.3889 33.7168 18.1209 33.7168 19.0786C33.7168 19.3538 33.6838 19.64 33.6177 19.9372C33.3426 21.2032 32.7867 22.1389 31.95 22.7443C31.1244 23.3498 29.9905 23.6525 28.5485 23.6525H26.3194L25.5598 27.2687C25.5377 27.3898 25.4772 27.4888 25.3782 27.5659C25.2791 27.6429 25.1745 27.6815 25.0645 27.6815H22.8188ZM28.6641 21.3738C29.1264 21.3738 29.5282 21.2472 29.8695 20.994C30.2217 20.7408 30.4529 20.3776 30.563 19.9042C30.596 19.717 30.6125 19.552 30.6125 19.4089C30.6125 19.0896 30.519 18.8474 30.3318 18.6823C30.1446 18.5062 29.8255 18.4182 29.3741 18.4182H27.3926L26.7652 21.3738H28.6641Z" fill="white" /> + + + ); diff --git a/packages/connectkit/src/assets/logos.tsx b/packages/connectkit/src/assets/logos.tsx index d556a5b31..0a05ad5c7 100644 --- a/packages/connectkit/src/assets/logos.tsx +++ b/packages/connectkit/src/assets/logos.tsx @@ -1,4 +1,4 @@ -import { isFamily, isRainbow, isZerion } from '../utils/wallets'; +import { isArgent, isPhantom, isSafe } from '../utils/wallets'; export const Mock = ({ ...props }) => ( {
-
{!isZerion() ? : }
+
{!isArgent() ? : }
-
{!isFamily() ? : }
-
{!isRainbow() ? : }
+
+ {!isPhantom() ? : } +
+
{!isSafe() ? : }
); diff --git a/packages/connectkit/src/utils/wallets.ts b/packages/connectkit/src/utils/wallets.ts index 539139224..13c8383a4 100644 --- a/packages/connectkit/src/utils/wallets.ts +++ b/packages/connectkit/src/utils/wallets.ts @@ -25,6 +25,7 @@ export const isFrame = () => isWalletInstalled('Frame'); export const isPhantom = () => isWalletInstalled('Phantom'); export const isInfinityWallet = () => isWalletInstalled('InfinityWallet'); export const isRabby = () => isWalletInstalled('Rabby'); +export const isArgent = () => isWalletInstalled('Argent'); export const isFrontier = () => isWalletInstalled('Frontier'); export const isTrust = () => { if (typeof window === 'undefined') return false; @@ -39,3 +40,4 @@ export const isTalisman = () => isWalletInstalled('Talisman'); export const isFordefi = () => isWalletInstalled('Fordefi'); export const isRainbow = () => isWalletInstalled('Rainbow'); export const isZerion = () => isWalletInstalled('Zerion'); +export const isSafe = () => isWalletInstalled('Safe'); From 64280e2caded2bc76de73f7228297445f7525b75 Mon Sep 17 00:00:00 2001 From: Lochie Axon Date: Wed, 2 Apr 2025 22:23:51 +1100 Subject: [PATCH 03/22] add: lens chain icon (#458) --- packages/connectkit/src/assets/chains.tsx | 22 +++++++++++++++++++ .../connectkit/src/constants/chainConfigs.tsx | 10 +++++++++ 2 files changed, 32 insertions(+) diff --git a/packages/connectkit/src/assets/chains.tsx b/packages/connectkit/src/assets/chains.tsx index 0d8f1c268..19b0d77ec 100644 --- a/packages/connectkit/src/assets/chains.tsx +++ b/packages/connectkit/src/assets/chains.tsx @@ -108,6 +108,27 @@ export const Ethereum = ({ testnet, ...props }: Logo) => { ); }; +export const LensChain = ({ testnet, ...props }: { testnet?: boolean }) => ( + + + +); + export const Polygon = ({ testnet, ...props }: Logo) => ( ( export default { UnknownChain, Base, + LensChain, Ethereum, Polygon, Optimism, diff --git a/packages/connectkit/src/constants/chainConfigs.tsx b/packages/connectkit/src/constants/chainConfigs.tsx index 94254b634..f62d87f3e 100644 --- a/packages/connectkit/src/constants/chainConfigs.tsx +++ b/packages/connectkit/src/constants/chainConfigs.tsx @@ -37,6 +37,16 @@ export const chainConfigs: Chain[] = [ }, }, }, + { + id: 232, + name: 'Lens Chain', + logo: , + }, + { + id: 37111, + name: 'Lens Chain Testnet', + logo: , + }, { id: 3, name: 'Rinkeby', From a28540a7b22bcb52cd7bde94ce8de8b1f9ec23e3 Mon Sep 17 00:00:00 2001 From: Lochie Axon Date: Wed, 2 Apr 2025 22:34:53 +1100 Subject: [PATCH 04/22] fix: empty string (#459) --- packages/connectkit/src/components/Common/Button/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/connectkit/src/components/Common/Button/index.tsx b/packages/connectkit/src/components/Common/Button/index.tsx index 1e1ecc994..0d722b47c 100644 --- a/packages/connectkit/src/components/Common/Button/index.tsx +++ b/packages/connectkit/src/components/Common/Button/index.tsx @@ -42,7 +42,7 @@ const Button: React.FC = ({ : flattenChildren(children).join(''); // Need to generate a string for the key so we can automatically animate between content const hrefUrl = - typeof href === 'string' ? href : flattenChildren(href).join(''); // Need to have a flat string for the href + href && (typeof href === 'string' ? href : flattenChildren(href).join('')); // Need to have a flat string for the href return ( Date: Wed, 2 Apr 2025 23:55:43 +1100 Subject: [PATCH 05/22] add: family connector (#456) * locales * family support * add logo * Update CHANGELOG.md * clean up * cleanup --- CHANGELOG.md | 16 ++ .../testbench/src/components/Web3Provider.tsx | 1 + packages/connectkit/package.json | 1 + packages/connectkit/src/assets/logos.tsx | 23 +- .../components/Common/ConnectorList/index.tsx | 23 +- .../components/Common/ConnectorList/styles.ts | 6 + .../Common/FamilyAccountsButton/index.tsx | 41 ++++ .../Common/FamilyAccountsButton/styles.ts | 79 +++++++ .../src/components/Common/Modal/index.tsx | 10 +- .../src/components/Common/Modal/styles.ts | 8 +- .../components/ConnectModal/ConnectUsing.tsx | 2 + .../ConnectWithInjector/index.tsx | 41 +++- .../ConnectModal/ConnectWithQRCode.tsx | 10 +- .../src/components/Pages/Connectors/index.tsx | 123 ++++++---- .../src/components/Pages/Connectors/styles.ts | 6 + packages/connectkit/src/defaultConfig.ts | 8 + packages/connectkit/src/defaultConnectors.ts | 13 +- .../hooks/connectors/useWalletConnectUri.ts | 2 +- .../connectkit/src/hooks/useConnectors.ts | 9 +- .../src/localizations/locales/ar-AE.ts | 12 +- .../src/localizations/locales/ca-AD.ts | 223 +++++++++--------- .../src/localizations/locales/ee-EE.ts | 2 + .../src/localizations/locales/en-US.ts | 8 +- .../src/localizations/locales/es-ES.ts | 2 + .../src/localizations/locales/fa-IR.ts | 2 + .../src/localizations/locales/fr-FR.ts | 2 + .../src/localizations/locales/ja-JP.ts | 8 +- .../src/localizations/locales/pt-BR.ts | 13 +- .../src/localizations/locales/ru-RU.ts | 6 +- .../src/localizations/locales/tr-TR.ts | 5 +- .../src/localizations/locales/vi-VN.ts | 2 + .../src/localizations/locales/zh-CN.ts | 2 + packages/connectkit/src/styles/index.ts | 14 +- packages/connectkit/src/utils/index.ts | 6 + .../connectkit/src/wallets/walletConfigs.tsx | 7 + yarn.lock | 22 ++ 36 files changed, 567 insertions(+), 191 deletions(-) create mode 100644 packages/connectkit/src/components/Common/FamilyAccountsButton/index.tsx create mode 100644 packages/connectkit/src/components/Common/FamilyAccountsButton/styles.ts diff --git a/CHANGELOG.md b/CHANGELOG.md index 47c0fe2a3..49746bf04 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,19 @@ +# 1.9.0 + +We're thrilled to announce a major upgrade to ConnectKit—designed to make onboarding and navigating Ethereum simpler and safer than ever. + +Introducing [Family Accounts](https://app.family.co), simplified onboarding for new users. + +Learn more by reading the announcement [here](https://family.co/blog/family-accounts). + +## New + +- Support for [Family Accounts](https://app.family.co). + +## Improved + +- Updates chain logos for `zora`, `base`, `optimism` and `lens`. + # 1.8.2 This update includes improvements to the `CoinbaseWalletSDK` connect popup and `MockConnector`. diff --git a/examples/testbench/src/components/Web3Provider.tsx b/examples/testbench/src/components/Web3Provider.tsx index 82622c1e6..18d42e94c 100644 --- a/examples/testbench/src/components/Web3Provider.tsx +++ b/examples/testbench/src/components/Web3Provider.tsx @@ -41,6 +41,7 @@ export const ckConfig = getDefaultConfig({ appName: 'ConnectKit testbench', appIcon: '/app.png', walletConnectProjectId: process.env.NEXT_PUBLIC_WALLETCONNECT_PROJECT_ID!, + //enableFamily: false, }); const customConfig = { ...ckConfig, diff --git a/packages/connectkit/package.json b/packages/connectkit/package.json index 1ca012997..cfc0e62aa 100644 --- a/packages/connectkit/package.json +++ b/packages/connectkit/package.json @@ -41,6 +41,7 @@ "dependencies": { "buffer": "^6.0.3", "detect-browser": "^5.3.0", + "family": "^0.1.1", "framer-motion": "^6.3.11", "qrcode": "^1.5.0", "react-transition-state": "^1.1.4", diff --git a/packages/connectkit/src/assets/logos.tsx b/packages/connectkit/src/assets/logos.tsx index 0a05ad5c7..46d61899b 100644 --- a/packages/connectkit/src/assets/logos.tsx +++ b/packages/connectkit/src/assets/logos.tsx @@ -384,6 +384,24 @@ export const Coinbase = ({ background = false, ...props }) => ( ); +export const FamilyAccount = () => ( + + + + +); + export const Family = ({ ...props }) => { const img = 'data:image/png;base64,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'; @@ -1262,12 +1280,12 @@ export const OtherWallets = ({ ...props }) => { position: 'relative', display: 'flex', flexDirection: 'column', - gap: 2, + gap: 3, }; const row: React.CSSProperties = { position: 'relative', display: 'flex', - gap: 2, + gap: 3, }; const cell: React.CSSProperties = { width: '50%', @@ -1331,6 +1349,7 @@ export default { MetaMask, Coinbase, Family, + FamilyAccount, Trust, Argent, ImToken, diff --git a/packages/connectkit/src/components/Common/ConnectorList/index.tsx b/packages/connectkit/src/components/Common/ConnectorList/index.tsx index 436c21d5f..beea9c35f 100644 --- a/packages/connectkit/src/components/Common/ConnectorList/index.tsx +++ b/packages/connectkit/src/components/Common/ConnectorList/index.tsx @@ -22,6 +22,11 @@ import { } from '../../../utils'; import { useLastConnector } from '../../../hooks/useLastConnector'; import { useConnect } from '../../../hooks/useConnect'; +import { + useFamilyAccountsConnector, + useFamilyConnector, +} from '../../../hooks/useConnectors'; +import { isFamily } from '../../../utils/wallets'; const ConnectorList = () => { const context = useContext(); @@ -29,17 +34,28 @@ const ConnectorList = () => { const wallets = useWallets(); const { lastConnectorId } = useLastConnector(); + const familyConnector = useFamilyConnector(); + const familyAccountsConnector = useFamilyAccountsConnector(); + + let filteredWallets = wallets.filter( + (wallet) => wallet.id !== familyAccountsConnector?.id + ); + if (familyConnector && isFamily()) { + filteredWallets = filteredWallets.filter( + (wallet) => wallet.id !== familyConnector?.id + ); + } const walletsToDisplay = context.options?.hideRecentBadge || lastConnectorId === 'walletConnect' // do not hoist walletconnect to top of list - ? wallets + ? filteredWallets : [ // move last used wallet to top of list // using .filter and spread to avoid mutating original array order with .sort - ...wallets.filter( + ...filteredWallets.filter( (wallet) => lastConnectorId === wallet.connector.id ), - ...wallets.filter( + ...filteredWallets.filter( (wallet) => lastConnectorId !== wallet.connector.id ), ]; @@ -134,6 +150,7 @@ const ConnectorItem = ({ {wallet.iconConnector ?? wallet.icon} diff --git a/packages/connectkit/src/components/Common/ConnectorList/styles.ts b/packages/connectkit/src/components/Common/ConnectorList/styles.ts index 0557aedff..0c4fbdbd3 100644 --- a/packages/connectkit/src/components/Common/ConnectorList/styles.ts +++ b/packages/connectkit/src/components/Common/ConnectorList/styles.ts @@ -212,6 +212,12 @@ const styles = { &[data-shape='square'] { border-radius: 0; } + + &[data-background='true'] { + border-radius: 22.5%; + background: var(--ck-body-background-tertiary); + padding: 8%; + } `, }, }; diff --git a/packages/connectkit/src/components/Common/FamilyAccountsButton/index.tsx b/packages/connectkit/src/components/Common/FamilyAccountsButton/index.tsx new file mode 100644 index 000000000..7dbde54ed --- /dev/null +++ b/packages/connectkit/src/components/Common/FamilyAccountsButton/index.tsx @@ -0,0 +1,41 @@ +import { + ButtonContainer, + InnerContainer, + IconContainer, + ButtonContainerInner, +} from './styles'; +import FitText from '../FitText'; +import useLocales from '../../../hooks/useLocales'; + +const FamilyLogo = () => ( + + + +); + +export const FamilyAccountsButton = ({ onClick }: { onClick: () => void }) => { + const locales = useLocales(); + return ( + + + + + + + {locales.continueWithFamily} + + + + ); +}; diff --git a/packages/connectkit/src/components/Common/FamilyAccountsButton/styles.ts b/packages/connectkit/src/components/Common/FamilyAccountsButton/styles.ts new file mode 100644 index 000000000..85016e55f --- /dev/null +++ b/packages/connectkit/src/components/Common/FamilyAccountsButton/styles.ts @@ -0,0 +1,79 @@ +import { motion } from 'framer-motion'; +import styled from './../../../styles/styled'; + +export const ButtonContainerInner = styled(motion.div)` + display: flex; + align-items: center; + justify-content: center; + inset: 0; + height: 100%; +`; +export const ButtonContainer = styled.button` + --color: #ffffff; + --background: var(--ck-family-accounts-brand); + --box-shadow: var(--ck-primary-button-box-shadow); + --border-radius: var(--ck-primary-button-border-radius); + --font-weight: var(--ck-primary-button-font-weight, 500); + + --hover-color: var(--ck-button-primary-hover-color, var(--color)); + --hover-background: var( + --ck-primary-button-hover-background, + var(--background) + ); + --hover-box-shadow: var( + --ck-primary-button-hover-box-shadow, + var(--box-shadow) + ); + --hover-border-radius: var( + --ck-primary-button-hover-border-radius, + var(--border-radius) + ); + --hover-font-weight: var(--ck-primary-button-font-weight, var(--font-weight)); + + appearance: none; + cursor: pointer; + user-select: none; + min-width: fit-content; + width: 100%; + display: block; + text-align: center; + height: 48px; + margin: 18px 0 2px; + line-height: 48px; + padding: 0 4px; + font-size: 16px; + font-weight: var(--font-weight, 500); + text-decoration: none; + white-space: nowrap; + transition: 100ms ease; + transition-property: box-shadow, background-color; + color: var(--color); + background: var(--background); + border-radius: var(--border-radius); + box-shadow: var(--box-shadow); + will-change: transform, box-shadow, background-color, color; +`; + +export const InnerContainer = styled.div` + transform: translateZ(0); // Shifting fix + position: relative; + display: inline-block; + vertical-align: middle; + max-width: calc(100% - 42px); + transition: opacity 300ms ease; +`; + +export const IconContainer = styled.div` + position: relative; + display: inline-block; + vertical-align: middle; + max-width: 20px; + max-height: 20px; + margin: 0 12px 0 0; + svg { + display: block; + position: relative; + max-width: 100%; + height: auto; + } +`; diff --git a/packages/connectkit/src/components/Common/Modal/index.tsx b/packages/connectkit/src/components/Common/Modal/index.tsx index 29e90aecc..c80c429d3 100644 --- a/packages/connectkit/src/components/Common/Modal/index.tsx +++ b/packages/connectkit/src/components/Common/Modal/index.tsx @@ -697,10 +697,16 @@ const Page: React.FC = ({ ); }; -export const OrDivider = ({ children }: { children?: React.ReactNode }) => { +export const OrDivider = ({ + children, + hideHr, +}: { + children?: React.ReactNode; + hideHr?: boolean; +}) => { const locales = useLocales(); return ( - + {children ?? locales.or} ); diff --git a/packages/connectkit/src/components/Common/Modal/styles.ts b/packages/connectkit/src/components/Common/Modal/styles.ts index 4d90071ec..0c9dbd69b 100644 --- a/packages/connectkit/src/components/Common/Modal/styles.ts +++ b/packages/connectkit/src/components/Common/Modal/styles.ts @@ -71,7 +71,9 @@ export const PageContent = styled(motion.div)` padding-top: 48px; `; -export const TextWithHr = styled(motion.div)` +export const TextWithHr = styled(motion.div)<{ + $disableHr?: boolean; +}>` user-select: none; position: relative; display: block; @@ -90,6 +92,9 @@ export const TextWithHr = styled(motion.div)` background: var(--ck-body-background); transition: background-color 200ms ease; } + ${(props) => + !props.$disableHr && + ` &:before { z-index: 2; content: ''; @@ -102,6 +107,7 @@ export const TextWithHr = styled(motion.div)` background: var(--ck-body-divider); box-shadow: var(--ck-body-divider-box-shadow); } + `} `; export const ModalHeading = styled(motion.div)` z-index: 3; diff --git a/packages/connectkit/src/components/ConnectModal/ConnectUsing.tsx b/packages/connectkit/src/components/ConnectModal/ConnectUsing.tsx index 877e945c5..f41a416d1 100644 --- a/packages/connectkit/src/components/ConnectModal/ConnectUsing.tsx +++ b/packages/connectkit/src/components/ConnectModal/ConnectUsing.tsx @@ -54,6 +54,7 @@ const ConnectUsing = () => { switchConnectMethod={(id?: string) => { //if (id) setId(id); setStatus(states.INJECTOR); + setTimeout(context.triggerResize, 10); // delay required here for modal to resize }} /> @@ -70,6 +71,7 @@ const ConnectUsing = () => { switchConnectMethod={(id?: string) => { //if (id) setId(id); setStatus(states.QRCODE); + setTimeout(context.triggerResize, 10); // delay required here for modal to resize }} /> diff --git a/packages/connectkit/src/components/ConnectModal/ConnectWithInjector/index.tsx b/packages/connectkit/src/components/ConnectModal/ConnectWithInjector/index.tsx index abacab0ee..e8b934772 100644 --- a/packages/connectkit/src/components/ConnectModal/ConnectWithInjector/index.tsx +++ b/packages/connectkit/src/components/ConnectModal/ConnectWithInjector/index.tsx @@ -27,7 +27,11 @@ import SquircleSpinner from './SquircleSpinner'; import { RetryIconCircle, Scan } from '../../../assets/icons'; import BrowserIcon from '../../Common/BrowserIcon'; import { AlertIcon, TickIcon } from '../../../assets/icons'; -import { detectBrowser, isWalletConnectConnector } from '../../../utils'; +import { + detectBrowser, + isFamilyAccountsConnector, + isWalletConnectConnector, +} from '../../../utils'; import useLocales from '../../../hooks/useLocales'; import { useConnect } from '../../../hooks/useConnect'; import { useContext } from '../../ConnectKit'; @@ -340,6 +344,16 @@ const ConnectWithInjector: React.FC<{ {locales.injectionScreen_failed_p} + + {isFamilyAccountsConnector(wallet.id) && ( + <> + + + + )} + {/* Reason: Coinbase Wallet does not expose a QRURI when extension is installed */} {/* {wallet?.getWalletConnectDeeplink && @@ -365,11 +379,28 @@ const ConnectWithInjector: React.FC<{ exit={'exit'} variants={contentVariants} > - + {locales.injectionScreen_rejected_h1} {locales.injectionScreen_rejected_p} + {isFamilyAccountsConnector(wallet.id) && ( + <> + + + + )} + {/* Reason: Coinbase Wallet does not expose a QRURI when extension is installed */} {/* {wallet?.getWalletConnectDeeplink && @@ -395,7 +426,11 @@ const ConnectWithInjector: React.FC<{ exit={'exit'} variants={contentVariants} > - + {wallet.connector.id === 'injected' ? locales.injectionScreen_connecting_injected_h1 diff --git a/packages/connectkit/src/components/ConnectModal/ConnectWithQRCode.tsx b/packages/connectkit/src/components/ConnectModal/ConnectWithQRCode.tsx index 7bb7cae9d..cfa6b9ba7 100644 --- a/packages/connectkit/src/components/ConnectModal/ConnectWithQRCode.tsx +++ b/packages/connectkit/src/components/ConnectModal/ConnectWithQRCode.tsx @@ -5,7 +5,7 @@ import { useWalletConnectModal } from '../../hooks/useWalletConnectModal'; import { detectBrowser, - isCoinbaseWalletConnector, + isFamilyAccountsConnector, isWalletConnectConnector, } from '../../utils'; @@ -130,6 +130,14 @@ const ConnectWithQRCode: React.FC<{ )} + {isFamilyAccountsConnector(wallet.id) && ( + <> + + + + )} {/* {hasExtensionInstalled && ( // Run the extension - )} + + + {familyAccountsConnector && ( + <> + { + if (familyConnector && isFamily()) { + context.setConnector(familyConnector); + } else { + context.setConnector(familyAccountsConnector); + } + context.setRoute(routes.CONNECT); + }} + /> + {locales.orSelectWallet} + + )} +
+ + {isMobile ? ( + <> + + + {locales.connectorsScreen_h1} + {locales.connectorsScreen_p} + + + {!context.options?.hideQuestionMarkCTA && ( + + )} + {!context.options?.hideNoWalletCTA && ( + + )} + + + + ) : ( + <> {!context.options?.hideNoWalletCTA && ( - + + context.setRoute(routes.ONBOARDING)} + > + {locales.connectorsScreen_newcomer} + + )} - - - - ) : ( - <> - {!context.options?.hideNoWalletCTA && ( - - context.setRoute(routes.ONBOARDING)} - > - {locales.connectorsScreen_newcomer} - - + + )} + {context.options?.disclaimer && ( + +
{context.options?.disclaimer}
+ )} - - )} - {context.options?.disclaimer && ( - -
{context.options?.disclaimer}
- - )} +
+ ); }; diff --git a/packages/connectkit/src/components/Pages/Connectors/styles.ts b/packages/connectkit/src/components/Pages/Connectors/styles.ts index d439628e6..22d9dd8b6 100644 --- a/packages/connectkit/src/components/Pages/Connectors/styles.ts +++ b/packages/connectkit/src/components/Pages/Connectors/styles.ts @@ -9,6 +9,12 @@ const Shimmer = keyframes` 100%{ transform: translate(100%) rotate(-80deg); } `; +export const Container = styled(motion.div)` + display: flex; + flex-direction: column; + gap: 12px; +`; + export const InfoBox = styled.div` padding: 24px 24px 28px; border-radius: var(--ck-tertiary-border-radius, 24px); diff --git a/packages/connectkit/src/defaultConfig.ts b/packages/connectkit/src/defaultConfig.ts index 719a59ccd..de6850699 100644 --- a/packages/connectkit/src/defaultConfig.ts +++ b/packages/connectkit/src/defaultConfig.ts @@ -2,6 +2,7 @@ import { http } from 'wagmi'; import { type CreateConfigParameters } from '@wagmi/core'; import { mainnet, polygon, optimism, arbitrum } from 'wagmi/chains'; import { CoinbaseWalletParameters } from 'wagmi/connectors'; +import { EthereumProviderOptions as FamilyOptions } from 'family'; import defaultConnectors from './defaultConnectors'; @@ -21,6 +22,9 @@ type DefaultConfigProps = { walletConnectProjectId: string; // Coinbase Wallet preference coinbaseWalletPreference?: CoinbaseWalletParameters<'4'>['preference']; + // Family options (https://app.family.co) + enableFamily?: boolean; + familyOptions?: FamilyOptions; } & Partial; const defaultConfig = ({ @@ -32,6 +36,8 @@ const defaultConfig = ({ coinbaseWalletPreference, chains = [mainnet, polygon, optimism, arbitrum], client, + enableFamily = true, + familyOptions, ...props }: DefaultConfigProps): CreateConfigParameters => { globalAppName = appName; @@ -53,6 +59,8 @@ const defaultConfig = ({ }, walletConnectProjectId, coinbaseWalletPreference, + enableFamily, + familyOptions, }); const config: CreateConfigParameters = { diff --git a/packages/connectkit/src/defaultConnectors.ts b/packages/connectkit/src/defaultConnectors.ts index 514b2283d..fd049103b 100644 --- a/packages/connectkit/src/defaultConnectors.ts +++ b/packages/connectkit/src/defaultConnectors.ts @@ -7,6 +7,11 @@ import { safe, } from '@wagmi/connectors'; +import { + EthereumProviderOptions as FamilyOptions, + familyAccountsConnector, +} from 'family'; + type DefaultConnectorsProps = { app: { name: string; @@ -16,18 +21,24 @@ type DefaultConnectorsProps = { }; walletConnectProjectId?: string; coinbaseWalletPreference?: CoinbaseWalletParameters<'4'>['preference']; + enableFamily?: boolean; + familyOptions?: FamilyOptions; }; const defaultConnectors = ({ app, walletConnectProjectId, coinbaseWalletPreference, + enableFamily, + familyOptions, }: DefaultConnectorsProps): CreateConnectorFn[] => { const hasAllAppData = app.name && app.icon && app.description && app.url; const shouldUseSafeConnector = !(typeof window === 'undefined') && window?.parent !== window; - const connectors: CreateConnectorFn[] = []; + const connectors: CreateConnectorFn[] = enableFamily + ? [familyAccountsConnector(familyOptions)] + : []; // If we're in an iframe, include the SafeConnector if (shouldUseSafeConnector) { diff --git a/packages/connectkit/src/hooks/connectors/useWalletConnectUri.ts b/packages/connectkit/src/hooks/connectors/useWalletConnectUri.ts index b5b785637..b43db83ae 100644 --- a/packages/connectkit/src/hooks/connectors/useWalletConnectUri.ts +++ b/packages/connectkit/src/hooks/connectors/useWalletConnectUri.ts @@ -18,7 +18,7 @@ export function useWalletConnectUri( const [uri, setUri] = useState(undefined); - const connector: Connector = useWalletConnectConnector(); + const connector = useWalletConnectConnector(); const { isConnected } = useAccount(); const { connectAsync } = useConnect(); diff --git a/packages/connectkit/src/hooks/useConnectors.ts b/packages/connectkit/src/hooks/useConnectors.ts index 8f9a17660..2ab20dc8c 100644 --- a/packages/connectkit/src/hooks/useConnectors.ts +++ b/packages/connectkit/src/hooks/useConnectors.ts @@ -14,7 +14,14 @@ export function useConnector(id: string, uuid?: string) { (c) => c.id === id && c.name.includes('Injected') ) as Connector; } - return connectors.find((c) => c.id === id) as Connector; + return connectors.find((c) => c.id === id); +} + +export function useFamilyAccountsConnector() { + return useConnector('familyAccountsProvider'); +} +export function useFamilyConnector() { + return useConnector('co.family.wallet'); } export function useInjectedConnector(uuid?: string) { diff --git a/packages/connectkit/src/localizations/locales/ar-AE.ts b/packages/connectkit/src/localizations/locales/ar-AE.ts index 1bc9667e4..8d7b9588d 100644 --- a/packages/connectkit/src/localizations/locales/ar-AE.ts +++ b/packages/connectkit/src/localizations/locales/ar-AE.ts @@ -1,6 +1,8 @@ import { LocaleProps } from './'; +import enUS from './en-US'; const arAE: LocaleProps = { + ...enUS, // fallback connectWallet: 'الاتصال بالمحفظة', disconnect: 'قطع الاتصال', connected: 'متصل', @@ -16,7 +18,7 @@ const arAE: LocaleProps = { more: 'المزيد', tryAgain: 'حاول مجددًا', tryAgainQuestion: 'هل نحاول مرة أخرى؟', - dontHaveTheApp: "ليس لديك التطبيق؟", + dontHaveTheApp: 'ليس لديك التطبيق؟', scanTheQRCode: 'مسح رمز الاستجابة السريعة', useWalletConnectModal: 'استخدم نموذج ولِيت‌كنيكت', useModal: 'استخدم النموذج', @@ -46,7 +48,7 @@ const arAE: LocaleProps = { onboardingScreen_ctaUrl: `https://ethereum.org/ar/wallets/find-wallet/`, aboutScreen_heading: `حول المحافظ`, - aboutScreen_a_h1: `حافظ على أصولك الرقمية`, + aboutScreen_a_h1: `حافظ على أصولك الرقمية`, aboutScreen_a_p: `تمكنك المحافظ من إرسال واستقبال وتخزين والتفاعل مع الأصول الرقمية مثل NFTs ورموز إيثريوم الأخرى.`, aboutScreen_b_h1: `وسيلة أفضل لتسجيل الدخول`, aboutScreen_b_p: `في تطبيقات العصر الحديث، يمكن استخدام محفظتك كوسيلة سهلة لتسجيل الدخول بدلاً من الحاجة إلى تذكر كلمة مرور.`, @@ -102,17 +104,17 @@ const arAE: LocaleProps = { switchNetworkScreen_heading: 'تبديل الشبكات', signInWithEthereumScreen_tooltip: -'أنت غير مسجل الدخول حاليًا إلى هذا التطبيق.\n**سجل الدخول باستخدام إثيريوم** للمتابعة.', + 'أنت غير مسجل الدخول حاليًا إلى هذا التطبيق.\n**سجل الدخول باستخدام إثيريوم** للمتابعة.', signInWithEthereumScreen_signedOut_heading: 'سجل الدخول باستخدام إثيريوم', signInWithEthereumScreen_signedOut_h1: -'يود هذا التطبيق التحقق منك \n كصاحب لهذه المحفظة.', + 'يود هذا التطبيق التحقق منك \n كصاحب لهذه المحفظة.', signInWithEthereumScreen_signedOut_p: `يرجى تأكيد طلب الرسالة في محفظتك للمتابعة.`, signInWithEthereumScreen_signedOut_button: 'سجل الدخول', signInWithEthereumScreen_signedIn_heading: 'تم تسجيل الدخول باستخدام إثيريوم', signInWithEthereumScreen_signedIn_h1: -'لقد قمت بتأكيد نفسك كصاحب لهذه المحفظة بنجاح.', + 'لقد قمت بتأكيد نفسك كصاحب لهذه المحفظة بنجاح.', signInWithEthereumScreen_signedIn_p: `سيتطلب تسجيل الخروج منك إعادة المصادقة مرة أخرى في المستقبل.`, signInWithEthereumScreen_signedIn_button: 'تسجيل الخروج', }; diff --git a/packages/connectkit/src/localizations/locales/ca-AD.ts b/packages/connectkit/src/localizations/locales/ca-AD.ts index 490e639b8..46b5c1d00 100644 --- a/packages/connectkit/src/localizations/locales/ca-AD.ts +++ b/packages/connectkit/src/localizations/locales/ca-AD.ts @@ -1,116 +1,121 @@ import { LocaleProps } from './'; +import enUS from './en-US'; const caAD: LocaleProps = { + ...enUS, // fallback connectWallet: 'Connecta la cartera', - disconnect: 'Desconnectar', - connected: 'Connectat', - wrongNetwork: 'Xarxa incorrecta', - switchNetworks: 'Canvi de xarxa', - chainNetwork: 'Xarxa {{ CHAIN }}', - copyToClipboard: 'Copia al portapapers', - copyCode: 'Copia codi', - moreInformation: 'Més informació', - back: 'Enrere', - close: 'Tanca', - or: 'o', - more: 'Més', - tryAgain: 'Torna-ho a intentar', - tryAgainQuestion: 'Tornar a intentar-ho?', - dontHaveTheApp: "No tens l'aplicació?", - scanTheQRCode: 'Escaneja el codi QR', - useWalletConnectModal: 'Utilitza WalletConnect Modal', - useModal: 'Utilitza Modal', - installTheExtension: "Instal·la l'extensió", - getWalletName: 'Obté {{ CONNECTORNAME }}', - otherWallets: 'Altres carteres', - learnMore: 'Més informació', - getWallet: 'Obté una cartera', - approveInWallet: 'Aprova a la cartera', - confirmInWallet: 'Confirma a la cartera', - awaitingConfirmation: 'Esperant confirmació', - signIn: 'Inicia sessió', - signOut: 'Tanca sessió', - signedIn: 'Sessió iniciada', - signedOut: 'Sessió tancada', - walletNotConnected: 'Cartera no connectada', - - warnings_walletSwitchingUnsupported: `La teva cartera no permet canviar de xarxa des d'aquesta aplicació.`, - warnings_walletSwitchingUnsupportedResolve: `Prova a canviar de xarxa des de la teva cartera.`, - warnings_chainUnsupported: `Aquesta aplicació no és compatible amb la xarxa connectada actualment.`, - warnings_chainUnsupportedResolve: `Canvia o desconnecta per continuar.`, - - onboardingScreen_heading: `Obté una cartera`, - onboardingScreen_h1: `Comença a explorar la Web3`, - onboardingScreen_p: `La teva cartera és el portal d'accés a tot el relacionat amb Ethereum, la tecnologia màgica que permet explorar la Web3.`, - onboardingScreen_ctaText: `Tria la teva primera cartera`, - onboardingScreen_ctaUrl: `https://ethereum.org/es/wallets/find-wallet/`, - - aboutScreen_heading: `Sobre les carteres`, - aboutScreen_a_h1: `Per als teus actius digitals`, - aboutScreen_a_p: `Les carteres et permeten enviar, rebre, emmagatzemar i interactuar amb actius digitals com els NFT i altres tokens d'Ethereum.`, - aboutScreen_b_h1: `Una manera millor d'iniciar sessió`, - aboutScreen_b_p: `Amb les aplicacions modernes, pots utilitzar la teva cartera per iniciar sessió fàcilment, en lloc de haver de recordar una contrasenya.`, - aboutScreen_c_h1: `Explora el món de la Web3`, - aboutScreen_c_p: `La teva cartera és una eina essencial que et permet explorar i participar en el món en ràpida evolució de la Web3.`, - aboutScreen_ctaText: `Més informació`, - aboutScreen_ctaUrl: `https://ethereum.org/es/wallets/`, - - connectorsScreen_heading: `Connecta una cartera`, - connectorsScreen_newcomer: `No tinc una cartera`, - connectorsScreen_h1: `Què és una cartera?`, - connectorsScreen_p: `Les carteres s'utilitzen per enviar, rebre i emmagatzemar actius digitals. Si connectes una cartera, podràs interactuar amb les aplicacions.`, - - mobileConnectorsScreen_heading: `Tria una cartera`, - - scanScreen_heading: `Escaneja amb el telèfon`, - scanScreen_heading_withConnector: `Escaneja amb {{ CONNECTORNAME }}`, - scanScreen_tooltip_walletConnect: `Obre una cartera compatible amb WalletConnect [WALLETCONNECTLOGO] per escanejar`, - scanScreen_tooltip_default: `Obre {{ CONNECTORNAME }} en el teu telèfon mòbil per escanejar`, - - downloadAppScreen_heading: `Obté {{ CONNECTORNAME }}`, - downloadAppScreen_iosAndroid: `Escaneja amb la càmera del teu telèfon per descarregar-la en iOS o Android.`, - downloadAppScreen_ios: `Escaneja amb la càmera del teu telèfon per descarregar-la en iOS.`, - downloadAppScreen_android: `Escaneja amb la càmera del teu telèfon per descarregar-la en Android.`, - - injectionScreen_unavailable_h1: `Navegador no compatible`, - injectionScreen_unavailable_p: `Per connectar la teva cartera de {{ CONNECTORSHORTNAME }}, instal·la l'extensió en {{ SUGGESTEDEXTENSIONBROWSER }}.`, - - injectionScreen_install_h1: `Instal·la {{ CONNECTORNAME }}`, - injectionScreen_install_p: `Per connectar la teva cartera de {{ CONNECTORSHORTNAME }}, instal·la l'extensió del navegador.`, - - injectionScreen_connecting_h1: `Sol·licitud de connexió`, - injectionScreen_connecting_p: `Obre l'extensió del navegador de {{ CONNECTORSHORTNAME }} per connectar la teva cartera.`, - - injectionScreen_connecting_injected_h1: `Sol·licitud de connexió`, - injectionScreen_connecting_injected_p: `Accepta la sol·licitud a través de la teva cartera per connectar-te a aquesta aplicació.`, - - injectionScreen_connected_h1: `Ja connectada`, - injectionScreen_connected_p: `Ja pots tancar aquesta finestra emergent`, - - injectionScreen_rejected_h1: `Sol·licitud cancel·lada`, - injectionScreen_rejected_p: `Has cancel·lat la sol·licitud. Fes clic a dalt per tornar-ho a intentar.`, - - injectionScreen_failed_h1: `Error de connexió`, - injectionScreen_failed_p: `Ho sentim, hi ha hagut un problema. Intenta connectar-te de nou.`, - - injectionScreen_notconnected_h1: `Inicia sessió en {{ CONNECTORNAME }}`, - injectionScreen_notconnected_p: `Per continuar, inicia sessió en la teva extensió de {{ CONNECTORNAME }}.`, - - profileScreen_heading: 'Connectat', - - switchNetworkScreen_heading: 'Canvi de xarxa', - - signInWithEthereumScreen_tooltip: 'No has iniciat sessió en aquesta aplicació.\n**Inicia sessió amb Ethereum** per continuar.', - - signInWithEthereumScreen_signedOut_heading: 'Inicia sessió amb Ethereum', - signInWithEthereumScreen_signedOut_h1: "Aquesta aplicació vol verificar que ets el propietari d'aquesta cartera.", - signInWithEthereumScreen_signedOut_p: `Signa la sol·licitud de missatge en la teva cartera per continuar.`, - signInWithEthereumScreen_signedOut_button: 'Inicia sessió', - - signInWithEthereumScreen_signedIn_heading: 'Sessió iniciada amb Ethereum', - signInWithEthereumScreen_signedIn_h1: "T'has verificat correctament com a propietari d'aquesta cartera.", - signInWithEthereumScreen_signedIn_p: `Si tanques la sessió, hauràs de tornar a autenticar-te més endavant.`, - signInWithEthereumScreen_signedIn_button: 'Tanca sessió', + disconnect: 'Desconnectar', + connected: 'Connectat', + wrongNetwork: 'Xarxa incorrecta', + switchNetworks: 'Canvi de xarxa', + chainNetwork: 'Xarxa {{ CHAIN }}', + copyToClipboard: 'Copia al portapapers', + copyCode: 'Copia codi', + moreInformation: 'Més informació', + back: 'Enrere', + close: 'Tanca', + or: 'o', + more: 'Més', + tryAgain: 'Torna-ho a intentar', + tryAgainQuestion: 'Tornar a intentar-ho?', + dontHaveTheApp: "No tens l'aplicació?", + scanTheQRCode: 'Escaneja el codi QR', + useWalletConnectModal: 'Utilitza WalletConnect Modal', + useModal: 'Utilitza Modal', + installTheExtension: "Instal·la l'extensió", + getWalletName: 'Obté {{ CONNECTORNAME }}', + otherWallets: 'Altres carteres', + learnMore: 'Més informació', + getWallet: 'Obté una cartera', + approveInWallet: 'Aprova a la cartera', + confirmInWallet: 'Confirma a la cartera', + awaitingConfirmation: 'Esperant confirmació', + signIn: 'Inicia sessió', + signOut: 'Tanca sessió', + signedIn: 'Sessió iniciada', + signedOut: 'Sessió tancada', + walletNotConnected: 'Cartera no connectada', + + warnings_walletSwitchingUnsupported: `La teva cartera no permet canviar de xarxa des d'aquesta aplicació.`, + warnings_walletSwitchingUnsupportedResolve: `Prova a canviar de xarxa des de la teva cartera.`, + warnings_chainUnsupported: `Aquesta aplicació no és compatible amb la xarxa connectada actualment.`, + warnings_chainUnsupportedResolve: `Canvia o desconnecta per continuar.`, + + onboardingScreen_heading: `Obté una cartera`, + onboardingScreen_h1: `Comença a explorar la Web3`, + onboardingScreen_p: `La teva cartera és el portal d'accés a tot el relacionat amb Ethereum, la tecnologia màgica que permet explorar la Web3.`, + onboardingScreen_ctaText: `Tria la teva primera cartera`, + onboardingScreen_ctaUrl: `https://ethereum.org/es/wallets/find-wallet/`, + + aboutScreen_heading: `Sobre les carteres`, + aboutScreen_a_h1: `Per als teus actius digitals`, + aboutScreen_a_p: `Les carteres et permeten enviar, rebre, emmagatzemar i interactuar amb actius digitals com els NFT i altres tokens d'Ethereum.`, + aboutScreen_b_h1: `Una manera millor d'iniciar sessió`, + aboutScreen_b_p: `Amb les aplicacions modernes, pots utilitzar la teva cartera per iniciar sessió fàcilment, en lloc de haver de recordar una contrasenya.`, + aboutScreen_c_h1: `Explora el món de la Web3`, + aboutScreen_c_p: `La teva cartera és una eina essencial que et permet explorar i participar en el món en ràpida evolució de la Web3.`, + aboutScreen_ctaText: `Més informació`, + aboutScreen_ctaUrl: `https://ethereum.org/es/wallets/`, + + connectorsScreen_heading: `Connecta una cartera`, + connectorsScreen_newcomer: `No tinc una cartera`, + connectorsScreen_h1: `Què és una cartera?`, + connectorsScreen_p: `Les carteres s'utilitzen per enviar, rebre i emmagatzemar actius digitals. Si connectes una cartera, podràs interactuar amb les aplicacions.`, + + mobileConnectorsScreen_heading: `Tria una cartera`, + + scanScreen_heading: `Escaneja amb el telèfon`, + scanScreen_heading_withConnector: `Escaneja amb {{ CONNECTORNAME }}`, + scanScreen_tooltip_walletConnect: `Obre una cartera compatible amb WalletConnect [WALLETCONNECTLOGO] per escanejar`, + scanScreen_tooltip_default: `Obre {{ CONNECTORNAME }} en el teu telèfon mòbil per escanejar`, + + downloadAppScreen_heading: `Obté {{ CONNECTORNAME }}`, + downloadAppScreen_iosAndroid: `Escaneja amb la càmera del teu telèfon per descarregar-la en iOS o Android.`, + downloadAppScreen_ios: `Escaneja amb la càmera del teu telèfon per descarregar-la en iOS.`, + downloadAppScreen_android: `Escaneja amb la càmera del teu telèfon per descarregar-la en Android.`, + + injectionScreen_unavailable_h1: `Navegador no compatible`, + injectionScreen_unavailable_p: `Per connectar la teva cartera de {{ CONNECTORSHORTNAME }}, instal·la l'extensió en {{ SUGGESTEDEXTENSIONBROWSER }}.`, + + injectionScreen_install_h1: `Instal·la {{ CONNECTORNAME }}`, + injectionScreen_install_p: `Per connectar la teva cartera de {{ CONNECTORSHORTNAME }}, instal·la l'extensió del navegador.`, + + injectionScreen_connecting_h1: `Sol·licitud de connexió`, + injectionScreen_connecting_p: `Obre l'extensió del navegador de {{ CONNECTORSHORTNAME }} per connectar la teva cartera.`, + + injectionScreen_connecting_injected_h1: `Sol·licitud de connexió`, + injectionScreen_connecting_injected_p: `Accepta la sol·licitud a través de la teva cartera per connectar-te a aquesta aplicació.`, + + injectionScreen_connected_h1: `Ja connectada`, + injectionScreen_connected_p: `Ja pots tancar aquesta finestra emergent`, + + injectionScreen_rejected_h1: `Sol·licitud cancel·lada`, + injectionScreen_rejected_p: `Has cancel·lat la sol·licitud. Fes clic a dalt per tornar-ho a intentar.`, + + injectionScreen_failed_h1: `Error de connexió`, + injectionScreen_failed_p: `Ho sentim, hi ha hagut un problema. Intenta connectar-te de nou.`, + + injectionScreen_notconnected_h1: `Inicia sessió en {{ CONNECTORNAME }}`, + injectionScreen_notconnected_p: `Per continuar, inicia sessió en la teva extensió de {{ CONNECTORNAME }}.`, + + profileScreen_heading: 'Connectat', + + switchNetworkScreen_heading: 'Canvi de xarxa', + + signInWithEthereumScreen_tooltip: + 'No has iniciat sessió en aquesta aplicació.\n**Inicia sessió amb Ethereum** per continuar.', + + signInWithEthereumScreen_signedOut_heading: 'Inicia sessió amb Ethereum', + signInWithEthereumScreen_signedOut_h1: + "Aquesta aplicació vol verificar que ets el propietari d'aquesta cartera.", + signInWithEthereumScreen_signedOut_p: `Signa la sol·licitud de missatge en la teva cartera per continuar.`, + signInWithEthereumScreen_signedOut_button: 'Inicia sessió', + + signInWithEthereumScreen_signedIn_heading: 'Sessió iniciada amb Ethereum', + signInWithEthereumScreen_signedIn_h1: + "T'has verificat correctament com a propietari d'aquesta cartera.", + signInWithEthereumScreen_signedIn_p: `Si tanques la sessió, hauràs de tornar a autenticar-te més endavant.`, + signInWithEthereumScreen_signedIn_button: 'Tanca sessió', }; export default caAD; diff --git a/packages/connectkit/src/localizations/locales/ee-EE.ts b/packages/connectkit/src/localizations/locales/ee-EE.ts index ce408882f..b0607d043 100644 --- a/packages/connectkit/src/localizations/locales/ee-EE.ts +++ b/packages/connectkit/src/localizations/locales/ee-EE.ts @@ -1,6 +1,8 @@ import { LocaleProps } from './'; +import enUS from './en-US'; const eeEE: LocaleProps = { + ...enUS, // fallback connectWallet: 'Ühenda rahakott', disconnect: 'Katkesta ühendus', connected: 'Ühendatud', diff --git a/packages/connectkit/src/localizations/locales/en-US.ts b/packages/connectkit/src/localizations/locales/en-US.ts index 0fcbac9d6..1ceb63744 100644 --- a/packages/connectkit/src/localizations/locales/en-US.ts +++ b/packages/connectkit/src/localizations/locales/en-US.ts @@ -1,4 +1,10 @@ const enUS = { + // Family Account + continueWithFamily: 'Continue with Family', + orSelectWallet: 'or select a wallet from the list below', + loginWithEmailOrPhone: 'Login with Email or Phone', + connectWithFamilyIOS: 'Connect with Family iOS', + // ConnectKit connectWallet: 'Connect Wallet', disconnect: 'Disconnect', connected: 'Connected', @@ -68,7 +74,7 @@ const enUS = { downloadAppScreen_heading: `Get {{ CONNECTORNAME }}`, downloadAppScreen_iosAndroid: `Scan with your phone camera to download on iOS or Android.`, downloadAppScreen_ios: `Scan with your phone camera to download on iOS.`, - downloadAppScreen_android: `Scan with your phone camera to download Android.`, + downloadAppScreen_android: `Scan with your phone camera to download on Android.`, injectionScreen_unavailable_h1: `Unsupported Browser`, injectionScreen_unavailable_p: `To connect your {{ CONNECTORSHORTNAME }} wallet,\ninstall the extension on {{ SUGGESTEDEXTENSIONBROWSER }}.`, diff --git a/packages/connectkit/src/localizations/locales/es-ES.ts b/packages/connectkit/src/localizations/locales/es-ES.ts index 56a44a8b8..c183e9ece 100644 --- a/packages/connectkit/src/localizations/locales/es-ES.ts +++ b/packages/connectkit/src/localizations/locales/es-ES.ts @@ -1,6 +1,8 @@ import { LocaleProps } from './'; +import enUS from './en-US'; const esES: LocaleProps = { + ...enUS, // fallback connectWallet: 'Conecta una cartera', disconnect: 'Desconectar', connected: 'Conectado', diff --git a/packages/connectkit/src/localizations/locales/fa-IR.ts b/packages/connectkit/src/localizations/locales/fa-IR.ts index 0da6ab35e..861f092fb 100644 --- a/packages/connectkit/src/localizations/locales/fa-IR.ts +++ b/packages/connectkit/src/localizations/locales/fa-IR.ts @@ -1,6 +1,8 @@ import { LocaleProps } from './'; +import enUS from './en-US'; const faIR: LocaleProps = { + ...enUS, // fallback connectWallet: 'اتصال به کیف پول', disconnect: 'قطع ارتباط', connected: 'متصل شد', diff --git a/packages/connectkit/src/localizations/locales/fr-FR.ts b/packages/connectkit/src/localizations/locales/fr-FR.ts index 4cf37cb9f..e8d152301 100644 --- a/packages/connectkit/src/localizations/locales/fr-FR.ts +++ b/packages/connectkit/src/localizations/locales/fr-FR.ts @@ -1,6 +1,8 @@ import { LocaleProps } from './'; +import enUS from './en-US'; const frFR: LocaleProps = { + ...enUS, // fallback connectWallet: 'Connecter le portefeuille', disconnect: 'Déconnecter', connected: 'Connecté', diff --git a/packages/connectkit/src/localizations/locales/ja-JP.ts b/packages/connectkit/src/localizations/locales/ja-JP.ts index 3d6ef9c34..ab7291bd2 100644 --- a/packages/connectkit/src/localizations/locales/ja-JP.ts +++ b/packages/connectkit/src/localizations/locales/ja-JP.ts @@ -1,4 +1,8 @@ -export default { +import { LocaleProps } from './'; +import enUS from './en-US'; + +const jaJP: LocaleProps = { + ...enUS, // fallback connectWallet: 'ウォレットの接続', disconnect: '切断', connected: '接続されました', @@ -111,3 +115,5 @@ export default { signInWithEthereumScreen_signedIn_p: `サインアウトすると、今後 再度認証する必要があります。`, signInWithEthereumScreen_signedIn_button: 'サインアウト', }; + +export default jaJP; diff --git a/packages/connectkit/src/localizations/locales/pt-BR.ts b/packages/connectkit/src/localizations/locales/pt-BR.ts index d623fa537..0f649ca19 100644 --- a/packages/connectkit/src/localizations/locales/pt-BR.ts +++ b/packages/connectkit/src/localizations/locales/pt-BR.ts @@ -1,6 +1,8 @@ import { LocaleProps } from './'; +import enUS from './en-US'; const ptBR: LocaleProps = { + ...enUS, // fallback connectWallet: 'Conectar carteira', disconnect: 'Desconectar', connected: 'Conectado', @@ -101,16 +103,19 @@ const ptBR: LocaleProps = { switchNetworkScreen_heading: 'Alternar rede', - signInWithEthereumScreen_tooltip: 'Você não está conectado a este aplicativo.\n**Entre com Ethereum** para continuar.', + signInWithEthereumScreen_tooltip: + 'Você não está conectado a este aplicativo.\n**Entre com Ethereum** para continuar.', signInWithEthereumScreen_signedOut_heading: 'Entrar com Ethereum', - signInWithEthereumScreen_signedOut_h1: 'Este aplicativo gostaria de verificar você \n como o proprietário desta carteira.', + signInWithEthereumScreen_signedOut_h1: + 'Este aplicativo gostaria de verificar você \n como o proprietário desta carteira.', signInWithEthereumScreen_signedOut_p: `Por favor, assine o pedido de mensagem \n em sua carteira para continuar.`, signInWithEthereumScreen_signedOut_button: 'Entrar', signInWithEthereumScreen_signedIn_heading: 'Conectado com Ethereum', - signInWithEthereumScreen_signedIn_h1: 'Você se verificou com sucesso \n como o proprietário desta carteira', + signInWithEthereumScreen_signedIn_h1: + 'Você se verificou com sucesso \n como o proprietário desta carteira', signInWithEthereumScreen_signedIn_p: `Se sair, será necessário que você \n autentique novamente no futuro.`, - signInWithEthereumScreen_signedIn_button: 'Sair' + signInWithEthereumScreen_signedIn_button: 'Sair', }; export default ptBR; diff --git a/packages/connectkit/src/localizations/locales/ru-RU.ts b/packages/connectkit/src/localizations/locales/ru-RU.ts index 87accce08..1ff69778f 100644 --- a/packages/connectkit/src/localizations/locales/ru-RU.ts +++ b/packages/connectkit/src/localizations/locales/ru-RU.ts @@ -1,6 +1,8 @@ import { LocaleProps } from './'; +import enUS from './en-US'; const ruRU: LocaleProps = { + ...enUS, // fallback connectWallet: 'Подключить кошелек', disconnect: 'Отключить', connected: 'Подключена', @@ -46,7 +48,7 @@ const ruRU: LocaleProps = { onboardingScreen_ctaUrl: `https://ethereum.org/en/wallets/find-wallet/`, aboutScreen_heading: `О кошельках`, - aboutScreen_a_h1: `Для ваших цифровых активов`, + aboutScreen_a_h1: `Для ваших цифровых активов`, aboutScreen_a_p: `Кошельки позволяют вам отправлять, получать, хранить и взаимодействовать с цифровыми активами, такими как NFT и другие токены Ethereum.`, aboutScreen_b_h1: `Лучший способ входа`, aboutScreen_b_p: `В современных приложениях ваш кошелек можно использовать как удобный способ входа без необходимости помнить пароль.`, @@ -115,4 +117,4 @@ const ruRU: LocaleProps = { signInWithEthereumScreen_signedIn_button: 'Выйти', }; -export default ruRU; \ No newline at end of file +export default ruRU; diff --git a/packages/connectkit/src/localizations/locales/tr-TR.ts b/packages/connectkit/src/localizations/locales/tr-TR.ts index ccc64fa5e..d2bc30d05 100644 --- a/packages/connectkit/src/localizations/locales/tr-TR.ts +++ b/packages/connectkit/src/localizations/locales/tr-TR.ts @@ -1,6 +1,8 @@ import { LocaleProps } from './'; +import enUS from './en-US'; const trTR: LocaleProps = { + ...enUS, // fallback connectWallet: 'Cüzdan Bağla', disconnect: 'Bağlantıyı Kes', connected: 'Bağlandı', @@ -16,7 +18,7 @@ const trTR: LocaleProps = { more: 'Daha Fazla', tryAgain: 'Tekrar Dene', tryAgainQuestion: 'Tekrar Dene?', - dontHaveTheApp: "Uygulaman yok mu?", + dontHaveTheApp: 'Uygulaman yok mu?', scanTheQRCode: 'Karekodu tarat', useWalletConnectModal: 'WalletConnect Modalini Kullan ', useModal: 'Modal Kullan', @@ -74,7 +76,6 @@ const trTR: LocaleProps = { injectionScreen_unavailable_h1: `Desteklenmeyen Tarayıcı`, injectionScreen_unavailable_p: `{{ CONNECTORSHORTNAME }} cüzdanına bağlanmak için\n{{ SUGGESTEDEXTENSIONBROWSER }} üzerinde indirmen gerekiyor.`, - injectionScreen_install_h1: `{{ CONNECTORNAME }} İndir`, injectionScreen_install_p: `{{ CONNECTORSHORTNAME }} cüzdanına bağlanmak için,\ntarayıcı eklentisini indir.`, diff --git a/packages/connectkit/src/localizations/locales/vi-VN.ts b/packages/connectkit/src/localizations/locales/vi-VN.ts index f53debd48..cf834c809 100644 --- a/packages/connectkit/src/localizations/locales/vi-VN.ts +++ b/packages/connectkit/src/localizations/locales/vi-VN.ts @@ -1,6 +1,8 @@ import { LocaleProps } from './'; +import enUS from './en-US'; const viVN: LocaleProps = { + ...enUS, // fallback connectWallet: 'Kết nối ví', disconnect: 'Ngắt kết nối', connected: 'Đã kết nối', diff --git a/packages/connectkit/src/localizations/locales/zh-CN.ts b/packages/connectkit/src/localizations/locales/zh-CN.ts index f390c1bd0..b16680ce6 100644 --- a/packages/connectkit/src/localizations/locales/zh-CN.ts +++ b/packages/connectkit/src/localizations/locales/zh-CN.ts @@ -1,6 +1,8 @@ import { LocaleProps } from './'; +import enUS from './en-US'; const zhCN: LocaleProps = { + ...enUS, // fallback connectWallet: '绑定钱包', disconnect: '解除绑定', connected: '已绑定', diff --git a/packages/connectkit/src/styles/index.ts b/packages/connectkit/src/styles/index.ts index af0b94613..e8134d4a2 100644 --- a/packages/connectkit/src/styles/index.ts +++ b/packages/connectkit/src/styles/index.ts @@ -31,7 +31,7 @@ const themeGlobals = { '--ck-graphic-scaniconwithlogos-04': '#F6F7F9', '--ck-chain-ethereum-01': '#25292E', - '--ck-chain-ethereum-02': '#fff', + '--ck-chain-ethereum-02': '#ffffff', '--ck-chain-ethereum-03': '#DFE0E0', }, dark: { @@ -90,6 +90,7 @@ const themeGlobals = { }, }, brand: { + '--ck-family-accounts-brand': '#0FCCCC', '--ck-family-brand': '#1A88F8', '--ck-brand-walletConnect': '#3B99FC', '--ck-brand-coinbaseWallet': '#0052FF', @@ -170,11 +171,11 @@ const themes = { nouns: createCssColors(themeColors.nouns), }; const globals = { - brand: createCssVars(themeGlobals.brand), - ensLight: createCssVars(themeGlobals.ens.light), - ensDark: createCssVars(themeGlobals.ens.dark), - graphicsLight: createCssVars(themeGlobals.graphics.light), - graphicsDark: createCssVars(themeGlobals.graphics.dark), + brand: createCssColors(themeGlobals.brand), + ensLight: createCssColors(themeGlobals.ens.light), + ensDark: createCssColors(themeGlobals.ens.dark), + graphicsLight: createCssColors(themeGlobals.graphics.light), + graphicsDark: createCssColors(themeGlobals.graphics.dark), }; const globalsLight = css` @@ -262,7 +263,6 @@ export const ResetContainer = styled(motion.div)<{ } }} - ${(props) => { if ( props.$customTheme && diff --git a/packages/connectkit/src/utils/index.ts b/packages/connectkit/src/utils/index.ts index 66f22e8ac..4257156ee 100644 --- a/packages/connectkit/src/utils/index.ts +++ b/packages/connectkit/src/utils/index.ts @@ -80,6 +80,12 @@ function flattenChildren(children: React.ReactNode): ReactChildArray { export const isWalletConnectConnector = (connectorId?: string) => connectorId === 'walletConnect'; +export const isFamilyAccountsConnector = (connectorId?: string) => + connectorId === 'familyAccountsProvider'; + +export const isFamilyConnector = (connectorId?: string) => + connectorId === 'co.family.wallet'; + export const isMetaMaskConnector = (connectorId?: string) => connectorId === 'metaMaskSDK'; diff --git a/packages/connectkit/src/wallets/walletConfigs.tsx b/packages/connectkit/src/wallets/walletConfigs.tsx index 557fb0266..dadf9057b 100644 --- a/packages/connectkit/src/wallets/walletConfigs.tsx +++ b/packages/connectkit/src/wallets/walletConfigs.tsx @@ -129,6 +129,13 @@ export const walletConfigs: { : `familywallet://wc?uri=${encodeURIComponent(uri)}`; }, }, + familyAccountsProvider: { + name: 'Family', + shortName: 'Family', + icon: , + iconConnector: , + iconShape: 'squircle', + }, frame: { name: 'Frame', icon: , diff --git a/yarn.lock b/yarn.lock index d73eb2652..cf1590374 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7218,6 +7218,7 @@ __metadata: "@types/styled-components": ^5.1.25 buffer: ^6.0.3 detect-browser: ^5.3.0 + family: ^0.1.1 framer-motion: ^6.3.11 qrcode: ^1.5.0 react-transition-state: ^1.1.4 @@ -9691,6 +9692,27 @@ __metadata: languageName: unknown linkType: soft +"family@npm:^0.1.1": + version: 0.1.1 + resolution: "family@npm:0.1.1" + peerDependencies: + react: 17.x || 18.x || 19.x + react-dom: 17.x || 18.x || 19.x + viem: 2.x + wagmi: 2.x + peerDependenciesMeta: + react: + optional: true + react-dom: + optional: true + viem: + optional: true + wagmi: + optional: true + checksum: 520006079a7c3f8ac1b5c492d30ab7bfa7f19f396aa2992bbe42e24ae1f65b4511ff1e6c25b325428cbbaaaae61b44cb6fca2bbddcf5307758c8f7f44fe9fb59 + languageName: node + linkType: hard + "fast-deep-equal@npm:^3.1.1, fast-deep-equal@npm:^3.1.3": version: 3.1.3 resolution: "fast-deep-equal@npm:3.1.3" From 1d1e5ea8a39834e0d55a2be53a5895aa53baf1dd Mon Sep 17 00:00:00 2001 From: Lochie Axon Date: Thu, 3 Apr 2025 00:32:27 +1100 Subject: [PATCH 06/22] version 1.9.0 --- packages/connectkit/package.json | 2 +- packages/connectkit/src/index.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/connectkit/package.json b/packages/connectkit/package.json index cfc0e62aa..a36eec5fe 100644 --- a/packages/connectkit/package.json +++ b/packages/connectkit/package.json @@ -1,6 +1,6 @@ { "name": "connectkit", - "version": "1.8.2", + "version": "1.9.0", "author": "Family", "homepage": "https://docs.family.co/connectkit", "license": "BSD-2-Clause license", diff --git a/packages/connectkit/src/index.ts b/packages/connectkit/src/index.ts index a9a16a772..1c947ce7f 100644 --- a/packages/connectkit/src/index.ts +++ b/packages/connectkit/src/index.ts @@ -1,4 +1,4 @@ -export const CONNECTKIT_VERSION = '1.8.2'; +export const CONNECTKIT_VERSION = '1.9.0'; export * as Types from './types'; export { default as getDefaultConfig } from './defaultConfig'; From 27cb532915495771f0c700f2ff7e29dbdcb93ad2 Mon Sep 17 00:00:00 2001 From: Lochie Axon Date: Wed, 21 May 2025 23:16:25 +1000 Subject: [PATCH 07/22] update: family branding --- packages/connectkit/src/styles/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/connectkit/src/styles/index.ts b/packages/connectkit/src/styles/index.ts index e8134d4a2..7a358cd98 100644 --- a/packages/connectkit/src/styles/index.ts +++ b/packages/connectkit/src/styles/index.ts @@ -90,7 +90,7 @@ const themeGlobals = { }, }, brand: { - '--ck-family-accounts-brand': '#0FCCCC', + '--ck-family-accounts-brand': '#0090ff', '--ck-family-brand': '#1A88F8', '--ck-brand-walletConnect': '#3B99FC', '--ck-brand-coinbaseWallet': '#0052FF', From b9ba493a36fce9d2efb0824b8cceb75225c9c9bf Mon Sep 17 00:00:00 2001 From: Lochie Axon Date: Fri, 13 Jun 2025 15:23:11 +1000 Subject: [PATCH 08/22] update: family sdk version + features (#464) * improve locale handling * bump family * add switch wallet support in family connector * update family logo --- packages/connectkit/package.json | 2 +- packages/connectkit/src/assets/logos.tsx | 3 +- .../src/components/Pages/Profile/index.tsx | 35 ++++++++++++++++++- packages/connectkit/src/hooks/useLocales.tsx | 9 ++--- .../src/localizations/locales/en-US.ts | 1 + yarn.lock | 10 +++--- 6 files changed, 47 insertions(+), 13 deletions(-) diff --git a/packages/connectkit/package.json b/packages/connectkit/package.json index a36eec5fe..9673f2931 100644 --- a/packages/connectkit/package.json +++ b/packages/connectkit/package.json @@ -41,7 +41,7 @@ "dependencies": { "buffer": "^6.0.3", "detect-browser": "^5.3.0", - "family": "^0.1.1", + "family": "^0.1.2", "framer-motion": "^6.3.11", "qrcode": "^1.5.0", "react-transition-state": "^1.1.4", diff --git a/packages/connectkit/src/assets/logos.tsx b/packages/connectkit/src/assets/logos.tsx index 46d61899b..1c2649ed0 100644 --- a/packages/connectkit/src/assets/logos.tsx +++ b/packages/connectkit/src/assets/logos.tsx @@ -392,12 +392,11 @@ export const FamilyAccount = () => ( fill="none" xmlns="http://www.w3.org/2000/svg" > - ); diff --git a/packages/connectkit/src/components/Pages/Profile/index.tsx b/packages/connectkit/src/components/Pages/Profile/index.tsx index b4c65f558..04f6cbdbc 100644 --- a/packages/connectkit/src/components/Pages/Profile/index.tsx +++ b/packages/connectkit/src/components/Pages/Profile/index.tsx @@ -1,6 +1,7 @@ import React, { useEffect, useState } from 'react'; import { useContext } from '../../ConnectKit'; import { + isFamilyAccountsConnector, isSafeConnector, nFormatter, truncateEthAddress, @@ -12,6 +13,7 @@ import { useAccount, useEnsName, useBalance, + useConnectorClient, } from 'wagmi'; import { @@ -50,6 +52,11 @@ const Profile: React.FC<{ closeModal?: () => void }> = ({ closeModal }) => { const { disconnect } = useDisconnect(); const { address, isConnected, connector, chain } = useAccount(); + const isFamilyConnector = isFamilyAccountsConnector(connector?.id); + const { data: connectorClient } = useConnectorClient({ + connector, + }); + const ensFallbackConfig = useEnsFallbackConfig(); const { data: ensName } = useEnsName({ chainId: 1, @@ -135,10 +142,36 @@ const Profile: React.FC<{ closeModal?: () => void }> = ({ closeModal }) => { )} + + {isFamilyConnector && ( + <> + + + )} {!isSafeConnector(connector?.id) && ( diff --git a/packages/connectkit/src/hooks/useLocales.tsx b/packages/connectkit/src/hooks/useLocales.tsx index 266f488a5..452da38ec 100644 --- a/packages/connectkit/src/hooks/useLocales.tsx +++ b/packages/connectkit/src/hooks/useLocales.tsx @@ -4,8 +4,9 @@ import Logos from '../assets/logos'; import { useContext } from '../components/ConnectKit'; import { getLocale } from './../localizations'; +import { LocaleProps } from '../localizations/locales'; -export default function useLocales(replacements?: any) { +export default function useLocales(replacements?: any): LocaleProps { const context = useContext(); const language = context.options?.language ?? 'en-US'; @@ -15,16 +16,16 @@ export default function useLocales(replacements?: any) { if (!translations) { console.error(`Missing translations for: ${language}`); - return `Missing translations for: ${language}`; + throw new Error(`Missing translations for: ${language}`); } - const translated: any = {}; + const translated = {}; Object.keys(translations).map((key) => { const string = translations[key]; return (translated[key] = localize(string, replacements)); }); - return translated; + return translated as LocaleProps; } const localize = (text: string, replacements?: any[string]) => { diff --git a/packages/connectkit/src/localizations/locales/en-US.ts b/packages/connectkit/src/localizations/locales/en-US.ts index 1ceb63744..c914bf0c2 100644 --- a/packages/connectkit/src/localizations/locales/en-US.ts +++ b/packages/connectkit/src/localizations/locales/en-US.ts @@ -10,6 +10,7 @@ const enUS = { connected: 'Connected', wrongNetwork: 'Wrong Network', switchNetworks: 'Switch Networks', + switchWallets: 'Switch Wallets', chainNetwork: '{{ CHAIN }} Network', copyToClipboard: 'Copy to Clipboard', copyCode: 'Copy Code', diff --git a/yarn.lock b/yarn.lock index cf1590374..fe62dc4d0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7218,7 +7218,7 @@ __metadata: "@types/styled-components": ^5.1.25 buffer: ^6.0.3 detect-browser: ^5.3.0 - family: ^0.1.1 + family: ^0.1.2 framer-motion: ^6.3.11 qrcode: ^1.5.0 react-transition-state: ^1.1.4 @@ -9692,9 +9692,9 @@ __metadata: languageName: unknown linkType: soft -"family@npm:^0.1.1": - version: 0.1.1 - resolution: "family@npm:0.1.1" +"family@npm:^0.1.2": + version: 0.1.2 + resolution: "family@npm:0.1.2" peerDependencies: react: 17.x || 18.x || 19.x react-dom: 17.x || 18.x || 19.x @@ -9709,7 +9709,7 @@ __metadata: optional: true wagmi: optional: true - checksum: 520006079a7c3f8ac1b5c492d30ab7bfa7f19f396aa2992bbe42e24ae1f65b4511ff1e6c25b325428cbbaaaae61b44cb6fca2bbddcf5307758c8f7f44fe9fb59 + checksum: 2e2d43b773f7c8719fcb93331416ef7710151f961e6645ae3ff87a23584335b1fe36b29099b28d6d860bacc3722888cf5de0373ea976d620b43a8daf21422274 languageName: node linkType: hard From cf8a1e2f9c36cf9fdc5fed280c9a7db103dcce78 Mon Sep 17 00:00:00 2001 From: Lochie Axon Date: Fri, 13 Jun 2025 17:14:35 +1000 Subject: [PATCH 09/22] version 1.9.1 --- CHANGELOG.md | 12 ++++++++++++ packages/connectkit/package.json | 2 +- packages/connectkit/src/index.ts | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 49746bf04..c8a4592a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,15 @@ +# 1.9.1 + +This update includes updates to the peer dependencies and improvements to the Family Accounts features. + +## Updated + +- `family` package updated to latest. + +## Improved + +- Improved support for `family` features. + # 1.9.0 We're thrilled to announce a major upgrade to ConnectKit—designed to make onboarding and navigating Ethereum simpler and safer than ever. diff --git a/packages/connectkit/package.json b/packages/connectkit/package.json index 9673f2931..9374bd108 100644 --- a/packages/connectkit/package.json +++ b/packages/connectkit/package.json @@ -1,6 +1,6 @@ { "name": "connectkit", - "version": "1.9.0", + "version": "1.9.1", "author": "Family", "homepage": "https://docs.family.co/connectkit", "license": "BSD-2-Clause license", diff --git a/packages/connectkit/src/index.ts b/packages/connectkit/src/index.ts index 1c947ce7f..023b3f059 100644 --- a/packages/connectkit/src/index.ts +++ b/packages/connectkit/src/index.ts @@ -1,4 +1,4 @@ -export const CONNECTKIT_VERSION = '1.9.0'; +export const CONNECTKIT_VERSION = '1.9.1'; export * as Types from './types'; export { default as getDefaultConfig } from './defaultConfig'; From 6095ed1e940dff2386c27f50980f89309be0ab85 Mon Sep 17 00:00:00 2001 From: Lochie Axon Date: Thu, 21 Aug 2025 22:51:26 +1000 Subject: [PATCH 10/22] update: metamask branding (#471) --- packages/connectkit/src/assets/logos.tsx | 251 ++--------------------- packages/connectkit/src/styles/index.ts | 21 +- 2 files changed, 23 insertions(+), 249 deletions(-) diff --git a/packages/connectkit/src/assets/logos.tsx b/packages/connectkit/src/assets/logos.tsx index 1c2649ed0..e1c77a1d0 100644 --- a/packages/connectkit/src/assets/logos.tsx +++ b/packages/connectkit/src/assets/logos.tsx @@ -94,265 +94,44 @@ export const MetaMask = ({ background = false, ...props }) => ( style={ background ? { - background: - 'linear-gradient(0deg, var(--ck-brand-metamask-12), var(--ck-brand-metamask-11))', + background: 'var(--ck-brand-metamask-bg)', borderRadius: '27.5%', } : undefined } - width="32" - height="32" - viewBox="0 0 32 32" + width="88" + height="88" + viewBox="0 0 88 88" fill="none" xmlns="http://www.w3.org/2000/svg" > - {/** - - - - - - - - */} - - - - - - - - - - - - - - - - - - - - - - ); diff --git a/packages/connectkit/src/styles/index.ts b/packages/connectkit/src/styles/index.ts index 7a358cd98..2b89d1c9a 100644 --- a/packages/connectkit/src/styles/index.ts +++ b/packages/connectkit/src/styles/index.ts @@ -94,19 +94,14 @@ const themeGlobals = { '--ck-family-brand': '#1A88F8', '--ck-brand-walletConnect': '#3B99FC', '--ck-brand-coinbaseWallet': '#0052FF', - '--ck-brand-metamask': '#f6851b', - '--ck-brand-metamask-01': '#F6851B', - '--ck-brand-metamask-02': '#E2761B', - '--ck-brand-metamask-03': '#CD6116', - '--ck-brand-metamask-04': '#161616', - '--ck-brand-metamask-05': '#763D16', - '--ck-brand-metamask-06': '#D7C1B3', - '--ck-brand-metamask-07': '#C0AD9E', - '--ck-brand-metamask-08': '#E4761B', - '--ck-brand-metamask-09': '#233447', - '--ck-brand-metamask-10': '#E4751F', - '--ck-brand-metamask-11': '#FEF5E7', - '--ck-brand-metamask-12': '#E3C8AB', + '--ck-brand-metamask': '#FF5C16', + '--ck-brand-metamask-bg': '#FFF2EB', + '--ck-brand-metamask-01': '#FF5C16', + '--ck-brand-metamask-02': '#E34807', + '--ck-brand-metamask-03': '#FF8D5D', + '--ck-brand-metamask-04': '#661800', + '--ck-brand-metamask-05': '#C0C4CD', + '--ck-brand-metamask-06': '#E7EBF6', '--ck-brand-trust-01': '#3375BB', '--ck-brand-trust-02': '#ffffff', '--ck-brand-trust-01b': '#ffffff', // dark Theme From 35b9af6f9361cf94ccd897207d23f253ce8e48c6 Mon Sep 17 00:00:00 2001 From: wizard <112275929+famouswizard@users.noreply.github.com> Date: Thu, 21 Aug 2025 16:06:08 +0300 Subject: [PATCH 11/22] fix: Correct symbol for billion from 'g' to 'b' (#445) Co-authored-by: Lochie Axon --- packages/connectkit/src/utils/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/connectkit/src/utils/index.ts b/packages/connectkit/src/utils/index.ts index 4257156ee..8cfe1a2e0 100644 --- a/packages/connectkit/src/utils/index.ts +++ b/packages/connectkit/src/utils/index.ts @@ -24,7 +24,7 @@ const nFormatter = (num: number, digits: number = 2) => { { value: 1, symbol: '' }, { value: 1e3, symbol: 'k' }, { value: 1e6, symbol: 'm' }, - { value: 1e9, symbol: 'g' }, + { value: 1e9, symbol: 'b' }, { value: 1e12, symbol: 't' }, { value: 1e15, symbol: 'p' }, { value: 1e18, symbol: 'e' }, From fc5026961857f6157a9245bef3a68af312f8ad9f Mon Sep 17 00:00:00 2001 From: jxom <7336481+jxom@users.noreply.github.com> Date: Thu, 11 Sep 2025 17:07:03 +1000 Subject: [PATCH 12/22] feat: add porto (#472) --- .../connectkit/src/components/Common/ConnectorList/index.tsx | 3 ++- packages/connectkit/src/utils/index.ts | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/connectkit/src/components/Common/ConnectorList/index.tsx b/packages/connectkit/src/components/Common/ConnectorList/index.tsx index beea9c35f..4e68c691d 100644 --- a/packages/connectkit/src/components/Common/ConnectorList/index.tsx +++ b/packages/connectkit/src/components/Common/ConnectorList/index.tsx @@ -18,6 +18,7 @@ import { WalletProps, useWallets } from '../../../wallets/useWallets'; import { detectBrowser, isCoinbaseWalletConnector, + isPortoConnector, isWalletConnectConnector, } from '../../../utils'; import { useLastConnector } from '../../../hooks/useLastConnector'; @@ -121,7 +122,7 @@ const ConnectorItem = ({ // Safari requires opening popup on user gesture, so we connect immediately here const shouldConnectImmediately = (detectBrowser() === 'safari' || detectBrowser() === 'ios') && - isCoinbaseWalletConnector(wallet.connector.id); + (isCoinbaseWalletConnector(wallet.connector.id) || isPortoConnector(wallet.connector.id)); if (redirectToMoreWallets || shouldConnectImmediately) deeplink = undefined; // mobile redirects to more wallets page diff --git a/packages/connectkit/src/utils/index.ts b/packages/connectkit/src/utils/index.ts index 8cfe1a2e0..58980508f 100644 --- a/packages/connectkit/src/utils/index.ts +++ b/packages/connectkit/src/utils/index.ts @@ -95,6 +95,9 @@ export const isCoinbaseWalletConnector = (connectorId?: string) => export const isLedgerConnector = (connectorId?: string) => connectorId === 'ledger'; +export const isPortoConnector = (connectorId?: string) => + connectorId === 'xyz.ithaca.porto'; + export const isSafeConnector = (connectorId?: string) => connectorId === 'safe'; export const isInjectedConnector = (connectorId?: string) => From e5c4efb2e8cc0065415a8aa7aab1c5dfb8fbe395 Mon Sep 17 00:00:00 2001 From: Franky Date: Wed, 17 Sep 2025 13:00:13 +0200 Subject: [PATCH 13/22] feat: Add dependency review (#474) --- .github/workflows/dependency-review.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .github/workflows/dependency-review.yml diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml new file mode 100644 index 000000000..078574c42 --- /dev/null +++ b/.github/workflows/dependency-review.yml @@ -0,0 +1,19 @@ +name: 'Dependency Review' +on: [pull_request] + +permissions: + contents: read + pull-requests: write + +jobs: + dependency-review: + runs-on: ubuntu-latest + steps: + - name: 'Checkout Repository' + uses: actions/checkout@v5 + - name: 'Dependency Review' + uses: actions/dependency-review-action@v4 + with: + comment-summary-in-pr: on-failure + fail-on-severity: moderate + license-check: false From c5842b48d2216402aaa8eb127ad3bfce4fc0085c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 Dec 2025 23:17:12 +1100 Subject: [PATCH 14/22] chore(deps): bump next from 14.0.4 to 14.2.32 (#489) Bumps [next](https://github.com/vercel/next.js) from 14.0.4 to 14.2.32. - [Release notes](https://github.com/vercel/next.js/releases) - [Changelog](https://github.com/vercel/next.js/blob/canary/release.js) - [Commits](https://github.com/vercel/next.js/compare/v14.0.4...v14.2.32) --- updated-dependencies: - dependency-name: next dependency-version: 14.2.32 dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- examples/nextjs-app/package.json | 2 +- examples/nextjs/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/nextjs-app/package.json b/examples/nextjs-app/package.json index 6635b1929..1f3cc8ece 100644 --- a/examples/nextjs-app/package.json +++ b/examples/nextjs-app/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-query": "^5.17.15", "connectkit": "workspace:packages/connectkit", - "next": "14.0.4", + "next": "14.2.32", "react": "^18.2.0", "react-dom": "^18.2.0", "viem": "^2.23.2", diff --git a/examples/nextjs/package.json b/examples/nextjs/package.json index dc959359b..a32869d7c 100644 --- a/examples/nextjs/package.json +++ b/examples/nextjs/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-query": "^5.17.15", "connectkit": "workspace:packages/connectkit", - "next": "14.0.4", + "next": "14.2.32", "react": "^18.2.0", "react-dom": "^18.2.0", "viem": "^2.23.2", From 9ae5258f867f117bd828cbac6c41aa58499d0a82 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 Dec 2025 23:35:33 +1100 Subject: [PATCH 15/22] chore(deps): bump next from 14.1.0 to 14.2.32 (#490) Bumps [next](https://github.com/vercel/next.js) from 14.1.0 to 14.2.32. - [Release notes](https://github.com/vercel/next.js/releases) - [Changelog](https://github.com/vercel/next.js/blob/canary/release.js) - [Commits](https://github.com/vercel/next.js/compare/v14.1.0...v14.2.32) --- updated-dependencies: - dependency-name: next dependency-version: 14.2.32 dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- examples/nextjs-app/package.json | 2 +- examples/nextjs/package.json | 2 +- examples/testbench/package.json | 2 +- yarn.lock | 247 ++++++++++++++++++++++++------- 4 files changed, 196 insertions(+), 57 deletions(-) diff --git a/examples/nextjs-app/package.json b/examples/nextjs-app/package.json index 1f3cc8ece..f006ed17b 100644 --- a/examples/nextjs-app/package.json +++ b/examples/nextjs-app/package.json @@ -22,7 +22,7 @@ "@types/react": "^18.2.43", "eslint": "^8.15.0", "eslint-config-next": "^14.0.4", - "next": "^14.0.4", + "next": "^14.2.32", "typescript": "^5.0.4" } } diff --git a/examples/nextjs/package.json b/examples/nextjs/package.json index a32869d7c..f4cf30551 100644 --- a/examples/nextjs/package.json +++ b/examples/nextjs/package.json @@ -22,7 +22,7 @@ "@types/react": "^18.2.43", "eslint": "^8.15.0", "eslint-config-next": "^14.0.4", - "next": "^14.0.4", + "next": "^14.2.32", "typescript": "^5.0.4" } } diff --git a/examples/testbench/package.json b/examples/testbench/package.json index 8398fd786..5ba503315 100644 --- a/examples/testbench/package.json +++ b/examples/testbench/package.json @@ -13,7 +13,7 @@ "connectkit": "workspace:packages/connectkit", "connectkit-next-siwe": "workspace:packages/connectkit-next-siwe", "local-ssl-proxy": "^1.3.0", - "next": "14.1.0", + "next": "14.2.32", "react": "^18.0.0", "react-dom": "^18.0.0", "viem": "^2.23.2", diff --git a/yarn.lock b/yarn.lock index fe62dc4d0..5627da651 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3067,10 +3067,17 @@ __metadata: languageName: node linkType: hard -"@next/env@npm:14.1.0": - version: 14.1.0 - resolution: "@next/env@npm:14.1.0" - checksum: ecec03a3e9745996ed1c7fc218fc9a1a4345a0cf368afb50f38a3b6fbf6f966a36dba174c90b5f90b568188dbd0eba48a2c5448b6742298417df4ff3351c6d40 +"@next/env@npm:14.2.32": + version: 14.2.32 + resolution: "@next/env@npm:14.2.32" + checksum: 499804b4b02c95af27bd31ac533a6789ee7a986d38dc683451405994a85e82adf7afbee6b8cc31ca21b7668428627236898def5fb7b2de828706d56bdddc3463 + languageName: node + linkType: hard + +"@next/env@npm:14.2.33": + version: 14.2.33 + resolution: "@next/env@npm:14.2.33" + checksum: cd09034ab6b934a0f6841a1a3c76887331d2042551f55d65e795e09d0679777e9c333ad6531049fce38139a541053cb7fe75f7ba311323e25dc19cc467e270a3 languageName: node linkType: hard @@ -3122,9 +3129,16 @@ __metadata: languageName: node linkType: hard -"@next/swc-darwin-arm64@npm:14.1.0": - version: 14.1.0 - resolution: "@next/swc-darwin-arm64@npm:14.1.0" +"@next/swc-darwin-arm64@npm:14.2.32": + version: 14.2.32 + resolution: "@next/swc-darwin-arm64@npm:14.2.32" + conditions: os=darwin & cpu=arm64 + languageName: node + linkType: hard + +"@next/swc-darwin-arm64@npm:14.2.33": + version: 14.2.33 + resolution: "@next/swc-darwin-arm64@npm:14.2.33" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard @@ -3136,9 +3150,16 @@ __metadata: languageName: node linkType: hard -"@next/swc-darwin-x64@npm:14.1.0": - version: 14.1.0 - resolution: "@next/swc-darwin-x64@npm:14.1.0" +"@next/swc-darwin-x64@npm:14.2.32": + version: 14.2.32 + resolution: "@next/swc-darwin-x64@npm:14.2.32" + conditions: os=darwin & cpu=x64 + languageName: node + linkType: hard + +"@next/swc-darwin-x64@npm:14.2.33": + version: 14.2.33 + resolution: "@next/swc-darwin-x64@npm:14.2.33" conditions: os=darwin & cpu=x64 languageName: node linkType: hard @@ -3164,9 +3185,16 @@ __metadata: languageName: node linkType: hard -"@next/swc-linux-arm64-gnu@npm:14.1.0": - version: 14.1.0 - resolution: "@next/swc-linux-arm64-gnu@npm:14.1.0" +"@next/swc-linux-arm64-gnu@npm:14.2.32": + version: 14.2.32 + resolution: "@next/swc-linux-arm64-gnu@npm:14.2.32" + conditions: os=linux & cpu=arm64 & libc=glibc + languageName: node + linkType: hard + +"@next/swc-linux-arm64-gnu@npm:14.2.33": + version: 14.2.33 + resolution: "@next/swc-linux-arm64-gnu@npm:14.2.33" conditions: os=linux & cpu=arm64 & libc=glibc languageName: node linkType: hard @@ -3178,9 +3206,16 @@ __metadata: languageName: node linkType: hard -"@next/swc-linux-arm64-musl@npm:14.1.0": - version: 14.1.0 - resolution: "@next/swc-linux-arm64-musl@npm:14.1.0" +"@next/swc-linux-arm64-musl@npm:14.2.32": + version: 14.2.32 + resolution: "@next/swc-linux-arm64-musl@npm:14.2.32" + conditions: os=linux & cpu=arm64 & libc=musl + languageName: node + linkType: hard + +"@next/swc-linux-arm64-musl@npm:14.2.33": + version: 14.2.33 + resolution: "@next/swc-linux-arm64-musl@npm:14.2.33" conditions: os=linux & cpu=arm64 & libc=musl languageName: node linkType: hard @@ -3192,9 +3227,16 @@ __metadata: languageName: node linkType: hard -"@next/swc-linux-x64-gnu@npm:14.1.0": - version: 14.1.0 - resolution: "@next/swc-linux-x64-gnu@npm:14.1.0" +"@next/swc-linux-x64-gnu@npm:14.2.32": + version: 14.2.32 + resolution: "@next/swc-linux-x64-gnu@npm:14.2.32" + conditions: os=linux & cpu=x64 & libc=glibc + languageName: node + linkType: hard + +"@next/swc-linux-x64-gnu@npm:14.2.33": + version: 14.2.33 + resolution: "@next/swc-linux-x64-gnu@npm:14.2.33" conditions: os=linux & cpu=x64 & libc=glibc languageName: node linkType: hard @@ -3206,9 +3248,16 @@ __metadata: languageName: node linkType: hard -"@next/swc-linux-x64-musl@npm:14.1.0": - version: 14.1.0 - resolution: "@next/swc-linux-x64-musl@npm:14.1.0" +"@next/swc-linux-x64-musl@npm:14.2.32": + version: 14.2.32 + resolution: "@next/swc-linux-x64-musl@npm:14.2.32" + conditions: os=linux & cpu=x64 & libc=musl + languageName: node + linkType: hard + +"@next/swc-linux-x64-musl@npm:14.2.33": + version: 14.2.33 + resolution: "@next/swc-linux-x64-musl@npm:14.2.33" conditions: os=linux & cpu=x64 & libc=musl languageName: node linkType: hard @@ -3220,9 +3269,16 @@ __metadata: languageName: node linkType: hard -"@next/swc-win32-arm64-msvc@npm:14.1.0": - version: 14.1.0 - resolution: "@next/swc-win32-arm64-msvc@npm:14.1.0" +"@next/swc-win32-arm64-msvc@npm:14.2.32": + version: 14.2.32 + resolution: "@next/swc-win32-arm64-msvc@npm:14.2.32" + conditions: os=win32 & cpu=arm64 + languageName: node + linkType: hard + +"@next/swc-win32-arm64-msvc@npm:14.2.33": + version: 14.2.33 + resolution: "@next/swc-win32-arm64-msvc@npm:14.2.33" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard @@ -3234,9 +3290,16 @@ __metadata: languageName: node linkType: hard -"@next/swc-win32-ia32-msvc@npm:14.1.0": - version: 14.1.0 - resolution: "@next/swc-win32-ia32-msvc@npm:14.1.0" +"@next/swc-win32-ia32-msvc@npm:14.2.32": + version: 14.2.32 + resolution: "@next/swc-win32-ia32-msvc@npm:14.2.32" + conditions: os=win32 & cpu=ia32 + languageName: node + linkType: hard + +"@next/swc-win32-ia32-msvc@npm:14.2.33": + version: 14.2.33 + resolution: "@next/swc-win32-ia32-msvc@npm:14.2.33" conditions: os=win32 & cpu=ia32 languageName: node linkType: hard @@ -3248,9 +3311,16 @@ __metadata: languageName: node linkType: hard -"@next/swc-win32-x64-msvc@npm:14.1.0": - version: 14.1.0 - resolution: "@next/swc-win32-x64-msvc@npm:14.1.0" +"@next/swc-win32-x64-msvc@npm:14.2.32": + version: 14.2.32 + resolution: "@next/swc-win32-x64-msvc@npm:14.2.32" + conditions: os=win32 & cpu=x64 + languageName: node + linkType: hard + +"@next/swc-win32-x64-msvc@npm:14.2.33": + version: 14.2.33 + resolution: "@next/swc-win32-x64-msvc@npm:14.2.33" conditions: os=win32 & cpu=x64 languageName: node linkType: hard @@ -4128,6 +4198,13 @@ __metadata: languageName: node linkType: hard +"@swc/counter@npm:^0.1.3": + version: 0.1.3 + resolution: "@swc/counter@npm:0.1.3" + checksum: df8f9cfba9904d3d60f511664c70d23bb323b3a0803ec9890f60133954173047ba9bdeabce28cd70ba89ccd3fd6c71c7b0bd58be85f611e1ffbe5d5c18616598 + languageName: node + linkType: hard + "@swc/helpers@npm:0.4.11": version: 0.4.11 resolution: "@swc/helpers@npm:0.4.11" @@ -4137,12 +4214,13 @@ __metadata: languageName: node linkType: hard -"@swc/helpers@npm:0.5.2": - version: 0.5.2 - resolution: "@swc/helpers@npm:0.5.2" +"@swc/helpers@npm:0.5.5": + version: 0.5.5 + resolution: "@swc/helpers@npm:0.5.5" dependencies: + "@swc/counter": ^0.1.3 tslib: ^2.4.0 - checksum: 51d7e3d8bd56818c49d6bfbd715f0dbeedc13cf723af41166e45c03e37f109336bbcb57a1f2020f4015957721aeb21e1a7fff281233d797ff7d3dd1f447fa258 + checksum: d4f207b191e54b29460804ddf2984ba6ece1d679a0b2f6a9c765dcf27bba92c5769e7965668a4546fb9f1021eaf0ff9be4bf5c235ce12adcd65acdfe77187d11 languageName: node linkType: hard @@ -13498,21 +13576,21 @@ __metadata: languageName: node linkType: hard -"next@npm:14.1.0, next@npm:^14.0.4": - version: 14.1.0 - resolution: "next@npm:14.1.0" - dependencies: - "@next/env": 14.1.0 - "@next/swc-darwin-arm64": 14.1.0 - "@next/swc-darwin-x64": 14.1.0 - "@next/swc-linux-arm64-gnu": 14.1.0 - "@next/swc-linux-arm64-musl": 14.1.0 - "@next/swc-linux-x64-gnu": 14.1.0 - "@next/swc-linux-x64-musl": 14.1.0 - "@next/swc-win32-arm64-msvc": 14.1.0 - "@next/swc-win32-ia32-msvc": 14.1.0 - "@next/swc-win32-x64-msvc": 14.1.0 - "@swc/helpers": 0.5.2 +"next@npm:14.2.32": + version: 14.2.32 + resolution: "next@npm:14.2.32" + dependencies: + "@next/env": 14.2.32 + "@next/swc-darwin-arm64": 14.2.32 + "@next/swc-darwin-x64": 14.2.32 + "@next/swc-linux-arm64-gnu": 14.2.32 + "@next/swc-linux-arm64-musl": 14.2.32 + "@next/swc-linux-x64-gnu": 14.2.32 + "@next/swc-linux-x64-musl": 14.2.32 + "@next/swc-win32-arm64-msvc": 14.2.32 + "@next/swc-win32-ia32-msvc": 14.2.32 + "@next/swc-win32-x64-msvc": 14.2.32 + "@swc/helpers": 0.5.5 busboy: 1.6.0 caniuse-lite: ^1.0.30001579 graceful-fs: ^4.2.11 @@ -13520,6 +13598,7 @@ __metadata: styled-jsx: 5.1.1 peerDependencies: "@opentelemetry/api": ^1.1.0 + "@playwright/test": ^1.41.2 react: ^18.2.0 react-dom: ^18.2.0 sass: ^1.3.0 @@ -13545,11 +13624,71 @@ __metadata: peerDependenciesMeta: "@opentelemetry/api": optional: true + "@playwright/test": + optional: true + sass: + optional: true + bin: + next: dist/bin/next + checksum: f85c8f819a6e94d62963afc1b66bb778083ff3e369df6b0e7eb5cbb753cc965d2d48a8e03e20471d7d5cb5064ecad61b3021c5c1e2cbefa3bc81f51f64564f9a + languageName: node + linkType: hard + +"next@npm:^14.2.32": + version: 14.2.33 + resolution: "next@npm:14.2.33" + dependencies: + "@next/env": 14.2.33 + "@next/swc-darwin-arm64": 14.2.33 + "@next/swc-darwin-x64": 14.2.33 + "@next/swc-linux-arm64-gnu": 14.2.33 + "@next/swc-linux-arm64-musl": 14.2.33 + "@next/swc-linux-x64-gnu": 14.2.33 + "@next/swc-linux-x64-musl": 14.2.33 + "@next/swc-win32-arm64-msvc": 14.2.33 + "@next/swc-win32-ia32-msvc": 14.2.33 + "@next/swc-win32-x64-msvc": 14.2.33 + "@swc/helpers": 0.5.5 + busboy: 1.6.0 + caniuse-lite: ^1.0.30001579 + graceful-fs: ^4.2.11 + postcss: 8.4.31 + styled-jsx: 5.1.1 + peerDependencies: + "@opentelemetry/api": ^1.1.0 + "@playwright/test": ^1.41.2 + react: ^18.2.0 + react-dom: ^18.2.0 + sass: ^1.3.0 + dependenciesMeta: + "@next/swc-darwin-arm64": + optional: true + "@next/swc-darwin-x64": + optional: true + "@next/swc-linux-arm64-gnu": + optional: true + "@next/swc-linux-arm64-musl": + optional: true + "@next/swc-linux-x64-gnu": + optional: true + "@next/swc-linux-x64-musl": + optional: true + "@next/swc-win32-arm64-msvc": + optional: true + "@next/swc-win32-ia32-msvc": + optional: true + "@next/swc-win32-x64-msvc": + optional: true + peerDependenciesMeta: + "@opentelemetry/api": + optional: true + "@playwright/test": + optional: true sass: optional: true bin: next: dist/bin/next - checksum: 077fd76a6fe7127a8be3d11035dcefb2c829f304aaa85144e0d1b531a1549b6c9bb99459af1ef0782c1f1110ca08f6f33efd293a2dc51672dd9dc45ede608ecf + checksum: b81c486367c2b001c96468b7380d7bcf8a6d26ca17318eefc0b729f1965cfc4c700fa632df5b2ed9a363ed6d462d6bd779e6388ddd407c155bb7ea6453db66b7 languageName: node linkType: hard @@ -13563,7 +13702,7 @@ __metadata: connectkit: "workspace:packages/connectkit" eslint: ^8.15.0 eslint-config-next: ^14.0.4 - next: ^14.0.4 + next: ^14.2.32 react: ^18.2.0 react-dom: ^18.2.0 typescript: ^5.0.4 @@ -13603,7 +13742,7 @@ __metadata: connectkit: "workspace:packages/connectkit" eslint: ^8.15.0 eslint-config-next: ^14.0.4 - next: ^14.0.4 + next: ^14.2.32 react: ^18.2.0 react-dom: ^18.2.0 typescript: ^5.0.4 @@ -17753,7 +17892,7 @@ __metadata: eslint: 8.23.1 eslint-config-next: 14.1.0 local-ssl-proxy: ^1.3.0 - next: 14.1.0 + next: 14.2.32 react: ^18.0.0 react-dom: ^18.0.0 typescript: ^5.0.4 From d5969808ee4c6a1060116c0d49f1c93263fabf45 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 Dec 2025 23:50:05 +1100 Subject: [PATCH 16/22] chore(deps): bump next from 12.3.0 to 14.2.32 (#491) Bumps [next](https://github.com/vercel/next.js) from 12.3.0 to 14.2.32. - [Release notes](https://github.com/vercel/next.js/releases) - [Changelog](https://github.com/vercel/next.js/blob/canary/release.js) - [Commits](https://github.com/vercel/next.js/compare/v12.3.0...v14.2.32) --- updated-dependencies: - dependency-name: next dependency-version: 14.2.32 dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- examples/nextjs-siwe/package.json | 2 +- yarn.lock | 207 +----------------------------- 2 files changed, 4 insertions(+), 205 deletions(-) diff --git a/examples/nextjs-siwe/package.json b/examples/nextjs-siwe/package.json index 6f5e00780..9818328e4 100644 --- a/examples/nextjs-siwe/package.json +++ b/examples/nextjs-siwe/package.json @@ -11,7 +11,7 @@ "dependencies": { "connectkit": "workspace:packages/connectkit", "connectkit-next-siwe": "workspace:packages/connectkit-next-siwe", - "next": "12.3.0", + "next": "14.2.32", "react": "^18.0.0", "react-dom": "^18.0.0", "siwe": "^2.1.4", diff --git a/yarn.lock b/yarn.lock index 5627da651..70de4beae 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3060,13 +3060,6 @@ __metadata: languageName: node linkType: hard -"@next/env@npm:12.3.0": - version: 12.3.0 - resolution: "@next/env@npm:12.3.0" - checksum: 9f5d0894de00f8827f887dc737b0beebc1f268cc6809dc0f49acbcc035f4398f2af1dccb2c2f470f2ac31ef450ff5214a1a63ddd5c906b3ea52960824a2552be - languageName: node - linkType: hard - "@next/env@npm:14.2.32": version: 14.2.32 resolution: "@next/env@npm:14.2.32" @@ -3108,27 +3101,6 @@ __metadata: languageName: node linkType: hard -"@next/swc-android-arm-eabi@npm:12.3.0": - version: 12.3.0 - resolution: "@next/swc-android-arm-eabi@npm:12.3.0" - conditions: os=android & cpu=arm - languageName: node - linkType: hard - -"@next/swc-android-arm64@npm:12.3.0": - version: 12.3.0 - resolution: "@next/swc-android-arm64@npm:12.3.0" - conditions: os=android & cpu=arm64 - languageName: node - linkType: hard - -"@next/swc-darwin-arm64@npm:12.3.0": - version: 12.3.0 - resolution: "@next/swc-darwin-arm64@npm:12.3.0" - conditions: os=darwin & cpu=arm64 - languageName: node - linkType: hard - "@next/swc-darwin-arm64@npm:14.2.32": version: 14.2.32 resolution: "@next/swc-darwin-arm64@npm:14.2.32" @@ -3143,13 +3115,6 @@ __metadata: languageName: node linkType: hard -"@next/swc-darwin-x64@npm:12.3.0": - version: 12.3.0 - resolution: "@next/swc-darwin-x64@npm:12.3.0" - conditions: os=darwin & cpu=x64 - languageName: node - linkType: hard - "@next/swc-darwin-x64@npm:14.2.32": version: 14.2.32 resolution: "@next/swc-darwin-x64@npm:14.2.32" @@ -3164,27 +3129,6 @@ __metadata: languageName: node linkType: hard -"@next/swc-freebsd-x64@npm:12.3.0": - version: 12.3.0 - resolution: "@next/swc-freebsd-x64@npm:12.3.0" - conditions: os=freebsd & cpu=x64 - languageName: node - linkType: hard - -"@next/swc-linux-arm-gnueabihf@npm:12.3.0": - version: 12.3.0 - resolution: "@next/swc-linux-arm-gnueabihf@npm:12.3.0" - conditions: os=linux & cpu=arm - languageName: node - linkType: hard - -"@next/swc-linux-arm64-gnu@npm:12.3.0": - version: 12.3.0 - resolution: "@next/swc-linux-arm64-gnu@npm:12.3.0" - conditions: os=linux & cpu=arm64 & libc=glibc - languageName: node - linkType: hard - "@next/swc-linux-arm64-gnu@npm:14.2.32": version: 14.2.32 resolution: "@next/swc-linux-arm64-gnu@npm:14.2.32" @@ -3199,13 +3143,6 @@ __metadata: languageName: node linkType: hard -"@next/swc-linux-arm64-musl@npm:12.3.0": - version: 12.3.0 - resolution: "@next/swc-linux-arm64-musl@npm:12.3.0" - conditions: os=linux & cpu=arm64 & libc=musl - languageName: node - linkType: hard - "@next/swc-linux-arm64-musl@npm:14.2.32": version: 14.2.32 resolution: "@next/swc-linux-arm64-musl@npm:14.2.32" @@ -3220,13 +3157,6 @@ __metadata: languageName: node linkType: hard -"@next/swc-linux-x64-gnu@npm:12.3.0": - version: 12.3.0 - resolution: "@next/swc-linux-x64-gnu@npm:12.3.0" - conditions: os=linux & cpu=x64 & libc=glibc - languageName: node - linkType: hard - "@next/swc-linux-x64-gnu@npm:14.2.32": version: 14.2.32 resolution: "@next/swc-linux-x64-gnu@npm:14.2.32" @@ -3241,13 +3171,6 @@ __metadata: languageName: node linkType: hard -"@next/swc-linux-x64-musl@npm:12.3.0": - version: 12.3.0 - resolution: "@next/swc-linux-x64-musl@npm:12.3.0" - conditions: os=linux & cpu=x64 & libc=musl - languageName: node - linkType: hard - "@next/swc-linux-x64-musl@npm:14.2.32": version: 14.2.32 resolution: "@next/swc-linux-x64-musl@npm:14.2.32" @@ -3262,13 +3185,6 @@ __metadata: languageName: node linkType: hard -"@next/swc-win32-arm64-msvc@npm:12.3.0": - version: 12.3.0 - resolution: "@next/swc-win32-arm64-msvc@npm:12.3.0" - conditions: os=win32 & cpu=arm64 - languageName: node - linkType: hard - "@next/swc-win32-arm64-msvc@npm:14.2.32": version: 14.2.32 resolution: "@next/swc-win32-arm64-msvc@npm:14.2.32" @@ -3283,13 +3199,6 @@ __metadata: languageName: node linkType: hard -"@next/swc-win32-ia32-msvc@npm:12.3.0": - version: 12.3.0 - resolution: "@next/swc-win32-ia32-msvc@npm:12.3.0" - conditions: os=win32 & cpu=ia32 - languageName: node - linkType: hard - "@next/swc-win32-ia32-msvc@npm:14.2.32": version: 14.2.32 resolution: "@next/swc-win32-ia32-msvc@npm:14.2.32" @@ -3304,13 +3213,6 @@ __metadata: languageName: node linkType: hard -"@next/swc-win32-x64-msvc@npm:12.3.0": - version: 12.3.0 - resolution: "@next/swc-win32-x64-msvc@npm:12.3.0" - conditions: os=win32 & cpu=x64 - languageName: node - linkType: hard - "@next/swc-win32-x64-msvc@npm:14.2.32": version: 14.2.32 resolution: "@next/swc-win32-x64-msvc@npm:14.2.32" @@ -4205,15 +4107,6 @@ __metadata: languageName: node linkType: hard -"@swc/helpers@npm:0.4.11": - version: 0.4.11 - resolution: "@swc/helpers@npm:0.4.11" - dependencies: - tslib: ^2.4.0 - checksum: 736857d524b41a8a4db81094e9b027f554004e0fa3e86325d85bdb38f7e6459ce022db079edb6c61ba0f46fe8583b3e663e95f7acbd13e51b8da6c34e45bba2e - languageName: node - linkType: hard - "@swc/helpers@npm:0.5.5": version: 0.5.5 resolution: "@swc/helpers@npm:0.5.5" @@ -6834,7 +6727,7 @@ __metadata: languageName: node linkType: hard -"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001332, caniuse-lite@npm:^1.0.30001578, caniuse-lite@npm:^1.0.30001579, caniuse-lite@npm:^1.0.30001580": +"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001578, caniuse-lite@npm:^1.0.30001579, caniuse-lite@npm:^1.0.30001580": version: 1.0.30001583 resolution: "caniuse-lite@npm:1.0.30001583" checksum: 35d34eac99c1f55a2232180254e9b674dd6326a89310e6896863bb0484278c6cdf1e934c9fbfb8ef7b215c47467354051f46dfce571f9b34c413f53b67c55aa1 @@ -13463,7 +13356,7 @@ __metadata: languageName: node linkType: hard -"nanoid@npm:^3.3.4, nanoid@npm:^3.3.6, nanoid@npm:^3.3.7": +"nanoid@npm:^3.3.6, nanoid@npm:^3.3.7": version: 3.3.7 resolution: "nanoid@npm:3.3.7" bin: @@ -13507,75 +13400,6 @@ __metadata: languageName: node linkType: hard -"next@npm:12.3.0": - version: 12.3.0 - resolution: "next@npm:12.3.0" - dependencies: - "@next/env": 12.3.0 - "@next/swc-android-arm-eabi": 12.3.0 - "@next/swc-android-arm64": 12.3.0 - "@next/swc-darwin-arm64": 12.3.0 - "@next/swc-darwin-x64": 12.3.0 - "@next/swc-freebsd-x64": 12.3.0 - "@next/swc-linux-arm-gnueabihf": 12.3.0 - "@next/swc-linux-arm64-gnu": 12.3.0 - "@next/swc-linux-arm64-musl": 12.3.0 - "@next/swc-linux-x64-gnu": 12.3.0 - "@next/swc-linux-x64-musl": 12.3.0 - "@next/swc-win32-arm64-msvc": 12.3.0 - "@next/swc-win32-ia32-msvc": 12.3.0 - "@next/swc-win32-x64-msvc": 12.3.0 - "@swc/helpers": 0.4.11 - caniuse-lite: ^1.0.30001332 - postcss: 8.4.14 - styled-jsx: 5.0.6 - use-sync-external-store: 1.2.0 - peerDependencies: - fibers: ">= 3.1.0" - node-sass: ^6.0.0 || ^7.0.0 - react: ^17.0.2 || ^18.0.0-0 - react-dom: ^17.0.2 || ^18.0.0-0 - sass: ^1.3.0 - dependenciesMeta: - "@next/swc-android-arm-eabi": - optional: true - "@next/swc-android-arm64": - optional: true - "@next/swc-darwin-arm64": - optional: true - "@next/swc-darwin-x64": - optional: true - "@next/swc-freebsd-x64": - optional: true - "@next/swc-linux-arm-gnueabihf": - optional: true - "@next/swc-linux-arm64-gnu": - optional: true - "@next/swc-linux-arm64-musl": - optional: true - "@next/swc-linux-x64-gnu": - optional: true - "@next/swc-linux-x64-musl": - optional: true - "@next/swc-win32-arm64-msvc": - optional: true - "@next/swc-win32-ia32-msvc": - optional: true - "@next/swc-win32-x64-msvc": - optional: true - peerDependenciesMeta: - fibers: - optional: true - node-sass: - optional: true - sass: - optional: true - bin: - next: dist/bin/next - checksum: eafed4732d1d3cfdc4ccfdd6e1047d24b29f0d19587a03d46581e77988e4a081d206ad373de98858dfbc7109308fe1ad39d0b8443ea19276fb11fa5634080841 - languageName: node - linkType: hard - "next@npm:14.2.32": version: 14.2.32 resolution: "next@npm:14.2.32" @@ -13722,7 +13546,7 @@ __metadata: connectkit-next-siwe: "workspace:packages/connectkit-next-siwe" eslint: 8.23.1 eslint-config-next: 12.3.0 - next: 12.3.0 + next: 14.2.32 react: ^18.0.0 react-dom: ^18.0.0 siwe: ^2.1.4 @@ -15417,17 +15241,6 @@ __metadata: languageName: node linkType: hard -"postcss@npm:8.4.14": - version: 8.4.14 - resolution: "postcss@npm:8.4.14" - dependencies: - nanoid: ^3.3.4 - picocolors: ^1.0.0 - source-map-js: ^1.0.2 - checksum: fe58766ff32e4becf65a7d57678995cfd239df6deed2fe0557f038b47c94e4132e7e5f68b5aa820c13adfec32e523b693efaeb65798efb995ce49ccd83953816 - languageName: node - linkType: hard - "postcss@npm:8.4.31": version: 8.4.31 resolution: "postcss@npm:8.4.31" @@ -17556,20 +17369,6 @@ __metadata: languageName: node linkType: hard -"styled-jsx@npm:5.0.6": - version: 5.0.6 - resolution: "styled-jsx@npm:5.0.6" - peerDependencies: - react: ">= 16.8.0 || 17.x.x || ^18.0.0-0" - peerDependenciesMeta: - "@babel/core": - optional: true - babel-plugin-macros: - optional: true - checksum: 9e41cb6958fcb980dbfcfee2fb133de61cc0873df9304d2476ab35930679fc3b3c1d968a503c9b0afa459f243c288119e35d0fd31cf3066c2ba0e130c4d2f87e - languageName: node - linkType: hard - "styled-jsx@npm:5.1.1": version: 5.1.1 resolution: "styled-jsx@npm:5.1.1" From 6d1bf04eef540bd90dcfeddee60793204151d8d7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 12 Dec 2025 00:01:07 +1100 Subject: [PATCH 17/22] chore(deps): bump sha.js from 2.4.11 to 2.4.12 (#493) Bumps [sha.js](https://github.com/crypto-browserify/sha.js) from 2.4.11 to 2.4.12. - [Changelog](https://github.com/browserify/sha.js/blob/master/CHANGELOG.md) - [Commits](https://github.com/crypto-browserify/sha.js/compare/v2.4.11...v2.4.12) --- updated-dependencies: - dependency-name: sha.js dependency-version: 2.4.12 dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Lochie Axon --- yarn.lock | 270 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 262 insertions(+), 8 deletions(-) diff --git a/yarn.lock b/yarn.lock index 70de4beae..069667f8d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6094,6 +6094,20 @@ __metadata: languageName: node linkType: hard +"async-function@npm:^1.0.0": + version: 1.0.0 + resolution: "async-function@npm:1.0.0" + checksum: 9102e246d1ed9b37ac36f57f0a6ca55226876553251a31fc80677e71471f463a54c872dc78d5d7f80740c8ba624395cccbe8b60f7b690c4418f487d8e9fd1106 + languageName: node + linkType: hard + +"async-generator-function@npm:^1.0.0": + version: 1.0.0 + resolution: "async-generator-function@npm:1.0.0" + checksum: 74a71a4a2dd7afd06ebb612f6d612c7f4766a351bedffde466023bf6dae629e46b0d2cd38786239e0fbf245de0c7df76035465e16d1213774a0efb22fec0d713 + languageName: node + linkType: hard + "async-mutex@npm:^0.2.6": version: 0.2.6 resolution: "async-mutex@npm:0.2.6" @@ -6165,6 +6179,15 @@ __metadata: languageName: node linkType: hard +"available-typed-arrays@npm:^1.0.7": + version: 1.0.7 + resolution: "available-typed-arrays@npm:1.0.7" + dependencies: + possible-typed-array-names: ^1.0.0 + checksum: 1aa3ffbfe6578276996de660848b6e95669d9a95ad149e3dd0c0cda77db6ee1dbd9d1dd723b65b6d277b882dd0c4b91a654ae9d3cf9e1254b7e93e4908d78fd3 + languageName: node + linkType: hard + "axe-core@npm:=4.7.0": version: 4.7.0 resolution: "axe-core@npm:4.7.0" @@ -6648,6 +6671,16 @@ __metadata: languageName: node linkType: hard +"call-bind-apply-helpers@npm:^1.0.0, call-bind-apply-helpers@npm:^1.0.1, call-bind-apply-helpers@npm:^1.0.2": + version: 1.0.2 + resolution: "call-bind-apply-helpers@npm:1.0.2" + dependencies: + es-errors: ^1.3.0 + function-bind: ^1.1.2 + checksum: b2863d74fcf2a6948221f65d95b91b4b2d90cfe8927650b506141e669f7d5de65cea191bf788838bc40d13846b7886c5bc5c84ab96c3adbcf88ad69a72fcdc6b + languageName: node + linkType: hard + "call-bind@npm:^1.0.0, call-bind@npm:^1.0.2, call-bind@npm:^1.0.5": version: 1.0.5 resolution: "call-bind@npm:1.0.5" @@ -6659,6 +6692,28 @@ __metadata: languageName: node linkType: hard +"call-bind@npm:^1.0.8": + version: 1.0.8 + resolution: "call-bind@npm:1.0.8" + dependencies: + call-bind-apply-helpers: ^1.0.0 + es-define-property: ^1.0.0 + get-intrinsic: ^1.2.4 + set-function-length: ^1.2.2 + checksum: aa2899bce917a5392fd73bd32e71799c37c0b7ab454e0ed13af7f6727549091182aade8bbb7b55f304a5bc436d543241c14090fb8a3137e9875e23f444f4f5a9 + languageName: node + linkType: hard + +"call-bound@npm:^1.0.3, call-bound@npm:^1.0.4": + version: 1.0.4 + resolution: "call-bound@npm:1.0.4" + dependencies: + call-bind-apply-helpers: ^1.0.2 + get-intrinsic: ^1.3.0 + checksum: 2f6399488d1c272f56306ca60ff696575e2b7f31daf23bc11574798c84d9f2759dceb0cb1f471a85b77f28962a7ac6411f51d283ea2e45319009a19b6ccab3b2 + languageName: node + linkType: hard + "callsites@npm:^3.0.0": version: 3.1.0 resolution: "callsites@npm:3.1.0" @@ -7920,6 +7975,17 @@ __metadata: languageName: node linkType: hard +"define-data-property@npm:^1.1.4": + version: 1.1.4 + resolution: "define-data-property@npm:1.1.4" + dependencies: + es-define-property: ^1.0.0 + es-errors: ^1.3.0 + gopd: ^1.0.1 + checksum: 8068ee6cab694d409ac25936eb861eea704b7763f7f342adbdfe337fc27c78d7ae0eff2364b2917b58c508d723c7a074326d068eef2e45c4edcd85cf94d0313b + languageName: node + linkType: hard + "define-lazy-prop@npm:^2.0.0": version: 2.0.0 resolution: "define-lazy-prop@npm:2.0.0" @@ -8229,6 +8295,17 @@ __metadata: languageName: node linkType: hard +"dunder-proto@npm:^1.0.1": + version: 1.0.1 + resolution: "dunder-proto@npm:1.0.1" + dependencies: + call-bind-apply-helpers: ^1.0.1 + es-errors: ^1.3.0 + gopd: ^1.2.0 + checksum: 149207e36f07bd4941921b0ca929e3a28f1da7bd6b6ff8ff7f4e2f2e460675af4576eeba359c635723dc189b64cdd4787e0255897d5b135ccc5d15cb8685fc90 + languageName: node + linkType: hard + "duplexer@npm:^0.1.2": version: 0.1.2 resolution: "duplexer@npm:0.1.2" @@ -8507,6 +8584,20 @@ __metadata: languageName: node linkType: hard +"es-define-property@npm:^1.0.0, es-define-property@npm:^1.0.1": + version: 1.0.1 + resolution: "es-define-property@npm:1.0.1" + checksum: 0512f4e5d564021c9e3a644437b0155af2679d10d80f21adaf868e64d30efdfbd321631956f20f42d655fedb2e3a027da479fad3fa6048f768eb453a80a5f80a + languageName: node + linkType: hard + +"es-errors@npm:^1.3.0": + version: 1.3.0 + resolution: "es-errors@npm:1.3.0" + checksum: ec1414527a0ccacd7f15f4a3bc66e215f04f595ba23ca75cdae0927af099b5ec865f9f4d33e9d7e86f512f252876ac77d4281a7871531a50678132429b1271b5 + languageName: node + linkType: hard + "es-get-iterator@npm:^1.1.3": version: 1.1.3 resolution: "es-get-iterator@npm:1.1.3" @@ -8553,6 +8644,15 @@ __metadata: languageName: node linkType: hard +"es-object-atoms@npm:^1.0.0, es-object-atoms@npm:^1.1.1": + version: 1.1.1 + resolution: "es-object-atoms@npm:1.1.1" + dependencies: + es-errors: ^1.3.0 + checksum: 214d3767287b12f36d3d7267ef342bbbe1e89f899cfd67040309fc65032372a8e60201410a99a1645f2f90c1912c8c49c8668066f6bdd954bcd614dda2e3da97 + languageName: node + linkType: hard + "es-set-tostringtag@npm:^2.0.1": version: 2.0.2 resolution: "es-set-tostringtag@npm:2.0.2" @@ -9914,6 +10014,15 @@ __metadata: languageName: node linkType: hard +"for-each@npm:^0.3.5": + version: 0.3.5 + resolution: "for-each@npm:0.3.5" + dependencies: + is-callable: ^1.2.7 + checksum: 3c986d7e11f4381237cc98baa0a2f87eabe74719eee65ed7bed275163082b940ede19268c61d04c6260e0215983b12f8d885e3c8f9aa8c2113bf07c37051745c + languageName: node + linkType: hard + "foreground-child@npm:^3.1.0": version: 3.1.1 resolution: "foreground-child@npm:3.1.1" @@ -10139,6 +10248,13 @@ __metadata: languageName: node linkType: hard +"generator-function@npm:^2.0.0": + version: 2.0.1 + resolution: "generator-function@npm:2.0.1" + checksum: 3bf87f7b0230de5d74529677e6c3ceb3b7b5d9618b5a22d92b45ce3876defbaf5a77791b25a61b0fa7d13f95675b5ff67a7769f3b9af33f096e34653519e873d + languageName: node + linkType: hard + "gensync@npm:^1.0.0-beta.2": version: 1.0.0-beta.2 resolution: "gensync@npm:1.0.0-beta.2" @@ -10165,6 +10281,27 @@ __metadata: languageName: node linkType: hard +"get-intrinsic@npm:^1.2.4, get-intrinsic@npm:^1.3.0": + version: 1.3.1 + resolution: "get-intrinsic@npm:1.3.1" + dependencies: + async-function: ^1.0.0 + async-generator-function: ^1.0.0 + call-bind-apply-helpers: ^1.0.2 + es-define-property: ^1.0.1 + es-errors: ^1.3.0 + es-object-atoms: ^1.1.1 + function-bind: ^1.1.2 + generator-function: ^2.0.0 + get-proto: ^1.0.1 + gopd: ^1.2.0 + has-symbols: ^1.1.0 + hasown: ^2.0.2 + math-intrinsics: ^1.1.0 + checksum: c02b3b6a445f9cd53e14896303794ac60f9751f58a69099127248abdb0251957174c6524245fc68579dc8e6a35161d3d94c93e665f808274716f4248b269436a + languageName: node + linkType: hard + "get-own-enumerable-property-symbols@npm:^3.0.0": version: 3.0.2 resolution: "get-own-enumerable-property-symbols@npm:3.0.2" @@ -10186,6 +10323,16 @@ __metadata: languageName: node linkType: hard +"get-proto@npm:^1.0.1": + version: 1.0.1 + resolution: "get-proto@npm:1.0.1" + dependencies: + dunder-proto: ^1.0.1 + es-object-atoms: ^1.0.0 + checksum: 4fc96afdb58ced9a67558698b91433e6b037aaa6f1493af77498d7c85b141382cf223c0e5946f334fb328ee85dfe6edd06d218eaf09556f4bc4ec6005d7f5f7b + languageName: node + linkType: hard + "get-stream@npm:^6.0.0": version: 6.0.1 resolution: "get-stream@npm:6.0.1" @@ -10355,6 +10502,13 @@ __metadata: languageName: node linkType: hard +"gopd@npm:^1.2.0": + version: 1.2.0 + resolution: "gopd@npm:1.2.0" + checksum: cc6d8e655e360955bdccaca51a12a474268f95bb793fc3e1f2bdadb075f28bfd1fd988dab872daf77a61d78cbaf13744bc8727a17cfb1d150d76047d805375f3 + languageName: node + linkType: hard + "graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.5, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.11, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9": version: 4.2.11 resolution: "graceful-fs@npm:4.2.11" @@ -10469,6 +10623,15 @@ __metadata: languageName: node linkType: hard +"has-property-descriptors@npm:^1.0.2": + version: 1.0.2 + resolution: "has-property-descriptors@npm:1.0.2" + dependencies: + es-define-property: ^1.0.0 + checksum: fcbb246ea2838058be39887935231c6d5788babed499d0e9d0cc5737494c48aba4fe17ba1449e0d0fbbb1e36175442faa37f9c427ae357d6ccb1d895fbcd3de3 + languageName: node + linkType: hard + "has-proto@npm:^1.0.1": version: 1.0.1 resolution: "has-proto@npm:1.0.1" @@ -10483,7 +10646,14 @@ __metadata: languageName: node linkType: hard -"has-tostringtag@npm:^1.0.0, has-tostringtag@npm:^1.0.1": +"has-symbols@npm:^1.1.0": + version: 1.1.0 + resolution: "has-symbols@npm:1.1.0" + checksum: b2316c7302a0e8ba3aaba215f834e96c22c86f192e7310bdf689dd0e6999510c89b00fbc5742571507cebf25764d68c988b3a0da217369a73596191ac0ce694b + languageName: node + linkType: hard + +"has-tostringtag@npm:^1.0.0, has-tostringtag@npm:^1.0.1, has-tostringtag@npm:^1.0.2": version: 1.0.2 resolution: "has-tostringtag@npm:1.0.2" dependencies: @@ -10511,6 +10681,15 @@ __metadata: languageName: node linkType: hard +"hasown@npm:^2.0.2": + version: 2.0.2 + resolution: "hasown@npm:2.0.2" + dependencies: + function-bind: ^1.1.2 + checksum: e8516f776a15149ca6c6ed2ae3110c417a00b62260e222590e54aa367cbcd6ed99122020b37b7fbdf05748df57b265e70095d7bf35a47660587619b15ffb93db + languageName: node + linkType: hard + "he@npm:^1.2.0": version: 1.2.0 resolution: "he@npm:1.2.0" @@ -11364,6 +11543,15 @@ __metadata: languageName: node linkType: hard +"is-typed-array@npm:^1.1.14": + version: 1.1.15 + resolution: "is-typed-array@npm:1.1.15" + dependencies: + which-typed-array: ^1.1.16 + checksum: ea7cfc46c282f805d19a9ab2084fd4542fed99219ee9dbfbc26284728bd713a51eac66daa74eca00ae0a43b61322920ba334793607dc39907465913e921e0892 + languageName: node + linkType: hard + "is-typedarray@npm:^1.0.0": version: 1.0.0 resolution: "is-typedarray@npm:1.0.0" @@ -12929,6 +13117,13 @@ __metadata: languageName: node linkType: hard +"math-intrinsics@npm:^1.1.0": + version: 1.1.0 + resolution: "math-intrinsics@npm:1.1.0" + checksum: 0e513b29d120f478c85a70f49da0b8b19bc638975eca466f2eeae0071f3ad00454c621bf66e16dd435896c208e719fc91ad79bbfba4e400fe0b372e7c1c9c9a2 + languageName: node + linkType: hard + "mdn-data@npm:2.0.14": version: 2.0.14 resolution: "mdn-data@npm:2.0.14" @@ -14421,6 +14616,13 @@ __metadata: languageName: node linkType: hard +"possible-typed-array-names@npm:^1.0.0": + version: 1.1.0 + resolution: "possible-typed-array-names@npm:1.1.0" + checksum: cfcd4f05264eee8fd184cd4897a17890561d1d473434b43ab66ad3673d9c9128981ec01e0cb1d65a52cd6b1eebfb2eae1e53e39b2e0eca86afc823ede7a4f41b + languageName: node + linkType: hard + "postcss-attribute-case-insensitive@npm:^5.0.2": version: 5.0.2 resolution: "postcss-attribute-case-insensitive@npm:5.0.2" @@ -16351,7 +16553,7 @@ __metadata: languageName: node linkType: hard -"safe-buffer@npm:5.2.1, safe-buffer@npm:>=5.1.0, safe-buffer@npm:^5.0.1, safe-buffer@npm:^5.1.0, safe-buffer@npm:~5.2.0": +"safe-buffer@npm:5.2.1, safe-buffer@npm:>=5.1.0, safe-buffer@npm:^5.1.0, safe-buffer@npm:^5.2.1, safe-buffer@npm:~5.2.0": version: 5.2.1 resolution: "safe-buffer@npm:5.2.1" checksum: b99c4b41fdd67a6aaf280fcd05e9ffb0813654894223afb78a31f14a19ad220bba8aba1cb14eddce1fcfb037155fe6de4e861784eb434f7d11ed58d1e70dd491 @@ -16617,6 +16819,20 @@ __metadata: languageName: node linkType: hard +"set-function-length@npm:^1.2.2": + version: 1.2.2 + resolution: "set-function-length@npm:1.2.2" + dependencies: + define-data-property: ^1.1.4 + es-errors: ^1.3.0 + function-bind: ^1.1.2 + get-intrinsic: ^1.2.4 + gopd: ^1.0.1 + has-property-descriptors: ^1.0.2 + checksum: a8248bdacdf84cb0fab4637774d9fb3c7a8e6089866d04c817583ff48e14149c87044ce683d7f50759a8c50fb87c7a7e173535b06169c87ef76f5fb276dfff72 + languageName: node + linkType: hard + "set-function-name@npm:^2.0.0, set-function-name@npm:^2.0.1": version: 2.0.1 resolution: "set-function-name@npm:2.0.1" @@ -16643,14 +16859,15 @@ __metadata: linkType: hard "sha.js@npm:^2.4.11": - version: 2.4.11 - resolution: "sha.js@npm:2.4.11" + version: 2.4.12 + resolution: "sha.js@npm:2.4.12" dependencies: - inherits: ^2.0.1 - safe-buffer: ^5.0.1 + inherits: ^2.0.4 + safe-buffer: ^5.2.1 + to-buffer: ^1.2.0 bin: - sha.js: ./bin.js - checksum: ebd3f59d4b799000699097dadb831c8e3da3eb579144fd7eb7a19484cbcbb7aca3c68ba2bb362242eb09e33217de3b4ea56e4678184c334323eca24a58e3ad07 + sha.js: bin.js + checksum: 9ec0fe39cc402acb33ffb18d261b52013485a2a9569a1873ff1861510a67b9ea2b3ccc78ab8aa09c34e1e85a5f06e18ab83637715509c6153ba8d537bbd2c29d languageName: node linkType: hard @@ -17764,6 +17981,17 @@ __metadata: languageName: node linkType: hard +"to-buffer@npm:^1.2.0": + version: 1.2.2 + resolution: "to-buffer@npm:1.2.2" + dependencies: + isarray: ^2.0.5 + safe-buffer: ^5.2.1 + typed-array-buffer: ^1.0.3 + checksum: b0cd2417989a9f3d47273301e8cec2c9798b19a117822424686f385f3ec0239d2defd5fd9f8e76cda0b21e2a2f5de65a58e806506bf4c296c31750c5efd3ae4b + languageName: node + linkType: hard + "to-fast-properties@npm:^2.0.0": version: 2.0.0 resolution: "to-fast-properties@npm:2.0.0" @@ -18003,6 +18231,17 @@ __metadata: languageName: node linkType: hard +"typed-array-buffer@npm:^1.0.3": + version: 1.0.3 + resolution: "typed-array-buffer@npm:1.0.3" + dependencies: + call-bound: ^1.0.3 + es-errors: ^1.3.0 + is-typed-array: ^1.1.14 + checksum: 3fb91f0735fb413b2bbaaca9fabe7b8fc14a3fa5a5a7546bab8a57e755be0e3788d893195ad9c2b842620592de0e68d4c077d4c2c41f04ec25b8b5bb82fa9a80 + languageName: node + linkType: hard + "typed-array-byte-length@npm:^1.0.0": version: 1.0.0 resolution: "typed-array-byte-length@npm:1.0.0" @@ -19013,6 +19252,21 @@ __metadata: languageName: node linkType: hard +"which-typed-array@npm:^1.1.16": + version: 1.1.19 + resolution: "which-typed-array@npm:1.1.19" + dependencies: + available-typed-arrays: ^1.0.7 + call-bind: ^1.0.8 + call-bound: ^1.0.4 + for-each: ^0.3.5 + get-proto: ^1.0.1 + gopd: ^1.2.0 + has-tostringtag: ^1.0.2 + checksum: 162d2a07f68ea323f88ed9419861487ce5d02cb876f2cf9dd1e428d04a63133f93a54f89308f337b27cabd312ee3d027cae4a79002b2f0a85b79b9ef4c190670 + languageName: node + linkType: hard + "which@npm:^1.2.9, which@npm:^1.3.1": version: 1.3.1 resolution: "which@npm:1.3.1" From ffc185ed3fd128682dbc0817168384ea48dd0c65 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 12 Dec 2025 00:28:49 +1100 Subject: [PATCH 18/22] chore(deps): bump form-data from 3.0.1 to 3.0.4 (#492) Bumps [form-data](https://github.com/form-data/form-data) from 3.0.1 to 3.0.4. - [Release notes](https://github.com/form-data/form-data/releases) - [Changelog](https://github.com/form-data/form-data/blob/master/CHANGELOG.md) - [Commits](https://github.com/form-data/form-data/compare/v3.0.1...v3.0.4) --- updated-dependencies: - dependency-name: form-data dependency-version: 3.0.4 dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/yarn.lock b/yarn.lock index 069667f8d..ef33f1133 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8664,6 +8664,18 @@ __metadata: languageName: node linkType: hard +"es-set-tostringtag@npm:^2.1.0": + version: 2.1.0 + resolution: "es-set-tostringtag@npm:2.1.0" + dependencies: + es-errors: ^1.3.0 + get-intrinsic: ^1.2.6 + has-tostringtag: ^1.0.2 + hasown: ^2.0.2 + checksum: 789f35de4be3dc8d11fdcb91bc26af4ae3e6d602caa93299a8c45cf05d36cc5081454ae2a6d3afa09cceca214b76c046e4f8151e092e6fc7feeb5efb9e794fc6 + languageName: node + linkType: hard + "es-shim-unscopables@npm:^1.0.0": version: 1.0.2 resolution: "es-shim-unscopables@npm:1.0.2" @@ -10065,13 +10077,15 @@ __metadata: linkType: hard "form-data@npm:^3.0.0": - version: 3.0.1 - resolution: "form-data@npm:3.0.1" + version: 3.0.4 + resolution: "form-data@npm:3.0.4" dependencies: asynckit: ^0.4.0 combined-stream: ^1.0.8 - mime-types: ^2.1.12 - checksum: b019e8d35c8afc14a2bd8a7a92fa4f525a4726b6d5a9740e8d2623c30e308fbb58dc8469f90415a856698933c8479b01646a9dff33c87cc4e76d72aedbbf860d + es-set-tostringtag: ^2.1.0 + hasown: ^2.0.2 + mime-types: ^2.1.35 + checksum: 989005f575b9a14a30144df1745ef60c64cf901e648ae198bf63e5caeaf8dacf595a85dfd56f90a845eceb14fe1bea58b3845e8171337a4cf72781fa19867efc languageName: node linkType: hard @@ -10281,7 +10295,7 @@ __metadata: languageName: node linkType: hard -"get-intrinsic@npm:^1.2.4, get-intrinsic@npm:^1.3.0": +"get-intrinsic@npm:^1.2.4, get-intrinsic@npm:^1.2.6, get-intrinsic@npm:^1.3.0": version: 1.3.1 resolution: "get-intrinsic@npm:1.3.1" dependencies: @@ -13225,7 +13239,7 @@ __metadata: languageName: node linkType: hard -"mime-types@npm:^2.1.12, mime-types@npm:^2.1.27, mime-types@npm:^2.1.31, mime-types@npm:~2.1.17, mime-types@npm:~2.1.24, mime-types@npm:~2.1.34": +"mime-types@npm:^2.1.27, mime-types@npm:^2.1.31, mime-types@npm:^2.1.35, mime-types@npm:~2.1.17, mime-types@npm:~2.1.24, mime-types@npm:~2.1.34": version: 2.1.35 resolution: "mime-types@npm:2.1.35" dependencies: From be8cb4d9f45355a0d898b4043da7402e53ad86f1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 12 Dec 2025 00:39:25 +1100 Subject: [PATCH 19/22] chore(deps-dev): bump rollup from 2.79.1 to 2.79.2 (#494) Bumps [rollup](https://github.com/rollup/rollup) from 2.79.1 to 2.79.2. - [Release notes](https://github.com/rollup/rollup/releases) - [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG-2.md) - [Commits](https://github.com/rollup/rollup/compare/v2.79.1...v2.79.2) --- updated-dependencies: - dependency-name: rollup dependency-version: 2.79.2 dependency-type: direct:development ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 18 ++++++++++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index aa0cfd405..9b0d590be 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "@rollup/plugin-node-resolve": "^13.1.3", "react": "^18.0.0", "react-dom": "^18.0.0", - "rollup": "^2.67.1", + "rollup": "^2.79.2", "rollup-plugin-peer-deps-external": "^2.2.4", "rollup-plugin-terser": "^7.0.2", "rollup-plugin-typescript2": "^0.34.0", diff --git a/yarn.lock b/yarn.lock index ef33f1133..892c04381 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9763,7 +9763,7 @@ __metadata: "@rollup/plugin-node-resolve": ^13.1.3 react: ^18.0.0 react-dom: ^18.0.0 - rollup: ^2.67.1 + rollup: ^2.79.2 rollup-plugin-peer-deps-external: ^2.2.4 rollup-plugin-terser: ^7.0.2 rollup-plugin-typescript2: ^0.34.0 @@ -16525,7 +16525,7 @@ __metadata: languageName: node linkType: hard -"rollup@npm:^2.43.1, rollup@npm:^2.67.1, rollup@npm:^2.79.1": +"rollup@npm:^2.43.1, rollup@npm:^2.79.1": version: 2.79.1 resolution: "rollup@npm:2.79.1" dependencies: @@ -16539,6 +16539,20 @@ __metadata: languageName: node linkType: hard +"rollup@npm:^2.79.2": + version: 2.79.2 + resolution: "rollup@npm:2.79.2" + dependencies: + fsevents: ~2.3.2 + dependenciesMeta: + fsevents: + optional: true + bin: + rollup: dist/bin/rollup + checksum: df7aa4c8b95245dede157b06ab71e1921de6080757d30e9bf31f8fb142064d12dda865e2bafbab4349588f43425b2965a290c9a5da1c048246a70fc21734ebd7 + languageName: node + linkType: hard + "run-parallel@npm:^1.1.9": version: 1.2.0 resolution: "run-parallel@npm:1.2.0" From 2ff0c0e902ceac096a9971786f58b4f72b62b401 Mon Sep 17 00:00:00 2001 From: Lochie Axon Date: Fri, 12 Dec 2025 01:37:55 +1100 Subject: [PATCH 20/22] fix: dependabot alerts (#495) * resolutions * patch --- package.json | 13 ++ yarn.lock | 436 ++++++++++++++++++++++----------------------------- 2 files changed, 199 insertions(+), 250 deletions(-) diff --git a/package.json b/package.json index 9b0d590be..e3f4574de 100644 --- a/package.json +++ b/package.json @@ -45,5 +45,18 @@ "packageManager": "yarn@3.2.0", "dependencies": { "@changesets/cli": "^2.24.4" + }, + "resolutions": { + "webpack-dev-middleware": "5.3.4", + "braces": "3.0.3", + "cross-spawn": "6.0.6", + "glob": "10.5.0", + "nth-check": "2.0.1", + "http-proxy-middleware": "2.0.9", + "path-to-regexp": "0.1.12", + "underscore": "1.12.1", + "body-parser": "1.20.3", + "ws": "8.17.1", + "node-forge": "1.3.2" } } diff --git a/yarn.lock b/yarn.lock index 892c04381..485bbb43d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6476,23 +6476,23 @@ __metadata: languageName: node linkType: hard -"body-parser@npm:1.20.1": - version: 1.20.1 - resolution: "body-parser@npm:1.20.1" +"body-parser@npm:1.20.3": + version: 1.20.3 + resolution: "body-parser@npm:1.20.3" dependencies: bytes: 3.1.2 - content-type: ~1.0.4 + content-type: ~1.0.5 debug: 2.6.9 depd: 2.0.0 destroy: 1.2.0 http-errors: 2.0.0 iconv-lite: 0.4.24 on-finished: 2.4.1 - qs: 6.11.0 - raw-body: 2.5.1 + qs: 6.13.0 + raw-body: 2.5.2 type-is: ~1.6.18 unpipe: 1.0.0 - checksum: f1050dbac3bede6a78f0b87947a8d548ce43f91ccc718a50dd774f3c81f2d8b04693e52acf62659fad23101827dd318da1fb1363444ff9a8482b886a3e4a5266 + checksum: 1a35c59a6be8d852b00946330141c4f142c6af0f970faa87f10ad74f1ee7118078056706a05ae3093c54dabca9cd3770fa62a170a85801da1a4324f04381167d languageName: node linkType: hard @@ -6506,7 +6506,7 @@ __metadata: languageName: node linkType: hard -"boolbase@npm:^1.0.0, boolbase@npm:~1.0.0": +"boolbase@npm:^1.0.0": version: 1.0.0 resolution: "boolbase@npm:1.0.0" checksum: 3e25c80ef626c3a3487c73dbfc70ac322ec830666c9ad915d11b701142fab25ec1e63eff2c450c74347acfd2de854ccde865cd79ef4db1683f7c7b046ea43bb0 @@ -6539,12 +6539,12 @@ __metadata: languageName: node linkType: hard -"braces@npm:^3.0.2, braces@npm:~3.0.2": - version: 3.0.2 - resolution: "braces@npm:3.0.2" +"braces@npm:3.0.3": + version: 3.0.3 + resolution: "braces@npm:3.0.3" dependencies: - fill-range: ^7.0.1 - checksum: e2a8e769a863f3d4ee887b5fe21f63193a891c68b612ddb4b68d82d1b5f3ff9073af066c343e9867a393fe4c2555dcb33e89b937195feb9c1613d259edfcd459 + fill-range: ^7.1.1 + checksum: b95aa0b3bd909f6cd1720ffcf031aeaf46154dd88b4da01f9a1d3f7ea866a79eba76a6d01cbc3c422b2ee5cdc39a4f02491058d5df0d7bf6e6a162a832df1f69 languageName: node linkType: hard @@ -6704,7 +6704,7 @@ __metadata: languageName: node linkType: hard -"call-bound@npm:^1.0.3, call-bound@npm:^1.0.4": +"call-bound@npm:^1.0.2, call-bound@npm:^1.0.3, call-bound@npm:^1.0.4": version: 1.0.4 resolution: "call-bound@npm:1.0.4" dependencies: @@ -7277,7 +7277,7 @@ __metadata: languageName: node linkType: hard -"content-type@npm:~1.0.4": +"content-type@npm:~1.0.4, content-type@npm:~1.0.5": version: 1.0.5 resolution: "content-type@npm:1.0.5" checksum: 566271e0a251642254cde0f845f9dd4f9856e52d988f4eb0d0dcffbb7a1f8ec98de7a5215fc628f3bce30fe2fb6fd2bc064b562d721658c59b544e2d34ea2766 @@ -7433,25 +7433,16 @@ __metadata: languageName: node linkType: hard -"cross-spawn@npm:^5.1.0": - version: 5.1.0 - resolution: "cross-spawn@npm:5.1.0" +"cross-spawn@npm:6.0.6": + version: 6.0.6 + resolution: "cross-spawn@npm:6.0.6" dependencies: - lru-cache: ^4.0.1 + nice-try: ^1.0.4 + path-key: ^2.0.1 + semver: ^5.5.0 shebang-command: ^1.2.0 which: ^1.2.9 - checksum: 726939c9954fc70c20e538923feaaa33bebc253247d13021737c3c7f68cdc3e0a57f720c0fe75057c0387995349f3f12e20e9bfdbf12274db28019c7ea4ec166 - languageName: node - linkType: hard - -"cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.2, cross-spawn@npm:^7.0.3": - version: 7.0.3 - resolution: "cross-spawn@npm:7.0.3" - dependencies: - path-key: ^3.1.0 - shebang-command: ^2.0.0 - which: ^2.0.1 - checksum: 671cc7c7288c3a8406f3c69a3ae2fc85555c04169e9d611def9a675635472614f1c0ed0ef80955d5b6d4e724f6ced67f0ad1bb006c2ea643488fcfef994d7f52 + checksum: a6e2e5b04a0e0f806c1df45f92cd079b65f95fbe5a7650ee1ab60318c33a6c156a8a2f8b6898f57764f7363ec599a0625e9855dfa78d52d2d73dbd32eb11c25e languageName: node linkType: hard @@ -9908,12 +9899,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: ^5.0.1 - checksum: cc283f4e65b504259e64fd969bcf4def4eb08d85565e906b7d36516e87819db52029a76b6363d0f02d0d532f0033c9603b9e2d943d56ee3b0d4f7ad3328ff917 + checksum: b4abfbca3839a3d55e4ae5ec62e131e2e356bf4859ce8480c64c4876100f4df292a63e5bb1618e1d7460282ca2b305653064f01654474aa35c68000980f17798 languageName: node linkType: hard @@ -10210,13 +10201,6 @@ __metadata: languageName: node linkType: hard -"fs.realpath@npm:^1.0.0": - version: 1.0.0 - resolution: "fs.realpath@npm:1.0.0" - checksum: 99ddea01a7e75aa276c250a04eedeffe5662bce66c65c07164ad6264f9de18fb21be9433ead460e54cff20e31721c811f4fb5d70591799df5f85dce6d6746fd0 - languageName: node - linkType: hard - "fsevents@npm:^2.3.2, fsevents@npm:~2.3.2": version: 2.3.3 resolution: "fsevents@npm:2.3.3" @@ -10295,7 +10279,7 @@ __metadata: languageName: node linkType: hard -"get-intrinsic@npm:^1.2.4, get-intrinsic@npm:^1.2.6, get-intrinsic@npm:^1.3.0": +"get-intrinsic@npm:^1.2.4, get-intrinsic@npm:^1.2.5, get-intrinsic@npm:^1.2.6, get-intrinsic@npm:^1.3.0": version: 1.3.1 resolution: "get-intrinsic@npm:1.3.1" dependencies: @@ -10405,46 +10389,19 @@ __metadata: languageName: node linkType: hard -"glob@npm:10.3.10, glob@npm:^10.2.2, glob@npm:^10.3.10": - version: 10.3.10 - resolution: "glob@npm:10.3.10" +"glob@npm:10.5.0": + version: 10.5.0 + resolution: "glob@npm:10.5.0" dependencies: foreground-child: ^3.1.0 - jackspeak: ^2.3.5 - minimatch: ^9.0.1 - minipass: ^5.0.0 || ^6.0.2 || ^7.0.0 - path-scurry: ^1.10.1 + jackspeak: ^3.1.2 + minimatch: ^9.0.4 + minipass: ^7.1.2 + package-json-from-dist: ^1.0.0 + path-scurry: ^1.11.1 bin: glob: dist/esm/bin.mjs - checksum: 4f2fe2511e157b5a3f525a54092169a5f92405f24d2aed3142f4411df328baca13059f4182f1db1bf933e2c69c0bd89e57ae87edd8950cba8c7ccbe84f721cf3 - languageName: node - linkType: hard - -"glob@npm:7.1.7": - version: 7.1.7 - resolution: "glob@npm:7.1.7" - dependencies: - fs.realpath: ^1.0.0 - inflight: ^1.0.4 - inherits: 2 - minimatch: ^3.0.4 - once: ^1.3.0 - path-is-absolute: ^1.0.0 - checksum: b61f48973bbdcf5159997b0874a2165db572b368b931135832599875919c237fc05c12984e38fe828e69aa8a921eb0e8a4997266211c517c9cfaae8a93988bb8 - languageName: node - linkType: hard - -"glob@npm:^7.1.1, glob@npm:^7.1.2, glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6, glob@npm:^7.2.0": - version: 7.2.3 - resolution: "glob@npm:7.2.3" - dependencies: - fs.realpath: ^1.0.0 - inflight: ^1.0.4 - inherits: 2 - minimatch: ^3.1.1 - once: ^1.3.0 - path-is-absolute: ^1.0.0 - checksum: 29452e97b38fa704dabb1d1045350fb2467cf0277e155aa9ff7077e90ad81d1ea9d53d3ee63bd37c05b09a065e90f16aec4a65f5b8de401d1dac40bc5605d133 + checksum: cda96c074878abca9657bd984d2396945cf0d64283f6feeb40d738fe2da642be0010ad5210a1646244a5fc3511b0cab5a374569b3de5a12b8a63d392f18c6043 languageName: node linkType: hard @@ -10906,9 +10863,9 @@ __metadata: languageName: node linkType: hard -"http-proxy-middleware@npm:^2.0.3": - version: 2.0.6 - resolution: "http-proxy-middleware@npm:2.0.6" +"http-proxy-middleware@npm:2.0.9": + version: 2.0.9 + resolution: "http-proxy-middleware@npm:2.0.9" dependencies: "@types/http-proxy": ^1.17.8 http-proxy: ^1.18.1 @@ -10920,7 +10877,7 @@ __metadata: peerDependenciesMeta: "@types/express": optional: true - checksum: 2ee85bc878afa6cbf34491e972ece0f5be0a3e5c98a60850cf40d2a9a5356e1fc57aab6cff33c1fc37691b0121c3a42602d2b1956c52577e87a5b77b62ae1c3a + checksum: 0ea88609b9c13fa03b89f8e6b85bd5c537027ec6990005dd81a7fbb3e73fcf8d6a6e3db2b57b1c6cddbcda80965704584dc6291d0e721b2700198c4e59ee0d0b languageName: node linkType: hard @@ -11090,30 +11047,20 @@ __metadata: languageName: node linkType: hard -"inflight@npm:^1.0.4": - version: 1.0.6 - resolution: "inflight@npm:1.0.6" - dependencies: - once: ^1.3.0 - wrappy: 1 - checksum: f4f76aa072ce19fae87ce1ef7d221e709afb59d445e05d47fba710e85470923a75de35bfae47da6de1b18afc3ce83d70facf44cfb0aff89f0a3f45c0a0244dfd +"inherits@npm:2.0.3": + version: 2.0.3 + resolution: "inherits@npm:2.0.3" + checksum: 78cb8d7d850d20a5e9a7f3620db31483aa00ad5f722ce03a55b110e5a723539b3716a3b463e2b96ce3fe286f33afc7c131fa2f91407528ba80cea98a7545d4c0 languageName: node linkType: hard -"inherits@npm:2, inherits@npm:2.0.4, inherits@npm:^2.0.1, inherits@npm:^2.0.3, inherits@npm:^2.0.4, inherits@npm:~2.0.3": +"inherits@npm:2.0.4, inherits@npm:^2.0.1, inherits@npm:^2.0.3, inherits@npm:^2.0.4, inherits@npm:~2.0.3": version: 2.0.4 resolution: "inherits@npm:2.0.4" checksum: 4a48a733847879d6cf6691860a6b1e3f0f4754176e4d71494c41f3475553768b10f84b5ce1d40fbd0e34e6bfbb864ee35858ad4dd2cf31e02fc4a154b724d7f1 languageName: node linkType: hard -"inherits@npm:2.0.3": - version: 2.0.3 - resolution: "inherits@npm:2.0.3" - checksum: 78cb8d7d850d20a5e9a7f3620db31483aa00ad5f722ce03a55b110e5a723539b3716a3b463e2b96ce3fe286f33afc7c131fa2f91407528ba80cea98a7545d4c0 - languageName: node - linkType: hard - "ini@npm:^1.3.5": version: 1.3.8 resolution: "ini@npm:1.3.8" @@ -11735,16 +11682,16 @@ __metadata: languageName: node linkType: hard -"jackspeak@npm:^2.3.5": - version: 2.3.6 - resolution: "jackspeak@npm:2.3.6" +"jackspeak@npm:^3.1.2": + version: 3.4.3 + resolution: "jackspeak@npm:3.4.3" dependencies: "@isaacs/cliui": ^8.0.2 "@pkgjs/parseargs": ^0.11.0 dependenciesMeta: "@pkgjs/parseargs": optional: true - checksum: 57d43ad11eadc98cdfe7496612f6bbb5255ea69fe51ea431162db302c2a11011642f50cfad57288bd0aea78384a0612b16e131944ad8ecd09d619041c8531b54 + checksum: be31027fc72e7cc726206b9f560395604b82e0fddb46c4cbf9f97d049bcef607491a5afc0699612eaa4213ca5be8fd3e1e7cd187b3040988b65c9489838a7c00 languageName: node linkType: hard @@ -13009,20 +12956,17 @@ __metadata: languageName: node linkType: hard -"lru-cache@npm:^10.0.1, lru-cache@npm:^10.0.2, lru-cache@npm:^9.1.1 || ^10.0.0": +"lru-cache@npm:^10.0.1, lru-cache@npm:^10.0.2": version: 10.2.0 resolution: "lru-cache@npm:10.2.0" checksum: eee7ddda4a7475deac51ac81d7dd78709095c6fa46e8350dc2d22462559a1faa3b81ed931d5464b13d48cbd7e08b46100b6f768c76833912bc444b99c37e25db languageName: node linkType: hard -"lru-cache@npm:^4.0.1": - version: 4.1.5 - resolution: "lru-cache@npm:4.1.5" - dependencies: - pseudomap: ^1.0.2 - yallist: ^2.1.2 - checksum: 4bb4b58a36cd7dc4dcec74cbe6a8f766a38b7426f1ff59d4cf7d82a2aa9b9565cd1cb98f6ff60ce5cd174524868d7bc9b7b1c294371851356066ca9ac4cf135a +"lru-cache@npm:^10.2.0": + version: 10.4.3 + resolution: "lru-cache@npm:10.4.3" + checksum: 6476138d2125387a6d20f100608c2583d415a4f64a0fecf30c9e2dda976614f09cad4baa0842447bd37dd459a7bd27f57d9d8f8ce558805abd487c583f3d774a languageName: node linkType: hard @@ -13313,7 +13257,7 @@ __metadata: languageName: node linkType: hard -"minimatch@npm:9.0.3, minimatch@npm:^9.0.1": +"minimatch@npm:9.0.3": version: 9.0.3 resolution: "minimatch@npm:9.0.3" dependencies: @@ -13322,7 +13266,7 @@ __metadata: languageName: node linkType: hard -"minimatch@npm:^3.0.4, minimatch@npm:^3.0.5, minimatch@npm:^3.1.1, minimatch@npm:^3.1.2": +"minimatch@npm:^3.0.4, minimatch@npm:^3.0.5, minimatch@npm:^3.1.2": version: 3.1.2 resolution: "minimatch@npm:3.1.2" dependencies: @@ -13340,6 +13284,15 @@ __metadata: languageName: node linkType: hard +"minimatch@npm:^9.0.4": + version: 9.0.5 + resolution: "minimatch@npm:9.0.5" + dependencies: + brace-expansion: ^2.0.1 + checksum: 2c035575eda1e50623c731ec6c14f65a85296268f749b9337005210bb2b34e2705f8ef1a358b188f69892286ab99dc42c8fb98a57bde55c8d81b3023c19cea28 + languageName: node + linkType: hard + "minimist-options@npm:^4.0.2": version: 4.1.0 resolution: "minimist-options@npm:4.1.0" @@ -13432,6 +13385,13 @@ __metadata: languageName: node linkType: hard +"minipass@npm:^7.1.2": + version: 7.1.2 + resolution: "minipass@npm:7.1.2" + checksum: 2bfd325b95c555f2b4d2814d49325691c7bee937d753814861b0b49d5edcda55cbbf22b6b6a60bb91eddac8668771f03c5ff647dcd9d0f798e9548b9cdc46ee3 + languageName: node + linkType: hard + "minizlib@npm:^2.1.1, minizlib@npm:^2.1.2": version: 2.1.2 resolution: "minizlib@npm:2.1.2" @@ -13784,6 +13744,13 @@ __metadata: languageName: unknown linkType: soft +"nice-try@npm:^1.0.4": + version: 1.0.5 + resolution: "nice-try@npm:1.0.5" + checksum: 0b4af3b5bb5d86c289f7a026303d192a7eb4417231fe47245c460baeabae7277bcd8fd9c728fb6bd62c30b3e15cd6620373e2cf33353b095d8b403d3e8a15aff + languageName: node + linkType: hard + "no-case@npm:^3.0.4": version: 3.0.4 resolution: "no-case@npm:3.0.4" @@ -13833,10 +13800,10 @@ __metadata: languageName: node linkType: hard -"node-forge@npm:^1, node-forge@npm:^1.3.1": - version: 1.3.1 - resolution: "node-forge@npm:1.3.1" - checksum: 08fb072d3d670599c89a1704b3e9c649ff1b998256737f0e06fbd1a5bf41cae4457ccaee32d95052d80bbafd9ffe01284e078c8071f0267dc9744e51c5ed42a9 +"node-forge@npm:1.3.2": + version: 1.3.2 + resolution: "node-forge@npm:1.3.2" + checksum: b6f905b0fcc39a2d59598e12ca2c071bfd760e56a9163aab8da7f8d6622547f8db60cfb2aefc39277d5a13af32e58573674b38107a2d4df7c243e12794839546 languageName: node linkType: hard @@ -13957,21 +13924,12 @@ __metadata: languageName: node linkType: hard -"nth-check@npm:^1.0.2": - version: 1.0.2 - resolution: "nth-check@npm:1.0.2" - dependencies: - boolbase: ~1.0.0 - checksum: 59e115fdd75b971d0030f42ada3aac23898d4c03aa13371fa8b3339d23461d1badf3fde5aad251fb956aaa75c0a3b9bfcd07c08a34a83b4f9dadfdce1d19337c - languageName: node - linkType: hard - -"nth-check@npm:^2.0.1": - version: 2.1.1 - resolution: "nth-check@npm:2.1.1" +"nth-check@npm:2.0.1": + version: 2.0.1 + resolution: "nth-check@npm:2.0.1" dependencies: boolbase: ^1.0.0 - checksum: 5afc3dafcd1573b08877ca8e6148c52abd565f1d06b1eb08caf982e3fa289a82f2cae697ffb55b5021e146d60443f1590a5d6b944844e944714a5b549675bcd3 + checksum: 5386d035c48438ff304fe687704d93886397349d1bed136de97aeae464caba10e8ffac55a04b215b86b3bc8897f33e0a5aa1045a9d8b2f251ae61b2a3ad3e450 languageName: node linkType: hard @@ -14014,6 +13972,13 @@ __metadata: languageName: node linkType: hard +"object-inspect@npm:^1.13.3": + version: 1.13.4 + resolution: "object-inspect@npm:1.13.4" + checksum: 582810c6a8d2ef988ea0a39e69e115a138dad8f42dd445383b394877e5816eb4268489f316a6f74ee9c4e0a984b3eab1028e3e79d62b1ed67c726661d55c7a8b + languageName: node + linkType: hard + "object-is@npm:^1.1.5": version: 1.1.5 resolution: "object-is@npm:1.1.5" @@ -14159,7 +14124,7 @@ __metadata: languageName: node linkType: hard -"once@npm:^1.3.0, once@npm:^1.3.1, once@npm:^1.4.0": +"once@npm:^1.3.1, once@npm:^1.4.0": version: 1.4.0 resolution: "once@npm:1.4.0" dependencies: @@ -14346,6 +14311,13 @@ __metadata: languageName: node linkType: hard +"package-json-from-dist@npm:^1.0.0": + version: 1.0.1 + resolution: "package-json-from-dist@npm:1.0.1" + checksum: 58ee9538f2f762988433da00e26acc788036914d57c71c246bf0be1b60cdbd77dd60b6a3e1a30465f0b248aeb80079e0b34cb6050b1dfa18c06953bb1cbc7602 + languageName: node + linkType: hard + "param-case@npm:^3.0.4": version: 3.0.4 resolution: "param-case@npm:3.0.4" @@ -14415,14 +14387,14 @@ __metadata: languageName: node linkType: hard -"path-is-absolute@npm:^1.0.0": - version: 1.0.1 - resolution: "path-is-absolute@npm:1.0.1" - checksum: 060840f92cf8effa293bcc1bea81281bd7d363731d214cbe5c227df207c34cd727430f70c6037b5159c8a870b9157cba65e775446b0ab06fd5ecc7e54615a3b8 +"path-key@npm:^2.0.1": + version: 2.0.1 + resolution: "path-key@npm:2.0.1" + checksum: f7ab0ad42fe3fb8c7f11d0c4f849871e28fbd8e1add65c370e422512fc5887097b9cf34d09c1747d45c942a8c1e26468d6356e2df3f740bf177ab8ca7301ebfd languageName: node linkType: hard -"path-key@npm:^3.0.0, path-key@npm:^3.1.0": +"path-key@npm:^3.0.0": version: 3.1.1 resolution: "path-key@npm:3.1.1" checksum: 55cd7a9dd4b343412a8386a743f9c746ef196e57c823d90ca3ab917f90ab9f13dd0ded27252ba49dbdfcab2b091d998bc446f6220cd3cea65db407502a740020 @@ -14443,20 +14415,20 @@ __metadata: languageName: node linkType: hard -"path-scurry@npm:^1.10.1": - version: 1.10.1 - resolution: "path-scurry@npm:1.10.1" +"path-scurry@npm:^1.11.1": + version: 1.11.1 + resolution: "path-scurry@npm:1.11.1" dependencies: - lru-cache: ^9.1.1 || ^10.0.0 + lru-cache: ^10.2.0 minipass: ^5.0.0 || ^6.0.2 || ^7.0.0 - checksum: e2557cff3a8fb8bc07afdd6ab163a92587884f9969b05bbbaf6fe7379348bfb09af9ed292af12ed32398b15fb443e81692047b786d1eeb6d898a51eb17ed7d90 + checksum: 890d5abcd593a7912dcce7cf7c6bf7a0b5648e3dee6caf0712c126ca0a65c7f3d7b9d769072a4d1baf370f61ce493ab5b038d59988688e0c5f3f646ee3c69023 languageName: node linkType: hard -"path-to-regexp@npm:0.1.7": - version: 0.1.7 - resolution: "path-to-regexp@npm:0.1.7" - checksum: 69a14ea24db543e8b0f4353305c5eac6907917031340e5a8b37df688e52accd09e3cebfe1660b70d76b6bd89152f52183f28c74813dbf454ba1a01c82a38abce +"path-to-regexp@npm:0.1.12": + version: 0.1.12 + resolution: "path-to-regexp@npm:0.1.12" + checksum: ab237858bee7b25ecd885189f175ab5b5161e7b712b360d44f5c4516b8d271da3e4bf7bf0a7b9153ecb04c7d90ce8ff5158614e1208819cf62bac2b08452722e languageName: node linkType: hard @@ -15674,13 +15646,6 @@ __metadata: languageName: node linkType: hard -"pseudomap@npm:^1.0.2": - version: 1.0.2 - resolution: "pseudomap@npm:1.0.2" - checksum: 856c0aae0ff2ad60881168334448e898ad7a0e45fe7386d114b150084254c01e200c957cf378378025df4e052c7890c5bd933939b0e0d2ecfcc1dc2f0b2991f5 - languageName: node - linkType: hard - "psl@npm:^1.1.33": version: 1.9.0 resolution: "psl@npm:1.9.0" @@ -15751,6 +15716,15 @@ __metadata: languageName: node linkType: hard +"qs@npm:6.13.0": + version: 6.13.0 + resolution: "qs@npm:6.13.0" + dependencies: + side-channel: ^1.0.6 + checksum: e9404dc0fc2849245107108ce9ec2766cde3be1b271de0bf1021d049dc5b98d1a2901e67b431ac5509f865420a7ed80b7acb3980099fe1c118a1c5d2e1432ad8 + languageName: node + linkType: hard + "query-string@npm:7.1.3": version: 7.1.3 resolution: "query-string@npm:7.1.3" @@ -15823,15 +15797,15 @@ __metadata: languageName: node linkType: hard -"raw-body@npm:2.5.1": - version: 2.5.1 - resolution: "raw-body@npm:2.5.1" +"raw-body@npm:2.5.2": + version: 2.5.2 + resolution: "raw-body@npm:2.5.2" dependencies: bytes: 3.1.2 http-errors: 2.0.0 iconv-lite: 0.4.24 unpipe: 1.0.0 - checksum: 5362adff1575d691bb3f75998803a0ffed8c64eabeaa06e54b4ada25a0cd1b2ae7f4f5ec46565d1bec337e08b5ac90c76eaa0758de6f72a633f025d754dec29e + checksum: ba1583c8d8a48e8fbb7a873fdbb2df66ea4ff83775421bfe21ee120140949ab048200668c47d9ae3880012f6e217052690628cf679ddfbd82c9fc9358d574676 languageName: node linkType: hard @@ -16732,7 +16706,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:2 || 3 || 4 || 5": +"semver@npm:2 || 3 || 4 || 5, semver@npm:^5.5.0": version: 5.7.2 resolution: "semver@npm:5.7.2" bin: @@ -16915,15 +16889,6 @@ __metadata: languageName: node linkType: hard -"shebang-command@npm:^2.0.0": - version: 2.0.0 - resolution: "shebang-command@npm:2.0.0" - dependencies: - shebang-regex: ^3.0.0 - checksum: 6b52fe87271c12968f6a054e60f6bde5f0f3d2db483a1e5c3e12d657c488a15474121a1d55cd958f6df026a54374ec38a4a963988c213b7570e1d51575cea7fa - languageName: node - linkType: hard - "shebang-regex@npm:^1.0.0": version: 1.0.0 resolution: "shebang-regex@npm:1.0.0" @@ -16931,13 +16896,6 @@ __metadata: languageName: node linkType: hard -"shebang-regex@npm:^3.0.0": - version: 3.0.0 - resolution: "shebang-regex@npm:3.0.0" - checksum: 1a2bcae50de99034fcd92ad4212d8e01eedf52c7ec7830eedcf886622804fe36884278f2be8be0ea5fde3fd1c23911643a4e0f726c8685b61871c8908af01222 - languageName: node - linkType: hard - "shell-quote@npm:^1.7.3, shell-quote@npm:^1.8.1": version: 1.8.1 resolution: "shell-quote@npm:1.8.1" @@ -16945,6 +16903,41 @@ __metadata: languageName: node linkType: hard +"side-channel-list@npm:^1.0.0": + version: 1.0.0 + resolution: "side-channel-list@npm:1.0.0" + dependencies: + es-errors: ^1.3.0 + object-inspect: ^1.13.3 + checksum: 603b928997abd21c5a5f02ae6b9cc36b72e3176ad6827fab0417ead74580cc4fb4d5c7d0a8a2ff4ead34d0f9e35701ed7a41853dac8a6d1a664fcce1a044f86f + languageName: node + linkType: hard + +"side-channel-map@npm:^1.0.1": + version: 1.0.1 + resolution: "side-channel-map@npm:1.0.1" + dependencies: + call-bound: ^1.0.2 + es-errors: ^1.3.0 + get-intrinsic: ^1.2.5 + object-inspect: ^1.13.3 + checksum: 42501371cdf71f4ccbbc9c9e2eb00aaaab80a4c1c429d5e8da713fd4d39ef3b8d4a4b37ed4f275798a65260a551a7131fd87fe67e922dba4ac18586d6aab8b06 + languageName: node + linkType: hard + +"side-channel-weakmap@npm:^1.0.2": + version: 1.0.2 + resolution: "side-channel-weakmap@npm:1.0.2" + dependencies: + call-bound: ^1.0.2 + es-errors: ^1.3.0 + get-intrinsic: ^1.2.5 + object-inspect: ^1.13.3 + side-channel-map: ^1.0.1 + checksum: a815c89bc78c5723c714ea1a77c938377ea710af20d4fb886d362b0d1f8ac73a17816a5f6640f354017d7e292a43da9c5e876c22145bac00b76cfb3468001736 + languageName: node + linkType: hard + "side-channel@npm:^1.0.4": version: 1.0.4 resolution: "side-channel@npm:1.0.4" @@ -16956,6 +16949,19 @@ __metadata: languageName: node linkType: hard +"side-channel@npm:^1.0.6": + version: 1.1.0 + resolution: "side-channel@npm:1.1.0" + dependencies: + es-errors: ^1.3.0 + object-inspect: ^1.13.3 + side-channel-list: ^1.0.0 + side-channel-map: ^1.0.1 + side-channel-weakmap: ^1.0.2 + checksum: bf73d6d6682034603eb8e99c63b50155017ed78a522d27c2acec0388a792c3ede3238b878b953a08157093b85d05797217d270b7666ba1f111345fbe933380ff + languageName: node + linkType: hard + "signal-exit@npm:^3.0.2, signal-exit@npm:^3.0.3": version: 3.0.7 resolution: "signal-exit@npm:3.0.7" @@ -18415,13 +18421,6 @@ __metadata: languageName: node linkType: hard -"underscore@npm:~1.6.0": - version: 1.6.0 - resolution: "underscore@npm:1.6.0" - checksum: bfb837d95164077bd2751247dd9797546287c060d86c3a730f590948dbc132b426238e37df7bea28f39d3e3abf571de5b974809ee3c32d309280fed851588ef9 - languageName: node - linkType: hard - "undici-types@npm:~5.26.4": version: 5.26.5 resolution: "undici-types@npm:5.26.5" @@ -18994,9 +18993,9 @@ __metadata: languageName: node linkType: hard -"webpack-dev-middleware@npm:^5.3.1": - version: 5.3.3 - resolution: "webpack-dev-middleware@npm:5.3.3" +"webpack-dev-middleware@npm:5.3.4": + version: 5.3.4 + resolution: "webpack-dev-middleware@npm:5.3.4" dependencies: colorette: ^2.0.10 memfs: ^3.4.3 @@ -19005,7 +19004,7 @@ __metadata: schema-utils: ^4.0.0 peerDependencies: webpack: ^4.0.0 || ^5.0.0 - checksum: dd332cc6da61222c43d25e5a2155e23147b777ff32fdf1f1a0a8777020c072fbcef7756360ce2a13939c3f534c06b4992a4d659318c4a7fe2c0530b52a8a6621 + checksum: 90cf3e27d0714c1a745454a1794f491b7076434939340605b9ee8718ba2b85385b120939754e9fdbd6569811e749dee53eec319e0d600e70e0b0baffd8e3fb13 languageName: node linkType: hard @@ -19306,17 +19305,6 @@ __metadata: languageName: node linkType: hard -"which@npm:^2.0.1": - version: 2.0.2 - resolution: "which@npm:2.0.2" - dependencies: - isexe: ^2.0.0 - bin: - node-which: ./bin/node-which - checksum: 1a5c563d3c1b52d5f893c8b61afe11abc3bab4afac492e8da5bde69d550de701cf9806235f20a47b5c8fa8a1d6a9135841de2596535e998027a54589000e66d1 - languageName: node - linkType: hard - "which@npm:^4.0.0": version: 4.0.0 resolution: "which@npm:4.0.0" @@ -19592,39 +19580,9 @@ __metadata: languageName: node linkType: hard -"ws@npm:8.18.0": - version: 8.18.0 - resolution: "ws@npm:8.18.0" - peerDependencies: - bufferutil: ^4.0.1 - utf-8-validate: ">=5.0.2" - peerDependenciesMeta: - bufferutil: - optional: true - utf-8-validate: - optional: true - checksum: 91d4d35bc99ff6df483bdf029b9ea4bfd7af1f16fc91231a96777a63d263e1eabf486e13a2353970efc534f9faa43bdbf9ee76525af22f4752cbc5ebda333975 - languageName: node - linkType: hard - -"ws@npm:^7.4.6, ws@npm:^7.5.1": - version: 7.5.9 - resolution: "ws@npm:7.5.9" - peerDependencies: - bufferutil: ^4.0.1 - utf-8-validate: ^5.0.2 - peerDependenciesMeta: - bufferutil: - optional: true - utf-8-validate: - optional: true - checksum: c3c100a181b731f40b7f2fddf004aa023f79d64f489706a28bc23ff88e87f6a64b3c6651fbec3a84a53960b75159574d7a7385709847a62ddb7ad6af76f49138 - languageName: node - linkType: hard - -"ws@npm:^8.13.0": - version: 8.16.0 - resolution: "ws@npm:8.16.0" +"ws@npm:8.17.1": + version: 8.17.1 + resolution: "ws@npm:8.17.1" peerDependencies: bufferutil: ^4.0.1 utf-8-validate: ">=5.0.2" @@ -19633,22 +19591,7 @@ __metadata: optional: true utf-8-validate: optional: true - checksum: feb3eecd2bae82fa8a8beef800290ce437d8b8063bdc69712725f21aef77c49cb2ff45c6e5e7fce622248f9c7abaee506bae0a9064067ffd6935460c7357321b - languageName: node - linkType: hard - -"ws@npm:~8.11.0": - version: 8.11.0 - resolution: "ws@npm:8.11.0" - peerDependencies: - bufferutil: ^4.0.1 - utf-8-validate: ^5.0.2 - peerDependenciesMeta: - bufferutil: - optional: true - utf-8-validate: - optional: true - checksum: 316b33aba32f317cd217df66dbfc5b281a2f09ff36815de222bc859e3424d83766d9eb2bd4d667de658b6ab7be151f258318fb1da812416b30be13103e5b5c67 + checksum: 442badcce1f1178ec87a0b5372ae2e9771e07c4929a3180321901f226127f252441e8689d765aa5cfba5f50ac60dd830954afc5aeae81609aefa11d3ddf5cecf languageName: node linkType: hard @@ -19694,13 +19637,6 @@ __metadata: languageName: node linkType: hard -"yallist@npm:^2.1.2": - version: 2.1.2 - resolution: "yallist@npm:2.1.2" - checksum: 9ba99409209f485b6fcb970330908a6d41fa1c933f75e08250316cce19383179a6b70a7e0721b89672ebb6199cc377bf3e432f55100da6a7d6e11902b0a642cb - languageName: node - linkType: hard - "yallist@npm:^3.0.2": version: 3.1.1 resolution: "yallist@npm:3.1.1" From eec3e983b4fd1eb1331ab5d60e9a81ca77926483 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 12 Dec 2025 02:15:35 +1100 Subject: [PATCH 21/22] chore(deps): bump rollup from 2.79.1 to 2.79.2 (#496) * chore(deps): bump rollup from 2.79.1 to 2.79.2 Bumps [rollup](https://github.com/rollup/rollup) from 2.79.1 to 2.79.2. - [Release notes](https://github.com/rollup/rollup/releases) - [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG-2.md) - [Commits](https://github.com/rollup/rollup/compare/v2.79.1...v2.79.2) --- updated-dependencies: - dependency-name: rollup dependency-version: 2.79.2 dependency-type: indirect ... Signed-off-by: dependabot[bot] * chore(deps): bump rollup from 2.79.1 to 2.79.2 Bumps [rollup](https://github.com/rollup/rollup) from 2.79.1 to 2.79.2. - [Release notes](https://github.com/rollup/rollup/releases) - [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG-2.md) - [Commits](https://github.com/rollup/rollup/compare/v2.79.1...v2.79.2) --- updated-dependencies: - dependency-name: rollup dependency-version: 2.79.2 dependency-type: indirect ... Signed-off-by: dependabot[bot] * Update yarn.lock * properly bump rollup --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Lochie Axon --- yarn.lock | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/yarn.lock b/yarn.lock index 485bbb43d..6ea97083c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -16499,21 +16499,7 @@ __metadata: languageName: node linkType: hard -"rollup@npm:^2.43.1, rollup@npm:^2.79.1": - version: 2.79.1 - resolution: "rollup@npm:2.79.1" - dependencies: - fsevents: ~2.3.2 - dependenciesMeta: - fsevents: - optional: true - bin: - rollup: dist/bin/rollup - checksum: 6a2bf167b3587d4df709b37d149ad0300692cc5deb510f89ac7bdc77c8738c9546ae3de9322b0968e1ed2b0e984571f5f55aae28fa7de4cfcb1bc5402a4e2be6 - languageName: node - linkType: hard - -"rollup@npm:^2.79.2": +"rollup@npm:^2.43.1, rollup@npm:^2.79.1, rollup@npm:^2.79.2": version: 2.79.2 resolution: "rollup@npm:2.79.2" dependencies: From 97589dfbf1d632e2f426ce9a7e0b82be6c6545a3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Feb 2026 19:56:47 +1100 Subject: [PATCH 22/22] chore(deps): bump tar from 6.2.0 to 7.5.7 (#497) * chore(deps): bump tar from 6.2.0 to 6.2.1 Bumps [tar](https://github.com/isaacs/node-tar) from 6.2.0 to 6.2.1. - [Release notes](https://github.com/isaacs/node-tar/releases) - [Changelog](https://github.com/isaacs/node-tar/blob/main/CHANGELOG.md) - [Commits](https://github.com/isaacs/node-tar/compare/v6.2.0...v6.2.1) --- updated-dependencies: - dependency-name: tar dependency-version: 6.2.1 dependency-type: indirect ... Signed-off-by: dependabot[bot] * Bump tar to 7.5.7 to fix 3 high-severity vulnerabilities (#498) * Initial plan * Add tar 7.5.7 resolution to fix security vulnerabilities Co-authored-by: lochie <1930210+lochie@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: lochie <1930210+lochie@users.noreply.github.com> --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com> Co-authored-by: lochie <1930210+lochie@users.noreply.github.com> --- package.json | 3 +- yarn.lock | 81 ++++++++++++++++++++++++++-------------------------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/package.json b/package.json index e3f4574de..70dbe4068 100644 --- a/package.json +++ b/package.json @@ -57,6 +57,7 @@ "underscore": "1.12.1", "body-parser": "1.20.3", "ws": "8.17.1", - "node-forge": "1.3.2" + "node-forge": "1.3.2", + "tar": "7.5.7" } } diff --git a/yarn.lock b/yarn.lock index 6ea97083c..47859268b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2349,6 +2349,15 @@ __metadata: languageName: node linkType: hard +"@isaacs/fs-minipass@npm:^4.0.0": + version: 4.0.1 + resolution: "@isaacs/fs-minipass@npm:4.0.1" + dependencies: + minipass: ^7.0.4 + checksum: 5d36d289960e886484362d9eb6a51d1ea28baed5f5d0140bbe62b99bac52eaf06cc01c2bc0d3575977962f84f6b2c4387b043ee632216643d4787b0999465bf2 + languageName: node + linkType: hard + "@istanbuljs/load-nyc-config@npm:^1.0.0": version: 1.1.0 resolution: "@istanbuljs/load-nyc-config@npm:1.1.0" @@ -6915,10 +6924,10 @@ __metadata: languageName: node linkType: hard -"chownr@npm:^2.0.0": - version: 2.0.0 - resolution: "chownr@npm:2.0.0" - checksum: c57cf9dd0791e2f18a5ee9c1a299ae6e801ff58fee96dc8bfd0dcb4738a6ce58dd252a3605b1c93c6418fe4f9d5093b28ffbf4d66648cb2a9c67eaef9679be2f +"chownr@npm:^3.0.0": + version: 3.0.0 + resolution: "chownr@npm:3.0.0" + checksum: fd73a4bab48b79e66903fe1cafbdc208956f41ea4f856df883d0c7277b7ab29fd33ee65f93b2ec9192fc0169238f2f8307b7735d27c155821d886b84aa97aa8d languageName: node linkType: hard @@ -10176,15 +10185,6 @@ __metadata: languageName: node linkType: hard -"fs-minipass@npm:^2.0.0": - version: 2.1.0 - resolution: "fs-minipass@npm:2.1.0" - dependencies: - minipass: ^3.0.0 - checksum: 1b8d128dae2ac6cc94230cc5ead341ba3e0efaef82dab46a33d171c044caaa6ca001364178d42069b2809c35a1c3c35079a32107c770e9ffab3901b59af8c8b1 - languageName: node - linkType: hard - "fs-minipass@npm:^3.0.0": version: 3.0.3 resolution: "fs-minipass@npm:3.0.3" @@ -13371,13 +13371,6 @@ __metadata: languageName: node linkType: hard -"minipass@npm:^5.0.0": - version: 5.0.0 - resolution: "minipass@npm:5.0.0" - checksum: 425dab288738853fded43da3314a0b5c035844d6f3097a8e3b5b29b328da8f3c1af6fc70618b32c29ff906284cf6406b6841376f21caaadd0793c1d5a6a620ea - languageName: node - linkType: hard - "minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0, minipass@npm:^7.0.2, minipass@npm:^7.0.3": version: 7.0.4 resolution: "minipass@npm:7.0.4" @@ -13385,14 +13378,14 @@ __metadata: languageName: node linkType: hard -"minipass@npm:^7.1.2": +"minipass@npm:^7.0.4, minipass@npm:^7.1.2": version: 7.1.2 resolution: "minipass@npm:7.1.2" checksum: 2bfd325b95c555f2b4d2814d49325691c7bee937d753814861b0b49d5edcda55cbbf22b6b6a60bb91eddac8668771f03c5ff647dcd9d0f798e9548b9cdc46ee3 languageName: node linkType: hard -"minizlib@npm:^2.1.1, minizlib@npm:^2.1.2": +"minizlib@npm:^2.1.2": version: 2.1.2 resolution: "minizlib@npm:2.1.2" dependencies: @@ -13402,6 +13395,15 @@ __metadata: languageName: node linkType: hard +"minizlib@npm:^3.1.0": + version: 3.1.0 + resolution: "minizlib@npm:3.1.0" + dependencies: + minipass: ^7.1.2 + checksum: a15e6f0128f514b7d41a1c68ce531155447f4669e32d279bba1c1c071ef6c2abd7e4d4579bb59ccc2ed1531346749665968fdd7be8d83eb6b6ae2fe1f3d370a7 + languageName: node + linkType: hard + "mipd@npm:0.0.7": version: 0.0.7 resolution: "mipd@npm:0.0.7" @@ -13421,15 +13423,6 @@ __metadata: languageName: node linkType: hard -"mkdirp@npm:^1.0.3": - version: 1.0.4 - resolution: "mkdirp@npm:1.0.4" - bin: - mkdirp: bin/cmd.js - checksum: a96865108c6c3b1b8e1d5e9f11843de1e077e57737602de1b82030815f311be11f96f09cce59bd5b903d0b29834733e5313f9301e3ed6d6f6fba2eae0df4298f - languageName: node - linkType: hard - "mkdirp@npm:~0.5.1": version: 0.5.6 resolution: "mkdirp@npm:0.5.6" @@ -17818,17 +17811,16 @@ __metadata: languageName: node linkType: hard -"tar@npm:^6.1.11, tar@npm:^6.1.2": - version: 6.2.0 - resolution: "tar@npm:6.2.0" +"tar@npm:7.5.7": + version: 7.5.7 + resolution: "tar@npm:7.5.7" dependencies: - chownr: ^2.0.0 - fs-minipass: ^2.0.0 - minipass: ^5.0.0 - minizlib: ^2.1.1 - mkdirp: ^1.0.3 - yallist: ^4.0.0 - checksum: db4d9fe74a2082c3a5016630092c54c8375ff3b280186938cfd104f2e089c4fd9bad58688ef6be9cf186a889671bf355c7cda38f09bbf60604b281715ca57f5c + "@isaacs/fs-minipass": ^4.0.0 + chownr: ^3.0.0 + minipass: ^7.1.2 + minizlib: ^3.1.0 + yallist: ^5.0.0 + checksum: 82fa04804b6cae4c0b46b84e97a08c39e1c17bb959350baa32d139bcf5e1fc7ebc3ceb72465dd3e2e311992386ecc13599a257d5672158490ceb9464146d5573 languageName: node linkType: hard @@ -19637,6 +19629,13 @@ __metadata: languageName: node linkType: hard +"yallist@npm:^5.0.0": + version: 5.0.0 + resolution: "yallist@npm:5.0.0" + checksum: eba51182400b9f35b017daa7f419f434424410691bbc5de4f4240cc830fdef906b504424992700dc047f16b4d99100a6f8b8b11175c193f38008e9c96322b6a5 + languageName: node + linkType: hard + "yaml@npm:^1.10.0, yaml@npm:^1.10.2, yaml@npm:^1.7.2": version: 1.10.2 resolution: "yaml@npm:1.10.2"