Skip to content

Commit b4996be

Browse files
authored
Merge branch 'main' into np/minorfixes
2 parents db6920e + 7d8566e commit b4996be

File tree

328 files changed

+6706
-3314
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

328 files changed

+6706
-3314
lines changed

.changeset/tricky-pears-check.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"thirdweb": patch
3+
---
4+
5+
Adds Humanity Testnet as a legacy transaction chain

.github/CODEOWNERS

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,18 @@
11
# Order is important; the last matching pattern takes the most precedence.
22

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

66
# packages
7-
packages/thirdweb/ @joaquim-verges @gregfromstl @jnsdls
7+
packages/thirdweb/ @thirdweb-dev/core-platform @thirdweb-dev/developer-tools
88

99
## specific thirdweb pieces
10-
packages/thirdweb/src/react/ @joaquim-verges @gregfromstl @MananTank @jnsdls @edwardysun
11-
packages/thirdweb/src/reactive/ @joaquim-verges @gregfromstl @MananTank @jnsdls
12-
packages/thirdweb/src/gas/ @joaquim-verges @jnsdls
13-
packages/thirdweb/src/pay/ @joaquim-verges @gregfromstl @MananTank @jnsdls @edwardysun
14-
packages/service-utils/ @arcoraven @jnsdls @joaquim-verges
15-
packages/eslint-config-thirdweb/ @jnsdls @joaquim-verges
16-
packages/tw-tsconfig/ @jnsdls @joaquim-verges
10+
packages/service-utils/ @thirdweb-dev/core-platform
11+
packages/eslint-config-thirdweb/ @thirdweb-dev/core-platform @edwardysun
12+
packages/tw-tsconfig/ @thirdweb-dev/core-platform @edwardysun
1713

1814
# apps
19-
apps/ @jnsdls @joaquim-verges
20-
apps/dashboard/ @jnsdls @MananTank @joaquim-verges @jakubkrehel
21-
apps/playground-web/ @joaquim-verges @gregfromstl @jnsdls @joaquim-verges @jakubkrehel
22-
apps/wallet-ui/ @gregfromstl @jnsdls @joaquim-verges @MananTank @jakubkrehel
23-
apps/portal/ @thirdweb-dev/product @thirdweb-dev/platform @thirdweb-dev/infra
15+
apps/ @thirdweb-dev/developer-tools @thirdweb-dev/core-platform @jakubkrehel
2416

2517
# .github folder + .changeset + turbo config is owned by jonas for now
2618
scripts/ @jnsdls @joaquim-verges

.github/dependabot.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,18 @@
55

66
version: 2
77
updates:
8-
- package-ecosystem: "npm" # See documentation for possible values
9-
directory: "/" # Location of package manifests
8+
- package-ecosystem: "npm"
9+
directory: "/"
1010
schedule:
1111
interval: "weekly"
12+
ignore:
13+
- dependency-name: "@aws-sdk/client-kms"
14+
versions: ["3.592.0"]
15+
- dependency-name: "@aws-sdk/client-lambda"
16+
versions: ["3.592.0"]
17+
- dependency-name: "@aws-sdk/credential-providers"
18+
versions: ["3.592.0"]
1219
- package-ecosystem: "github-actions"
1320
directory: "/"
1421
schedule:
15-
# Check for updates to GitHub Actions every week
1622
interval: "weekly"

.github/workflows/CI.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
uses: ./.github/composite-actions/install
4545

4646
- name: Build Packages
47-
run: pnpm build:packages
47+
run: pnpm build
4848

4949
lint:
5050
needs: optimize_ci
@@ -112,7 +112,7 @@ jobs:
112112
uses: ./.github/composite-actions/install
113113

114114
- name: Build Packages
115-
run: pnpm build:packages
115+
run: pnpm build
116116

117117
- name: Install Yarn (if needed)
118118
if: matrix.package_manager == 'yarn'

.github/workflows/auto-assign.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,17 @@ name: Auto Author Assign
22

33
on:
44
pull_request:
5-
types: [ opened, reopened ]
5+
types: [opened, reopened]
66

77
permissions:
88
pull-requests: write
99

