Skip to content

Commit 86f30c5

Browse files
authored
Merge branch 'main' into yash/interop-module-support
2 parents fb89708 + c547164 commit 86f30c5

File tree

482 files changed

+13795
-14256
lines changed

Some content is hidden

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

482 files changed

+13795
-14256
lines changed

.changeset/funny-dragons-thank.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/twelve-walls-teach.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.github/contributing.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ To get started, read the [How this repo works](#how-this-repo-works) section bel
66

77
From there, you can take a look at our [Good First Issues](https://github.com/thirdweb-dev/js/labels/good%20first%20issue) board and find an issue that interests you!
88

9-
If you have any questions about the issue, feel free to ask on our [Discord server](https://discord.gg/thirdweb) in the `#contributors` channel; where you'll be able to get help from our team and other contributors.
10-
119
<br />
1210

1311
## How this repo works
@@ -85,7 +83,10 @@ If your test depends on a downstream network call, you must mock the call using
8583
import { setupServer } from "msw/node";
8684
import { downloadMock, uploadMock } from "../../../test/src/mocks/storage.js";
8785

88-
const server = setupServer(uploadMock("HASH"), downloadMock({ name: "Test NFT" }));
86+
const server = setupServer(
87+
uploadMock("HASH"),
88+
downloadMock({ name: "Test NFT" })
89+
);
8990

9091
beforeAll(() => server.listen());
9192
afterEach(() => server.resetHandlers());

.github/workflows/CI.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ env:
2020

2121
jobs:
2222
optimize_ci:
23-
runs-on: ubuntu-latest
23+
runs-on: ubuntu-latest-8
2424
outputs:
2525
skip: ${{ steps.check_skip.outputs.skip }}
2626
steps:
@@ -34,7 +34,7 @@ jobs:
3434
build:
3535
needs: optimize_ci
3636
if: needs.optimize_ci.outputs.skip == 'false'
37-
runs-on: ubuntu-latest
37+
runs-on: ubuntu-latest-8
3838
name: Build Packages
3939
steps:
4040
- name: Check out the code
@@ -51,7 +51,7 @@ jobs:
5151
if: needs.optimize_ci.outputs.skip == 'false'
5252
timeout-minutes: 15
5353
name: Lint Packages
54-
runs-on: ubuntu-latest
54+
runs-on: ubuntu-latest-8
5555
steps:
5656
- name: Check out the code
5757
uses: actions/checkout@v4
@@ -71,7 +71,7 @@ jobs:
7171
if: needs.optimize_ci.outputs.skip == 'false'
7272
timeout-minutes: 15
7373
name: Unit Tests
74-
runs-on: ubuntu-latest
74+
runs-on: ubuntu-latest-8
7575
steps:
7676
- name: Check out the code
7777
uses: actions/checkout@v4
@@ -99,7 +99,7 @@ jobs:
9999
if: needs.optimize_ci.outputs.skip == 'false'
100100
timeout-minutes: 15
101101
name: E2E Tests
102-
runs-on: ubuntu-latest
102+
runs-on: ubuntu-latest-8
103103
strategy:
104104
matrix:
105105
package_manager: [npm, yarn, pnpm, bun]
@@ -169,7 +169,7 @@ jobs:
169169
if: github.event_name == 'pull_request' && needs.optimize_ci.outputs.skip == 'false'
170170
timeout-minutes: 15
171171
name: "Size"
172-
runs-on: ubuntu-latest
172+
runs-on: ubuntu-latest-8
173173
steps:
174174
- name: Check out the code
175175
uses: actions/checkout@v4

.github/workflows/issue.yml

Lines changed: 0 additions & 49 deletions
This file was deleted.

README.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@
1111
<a href="https://github.com/thirdweb-dev/js/actions/workflows/CI.yml">
1212
<img alt="Build Status" src="https://github.com/thirdweb-dev/js/actions/workflows/CI.yml/badge.svg"/>
1313
</a>
14-
<a href="https://discord.gg/thirdweb">
15-
<img alt="Join our Discord!" src="https://img.shields.io/discord/834227967404146718.svg?color=7289da&label=discord&logo=discord&style=flat"/>
16-
</a>
1714
</p>
1815

1916
<p align="center"><strong>All-in-one web3 SDK for Browser, Node and Mobile apps</strong></p>

apps/dashboard/.env.example

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,14 @@
66
# not required to build, defaults to prod
77
NEXT_PUBLIC_THIRDWEB_DOMAIN="localhost:3000"
88

9-
# API host. For local development, please use "https://api.thirdweb-preview.com"
9+
# API host. For local development, please use "https://api.thirdweb-dev.com"
1010
# otherwise: "https://api.thirdweb.com"
1111
NEXT_PUBLIC_THIRDWEB_API_HOST="https://api.thirdweb-dev.com"
1212

13+
# Bridge API. For local development, please use "https://bridge.thirdweb-dev.com"
14+
# otherwise: "https://bridge.thirdweb.com"
15+
NEXT_PUBLIC_THIRDWEB_BRIDGE_HOST="https://bridge.thirdweb-dev.com"
16+
1317
# Paper API host
1418
NEXT_PUBLIC_THIRDWEB_EWS_API_HOST="https://ews.thirdweb-dev.com"
1519

@@ -97,4 +101,4 @@ REDIS_URL=""
97101
ANALYTICS_SERVICE_URL=""
98102

99103
# Required for Nebula Chat
100-
NEXT_PUBLIC_NEBULA_URL=""
104+
NEXT_PUBLIC_NEBULA_URL=""

apps/dashboard/framer-rewrites.js

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ module.exports = [
1111
"/connect/sign-in",
1212
"/connect/account-abstraction",
1313
"/connect/universal-bridge",
14+
"/connect/auth",
15+
"/connect/in-app-wallets",
16+
// -- storage
17+
"/storage",
1418
// -- nebula
1519
"/nebula",
1620
// --insight
@@ -43,4 +47,14 @@ module.exports = [
4347
// -- templates --
4448
"/templates",
4549
"/templates/:template_slug",
50+
// -- learn --
51+
"/learn",
52+
"/learn/tutorials",
53+
"/learn/tutorials/:tutorial_slug",
54+
"/learn/guides",
55+
"/learn/guides/:guide_slug",
56+
"/learn/courses",
57+
"/learn/glossary",
58+
// -- faucets --
59+
"/faucets",
4660
];

apps/dashboard/knip.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,9 @@
99
],
1010
"project": ["src/**"],
1111
"ignoreBinaries": ["only-allow", "biome"],
12-
"ignoreDependencies": ["@storybook/blocks", "@thirdweb-dev/service-utils"]
12+
"ignoreDependencies": [
13+
"@storybook/blocks",
14+
"@thirdweb-dev/service-utils",
15+
"@types/color"
16+
]
1317
}

apps/dashboard/next.config.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const ContentSecurityPolicy = `
1212
style-src 'self' 'unsafe-inline' vercel.live;
1313
font-src 'self' vercel.live assets.vercel.com framerusercontent.com fonts.gstatic.com;
1414
frame-src * data:;
15-
script-src 'self' 'unsafe-eval' 'unsafe-inline' 'wasm-unsafe-eval' 'inline-speculation-rules' *.thirdweb.com *.thirdweb-dev.com vercel.live js.stripe.com framerusercontent.com events.framer.com challenges.cloudflare.com;
15+
script-src 'self' 'unsafe-eval' 'unsafe-inline' 'wasm-unsafe-eval' 'inline-speculation-rules' *.thirdweb.com *.thirdweb-dev.com vercel.live js.stripe.com framerusercontent.com events.framer.com challenges.cloudflare.com static.reo.dev;
1616
connect-src * data: blob:;
1717
worker-src 'self' blob:;
1818
block-all-mixed-content;
@@ -101,9 +101,6 @@ const SENTRY_OPTIONS: SentryBuildOptions = {
101101
// Routes browser requests to Sentry through a Next.js rewrite to circumvent ad-blockers (increases server load)
102102
tunnelRoute: "/err",
103103

104-
// Hides source maps from generated client bundles
105-
hideSourceMaps: true,
106-
107104
// Automatically tree-shake Sentry logger statements to reduce bundle size
108105
disableLogger: true,
109106

@@ -156,7 +153,7 @@ const baseNextConfig: NextConfig = {
156153
// re-write /home to / (this is so that logged in users will be able to go to /home and NOT be redirected to the logged in app)
157154
{
158155
source: "/home",
159-
destination: "/",
156+
destination: "https://landing.thirdweb.com",
160157
},
161158
...FRAMER_PATHS.map((path) => ({
162159
source: path,

0 commit comments

Comments
 (0)