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

setup(next.js) 15.2 #7513

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+193 −289
Open

setup(next.js) 15.2 #7513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 4 additions & 8 deletions apps/site/components/Common/AvatarGroup/Avatar/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

import classNames from 'classnames';
import Image from 'next/image';
import type { HTMLAttributes } from 'react';
import { forwardRef } from 'react';
import type {FC, HTMLAttributes } from 'react';

import Link from '@/components/Link';

Expand All @@ -14,21 +14,17 @@ export type AvatarProps = {
fallback?: string;
size?: 'small' | 'medium';
url?: string;
};
} & HTMLAttributes<HTMLSpanElement>;

// @TODO: We temporarily removed the Avatar Radix UI primitive, since it was causing flashing
// during initial load and not being able to render nicely when images are already cached.
// @see https://github.com/radix-ui/primitives/pull/3008
const Avatar = forwardRef<
HTMLSpanElement,
HTMLAttributes<HTMLSpanElement> & AvatarProps
>(({ image, nickname, name, fallback, url, size = 'small', ...props }, ref) => {
const Avatar: FC<AvatarProps> = (({ image, nickname, name, fallback, url, size = 'small', ...props }) => {
const Wrapper = url ? Link : 'div';

return (
<span
{...props}
ref={ref}
className={classNames(styles.avatar, styles[size], props.className)}
>
<Wrapper
Expand Down
6 changes: 2 additions & 4 deletions apps/site/next.config.mjs → apps/site/next.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
'use strict';

import type { NextConfig } from 'next';
import withNextIntl from 'next-intl/plugin';

import { BASE_PATH, ENABLE_STATIC_EXPORT } from './next.constants.mjs';
import { redirects, rewrites } from './next.rewrites.mjs';

/** @type {import('next').NextConfig} */
const nextConfig = {
// We don't use trailing slashes on URLs from the Node.js Website
trailingSlash: false,
Expand Down Expand Up @@ -97,6 +95,6 @@ const nextConfig = {
'shiki',
],
},
};
} as NextConfig;

export default withNextIntl('./i18n.tsx')(nextConfig);
17 changes: 8 additions & 9 deletions apps/site/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,17 +53,17 @@
"github-slugger": "~2.0.0",
"glob": "~11.0.0",
"gray-matter": "~4.0.3",
"next": "15.1.6",
"next-intl": "~3.26.3",
"next-themes": "~0.4.3",
"next": "15.2.0",
"next-intl": "~3.26.5",
"next-themes": "~0.4.4",
"postcss": "~8.4.49",
"postcss-calc": "~10.0.2",
"postcss-import": "~16.1.0",
"postcss-loader": "~8.1.1",
"postcss-mixins": "~11.0.3",
"postcss-simple-vars": "~7.0.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"rehype-autolink-headings": "~7.1.0",
"rehype-slug": "~6.0.0",
"remark-gfm": "~4.0.0",
Expand All @@ -78,7 +78,7 @@
},
"devDependencies": {
"@eslint/compat": "~1.2.3",
"@next/eslint-plugin-next": "15.1.6",
"@next/eslint-plugin-next": "15.2.0",
"@storybook/addon-controls": "^8.5.2",
"@storybook/addon-interactions": "^8.5.2",
"@storybook/addon-styling-webpack": "^1.0.1",
Expand All @@ -90,10 +90,9 @@
"@testing-library/react": "~16.2.0",
"@testing-library/user-event": "~14.6.1",
"@types/jest": "29.5.14",
"@types/react": "^18.3.12",
"@types/react-dom": "^18.3.1",
"@types/react": "^19.0.10",
"@types/react-dom": "^19.0.4",
"@types/semver": "~7.5.8",
"eslint-config-next": "15.1.3",
"eslint-import-resolver-typescript": "~3.7.0",
"eslint-plugin-mdx": "~3.1.5",
"eslint-plugin-react": "~7.37.2",
Expand Down
Loading
Loading