Merge remote-tracking branch 'origin/main' into dalechyn/composer-act…

…ions
wevm · Jul 18, 2024 · a709e2b · a709e2b
2 parents 16f117f + ddb510f
commit a709e2b
Show file tree

Hide file tree

Showing 14 changed files with 92 additions and 228 deletions.
diff --git a/.github/workflows/on-push-to-main.yml b/.github/workflows/on-push-to-main.yml
@@ -42,7 +42,7 @@ jobs:
         with:
           title: 'chore: version packages'
           commit: 'chore: version packages'
-          publish: pnpm changeset:release
+          publish: pnpm changeset:publish
           version: pnpm changeset:version
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -59,4 +59,5 @@ jobs:
           git reset --hard origin/main
           pnpm clean
           pnpm changeset version --no-git-tag --snapshot canary
+          pnpm changeset:prepublish
           pnpm changeset publish --no-git-tag --snapshot canary --tag canary
diff --git a/package.json b/package.json
@@ -10,7 +10,8 @@
     "build:create-frog": "rimraf create-frog/_lib && tsc -p create-frog/tsconfig.build.json",
     "build:ui": "pnpm --filter ui build",
     "changeset": "changeset",
-    "changeset:release": "pnpm build && changeset publish",
+    "changeset:prepublish": "bun .scripts/postversion.ts && pnpm build",
+    "changeset:publish": "pnpm changeset:prepublish && changeset publish",
     "changeset:version": "changeset version && pnpm install --lockfile-only && bun .scripts/postversion.ts",
     "clean": "rimraf src/_lib src/protobufs/generated src/ui/icons/index.ts src/ui/icons/**/index.ts src/ui/icons/**/package.json src/ui/.frog src/tsconfig.build.tsbuildinfo",
     "create-frog": "node --import tsx ./create-frog/bin.ts",

diff --git a/playground/src/signature.tsx b/playground/src/signature.tsx
@@ -30,6 +30,7 @@ export const app = new Frog({ verify: 'silent', title: 'Signature' })
         Person: [
           { name: 'name', type: 'string' },
           { name: 'wallet', type: 'address' },
+          { name: 'balance', type: 'uint256' },
         ],
         Mail: [
           { name: 'from', type: 'Person' },
@@ -42,10 +43,12 @@ export const app = new Frog({ verify: 'silent', title: 'Signature' })
         from: {
           name: 'Cow',
           wallet: '0xCD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826',
+          balance: 0n,
         },
         to: {
           name: 'Bob',
           wallet: '0xbBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB',
+          balance: 1n,
         },
         contents: 'Hello, Bob!',
       },

diff --git a/site/pages/index.mdx b/site/pages/index.mdx
@@ -19,6 +19,3 @@ import { CollaborationBadge } from '../components/CollaborationBadge'
   </HomePage.Buttons>
 </HomePage.Root>
 
-# Sponsors
-
-::sponsors
diff --git a/site/vocs.config.tsx b/site/vocs.config.tsx
@@ -79,170 +79,6 @@ export default defineConfig({
       link: 'https://warpcast.com/wevm',
     },
   ],
