Skip to content

Commit

Permalink
Merge pull request #491 from elsoul/addFrontend
Browse files Browse the repository at this point in the history
update Next.js 15.1, React 19 stable, stop to use __filename, Update Solana Web3.js
  • Loading branch information
KishiTheMechanic authored Dec 28, 2024
2 parents e437ae9 + fb4d0b8 commit abaeb29
Show file tree
Hide file tree
Showing 25 changed files with 811 additions and 1,318 deletions.
1,727 changes: 744 additions & 983 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

47 changes: 21 additions & 26 deletions website/skeet-dev/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
},
"packageManager": "[email protected]",
"scripts": {
"dev": "next dev -p 4242",
"dev": "next dev --turbopack -p 4242",
"build": "next build",
"postbuild": "next-sitemap",
"start": "next start",
Expand All @@ -27,24 +27,23 @@
"@fortawesome/free-solid-svg-icons": "6.5.2",
"@fortawesome/react-fontawesome": "0.2.2",
"@glitchful-dev/sol-apy-sdk": "3.0.8",
"@radix-ui/react-aspect-ratio": "1.1.0",
"@radix-ui/react-avatar": "1.0.4",
"@radix-ui/react-dialog": "1.0.5",
"@radix-ui/react-dropdown-menu": "2.0.6",
"@radix-ui/react-icons": "1.3.0",
"@radix-ui/react-label": "2.0.2",
"@radix-ui/react-aspect-ratio": "1.1.1",
"@radix-ui/react-avatar": "1.1.2",
"@radix-ui/react-dialog": "1.1.4",
"@radix-ui/react-dropdown-menu": "2.1.4",
"@radix-ui/react-icons": "1.3.2",
"@radix-ui/react-label": "2.1.1",
"@radix-ui/react-progress": "1.1.0",
"@radix-ui/react-slot": "1.0.2",
"@radix-ui/react-tabs": "1.1.1",
"@radix-ui/react-toast": "1.1.5",
"@react-spring/web": "9.7.4",
"@radix-ui/react-slot": "1.1.1",
"@radix-ui/react-tabs": "1.1.2",
"@radix-ui/react-toast": "1.2.4",
"@solana/spl-stake-pool": "1.1.0",
"@solana/wallet-adapter-base": "0.9.23",
"@solana/wallet-adapter-react": "0.15.35",
"@solana/wallet-adapter-react-ui": "0.9.35",
"@solana/wallet-standard-features": "1.2.0",
"@solana/wallet-standard-util": "1.1.1",
"@solana/web3.js": "1.95.3",
"@solana/web3.js": "1.98.0",
"class-variance-authority": "0.7.0",
"clsx": "2.1.1",
"date-fns": "4.1.0",
Expand All @@ -54,11 +53,11 @@
"jotai": "2.10.1",
"lodash.throttle": "4.1.1",
"mdast-util-to-string": "4.0.0",
"next": "15.0.3",
"next-intl": "3.25.0",
"next-themes": "0.3.0",
"react": "19.0.0-rc-66855b96-20241106",
"react-dom": "19.0.0-rc-66855b96-20241106",
"next": "15.1.3",
"next-intl": "3.26.3",
"next-themes": "0.4.4",
"react": "19.0.0",
"react-dom": "19.0.0",
"react-markdown": "9.0.1",
"react-syntax-highlighter": "15.6.1",
"remark": "15.0.1",
Expand All @@ -71,19 +70,19 @@
"@tailwindcss/typography": "0.5.14",
"@types/lodash.throttle": "4.1.9",
"@types/node": "20.13.0",
"@types/react": "npm:types-react@19.0.0-rc.1",
"@types/react-dom": "npm:types-react-dom@19.0.0-rc.1",
"@types/react": "19.0.2",
"@types/react-dom": "19.0.2",
"@types/react-syntax-highlighter": "15.5.13",
"autoprefixer": "10.4.19",
"babel-plugin-react-compiler": "19.0.0-beta-63b359f-20241101",
"babel-plugin-react-compiler": "19.0.0-beta-b2e8e9c-20241220",
"eslint": "9.14.0",
"eslint-config-next": "15.0.3",
"eslint-config-next": "15.1.3",
"eslint-config-prettier": "9.1.0",
"glob": "10.4.3",
"gray-matter": "4.0.3",
"next-sitemap": "4.2.3",
"postcss": "8.4.38",
"prettier": "3.2.5",
"prettier": "3.3.3",
"prettier-plugin-tailwindcss": "0.6.1",
"tailwind-merge": "2.3.0",
"tailwind-scrollbar": "3.1.0",
Expand All @@ -92,9 +91,5 @@
"typescript": "5.6.3",
"unified": "11.0.5",
"wrangler": "3.86.0"
},
"peerDependencies": {
"react": "^16.8 || ^17.0 || ^18.0 || ^19.0",
"react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0"
}
}
5 changes: 3 additions & 2 deletions website/skeet-dev/src/app/[locale]/(default)/(home)/page.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { setRequestLocale } from 'next-intl/server'
import { getDataForPageByFilename, PageProps } from '@/lib/pages'
import { getDataForPageByGroupDir, PageProps } from '@/lib/pages'
import { getArticleForIndex } from '@/lib/articles'
import ArticleIndex from '@/components/articles/ArticleIndex'
import HomeHeroRow from './HomeHeroRow'
Expand All @@ -10,7 +10,8 @@ import ManageableMicroServicesRow from './ManageableMicroServicesRow'
import Web3CompatibleRow from './Web3CompatibleRow'
import GreenCodingRow from './GreenCodingRow'

