Skip to content

Commit

Permalink
Merge branch 'main' into greg/viem-ox
Browse files Browse the repository at this point in the history
  • Loading branch information
gregfromstl committed Dec 18, 2024
2 parents 59faac0 + 7d8566e commit 6172ede
Show file tree
Hide file tree
Showing 306 changed files with 5,125 additions and 2,732 deletions.
5 changes: 0 additions & 5 deletions .changeset/tidy-squids-end.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/tricky-pears-check.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"thirdweb": patch
---

Adds Humanity Testnet as a legacy transaction chain
20 changes: 6 additions & 14 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,26 +1,18 @@
# Order is important; the last matching pattern takes the most precedence.

# default ownership group
- @jnsdls @joaquim-verges @MananTank @gregfromstl
@thirdweb-dev/developer-tools

# packages
packages/thirdweb/ @joaquim-verges @gregfromstl @jnsdls
packages/thirdweb/ @thirdweb-dev/core-platform @thirdweb-dev/developer-tools

## specific thirdweb pieces
packages/thirdweb/src/react/ @joaquim-verges @gregfromstl @MananTank @jnsdls @edwardysun
packages/thirdweb/src/reactive/ @joaquim-verges @gregfromstl @MananTank @jnsdls
packages/thirdweb/src/gas/ @joaquim-verges @jnsdls
packages/thirdweb/src/pay/ @joaquim-verges @gregfromstl @MananTank @jnsdls @edwardysun
packages/service-utils/ @arcoraven @jnsdls @joaquim-verges
packages/eslint-config-thirdweb/ @jnsdls @joaquim-verges
packages/tw-tsconfig/ @jnsdls @joaquim-verges
packages/service-utils/ @thirdweb-dev/core-platform
packages/eslint-config-thirdweb/ @thirdweb-dev/core-platform @edwardysun
packages/tw-tsconfig/ @thirdweb-dev/core-platform @edwardysun

# apps
apps/ @jnsdls @joaquim-verges
apps/dashboard/ @jnsdls @MananTank @joaquim-verges @jakubkrehel
apps/playground-web/ @joaquim-verges @gregfromstl @jnsdls @joaquim-verges @jakubkrehel
apps/wallet-ui/ @gregfromstl @jnsdls @joaquim-verges @MananTank @jakubkrehel
apps/portal/ @thirdweb-dev/product @thirdweb-dev/platform @thirdweb-dev/infra
apps/ @thirdweb-dev/developer-tools @thirdweb-dev/core-platform @jakubkrehel

# .github folder + .changeset + turbo config is owned by jonas for now
scripts/ @jnsdls @joaquim-verges
Expand Down
12 changes: 9 additions & 3 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,18 @@

version: 2
updates:
- package-ecosystem: "npm" # See documentation for possible values
directory: "/" # Location of package manifests
- package-ecosystem: "npm"
directory: "/"
schedule:
interval: "weekly"
ignore:
- dependency-name: "@aws-sdk/client-kms"
versions: ["3.592.0"]
- dependency-name: "@aws-sdk/client-lambda"
versions: ["3.592.0"]
- dependency-name: "@aws-sdk/credential-providers"
versions: ["3.592.0"]
- package-ecosystem: "github-actions"
directory: "/"
schedule:
# Check for updates to GitHub Actions every week
interval: "weekly"
6 changes: 5 additions & 1 deletion .github/workflows/auto-assign.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,17 @@ name: Auto Author Assign

on:
pull_request:
types: [ opened, reopened ]
types: [opened, reopened]

permissions:
pull-requests: write

jobs:
assign-author:
runs-on: ubuntu-latest
if: |
github.event.pull_request.author_association == 'MEMBER' ||
github.event.pull_request.author_association == 'OWNER' ||
github.event.pull_request.author_association == 'COLLABORATOR'
steps:
- uses: toshimaru/[email protected]
15 changes: 13 additions & 2 deletions .github/workflows/issue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ name: Linked Issue

on:
pull_request:
types: [opened, edited]
types: [opened, edited, ready_for_review]

env:
VALID_ISSUE_PREFIXES: "CNCT|DASH|PROT|INSIGHT"
VALID_ISSUE_PREFIXES: "CORE|TOOL"

jobs:
linear:
Expand All @@ -22,6 +22,17 @@ jobs:
pull_number: context.issue.number
});
// Check if contributor is external
const isInternalContributor = ['MEMBER', 'OWNER', 'COLLABORATOR'].includes(
context.payload.pull_request.author_association
);
// Automatically pass for external contributors
if (!isInternalContributor) {
console.log('External contributor detected - automatically passing check');
return;
}
const body = pr.data.body || '';
const branchName = pr.data.head.ref;
const issueRegex = new RegExp(`(${process.env.VALID_ISSUE_PREFIXES})-\\d+`, 'i');
Expand Down
50 changes: 50 additions & 0 deletions .github/workflows/typedoc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
name: TypeDoc

on:
push:
branches:
- main

permissions:
contents: read
pages: write
id-token: write

# Allow only one concurrent deployment
concurrency:
group: "typedoc"
cancel-in-progress: true

jobs:
build:
name: "Generate TypeDoc"
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Install
uses: ./.github/composite-actions/install

- name: Run TypeDoc
run: pnpm typedoc