-  sponsors: [
-    {
-      name: 'Collaborator',
-      height: 120,
-      items: [
-        [
-          {
-            name: 'Paradigm',
-            link: 'https://paradigm.xyz',
-            image:
-              'https://raw.githubusercontent.com/wevm/.github/main/content/sponsors/paradigm-light.svg',
-          },
-        ],
-      ],
-    },
-    {
-      name: 'Large Enterprise',
-      height: 60,
-      items: [
-        [
-          {
-            name: 'WalletConnect',
-            link: 'https://walletconnect.com',
-            image:
-              'https://raw.githubusercontent.com/wevm/.github/main/content/sponsors/walletconnect-light.svg',
-          },
-          {
-            name: 'Stripe',
-            link: 'https://www.stripe.com',
-            image:
-              'https://raw.githubusercontent.com/wevm/.github/main/content/sponsors/stripe-light.svg',
-          },
-        ],
-        [
-          {
-            name: 'PancakeSwap',
-            link: 'https://pancakeswap.finance/',
-            image:
-              'https://raw.githubusercontent.com/wevm/.github/main/content/sponsors/pancake-light.svg',
-          },
-          {
-            name: 'zkSync',
-            link: 'https://zksync.io',
-            image:
-              'https://raw.githubusercontent.com/wevm/.github/main/content/sponsors/zksync-light.svg',
-          },
-        ],
-      ],
-    },
-    {
-      name: 'Small Enterprise',
-      height: 40,
-      items: [
-        [
-          {
-            name: 'Family',
-            link: 'https://twitter.com/family',
-            image:
-              'https://raw.githubusercontent.com/wevm/.github/main/content/sponsors/family-light.svg',
-          },
-          {
-            name: 'Context',
-            link: 'https://twitter.com/context',
-            image:
-              'https://raw.githubusercontent.com/wevm/.github/main/content/sponsors/context-light.svg',
-          },
-          {
-            name: 'PartyDAO',
-            link: 'https://twitter.com/prtyDAO',
-            image:
-              'https://raw.githubusercontent.com/wevm/.github/main/content/sponsors/partydao-light.svg',
-          },
-        ],
-        [
-          {
-            name: 'SushiSwap',
-            link: 'https://www.sushi.com',
-            image:
-              'https://raw.githubusercontent.com/wevm/.github/main/content/sponsors/sushi-light.svg',
-          },
-          {
-            name: 'Dynamic',
-            link: 'https://www.dynamic.xyz',
-            image:
-              'https://raw.githubusercontent.com/wevm/.github/main/content/sponsors/dynamic-light.svg',
-          },
-          {
-            name: 'BitKeep',
-            link: 'https://bitkeep.com',
-            image:
-              'https://raw.githubusercontent.com/wevm/.github/main/content/sponsors/bitkeep-light.svg',
-          },
-        ],
-        [
-          {
-            name: 'Privy',
-            link: 'https://privy.io',
-            image:
-              'https://raw.githubusercontent.com/wevm/.github/main/content/sponsors/privy-light.svg',
-          },
-          {
-            name: 'Spruce',
-            link: 'https://spruceid.com',
-            image:
-              'https://raw.githubusercontent.com/wevm/.github/main/content/sponsors/spruce-light.svg',
-          },
-          {
-            name: 'rollup.id',
-            link: 'https://rollup.id',
-            image:
-              'https://raw.githubusercontent.com/wevm/.github/main/content/sponsors/rollup.id-light.svg',
-          },
-        ],
-        [
-          {
-            name: 'Celo',
-            link: 'https://celo.org',
-            image:
-              'https://raw.githubusercontent.com/wevm/.github/main/content/sponsors/celo-light.svg',
-          },
-          {
-            name: 'Rainbow',
-            link: 'https://rainbow.me',
-            image:
-              'https://raw.githubusercontent.com/wevm/.github/main/content/sponsors/rainbow-light.svg',
-          },
-          {
-            name: 'Pimlico',
-            link: 'https://pimlico.io',
-            image:
-              'https://raw.githubusercontent.com/wevm/.github/main/content/sponsors/pimlico-light.svg',
-          },
-        ],
-        [
-          {
-            name: 'Zora',
-            link: 'https://zora.co',
-            image:
-              'https://raw.githubusercontent.com/wevm/.github/main/content/sponsors/zora-light.svg',
-          },
-          {
-            name: 'Lattice',
-            link: 'https://lattice.xyz',
-            image:
-              'https://raw.githubusercontent.com/wevm/.github/main/content/sponsors/lattice-light.svg',
-          },
-        ],
-        [
-          {
-            name: 'Supa',
-            link: 'https://twitter.com/supafinance',
-            image:
-              'https://raw.githubusercontent.com/wevm/.github/main/content/sponsors/supa-light.svg',
-          },
-          {
-            name: 'Blocto',
-            link: 'https://blocto.io/',
-            image:
-              'https://raw.githubusercontent.com/wevm/.github/main/content/sponsors/blocto-light.svg',
-          },
-        ],
-      ],
-    },
-  ],
   sidebar: {
     '/': [
       {

diff --git a/src/CHANGELOG.md b/src/CHANGELOG.md
@@ -1,5 +1,68 @@
 # frog
 
+## 0.14.4
+
+### Patch Changes
+
+- [#420](https://github.com/wevm/frog/pull/420) [`6114139`](https://github.com/wevm/frog/commit/6114139cb7b56ca5bc95ae2af7722f9ba0ec7f80) Thanks [@dalechyn](https://github.com/dalechyn)! - Fixed an issue where `TextInput` component was unnecessarily unwrapped causing an issue with getting button values.
+
+## 0.14.3
+
+### Patch Changes
+
+- [#414](https://github.com/wevm/frog/pull/414) [`51f5678`](https://github.com/wevm/frog/commit/51f567877c8b8c6775e91d8e4ec5c066056830b7) Thanks [@dalechyn](https://github.com/dalechyn)! - Fixed an issue where `Box` props weren't accessible in `HStack` and `VStack` components.
+
+- [#417](https://github.com/wevm/frog/pull/417) [`24e7fd0`](https://github.com/wevm/frog/commit/24e7fd04a3fda767442f0b43e2fd1fd16d5f28c1) Thanks [@dalechyn](https://github.com/dalechyn)! - Fixed an issue where `verify` value would be the same as the parent's Frog instance even if `false` is passed.
+
+## 0.14.2
+
+### Patch Changes
+
+- [#412](https://github.com/wevm/frog/pull/412) [`10e522d`](https://github.com/wevm/frog/commit/10e522d1a0b5bf05090a5f829993f44495412afc) Thanks [@dalechyn](https://github.com/dalechyn)! - Reverted the changes introduced in 0.14.1.
+
+## 0.14.1
+
+### Patch Changes
+
+- [#409](https://github.com/wevm/frog/pull/409) [`9304567`](https://github.com/wevm/frog/commit/930456770370cd0f553d78e05071a07149cebda4) Thanks [@dalechyn](https://github.com/dalechyn)! - Fixed an issue where `c.deriveState` would not modify state in initial frame handler.
+
+## 0.14.0
+
+### Minor Changes
+
+- [#407](https://github.com/wevm/frog/pull/407) [`902f03d`](https://github.com/wevm/frog/commit/902f03dbcfa77afa027b94c90d755f09cb2380e4) Thanks [@dalechyn](https://github.com/dalechyn)! - **Breaking Change**. Added `chainId` back as a parameter to `.signature` handler's `c.signTypedData` response.
+
+  ```diff
+  app.signature('/sign', (c) =>
+    c.signTypedData({
+  +   chainId: 'eip155:8543',
+      /**/
+    })
+  ```
+
+## 0.13.1
+
+### Patch Changes
+
+- [#401](https://github.com/wevm/frog/pull/401) [`5cd9839`](https://github.com/wevm/frog/commit/5cd9839c65165eb5ef793612f08ea856c9f15fa9) Thanks [@dalechyn](https://github.com/dalechyn)! - Fixed an issue with serializing typed data messages that have `bigint` fields.
+
+## 0.13.0
+
+### Minor Changes
+
+- [#398](https://github.com/wevm/frog/pull/398) [`88b5361`](https://github.com/wevm/frog/commit/88b5361dc0b11b7130f527d69ce3c3045189a7c8) Thanks [@dalechyn](https://github.com/dalechyn)! - Removed `chainId` property from the `.signature` handler response. [See more](https://warpcast.notion.site/Frames-Wallet-Signatures-debe97a82e2643d094d4088f1badd791).
+  ```diff
+  app.signature('/sign', (c) =>
+    c.signTypedData({
+  -   chainId: 'eip155:8543',
+      /**/
+    })
+  ```
+
+### Patch Changes
+
+- [#398](https://github.com/wevm/frog/pull/398) [`88b5361`](https://github.com/wevm/frog/commit/88b5361dc0b11b7130f527d69ce3c3045189a7c8) Thanks [@dalechyn](https://github.com/dalechyn)! - Fixed a bug where `Button.Signature` would not set a correct `post_url`.
+
 ## 0.12.3
 
 ### Patch Changes

diff --git a/src/frog-base.tsx b/src/frog-base.tsx
@@ -1017,7 +1017,7 @@ export class FrogBase<
     if (!frog.origin) frog.origin = this.origin
     if (!frog.secret) frog.secret = this.secret
     if (!frog.ui) frog.ui = this.ui
-    if (!frog.verify) frog.verify = this.verify
+    if (typeof frog.verify === 'undefined') frog.verify = this.verify
 
     this.hono.route(path, frog.hono)
 
@@ -1088,7 +1088,13 @@ export class FrogBase<
         return c.json({ message: response.error.message })
       }
 
-      return c.json(response.data)
+      return c.text(
+        JSON.stringify(response.data, (_, value) =>
+          typeof value === 'bigint' ? value.toString() : value,
+        ),
+        200,
+        { 'Content-Type': 'application/json' },
+      )
     })
 
     return this

diff --git a/src/package.json b/src/package.json
@@ -1,7 +1,7 @@
 {
   "name": "frog",
   "description": "Framework for Farcaster Frames",
-  "version": "0.12.3",
+  "version": "0.14.4",
   "type": "module",
   "module": "_lib/index.js",
   "types": "_lib/index.d.ts",

diff --git a/src/types/signature.ts b/src/types/signature.ts
@@ -1,5 +1,4 @@
 import type { TypedData, TypedDataDefinition } from 'viem'
-
 import type { ChainIdEip155, ChainNamespace } from './transaction.js'
 
 import type { TypedResponse } from './response.js'

diff --git a/src/ui/HStack.tsx b/src/ui/HStack.tsx
@@ -1,31 +1,7 @@
 import { Box, type BoxProps } from './Box.js'
 import type { DefaultVars, Vars } from './vars.js'
 
-export type HStackProps<vars extends Vars = DefaultVars> = Pick<
-  BoxProps<vars>,
-  | 'bottom'
-  | 'children'
-  | 'flex'
-  | 'flexBasis'
-  | 'flexFlow'
-  | 'flexShrink'
-  | 'gap'
-  | 'grow'
-  | 'height'
-  | 'left'
-  | 'maxHeight'
-  | 'maxWidth'
-  | 'maxWidth'
-  | 'minWidth'
-  | 'padding'
-  | 'paddingBottom'
-  | 'paddingLeft'
-  | 'paddingRight'
-  | 'paddingTop'
-  | 'right'
-  | 'top'
-  | 'width'
-> & {
+export type HStackProps<vars extends Vars = DefaultVars> = BoxProps<vars> & {
   /** Horizontally aligns the contents. */
   alignHorizontal?: 'left' | 'center' | 'right' | 'space-between'
   /** Vertically aligns the contents. */

diff --git a/src/ui/VStack.tsx b/src/ui/VStack.tsx
@@ -1,31 +1,7 @@
 import { Box, type BoxProps } from './Box.js'
 import type { DefaultVars, Vars } from './vars.js'
 
-export type VStackProps<vars extends Vars = DefaultVars> = Pick<
-  BoxProps<vars>,
-  | 'bottom'
-  | 'children'
-  | 'flex'
-  | 'flexBasis'
-  | 'flexFlow'
-  | 'flexShrink'
-  | 'gap'
-  | 'grow'
-  | 'height'
-  | 'left'
-  | 'maxHeight'
-  | 'maxWidth'
-  | 'maxWidth'
-  | 'minWidth'
-  | 'padding'
-  | 'paddingBottom'
-  | 'paddingLeft'
-  | 'paddingRight'
-  | 'paddingTop'
-  | 'right'
-  | 'top'
-  | 'width'
-> & {
+export type VStackProps<vars extends Vars = DefaultVars> = BoxProps<vars> & {
   /** Horizontally aligns the contents. */
   alignHorizontal?: 'left' | 'center' | 'right'
   /** Vertically aligns the contents. */