1010
jobs:
1111
assign-author:
1212
runs-on: ubuntu-latest
13+
if: |
14+
github.event.pull_request.author_association == 'MEMBER' ||
15+
github.event.pull_request.author_association == 'OWNER' ||
16+
github.event.pull_request.author_association == 'COLLABORATOR'
1317
steps:
1418
- uses: toshimaru/[email protected]

.github/workflows/issue.yml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ name: Linked Issue
22

33
on:
44
pull_request:
5-
types: [opened, edited]
5+
types: [opened, edited, ready_for_review]
66

77
env:
8-
VALID_ISSUE_PREFIXES: "CNCT|DASH|PROT|INSIGHT"
8+
VALID_ISSUE_PREFIXES: "CORE|TOOL"
99

1010
jobs:
1111
linear:
@@ -22,6 +22,17 @@ jobs:
2222
pull_number: context.issue.number
2323
});
2424
25+
// Check if contributor is external
26+
const isInternalContributor = ['MEMBER', 'OWNER', 'COLLABORATOR'].includes(
27+
context.payload.pull_request.author_association
28+
);
29+
30+
// Automatically pass for external contributors
31+
if (!isInternalContributor) {
32+
console.log('External contributor detected - automatically passing check');
33+
return;
34+
}
35+
2536
const body = pr.data.body || '';
2637
const branchName = pr.data.head.ref;
2738
const issueRegex = new RegExp(`(${process.env.VALID_ISSUE_PREFIXES})-\\d+`, 'i');

.github/workflows/release-nightly.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,9 @@ jobs:
3030
# Do not use the GITHUB_TOKEN by default
3131
token: ${{ secrets.CUSTOM_GITHUB_TOKEN }}
3232

33-
- name: Setup bun
34-
uses: oven-sh/setup-bun@v1
35-
with:
36-
bun-version: 1.0.35
37-
3833
- name: Install
3934
uses: ./.github/composite-actions/install
4035

41-
- name: Build
42-
run: pnpm build
43-
4436
- name: Create @nightly release
4537
run: |
4638
pnpm version-packages:nightly

.github/workflows/release.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,9 @@ jobs:
3131
# Do not use the GITHUB_TOKEN by default
3232
token: ${{ secrets.CUSTOM_GITHUB_TOKEN }}
3333

34-
- name: Setup bun
35-
uses: oven-sh/setup-bun@v1
36-
with:
37-
bun-version: 1.0.35
38-
3934
- name: Install
4035
uses: ./.github/composite-actions/install
4136

42-
- name: Build
43-
run: pnpm build:release
44-
4537
- name: Create release Pull Request or publish to NPM
4638
id: changesets
4739
uses: changesets/action@v1

.github/workflows/typedoc.yml

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
name: TypeDoc
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
8+
permissions:
9+
contents: read
10+
pages: write
11+
id-token: write
12+
13+
# Allow only one concurrent deployment
14+
concurrency:
15+
group: "typedoc"
16+
cancel-in-progress: true
17+
18+
jobs:
19+
build:
20+
name: "Generate TypeDoc"
21+
runs-on: ubuntu-latest
22+
steps:
23+
- name: Checkout
24+
uses: actions/checkout@v4
25+
26+
- name: Install
27+
uses: ./.github/composite-actions/install
28+
29+
- name: Run TypeDoc
30+
run: pnpm typedoc
31+
32+
- name: Update Gist
33+
uses: actions/github-script@v7
34+
with:
35+
github-token: ${{ secrets.GIST_TOKEN }}
36+
script: |
37+
const fs = require('fs');
38+
const content = fs.readFileSync('./packages/thirdweb/typedoc/parsed.json', 'utf8');
39+
const gistId = '678fe1f331a01270bb002fee660f285d';
40+
41+
await github.rest.gists.update({
42+
gist_id: gistId,
43+
files: {
44+
'data.json': {
45+
content: content
46+
}
47+
}
48+
});
49+
50+
console.log(`Permalink: https://gist.githubusercontent.com/raw/${gistId}/data.json`);

apps/dashboard/next-env.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
/// <reference types="next/navigation-types/compat/navigation" />
44

55
// NOTE: This file should not be edited
6-
// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.
6+
// see https://nextjs.org/docs/app/api-reference/config/typescript for more information.

0 commit comments

Comments
 (0)