- name: Update Gist
uses: actions/github-script@v7
with:
github-token: ${{ secrets.GIST_TOKEN }}
script: |
const fs = require('fs');
const content = fs.readFileSync('./packages/thirdweb/typedoc/parsed.json', 'utf8');
const gistId = '678fe1f331a01270bb002fee660f285d';
await github.rest.gists.update({
gist_id: gistId,
files: {
'data.json': {
content: content
}
}
});
console.log(`Permalink: https://gist.githubusercontent.com/raw/${gistId}/data.json`);
2 changes: 1 addition & 1 deletion apps/dashboard/next-env.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
/// <reference types="next/navigation-types/compat/navigation" />

// NOTE: This file should not be edited
// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.
// see https://nextjs.org/docs/app/api-reference/config/typescript for more information.
46 changes: 23 additions & 23 deletions apps/dashboard/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"private": true,
"scripts": {
"preinstall": "npx only-allow pnpm",
"dev": "next dev",
"dev": "next dev --turbo",
"build": "NODE_OPTIONS=--max-old-space-size=6144 next build",
"start": "next start",
"format": "biome format ./src --write",
Expand All @@ -30,28 +30,28 @@
"@hookform/resolvers": "^3.9.1",
"@marsidev/react-turnstile": "^1.1.0",
"@n8tb1t/use-scroll-position": "^2.0.3",
"@radix-ui/react-accordion": "^1.2.1",
"@radix-ui/react-alert-dialog": "^1.1.2",
"@radix-ui/react-avatar": "^1.1.1",
"@radix-ui/react-checkbox": "^1.1.2",
"@radix-ui/react-dialog": "1.1.2",
"@radix-ui/react-dropdown-menu": "^2.1.2",
"@radix-ui/react-hover-card": "^1.1.2",
"@radix-ui/react-label": "^2.1.0",
"@radix-ui/react-popover": "^1.1.2",
"@radix-ui/react-progress": "^1.1.0",
"@radix-ui/react-radio-group": "^1.2.1",
"@radix-ui/react-select": "^2.1.2",
"@radix-ui/react-separator": "^1.1.0",
"@radix-ui/react-slot": "^1.1.0",
"@radix-ui/react-switch": "^1.1.1",
"@radix-ui/react-tooltip": "1.1.4",
"@sentry/nextjs": "8.43.0",
"@shazow/whatsabi": "^0.17.0",
"@radix-ui/react-accordion": "^1.2.2",
"@radix-ui/react-alert-dialog": "^1.1.3",
"@radix-ui/react-avatar": "^1.1.2",
"@radix-ui/react-checkbox": "^1.1.3",
"@radix-ui/react-dialog": "1.1.3",
"@radix-ui/react-dropdown-menu": "^2.1.3",
"@radix-ui/react-hover-card": "^1.1.3",
"@radix-ui/react-label": "^2.1.1",
"@radix-ui/react-popover": "^1.1.3",
"@radix-ui/react-progress": "^1.1.1",
"@radix-ui/react-radio-group": "^1.2.2",
"@radix-ui/react-select": "^2.1.3",
"@radix-ui/react-separator": "^1.1.1",
"@radix-ui/react-slot": "^1.1.1",
"@radix-ui/react-switch": "^1.1.2",
"@radix-ui/react-tooltip": "1.1.5",
"@sentry/nextjs": "8.45.1",
"@shazow/whatsabi": "^0.18.0",
"@tanstack/react-query": "5.62.7",
"@tanstack/react-table": "^8.17.3",
"@tanstack/react-table": "^8.20.6",
"@thirdweb-dev/service-utils": "workspace:*",
"@vercel/functions": "^1.5.1",
"@vercel/functions": "^1.5.2",
"@vercel/og": "^0.6.4",
"abitype": "1.0.7",
"chakra-react-select": "^4.7.6",
Expand All @@ -62,7 +62,7 @@
"date-fns": "4.1.0",
"fetch-event-stream": "0.1.5",
"flat": "^6.0.1",
"framer-motion": "11.13.5",
"framer-motion": "11.15.0",
"fuse.js": "7.0.0",
"input-otp": "^1.4.1",
"ioredis": "^5.4.1",
Expand Down Expand Up @@ -133,7 +133,7 @@
"eslint-config-biome": "1.9.4",
"eslint-plugin-react-compiler": "19.0.0-beta-df7b47d-20241124",
"eslint-plugin-storybook": "^0.11.1",
"knip": "5.39.4",
"knip": "5.41.0",
"next-sitemap": "^4.2.3",
"postcss": "8.4.49",
"storybook": "8.4.7",
Expand Down
12 changes: 0 additions & 12 deletions apps/dashboard/public/assets/ambassadors/access-icon.svg

This file was deleted.

Binary file removed apps/dashboard/public/assets/ambassadors/bank.jpg
Binary file not shown.
Binary file removed apps/dashboard/public/assets/ambassadors/brolag.jpg
Binary file not shown.
30 changes: 0 additions & 30 deletions apps/dashboard/public/assets/ambassadors/card-1-icon.svg

This file was deleted.

12 changes: 0 additions & 12 deletions apps/dashboard/public/assets/ambassadors/card-2-icon.svg

This file was deleted.

Loading

0 comments on commit 6172ede

Please sign in to comment.