Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump Nextjs to Latest #1886

Merged
merged 4 commits into from
Dec 11, 2023
Merged

Bump Nextjs to Latest #1886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3b7f38f
ci: bump nextjs to latest version
AtelyPham Dec 8, 2023
53085c6
chore: trigger faucet deployment preview
AtelyPham Dec 8, 2023
6eefd5d
chore: retrigger netlify
AtelyPham Dec 11, 2023
a22db99
chore: trigger faucet deploy
AtelyPham Dec 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions apps/faucet/next.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ const nextConfig = {
...nextCfgBase,

reactStrictMode: true,

nx: {
// Set this to true if you would like to to use SVGR
// See: https://github.com/gregberge/svgr
Expand Down
8 changes: 4 additions & 4 deletions apps/faucet/src/pages/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@ export const metadata: NextSeoProps = {

export default function Page({ sideBarInitialState }: PageProps) {
return (
<div className="h-screen flex">
<div className="flex h-screen">
<SideBar
{...sideBarProps}
className="!z-0 hidden lg:block"
isExpandedAtDefault={sideBarInitialState}
onSideBarToggle={setSideBarCookieOnToggle}
className="!z-0 hidden lg:block"
/>
<main className="flex-[1] h-full overflow-y-auto">
<div className="flex flex-col justify-between h-full px-3 md:px-5 lg:px-10 space-y-4">
<div className="flex flex-col justify-between h-full px-3 space-y-4 md:px-5 lg:px-10">
<div className="flex-1">
<Header />

Expand Down Expand Up @@ -105,7 +105,7 @@ export default function Page({ sideBarInitialState }: PageProps) {
</main>
</div>

<Footer isMinimal isNext className="py-12 w-full" />
<Footer isMinimal isNext className="w-full py-12" />
</div>
</main>
</div>
Expand Down
10 changes: 8 additions & 2 deletions apps/hubble-stats/app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,17 @@ import '@webb-tools/webb-ui-components/tailwind.css';

import Providers from './providers';
import { HUBBLE_STATS_URL } from '@webb-tools/webb-ui-components/constants';
import { Metadata } from 'next';
import type { Metadata, Viewport } from 'next';

import { Layout } from '../containers';

export const viewport: Viewport = {
themeColor: [
{ media: '(prefers-color-scheme: light)', color: '#fff' },
{ media: '(prefers-color-scheme: dark)', color: '#252836' },
],
};

export const metadata: Metadata = {
title: {
default: 'Hubble Stats',
Expand All @@ -29,7 +36,6 @@ export const metadata: Metadata = {
locale: 'en_US',
type: 'website',
},
themeColor: '#ffffff',
icons: {
icon: '/favicon.png',
},
Expand Down
4 changes: 0 additions & 4 deletions apps/hubble-stats/next.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@ const nextConfig = {
svgr: false,
},

experimental: {
serverActions: true,
},

// webpack config for wasm support
// following this approach: https://github.com/vercel/next.js/issues/29362#issuecomment-1149903338
webpack: (config) => {
Expand Down
19 changes: 14 additions & 5 deletions apps/tangle-dapp/app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
import '@webb-tools/webb-ui-components/tailwind.css';

import Suspense from '@webb-tools/webb-ui-components/components/Suspense';
import { TANGLE_DAPP_URL } from '@webb-tools/webb-ui-components/constants';
import { Metadata } from 'next';
import type { Metadata, Viewport } from 'next';
import type React from 'react';

import { Layout } from '../containers';
import Providers from './providers';

export const viewport: Viewport = {
themeColor: [
{ media: '(prefers-color-scheme: light)', color: '#fff' },
{ media: '(prefers-color-scheme: dark)', color: '#252836' },
],
};

export const metadata: Metadata = {
title: {
default: 'Tangle Dapp',
Expand Down Expand Up @@ -34,7 +42,6 @@ export const metadata: Metadata = {
locale: 'en_US',
type: 'website',
},
themeColor: '#ffffff',
icons: {
icon: '/favicon.png',
},
Expand All @@ -53,9 +60,11 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<body>
<Providers>
<Layout>{children}</Layout>
</Providers>
<Suspense>
<Providers>
<Layout>{children}</Layout>
</Providers>
</Suspense>
</body>
</html>
);
Expand Down
4 changes: 0 additions & 4 deletions apps/tangle-dapp/next.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,6 @@ const nextConfig = {
svgr: false,
},

experimental: {
serverActions: true,
},

// Follow wasm example from next.js repo: https://github.com/vercel/next.js/blob/canary/examples/with-webassembly/next.config.js
webpack(config, { isServer, dev }) {
// Use the client static directory in the server bundle and prod mode
Expand Down
7 changes: 5 additions & 2 deletions apps/testnet-leaderboard/app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
import '@webb-tools/webb-ui-components/tailwind.css';

import { TESTNET_LEADERBOARD_URL } from '@webb-tools/webb-ui-components/constants';
import type { Metadata } from 'next';
import type { Metadata, Viewport } from 'next';
import Script from 'next/script';

import Footer from '../components/Footer';
import Header from '../components/Header';
import Providers from './providers';

export const viewport: Viewport = {
themeColor: '#ffffff',
};

export const metadata: Metadata = {
title: {
default: 'Testnet Leaderboard',
Expand Down Expand Up @@ -35,7 +39,6 @@ export const metadata: Metadata = {
locale: 'en_US',
type: 'website',
},
themeColor: '#ffffff',
icons: {
icon: '/assets/favicon.png',
},
Expand Down
7 changes: 3 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@
"@polkadot/util": "^12.3.2",
"@polkadot/util-crypto": "^12.3.2",
"@polkadot/wasm-crypto": "^7.1.2",
"node-gyp-build": "4.7.1",
"typescript": "^5.1.6",
"webpack": "5.88.2"
},
Expand Down Expand Up @@ -121,7 +120,7 @@
"lodash": "^4.17.21",
"lottie-react": "^2.3.1",
"neverthrow": "^6.0.0",
"next": "13.4.9",
"next": "^14.0.3",
"next-query-params": "^4.3.0",
"next-secure-headers": "^2.2.0",
"next-seo": "^6.0.0",
Expand Down Expand Up @@ -168,7 +167,7 @@
"@graphql-codegen/typescript": "3.0.4",
"@graphql-codegen/typescript-operations": "3.0.4",
"@graphql-codegen/typescript-react-apollo": "3.3.7",
"@netlify/plugin-nextjs": "^4.41.0",
"@netlify/plugin-nextjs": "^4.41.2",
"@nx/cypress": "16.9.0",
"@nx/eslint-plugin": "16.9.0",
"@nx/jest": "16.9.0",
Expand Down Expand Up @@ -247,7 +246,7 @@
"dotenv": "16.0.3",
"encoding": "^0.1.13",
"eslint": "8.46.0",
"eslint-config-next": "13.4.9",
"eslint-config-next": "^14.0.3",
"eslint-config-prettier": "8.8.0",
"eslint-plugin-cypress": "2.15.1",
"eslint-plugin-import": "2.27.5",
Expand Down
Loading
Loading