diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 82b9ffa..f649c74 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -36,19 +36,19 @@ jobs: run: git submodule update --init --recursive - name: Install dependencies - run: pnpm i --frozen-lockfile + run: pnpm i --frozen-lockfile --ignore-scripts - name: Build dependencies working-directory: . - run: pnpm --filter passkeys --filter passkeys-react build + run: pnpm --filter passkey-signer --filter passkey-signer-react build - name: Upload build artifacts uses: actions/upload-artifact@v4 with: name: dist-files path: | - packages/passkeys/dist - packages/passkeys-react/dist + packages/passkey-signer/dist + packages/passkey-signer-react/dist - name: Run ESLint run: pnpm lint @@ -82,7 +82,7 @@ jobs: run: git submodule update --init --recursive - name: Install dependencies - run: pnpm i --frozen-lockfile + run: pnpm i --frozen-lockfile --ignore-scripts - name: Download build artifacts uses: actions/download-artifact@v4 diff --git a/README.md b/README.md index a014f30..ad87e57 100644 --- a/README.md +++ b/README.md @@ -62,13 +62,17 @@ Follow these steps to build the extension and install it in Google Chrome: cd apps/signer ``` -3. Install the dependencies: +4. Install the dependencies: ```sh pnpm i ``` -4. Build the extension: + The`postinstall` hook in the root `package.json` will trigger builds for `packages/passkey-signer` and `packages/passkey-signer-react` modules which are required to be built prior to running app/signer `build` script. + + Both of those packages have to be rebuilt after each change in their codebase. + +5. Build the extension: ```sh pnpm build diff --git a/apps/signer/package.json b/apps/signer/package.json index a891f9c..4738b6a 100644 --- a/apps/signer/package.json +++ b/apps/signer/package.json @@ -11,8 +11,8 @@ "lint": "eslint" }, "dependencies": { - "passkeys": "workspace:*", - "passkeys-react": "workspace:*", + "passkey-signer": "workspace:*", + "passkey-signer-react": "workspace:*", "@better-fetch/fetch": "^1.1.18", "@jstz-dev/jstz-client": "0.1.1-alpha.5", "@jstz-dev/jstz_sdk": "0.1.1-alpha.5", diff --git a/apps/signer/src/main.tsx b/apps/signer/src/main.tsx index 041dc2b..18542fb 100644 --- a/apps/signer/src/main.tsx +++ b/apps/signer/src/main.tsx @@ -1,4 +1,4 @@ -import { PasskeyProvider } from "passkeys-react"; +import { PasskeyProvider } from "passkey-signer-react"; import { StrictMode } from "react"; import { createRoot } from "react-dom/client"; import { RouterProvider } from "react-router"; diff --git a/apps/signer/src/pages/home/Home.tsx b/apps/signer/src/pages/home/Home.tsx index 32bf6f5..95ad33b 100644 --- a/apps/signer/src/pages/home/Home.tsx +++ b/apps/signer/src/pages/home/Home.tsx @@ -3,8 +3,8 @@ import * as SimpleWebAuthnBrowser from "@simplewebauthn/browser"; import * as TaquitoUtils from "@taquito/utils"; import { Button, buttonVariants } from "jstz-ui/ui/button"; import { ArrowLeft, ExternalLink } from "lucide-react"; -import { parseKey } from "passkeys"; -import { usePasskeyWallet } from "passkeys-react"; +import { parseKey } from "passkey-signer"; +import { usePasskeyWallet } from "passkey-signer-react"; import { Link, redirect, useLocation, useNavigate, type LoaderFunctionArgs } from "react-router"; import { AccountSelect } from "~/components/AccountSelect"; import { StorageKeys } from "~/lib/constants/storage"; diff --git a/apps/signer/src/pages/wallet/Wallet.tsx b/apps/signer/src/pages/wallet/Wallet.tsx index b1d6c23..ecb1e70 100644 --- a/apps/signer/src/pages/wallet/Wallet.tsx +++ b/apps/signer/src/pages/wallet/Wallet.tsx @@ -8,7 +8,7 @@ import { Tooltip, TooltipContent, TooltipTrigger } from "jstz-ui/ui/tooltip"; import { cn } from "jstz-ui/utils"; import { Eye, EyeOff } from "lucide-react"; import { useQueryStates } from "nuqs"; -import { usePasskeyWallet } from "passkeys-react"; +import { usePasskeyWallet } from "passkey-signer-react"; import { Suspense, useState } from "react"; import { redirect, useParams, type LoaderFunctionArgs } from "react-router"; import SuperJSON from "superjson"; diff --git a/package.json b/package.json index 8c8cbd9..6e8b9c9 100644 --- a/package.json +++ b/package.json @@ -5,6 +5,9 @@ "type": "module", "private": true, "packageManager": "pnpm@10.12.4+sha512.5ea8b0deed94ed68691c9bad4c955492705c5eeb8a87ef86bc62c74a26b037b08ff9570f108b2e4dbd1dd1a9186fea925e527f141c648e85af45631074680184", + "scripts": { + "postinstall": "pnpm --filter passkey-signer --filter passkey-signer-react build" + }, "devDependencies": { "prettier": "^3.6.2", "prettier-plugin-organize-imports": "^4.3.0", diff --git a/packages/passkeys-react/package.json b/packages/passkey-signer-react/package.json similarity index 90% rename from packages/passkeys-react/package.json rename to packages/passkey-signer-react/package.json index 4dee872..f6bb5c5 100644 --- a/packages/passkeys-react/package.json +++ b/packages/passkey-signer-react/package.json @@ -1,5 +1,5 @@ { - "name": "passkeys-react", + "name": "passkey-signer-react", "version": "0.0.1", "description": "", "scripts": { @@ -20,7 +20,7 @@ "react": "^19.0.0" }, "dependencies": { - "passkeys": "workspace:*" + "passkey-signer": "workspace:*" }, "devDependencies": { "@types/react": "^19.2.6", diff --git a/packages/passkeys-react/src/PasskeyWalletProvider.jsx b/packages/passkey-signer-react/src/PasskeyWalletProvider.jsx similarity index 89% rename from packages/passkeys-react/src/PasskeyWalletProvider.jsx rename to packages/passkey-signer-react/src/PasskeyWalletProvider.jsx index 58e5bfc..aedd65c 100644 --- a/packages/passkeys-react/src/PasskeyWalletProvider.jsx +++ b/packages/passkey-signer-react/src/PasskeyWalletProvider.jsx @@ -1,8 +1,8 @@ -import { PasskeyWallet } from "passkeys"; +import { PasskeyWallet } from "passkey-signer"; import { createContext, useContext, useMemo, useRef } from "react"; /** @import {PropsWithChildren, Context} from "react"; */ -/** @import {UserStore} from "passkeys"; */ +/** @import {UserStore} from "passkey-signer"; */ /** @type {Context<{ wallet: PasskeyWallet }>} */ const PasskeyContext = createContext(/** @type {{ wallet: PasskeyWallet }} */ ({})); diff --git a/packages/passkeys-react/src/constants.js b/packages/passkey-signer-react/src/constants.js similarity index 100% rename from packages/passkeys-react/src/constants.js rename to packages/passkey-signer-react/src/constants.js diff --git a/packages/passkeys-react/src/index.js b/packages/passkey-signer-react/src/index.js similarity index 100% rename from packages/passkeys-react/src/index.js rename to packages/passkey-signer-react/src/index.js diff --git a/packages/passkeys-react/tsconfig.json b/packages/passkey-signer-react/tsconfig.json similarity index 100% rename from packages/passkeys-react/tsconfig.json rename to packages/passkey-signer-react/tsconfig.json diff --git a/packages/passkeys-react/tsdown.config.ts b/packages/passkey-signer-react/tsdown.config.ts similarity index 100% rename from packages/passkeys-react/tsdown.config.ts rename to packages/passkey-signer-react/tsdown.config.ts diff --git a/packages/passkeys/package.json b/packages/passkey-signer/package.json similarity index 96% rename from packages/passkeys/package.json rename to packages/passkey-signer/package.json index b2e52bb..65d5cda 100644 --- a/packages/passkeys/package.json +++ b/packages/passkey-signer/package.json @@ -1,5 +1,5 @@ { - "name": "passkeys", + "name": "passkey-signer", "version": "0.0.1", "description": "", "scripts": { diff --git a/packages/passkeys/src/PasskeyWallet.js b/packages/passkey-signer/src/PasskeyWallet.js similarity index 100% rename from packages/passkeys/src/PasskeyWallet.js rename to packages/passkey-signer/src/PasskeyWallet.js diff --git a/packages/passkeys/src/encode.js b/packages/passkey-signer/src/encode.js similarity index 100% rename from packages/passkeys/src/encode.js rename to packages/passkey-signer/src/encode.js diff --git a/packages/passkeys/src/index.ts b/packages/passkey-signer/src/index.ts similarity index 100% rename from packages/passkeys/src/index.ts rename to packages/passkey-signer/src/index.ts diff --git a/packages/passkeys/src/userStore.d.ts b/packages/passkey-signer/src/userStore.d.ts similarity index 100% rename from packages/passkeys/src/userStore.d.ts rename to packages/passkey-signer/src/userStore.d.ts diff --git a/packages/passkeys/src/utils.js b/packages/passkey-signer/src/utils.js similarity index 100% rename from packages/passkeys/src/utils.js rename to packages/passkey-signer/src/utils.js diff --git a/packages/passkeys/tsconfig.json b/packages/passkey-signer/tsconfig.json similarity index 100% rename from packages/passkeys/tsconfig.json rename to packages/passkey-signer/tsconfig.json diff --git a/packages/passkeys/tsdown.config.ts b/packages/passkey-signer/tsdown.config.ts similarity index 100% rename from packages/passkeys/tsdown.config.ts rename to packages/passkey-signer/tsdown.config.ts diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 43c5075..50bf5ca 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -74,12 +74,12 @@ importers: nuqs: specifier: ^2.8.0 version: 2.8.0(react-router@7.9.6(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(react@19.2.0) - passkeys: + passkey-signer: specifier: workspace:* - version: link:../../packages/passkeys - passkeys-react: + version: link:../../packages/passkey-signer + passkey-signer-react: specifier: workspace:* - version: link:../../packages/passkeys-react + version: link:../../packages/passkey-signer-react react: specifier: ~19.2.0 version: 19.2.0 @@ -317,7 +317,7 @@ importers: specifier: ^3.2.4 version: 3.2.4(@types/debug@4.1.12)(@types/node@22.18.12)(@vitest/browser@3.2.4)(jiti@2.6.1)(lightningcss@1.30.2) - packages/passkeys: + packages/passkey-signer: dependencies: '@jstz-dev/jstz-client': specifier: 0.1.1-alpha.5 @@ -345,11 +345,11 @@ importers: specifier: ^5.9.3 version: 5.9.3 - packages/passkeys-react: + packages/passkey-signer-react: dependencies: - passkeys: + passkey-signer: specifier: workspace:* - version: link:../passkeys + version: link:../passkey-signer devDependencies: '@types/react': specifier: ^19.2.6