const { generateMetadata } = getDataForPageByFilename(__filename)
const groupDir = '(home)'
const { generateMetadata } = getDataForPageByGroupDir(groupDir)
export { generateMetadata }

export default async function HomePage({ params }: PageProps) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { setRequestLocale } from 'next-intl/server'
import {
ArticlePageProps,
getDataForArticlePageByFilename,
getArticleBySlug,
getAllRoutes,
getDataForArticlePageByGroupDir,
} from '@/lib/articles'
import ScrollSyncToc from '@/components/articles/ScrollSyncToc'
import { cn } from '@/lib/utils'
Expand All @@ -13,8 +13,9 @@ import { docMenuData } from '../docNavs'
import ArticlePager from '@/components/articles/ArticlePager'
import { getPagerData } from '@/lib/getPagerData'

const { groupDir, generateMetadata, generateStaticParams } =
getDataForArticlePageByFilename(__filename)
const groupDir = 'doc'
const { generateMetadata, generateStaticParams } =
getDataForArticlePageByGroupDir(groupDir)
export { generateMetadata, generateStaticParams }

export default async function DocArticlePage({ params }: ArticlePageProps) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
import { setRequestLocale } from 'next-intl/server'
import {
ArticlePageProps,
getDataForArticlePageByFilename,
getArticleBySlug,
getDataForArticlePageByGroupDir,
} from '@/lib/articles'
import ScrollSyncToc from '@/components/articles/ScrollSyncToc'
import ArticleContents from '@/components/articles/ArticleContents'
import { cn } from '@/lib/utils'

const { groupDir, generateMetadata, generateStaticParams } =
getDataForArticlePageByFilename(__filename)
const groupDir = 'legal'
const { generateMetadata, generateStaticParams } =
getDataForArticlePageByGroupDir(groupDir)
export { generateMetadata, generateStaticParams }

export default async function LegalArticlePage({ params }: ArticlePageProps) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { setRequestLocale } from 'next-intl/server'
import {
ArticlePageProps,
getDataForArticlePageByFilename,
getArticleBySlug,
getArticleForIndex,
getDataForArticlePageByGroupDir,
} from '@/lib/articles'
import NewsMobileHeader from '../NewsMobileHeader'
import ScrollSyncToc from '@/components/articles/ScrollSyncToc'
Expand All @@ -15,8 +15,9 @@ import ArticleIndex from '@/components/articles/ArticleIndex'
import ArticlePager from '@/components/articles/ArticlePager'
import { getPagerData } from '@/lib/getPagerData'

const { groupDir, generateMetadata, generateStaticParams, getArticlePaths } =
getDataForArticlePageByFilename(__filename)
const groupDir = 'news'
const { generateMetadata, generateStaticParams, getArticlePaths } =
getDataForArticlePageByGroupDir(groupDir)
export { generateMetadata, generateStaticParams }

