Skip to content

Commit 80d07bd

Browse files
committed
Merge branch 'winston/cnct-2522-unable-to-log-in-to-ecosystem-wallet-and-xai-connect' of https://github.com/thirdweb-dev/js into winston/cnct-2522-unable-to-log-in-to-ecosystem-wallet-and-xai-connect
2 parents eed086c + 16b4b82 commit 80d07bd

File tree

13 files changed

+44
-285
lines changed

13 files changed

+44
-285
lines changed

.changeset/tidy-zoos-know.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+
Fix: Removed the auth prop from useConnectModal as it is currently not supported

apps/dashboard/next-sitemap.config.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,14 @@ module.exports = {
4848
policies: [
4949
{
5050
userAgent: "*",
51-
[process.env.VERCEL_ENV !== "preview" &&
52-
process.env.VERCEL_ENV !== "development"
53-
? "allow"
54-
: "disallow"]: "/",
51+
// allow all if production
52+
allow: process.env.VERCEL_ENV === "production" ? ["/"] : [],
53+
// disallow all if not production
54+
disallow:
55+
process.env.VERCEL_ENV !== "production"
56+
? ["/"]
57+
: // disallow `/team` and `/team/*` if production
58+
["/team", "/team/*"],
5559
},
5660
],
5761
},

apps/dashboard/redirects.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,12 @@ async function redirects() {
291291
destination: "https://portal.thirdweb.com/connect/blockchain-api",
292292
permanent: false,
293293
},
294+
// redirect `/events` to homepage
295+
{
296+
source: "/events",
297+
destination: "/",
298+
permanent: false,
299+
},
294300
...legacyDashboardToTeamRedirects,
295301
];
296302
}

apps/dashboard/src/app/layout.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ const fontSans = Inter({
1717
});
1818

1919
export const metadata: Metadata = {
20+
metadataBase: new URL("https://thirdweb.com"),
21+
alternates: {
22+
canonical: "./",
23+
},
2024
title: "thirdweb: The complete web3 development platform",
2125
description:
2226
"Build web3 apps easily with thirdweb's powerful SDKs, audited smart contracts, and developer tools—for Ethereum & 700+ EVM chains. Try now.",

apps/dashboard/src/components/devRelEvents/DevRelEvent.tsx

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

apps/dashboard/src/page-id.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,6 @@ export enum PageId {
4646
// general product pages
4747
// ---------------------------------------------------------------------------
4848

49-
// thirdweb.com/events
50-
Events = "events",
51-
5249
// thirdweb..com/mission
5350
Mission = "mission",
5451

apps/dashboard/src/pages/events.tsx

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

apps/portal/src/app/connect/auth/frameworks/next/page.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ Create an `actions` directory with a `login.ts` file with the following:
226226
```tsx
227227
"use server";
228228
import { VerifyLoginPayloadParams, createAuth } from "thirdweb/auth";
229-
import { privateKeyAccount } from "thirdweb/wallets";
229+
import { privateKeyToAccount } from "thirdweb/wallets";
230230
import { client } from "@/lib/client";
231231
import { cookies } from "next/headers";
232232

@@ -238,7 +238,7 @@ if (!privateKey) {
238238

239239
const thirdwebAuth = createAuth({
240240
domain: process.env.NEXT_PUBLIC_THIRDWEB_AUTH_DOMAIN || "",
241-
adminAccount: privateKeyAccount({ client, privateKey }),
241+
adminAccount: privateKeyToAccount({ client, privateKey }),
242242
client: client,
243243
});
244244

apps/portal/src/components/others/TableOfContents.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import { cn } from "@/lib/utils";
44
import Link from "next/link";
5+
import { usePathname } from "next/navigation";
56
import { useEffect, useRef, useState } from "react";
67

78
/**
@@ -29,6 +30,7 @@ export function TableOfContentsSideBar(props: {
2930
}) {
3031
const [nodes, setNodes] = useState<TableOfContentNode[]>([]);
3132
const tocRef = useRef<HTMLDivElement>(null);
33+
const pathname = usePathname();
3234

3335
const [hideNav, setHideNav] = useState(false);
3436
const { filterHeading } = props;
@@ -45,6 +47,9 @@ export function TableOfContentsSideBar(props: {
4547
root.querySelectorAll("a[href^='#']"),
4648
) as HTMLAnchorElement[];
4749

50+
// using pathname to fix exhaustive dependency lint warning without suppressing it entirely
51+
tocRef.current?.setAttribute("data-pathname", pathname);
52+
4853
// hide anchors inside hidden elements
4954
const anchors = anchorsAll.filter((anchor) => {
5055
return anchor.closest("[data-collapsible]") === null;
@@ -104,7 +109,7 @@ export function TableOfContentsSideBar(props: {
104109
return () => {
105110
observer.disconnect();
106111
};
107-
}, [filterHeading]);
112+
}, [filterHeading, pathname]);
108113

109114
return (
110115
<nav

packages/thirdweb/.size-limit.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
{
99
"name": "thirdweb (cjs)",
1010
"path": "./dist/cjs/exports/thirdweb.js",
11-
"limit": "110 kB"
11+
"limit": "120 kB"
1212
},
1313
{
1414
"name": "thirdweb (minimal + tree-shaking)",

0 commit comments

Comments
 (0)