Skip to content

Commit 6a41b31

Browse files
committed
Merge branch 'main' into mintable-module
2 parents 9798428 + cc47b7b commit 6a41b31

File tree

506 files changed

+9712
-13562
lines changed

Some content is hidden

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

506 files changed

+9712
-13562
lines changed

.changeset/early-shoes-applaud.md

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

.changeset/fuzzy-olives-prove.md

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

.changeset/smart-chicken-beam.md

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

.changeset/three-dancers-hear.md

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

.github/workflows/linear.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: Check for linked issue in pull request body
2+
3+
on:
4+
pull_request:
5+
types:
6+
- opened
7+
- edited
8+
9+
jobs:
10+
check_linear_in_pr_body:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- name: Check for linked issue in pull request body
14+
run: |
15+
pr_body=$(curl -s \
16+
-H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
17+
https://api.github.com/repos/${{ github.repository }}/pulls/${{ github.event.number }} | jq -r .body)
18+
19+
echo "Pull Request Body: $pr_body"
20+
21+
if echo "$pr_body" | grep -iE "CNCT|DASH"; then
22+
echo "Linked issue found in the pull request body."
23+
else
24+
echo "No linked issue found in the pull request body."
25+
exit 1
26+
fi

.github/workflows/stale.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: 'Close stale issues and PRs'
2+
on:
3+
schedule:
4+
- cron: '30 1 * * *'
5+
6+
jobs:
7+
stale:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- uses: actions/stale@v9
11+
with:
12+
stale-issue-message: 'This issue has been inactive for 30 days. It is now marked as stale and will be closed in 5 days if no further activity occurs.'
13+
stale-pr-message: 'This PR has been inactive for 30 days. It is now marked as stale and will be closed in 5 days if no further activity occurs.'
14+
days-before-stale: 30
15+
days-before-close: 5

apps/dashboard/README.md

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,17 @@ Some env vars can be overridden that are required for some external services to
2323

2424
To define env vars please create a `.env` file based on the `.env.example` template at the root level of the project. This file is ignored by git so you can safely add it to your local copy of the project.
2525

26-
**Add your thirdweb clientID and secret key to build a basic functioning version of the site.**
26+
**Add your thirdweb clientID and secret key to build a basic functioning version of the site.**
27+
28+
## Code Structure and Style Guide
29+
30+
### Components
31+
- Components should go in a `components` folder next to the app page they are used in.
32+
- If a component is reused in multiple pages, it should go in the lowest level route folder it is used in. For example, if a chart component is used in all analytics subroutes `/analytics/...`, it should go in the `/analytics/components` folder.
33+
- All low-level components such as buttons, inputs, etc. should be shadcn components found in `@/ui`.
34+
- All composed components reused across all page routes are `blocks`, and should also go in the `@/ui` folder.
35+
36+
### Data fetching
37+
- Use RSC wherever possible.
38+
- Write data fetching code in its own function in the same file as the component it is used in, not exported.
39+
- If the same data fetching function is used in multiple components, place it in a file in an `api` folder at the lowest level possible (just like components). If you need to do this you probable aren't organizing your components properly.

apps/dashboard/framer-rewrites.js

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,20 @@
11
// add framer paths here
22
module.exports = [
3+
// -- home
34
"/",
5+
// -- product landing pages --
6+
// -- connect
47
"/connect/sign-in",
8+
// -- contracts
59
"/contracts/modular-contracts",
10+
"/contracts/explore",
11+
"/contracts/deployment-tool",
12+
// -- engine
13+
"/engine",
14+
// -- solutions pages --
15+
"/solutions/gaming",
16+
"/solutions/consumer-apps",
17+
"/solutions/defi",
18+
// -- campaigns --
619
"/unlimited-wallets",
720
];

apps/dashboard/next.config.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,6 @@ const moduleExports = {
158158
serverSourceMaps: false,
159159
},
160160
cacheMaxMemorySize: 0,
161-
swcMinify: true,
162161
compiler: {
163162
emotion: true,
164163
},

apps/dashboard/package.json

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"private": true,
55
"scripts": {
66
"preinstall": "npx only-allow pnpm",
7-
"dev": "next dev --turbo",
7+
"dev": "next dev --turbopack",
88
"build": "next build",
99
"start": "next start",
1010
"format": "biome format ./src --write",
@@ -27,7 +27,7 @@
2727
"@chakra-ui/theme-tools": "^2.1.2",
2828
"@emotion/react": "11.13.3",
2929
"@emotion/styled": "11.13.0",
30-
"@hookform/resolvers": "^3.9.0",
30+
"@hookform/resolvers": "^3.9.1",
3131
"@marsidev/react-turnstile": "^1.0.2",
3232
"@n8tb1t/use-scroll-position": "^2.0.3",
3333
"@radix-ui/react-accordion": "^1.2.1",
@@ -46,13 +46,14 @@
4646
"@radix-ui/react-slot": "^1.1.0",
4747
"@radix-ui/react-switch": "^1.1.1",
4848
"@radix-ui/react-tooltip": "1.1.3",
49-
"@sentry/nextjs": "8.35.0",
50-
"@shazow/whatsabi": "^0.15.4",
49+
"@sentry/nextjs": "8.36.0",
50+
"@shazow/whatsabi": "^0.16.0",
5151
"@stripe/react-stripe-js": "^2.8.1",
5252
"@stripe/stripe-js": "^3.5.0",
53-
"@tanstack/react-query": "5.59.16",
53+
"@tanstack/react-query": "5.59.19",
5454
"@tanstack/react-table": "^8.17.3",
5555
"@thirdweb-dev/service-utils": "workspace:*",
56+
"@vercel/functions": "^1.4.2",
5657
"@vercel/og": "^0.6.2",
5758
"abitype": "1.0.6",
5859
"chakra-react-select": "^4.7.6",
@@ -62,38 +63,38 @@
6263
"compare-versions": "^6.1.0",
6364
"date-fns": "4.1.0",
6465
"flat": "^6.0.1",
65-
"framer-motion": "11.11.10",
66+
"framer-motion": "11.11.11",
6667
"fuse.js": "7.0.0",
67-
"input-otp": "^1.2.4",
68+
"input-otp": "^1.4.1",
6869
"ioredis": "^5.4.1",
6970
"ipaddr.js": "^2.2.0",
7071
"lottie-react": "^2.4.0",
7172
"lucide-react": "0.454.0",
72-
"next": "14.2.15",
73-
"next-plausible": "^3.12.0",
73+
"next": "15.0.2",
74+
"next-plausible": "^3.12.3",
7475
"next-seo": "^6.5.0",
75-
"next-themes": "^0.3.0",
76+
"next-themes": "^0.4.3",
7677
"nextjs-toploader": "^1.6.12",
7778
"papaparse": "^5.4.1",
7879
"pluralize": "^8.0.0",
7980
"posthog-js": "1.67.1",
8081
"prism-react-renderer": "^2.3.1",
8182
"prismjs": "^1.29.0",
8283
"qrcode": "^1.5.3",
83-
"react": "18.3.1",
84+
"react": "19.0.0-rc-69d4b800-20241021",
8485
"react-children-utilities": "^2.10.0",
8586
"react-day-picker": "^8.10.1",
86-
"react-dom": "18.3.1",
87-
"react-dropzone": "^14.2.9",
87+
"react-dom": "19.0.0-rc-69d4b800-20241021",
88+
"react-dropzone": "^14.3.5",
8889
"react-error-boundary": "^4.1.2",
8990
"react-hook-form": "7.52.0",
9091
"react-markdown": "^9.0.1",
9192
"react-responsive-carousel": "^3.2.23",
9293
"react-table": "^7.8.0",
93-
"recharts": "^2.13.0",
94+
"recharts": "^2.13.3",
9495
"remark-gfm": "^4.0.0",
9596
"server-only": "^0.0.1",
96-
"sonner": "^1.5.0",
97+
"sonner": "^1.7.0",
9798
"spdx-correct": "^3.2.0",
9899
"swagger-ui-react": "^5.17.14",
99100
"tailwind-merge": "^2.5.4",
@@ -105,26 +106,26 @@
105106
},
106107
"devDependencies": {
107108
"@chakra-ui/cli": "^2.4.1",
108-
"@chromatic-com/storybook": "2.0.2",
109-
"@next/bundle-analyzer": "14.2.15",
110-
"@next/eslint-plugin-next": "14.2.15",
109+
"@chromatic-com/storybook": "3.2.2",
110+
"@next/bundle-analyzer": "15.0.2",
111+
"@next/eslint-plugin-next": "15.0.2",
111112
"@playwright/test": "1.48.2",
112-
"@storybook/addon-essentials": "8.3.6",
113-
"@storybook/addon-interactions": "8.3.6",
114-
"@storybook/addon-links": "8.3.6",
115-
"@storybook/addon-onboarding": "8.3.6",
116-
"@storybook/addon-viewport": "8.3.6",
117-
"@storybook/blocks": "8.3.6",
118-
"@storybook/nextjs": "8.3.6",
119-
"@storybook/react": "8.3.6",
120-
"@storybook/test": "8.3.6",
113+
"@storybook/addon-essentials": "8.4.2",
114+
"@storybook/addon-interactions": "8.4.2",
115+
"@storybook/addon-links": "8.4.2",
116+
"@storybook/addon-onboarding": "8.4.2",
117+
"@storybook/addon-viewport": "8.4.2",
118+
"@storybook/blocks": "8.4.2",
119+
"@storybook/nextjs": "8.4.2",
120+
"@storybook/react": "8.4.2",
121+
"@storybook/test": "8.4.2",
121122
"@types/color": "4.2.0",
122123
"@types/node": "20.14.9",
123124
"@types/papaparse": "^5.3.15",
124125
"@types/pluralize": "^0.0.33",
125126
"@types/qrcode": "^1.5.5",
126-
"@types/react": "^18.3.11",
127-
"@types/react-dom": "^18.3.1",
127+
"@types/react": "npm:[email protected]",
128+
"@types/react-dom": "npm:[email protected].1",
128129
"@types/react-table": "^7.7.20",
129130
"@types/spdx-correct": "^3.1.3",
130131
"@types/swagger-ui-react": "^4.18.3",
@@ -134,12 +135,12 @@
134135
"checkly": "^4.8.1",
135136
"eslint": "8.57.0",
136137
"eslint-config-biome": "1.9.3",
137-
"eslint-plugin-react-compiler": "0.0.0-experimental-fa06e2c-20241014",
138+
"eslint-plugin-react-compiler": "19.0.0-beta-8a03594-20241020",
138139
"eslint-plugin-storybook": "^0.9.0",
139-
"knip": "5.34.2",
140+
"knip": "5.36.2",
140141
"next-sitemap": "^4.2.3",
141142
"postcss": "8.4.47",
142-
"storybook": "8.3.6",
143+
"storybook": "8.4.2",
143144
"tailwindcss": "3.4.14",
144145
"typescript": "5.6.3"
145146
}

0 commit comments

Comments
 (0)