export default async function NewsArticlePage({ params }: ArticlePageProps) {
Expand Down
5 changes: 3 additions & 2 deletions website/skeet-dev/src/app/[locale]/(default)/news/page.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import { setRequestLocale } from 'next-intl/server'
import { getDataForPageByFilename, PageProps } from '@/lib/pages'
import { getDataForPageByGroupDir, PageProps } from '@/lib/pages'

import { getArticleForIndex } from '@/lib/articles'
import ArticleIndex from '@/components/articles/ArticleIndex'

const { groupDir, generateMetadata } = getDataForPageByFilename(__filename)
const groupDir = 'news'
const { generateMetadata } = getDataForPageByGroupDir(groupDir)
export { generateMetadata }

export default async function NewsPage({ params }: PageProps) {
Expand Down
5 changes: 3 additions & 2 deletions website/skeet-dev/src/app/[locale]/(default)/staking/page.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { setRequestLocale } from 'next-intl/server'
import { getDataForPageByFilename, PageProps } from '@/lib/pages'
import { getDataForPageByGroupDir, PageProps } from '@/lib/pages'

import CTARow from '@/components/rows/CTARow'
import ProductsSlideRow from '@/components/rows/ProductsSlideRow'
Expand All @@ -11,7 +11,8 @@ import InstantLiquidityRow from '@/components/rows/InstantLiquidityRow'
import DirectStakingRow from './DirectStakingRow'
import VLDAirdropRow from '@/components/rows/VLDAirdropRow'

const { generateMetadata } = getDataForPageByFilename(__filename)
const groupDir = 'staking'
const { generateMetadata } = getDataForPageByGroupDir(groupDir)
export { generateMetadata }

export default async function BlinksPage({ params }: PageProps) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { setRequestLocale } from 'next-intl/server'
import {
ArticlePageProps,
getDataForArticlePageByFilename,
getArticleBySlug,
getAllRoutes,
getDataForArticlePageByGroupDir,
} from '@/lib/articles'
import ScrollSyncToc from '@/components/articles/ScrollSyncToc'
import { cn } from '@/lib/utils'
Expand All @@ -14,8 +14,9 @@ import ArticlePager from '@/components/articles/ArticlePager'
import { getPagerData } from '@/lib/getPagerData'
import ShowOldDoc from '@/components/articles/ShowOldDoc'

const { groupDir, generateMetadata, generateStaticParams } =
getDataForArticlePageByFilename(__filename)
const groupDir = 'v1doc'
const { generateMetadata, generateStaticParams } =
getDataForArticlePageByGroupDir(groupDir)
export { generateMetadata, generateStaticParams }

export default async function V1DocArticlePage({ params }: ArticlePageProps) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { setRequestLocale } from 'next-intl/server'
import {
ArticlePageProps,
getDataForArticlePageByFilename,
getArticleBySlug,
getAllRoutes,
getDataForArticlePageByGroupDir,
} from '@/lib/articles'
import ScrollSyncToc from '@/components/articles/ScrollSyncToc'
import { cn } from '@/lib/utils'
Expand All @@ -14,8 +14,9 @@ import ArticlePager from '@/components/articles/ArticlePager'
import { getPagerData } from '@/lib/getPagerData'
import ShowOldDoc from '@/components/articles/ShowOldDoc'

const { groupDir, generateMetadata, generateStaticParams } =
getDataForArticlePageByFilename(__filename)
const groupDir = 'v2doc'
const { generateMetadata, generateStaticParams } =
getDataForArticlePageByGroupDir(groupDir)
export { generateMetadata, generateStaticParams }

export default async function V2DocArticlePage({ params }: ArticlePageProps) {
Expand Down
24 changes: 0 additions & 24 deletions website/skeet-dev/src/components/animation/BlinkingAnimation.tsx

This file was deleted.

This file was deleted.

35 changes: 0 additions & 35 deletions website/skeet-dev/src/components/animation/ElasticAnimation.tsx

This file was deleted.

18 changes: 0 additions & 18 deletions website/skeet-dev/src/components/animation/ExpandAnimation.tsx

This file was deleted.

16 changes: 0 additions & 16 deletions website/skeet-dev/src/components/animation/FallingAnimation.tsx

This file was deleted.

Loading

0 comments on commit abaeb29

Please sign in to comment.