Skip to content

Commit b9ce678

Browse files
authored
Merge branch 'main' into dependabot/npm_and_yarn/lint-9c2ea18694
2 parents 5bfac02 + e2e1a23 commit b9ce678

18 files changed

Lines changed: 506 additions & 29 deletions

File tree

‎.changeset/ripe-papers-occur.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@node-core/ui-components': minor
3+
'@node-core/website-i18n': patch
4+
---
5+
6+
Add the Vite+ installation method icon and description.

‎.github/workflows/pull-request-age-gate.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
egress-policy: audit
4646

4747
- name: Check Pull Request Age
48-
uses: bmuenzenmeyer/pr-age-gate@d4243cf80a6386863234c6fc6be01f19bf4a6bfc # v0.2.3
48+
uses: bmuenzenmeyer/pr-age-gate@1581d7c3943b70747e697f519ecad52eb0f671d0 # v1.0.0
4949
with:
5050
min-hours: '48'
5151
bypass-labels: fast-track

‎.github/workflows/translations-sync.yml‎

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

4040
# see all the options at https://github.com/crowdin/github-action
4141
- name: Crowdin PR
42-
uses: crowdin/github-action@8f01d54f70f1713ee3f09d82c2bbb2daeac28689 # v2.17.1
42+
uses: crowdin/github-action@9c23991700c0ec5256fd41089b9d9d7d540e424e # v3.3.0
4343
with:
4444
# do not upload anything - this is a one-way operation download
4545
upload_sources: false

‎.github/workflows/translations-upload.yml‎

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

3434
# see all the options at https://github.com/crowdin/github-action
3535
- name: crowdin action
36-
uses: crowdin/github-action@8f01d54f70f1713ee3f09d82c2bbb2daeac28689 # v2.17.1
36+
uses: crowdin/github-action@9c23991700c0ec5256fd41089b9d9d7d540e424e # v3.3.0
3737
with:
3838
# only upload sources, ensuring this is a one-way operation
3939
upload_sources: true

‎.github/workflows/zizmor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ jobs:
2929
persist-credentials: false
3030

3131
- name: Run zizmor 🌈
32-
uses: zizmorcore/zizmor-action@3dc1ecc9bcb9e94e9b2c709687979e1298497054 # v0.6.2
32+
uses: zizmorcore/zizmor-action@cc914d7f3750a2d13d75c7f184a1060aa0e9d482 # v0.6.4

‎apps/site/components/Downloads/Release/ReleaseCodeBox.tsx‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -67,19 +67,20 @@ const useSnippetProcessor = (
6767
context.release.major >= 25 &&
6868
snippets.find(({ name }) => name === 'corepack');
6969

70-
// Combine and parse snippets
71-
const parsedContent = parseSnippet(
72-
[
73-
installMethodSnippet,
74-
verifyNodeSnippet,
75-
installCorepackSnippet,
76-
packageManagerSnippet,
77-
]
78-
.filter(Boolean)
79-
.map(snippet => (snippet as DownloadSnippet).content)
80-
.join('\n'),
81-
context
82-
);
70+
// Parse snippets individually, skipping those that render empty
71+
const parsedContent = [
72+
installMethodSnippet,
73+
verifyNodeSnippet,
74+
installCorepackSnippet,
75+
packageManagerSnippet,
76+
]
77+
.filter(Boolean)
78+
.map(snippet =>
79+
parseSnippet((snippet as DownloadSnippet).content, context)
80+
)
81+
.map(content => content.trim())
82+
.filter(Boolean)
83+
.join('\n\n');
8384

8485
// Convert to HTML using Shiki's highlighter
8586
// This is faster than JSX rendering as it avoids React runtime overhead
Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
1-
# Install Corepack:
2-
npm install -g corepack
1+
${props.installMethod === 'VP' ?
2+
'' :
3+
`# Install Corepack:
4+
npm install -g corepack`
5+
}
Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
# Download and install pnpm:
2-
corepack enable pnpm
1+
${props.installMethod === 'VP' ?
2+
'' :
3+
`# Download and install pnpm:
4+
corepack enable pnpm`
5+
}
36

47
# Verify pnpm version:
58
pnpm -v
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Download and install Vite+
2+
${props.os === 'WIN' ?
3+
'$env:VP_NODE_MANAGER = "yes"\nirm https://vite.plus/ps1 | iex' :
4+
'curl -fsSL https://vite.plus | VP_NODE_MANAGER=yes bash'
5+
}
6+
7+
# In lieu of restarting the shell
8+
${props.os === 'WIN'
9+
? '. "$env:APPDATA\\vite-plus\\env.ps1"'
10+
: '. "${XDG_CONFIG_HOME:-$HOME/.config}/vite-plus/env"'
11+
}
12+
13+
# Download and install Node.js:
14+
vp env default ${props.release.version}
Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
# Download and install Yarn:
2-
corepack enable yarn
1+
${props.installMethod === 'VP' ?
2+
'' :
3+
`# Download and install Yarn:
4+
corepack enable yarn`
5+
}
36

47
# Verify Yarn version:
58
yarn -v

0 commit comments

Comments
 (0)