Skip to content

Commit 04e4f5c

Browse files
Merge branch 'main' into eol
Signed-off-by: Brian Muenzenmeyer <brian.muenzenmeyer@gmail.com>
2 parents 669d21d + 0a9ead8 commit 04e4f5c

File tree

12 files changed

+705
-181
lines changed

12 files changed

+705
-181
lines changed

.github/workflows/playwright-cloudflare-open-next.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,12 @@ jobs:
5151
- name: Install packages
5252
run: pnpm install --frozen-lockfile
5353

54+
- name: Downgrade Next.js
55+
# Open-next does not yet support next@15.4, so temporarily in order to have
56+
# this workflow working we force install the latest Next.js 15.3 version instead
57+
run: pnpm i next@15.3.2
58+
working-directory: apps/site
59+
5460
- name: Get Playwright version
5561
id: playwright-version
5662
working-directory: apps/site

apps/site/next.mdx.use.client.mjs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import Blockquote from '@node-core/ui-components/Common/Blockquote';
44
import MDXCodeTabs from '@node-core/ui-components/MDX/CodeTabs';
55

6-
import Button from './components/Common/Button';
76
import DownloadButton from './components/Downloads/DownloadButton';
87
import DownloadLink from './components/Downloads/DownloadLink';
98
import BlogPostLink from './components/Downloads/Release/BlogPostLink';
@@ -17,7 +16,6 @@ import ReleasePrebuiltDownloadButtons from './components/Downloads/Release/Prebu
1716
import ReleaseCodeBox from './components/Downloads/Release/ReleaseCodeBox';
1817
import ReleaseVersionDropdown from './components/Downloads/Release/VersionDropdown';
1918
import Link from './components/Link';
20-
import LinkWithArrow from './components/LinkWithArrow';
2119
import MDXCodeBox from './components/MDX/CodeBox';
2220
import MDXImage from './components/MDX/Image';
2321
import { ReleaseProvider } from './providers/releaseProvider';
@@ -30,12 +28,6 @@ import { ReleaseProvider } from './providers/releaseProvider';
3028
export const clientMdxComponents = {
3129
// Renders MDX CodeTabs
3230
CodeTabs: MDXCodeTabs,
33-
// Renders a Button Component for `button` tags
34-
Button: Button,
35-
// Links with External Arrow
36-
LinkWithArrow: LinkWithArrow,
37-
// Regular links (without arrow)
38-
Link: Link,
3931
// Renders a Download Button
4032
DownloadButton: DownloadButton,
4133
// Renders a Download Link

apps/site/next.mdx.use.mjs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,12 @@
22

33
import BadgeGroup from '@node-core/ui-components/Common/BadgeGroup';
44

5+
import Button from './components/Common/Button';
56
import DownloadReleasesTable from './components/Downloads/DownloadReleasesTable';
67
import EOLAlertBox from './components/EOL/EOLAlert';
78
import EOLReleaseTable from './components/EOL/EOLReleaseTable';
9+
import Link from './components/Link';
10+
import LinkWithArrow from './components/LinkWithArrow';
811
import UpcomingMeetings from './components/MDX/Calendar/UpcomingMeetings';
912
import WithBadgeGroup from './components/withBadgeGroup';
1013
import WithBanner from './components/withBanner';
@@ -31,4 +34,10 @@ export const mdxComponents = {
3134
EOLAlertBox,
3235
// Renders the EOL Table
3336
EOLReleaseTable,
37+
// Renders a Button Component for `button` tags
38+
Button,
39+
// Regular links (without arrow)
40+
Link,
41+
// Links with External Arrow
42+
LinkWithArrow,
3443
};

apps/site/package.json

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@
3636
"@node-core/ui-components": "workspace:*",
3737
"@node-core/website-i18n": "workspace:*",
3838
"@nodevu/core": "0.3.0",
39-
"@opentelemetry/api-logs": "~0.202.0",
40-
"@opentelemetry/instrumentation": "~0.202.0",
39+
"@opentelemetry/api-logs": "~0.203.0",
40+
"@opentelemetry/instrumentation": "~0.203.0",
4141
"@opentelemetry/resources": "~1.30.1",
42-
"@opentelemetry/sdk-logs": "~0.202.0",
42+
"@opentelemetry/sdk-logs": "~0.203.0",
4343
"@orama/react-components": "^0.8.1",
4444
"@oramacloud/client": "^2.1.4",
4545
"@radix-ui/react-slot": "^1.2.3",
@@ -57,7 +57,7 @@
5757
"feed": "~5.1.0",
5858
"github-slugger": "~2.0.0",
5959
"gray-matter": "~4.0.3",
60-
"next": "15.4.3",
60+
"next": "15.4.4",
6161
"next-intl": "~4.3.4",
6262
"next-themes": "~0.4.6",
6363
"postcss-calc": "~10.1.1",
@@ -77,11 +77,12 @@
7777
"devDependencies": {
7878
"@eslint/compat": "~1.3.1",
7979
"@eslint/eslintrc": "~3.3.1",
80-
"@flarelabs-net/wrangler-build-time-fs-assets-polyfilling": "^0.0.0",
81-
"@next/eslint-plugin-next": "15.3.4",
80+
"@flarelabs-net/wrangler-build-time-fs-assets-polyfilling": "^0.0.1",
81+
"@next/eslint-plugin-next": "15.4.4",
8282
"@opennextjs/cloudflare": "^1.6.0",
8383
"@playwright/test": "^1.54.1",
8484
"@testing-library/user-event": "~14.6.1",
85+
"@types/mdx": "^2.0.13",
8586
"@types/semver": "~7.7.0",
8687
"eslint-config-next": "15.4.3",
8788
"eslint-import-resolver-typescript": "~4.4.4",

apps/site/pages/en/blog/release/v22.18.0.md

Lines changed: 259 additions & 0 deletions
Large diffs are not rendered by default.

apps/site/pages/en/blog/release/v24.5.0.md

Lines changed: 245 additions & 0 deletions
Large diffs are not rendered by default.

apps/site/pages/en/learn/asynchronous-work/event-loop-timers-and-nexttick.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ function someAsyncApiCall(callback) {
347347
// the callback is called before `someAsyncApiCall` completes.
348348
someAsyncApiCall(() => {
349349
// since someAsyncApiCall hasn't completed, bar hasn't been assigned any value
350-
console.log('bar', bar); // undefined
350+
console.log('bar', bar); // null
351351
});
352352

353353
bar = 1;

apps/site/tsconfig.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"plugins": [{ "name": "next" }],
1818
"baseUrl": "."
1919
},
20+
"mdx": { "checkMdx": true },
2021
"include": [
2122
"next-env.d.ts",
2223
"global.d.ts",

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"dependencies": {
3737
"husky": "9.1.7",
3838
"lint-staged": "16.1.2",
39-
"turbo": "2.5.4"
39+
"turbo": "2.5.5"
4040
},
4141
"devDependencies": {
4242
"@eslint/js": "~9.31.0",

packages/ui-components/src/Containers/Sidebar/SidebarItem/index.module.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@
1616

1717
&:hover {
1818
&:not(.progression) .label {
19+
/* @see https://github.com/nodejs/nodejs.org/blob/main/packages/ui-components/src/Containers/NavBar/NavItem/index.module.css#L24 */
1920
@apply rounded-sm
2021
bg-neutral-100
2122
text-neutral-900
22-
dark:bg-neutral-800
23+
dark:bg-neutral-900
2324
dark:text-neutral-100;
2425
}
2526

0 commit comments

Comments
 (0)