Skip to content

Commit d82468f

Browse files
committed
Merge remote-tracking branch 'upstream/main'
2 parents fd57021 + 2b8a28e commit d82468f

Some content is hidden

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

71 files changed

+1718
-273
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959

6060
- name: Upload Playwright test results
6161
if: always()
62-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
62+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
6363
with:
6464
name: playwright-report
6565
path: apps/site/playwright-report/

.github/workflows/playwright.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484

8585
- name: Upload Playwright test results
8686
if: always()
87-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
87+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
8888
with:
8989
name: playwright-report
9090
path: apps/site/playwright-report/

.github/workflows/tmp-cloudflare-open-next-deploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ jobs:
3838
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3939

4040
- name: Set up pnpm
41-
uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
41+
uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
4242

4343
- name: Set up Node.js
44-
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
44+
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
4545
with:
4646
# We want to ensure that the Node.js version running here respects our supported versions
4747
node-version-file: '.nvmrc'

.github/workflows/translations-sync.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737

3838
# see all the options at https://github.com/crowdin/github-action
3939
- name: Crowdin PR
40-
uses: crowdin/github-action@0749939f635900a2521aa6aac7a3766642b2dc71 # v2.11.0
40+
uses: crowdin/github-action@08713f00a50548bfe39b37e8f44afb53e7a802d4 # v2.12.0
4141
with:
4242
# do not upload anything - this is a one-way operation download
4343
upload_sources: false
@@ -105,7 +105,7 @@ jobs:
105105
run: node --run prettier:fix
106106

107107
- name: Push Changes back to Pull Request
108-
uses: stefanzweifel/git-auto-commit-action@778341af668090896ca464160c2def5d1d1a3eb0 # v6.0.1
108+
uses: stefanzweifel/git-auto-commit-action@28e16e81777b558cc906c8750092100bbb34c5e3 # v7.0.0
109109
with:
110110
commit_options: '--no-verify --signoff'
111111
commit_message: 'chore: automated format of translated files'

.github/workflows/translations-upload.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727

2828
# see all the options at https://github.com/crowdin/github-action
2929
- name: crowdin action
30-
uses: crowdin/github-action@0749939f635900a2521aa6aac7a3766642b2dc71 # v2.11.0
30+
uses: crowdin/github-action@08713f00a50548bfe39b37e8f44afb53e7a802d4 # v2.12.0
3131
with:
3232
# only upload sources, ensuring this is a one-way operation
3333
upload_sources: true

apps/site/layouts/Blog.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ const BlogLayout: FC = () => {
6363
'announcements',
6464
'release',
6565
'vulnerability',
66+
'migrations',
6667
'events',
6768
])}
6869
/>

apps/site/mdx/components.mjs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
'use strict';
22

3+
import AlertBox from '@node-core/ui-components/Common/AlertBox';
34
import BadgeGroup from '@node-core/ui-components/Common/BadgeGroup';
45
import Blockquote from '@node-core/ui-components/Common/Blockquote';
56
import MDXCodeTabs from '@node-core/ui-components/MDX/CodeTabs';
@@ -54,6 +55,8 @@ export default {
5455
blockquote: Blockquote,
5556
pre: MDXCodeBox,
5657
img: MDXImage,
58+
// Renders a CSS-enhanced Alert Box
59+
AlertBox,
5760
// Renders MDX CodeTabs
5861
CodeTabs: MDXCodeTabs,
5962
// Renders Tooltips

apps/site/mdx/plugins.mjs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,20 @@ import remarkTableTitles from '../util/table';
1515
// Reference: https://github.com/nodejs/nodejs.org/pull/7896#issuecomment-3009480615
1616
const OPEN_NEXT_CLOUDFLARE = 'Cloudflare' in global;
1717

18+
// Shiki is created out here to avoid an async rehype plugin
19+
const singletonShiki = await rehypeShikiji({
20+
// We use the faster WASM engine on the server instead of the web-optimized version.
21+
//
22+
// Currently we fall back to the JavaScript RegEx engine
23+
// on Cloudflare workers because `shiki/wasm` requires loading via
24+
// `WebAssembly.instantiate` with custom imports, which Cloudflare doesn't support
25+
// for security reasons.
26+
wasm: !OPEN_NEXT_CLOUDFLARE,
27+
28+
// TODO(@avivkeller): Find a way to enable Twoslash w/ a VFS on Cloudflare
29+
twoslash: !OPEN_NEXT_CLOUDFLARE,
30+
});
31+
1832
/**
1933
* Provides all our Rehype Plugins that are used within MDX
2034
*/
@@ -25,21 +39,7 @@ export const rehypePlugins = [
2539
[rehypeAutolinkHeadings, { behavior: 'wrap' }],
2640
// Transforms sequential code elements into code tabs and
2741
// adds our syntax highlighter (Shikiji) to Codeboxes
28-
[
29-
rehypeShikiji,
30-
{
31-
// We use the faster WASM engine on the server instead of the web-optimized version.
32-
//
33-
// Currently we fall back to the JavaScript RegEx engine
34-
// on Cloudflare workers because `shiki/wasm` requires loading via
35-
// `WebAssembly.instantiate` with custom imports, which Cloudflare doesn't support
36-
// for security reasons.
37-
wasm: !OPEN_NEXT_CLOUDFLARE,
38-
39-
// TODO(@avivkeller): Find a way to enable Twoslash w/ a VFS on Cloudflare
40-
twoslash: !OPEN_NEXT_CLOUDFLARE,
41-
},
42-
],
42+
() => singletonShiki,
4343
];
4444

4545
/**

0 commit comments

Comments
 (0)