Skip to content

Commit 076f336

Browse files
SalnikaSalnika
committed
chore(dev): fix vp check
1 parent 4869510 commit 076f336

File tree

3 files changed

+83
-38
lines changed

3 files changed

+83
-38
lines changed

‎packages/tools/src/local-cli.ts‎

Lines changed: 54 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,12 @@ function localCliEnv(): NodeJS.ProcessEnv {
6060
function rolldownBindingCandidates() {
6161
switch (process.platform) {
6262
case 'android':
63-
if (process.arch === 'arm64') return ['@rolldown/binding-android-arm64/package.json'];
64-
if (process.arch === 'arm') return ['@rolldown/binding-android-arm-eabi/package.json'];
63+
if (process.arch === 'arm64') {
64+
return ['@rolldown/binding-android-arm64/package.json'];
65+
}
66+
if (process.arch === 'arm') {
67+
return ['@rolldown/binding-android-arm-eabi/package.json'];
68+
}
6569
return [];
6670
case 'darwin':
6771
if (process.arch === 'arm64') {
@@ -78,8 +82,12 @@ function rolldownBindingCandidates() {
7882
}
7983
return [];
8084
case 'freebsd':
81-
if (process.arch === 'arm64') return ['@rolldown/binding-freebsd-arm64/package.json'];
82-
if (process.arch === 'x64') return ['@rolldown/binding-freebsd-x64/package.json'];
85+
if (process.arch === 'arm64') {
86+
return ['@rolldown/binding-freebsd-arm64/package.json'];
87+
}
88+
if (process.arch === 'x64') {
89+
return ['@rolldown/binding-freebsd-x64/package.json'];
90+
}
8391
return [];
8492
case 'linux':
8593
if (process.arch === 'arm') {
@@ -100,14 +108,18 @@ function rolldownBindingCandidates() {
100108
'@rolldown/binding-linux-loong64-musl/package.json',
101109
];
102110
}
103-
if (process.arch === 'ppc64') return ['@rolldown/binding-linux-ppc64-gnu/package.json'];
111+
if (process.arch === 'ppc64') {
112+
return ['@rolldown/binding-linux-ppc64-gnu/package.json'];
113+
}
104114
if (process.arch === 'riscv64') {
105115
return [
106116
'@rolldown/binding-linux-riscv64-gnu/package.json',
107117
'@rolldown/binding-linux-riscv64-musl/package.json',
108118
];
109119
}
110-
if (process.arch === 's390x') return ['@rolldown/binding-linux-s390x-gnu/package.json'];
120+
if (process.arch === 's390x') {
121+
return ['@rolldown/binding-linux-s390x-gnu/package.json'];
122+
}
111123
if (process.arch === 'x64') {
112124
return [
113125
'@rolldown/binding-linux-x64-gnu/package.json',
@@ -116,8 +128,12 @@ function rolldownBindingCandidates() {
116128
}
117129
return [];
118130
case 'win32':
119-
if (process.arch === 'arm64') return ['@rolldown/binding-win32-arm64-msvc/package.json'];
120-
if (process.arch === 'ia32') return ['@rolldown/binding-win32-ia32-msvc/package.json'];
131+
if (process.arch === 'arm64') {
132+
return ['@rolldown/binding-win32-arm64-msvc/package.json'];
133+
}
134+
if (process.arch === 'ia32') {
135+
return ['@rolldown/binding-win32-ia32-msvc/package.json'];
136+
}
121137
if (process.arch === 'x64') {
122138
return [
123139
'@rolldown/binding-win32-x64-msvc/package.json',
@@ -162,7 +178,8 @@ function materializeRolldownPackagedBindings() {
162178
files?: string[];
163179
main?: string;
164180
};
165-
const bindingFile = packageJson.main ?? packageJson.files?.find((file) => file.endsWith('.node'));
181+
const bindingFile =
182+
packageJson.main ?? packageJson.files?.find((file) => file.endsWith('.node'));
166183
if (!bindingFile) {
167184
continue;
168185
}
@@ -182,9 +199,7 @@ function ensureBuildWorkspaceReady() {
182199
console.error(
183200
`Found legacy checkout at ${legacyViteRepoDir}. This repo now expects the upstream Vite checkout at ./vite.`,
184201
);
185-
console.error(
186-
`Run "${installHint}" to recreate the canonical layout.`,
187-
);
202+
console.error(`Run "${installHint}" to recreate the canonical layout.`);
188203
} else {
189204
console.error(
190205
`Run "${installHint}" to fetch the local upstream checkouts, or "${bootstrapHint}" to prepare and build the local CLI.`,
@@ -298,21 +313,36 @@ export function runBuildLocalCli(args: string[]) {
298313
runPnpmCommand('Build rolldown JS glue', ['--filter', 'rolldown', 'build-node'], {
299314
hint: 'If this fails with a missing rolldown native binding, rerun "pnpm install:dev". If the error mentions "cmake", install cmake to build rolldown from source.',
300315
});
301-
runPnpmCommand('Build vite rolled-up types', ['-C', 'vite', '--filter', 'vite', 'build-types-roll'], {
302-
hint: 'If this fails because vite dependencies are missing, rerun "pnpm install" from the repo root.',
303-
});
304-
runPnpmCommand('Type-check vite declarations', ['-C', 'vite', '--filter', 'vite', 'build-types-check'], {
305-
hint: 'If this fails because vite dependencies are missing, rerun "pnpm install" from the repo root.',
306-
});
316+
runPnpmCommand(
317+
'Build vite rolled-up types',
318+
['-C', 'vite', '--filter', 'vite', 'build-types-roll'],
319+
{
320+
hint: 'If this fails because vite dependencies are missing, rerun "pnpm install" from the repo root.',
321+
},
322+
);
323+
runPnpmCommand(
324+
'Type-check vite declarations',
325+
['-C', 'vite', '--filter', 'vite', 'build-types-check'],
326+
{
327+
hint: 'If this fails because vite dependencies are missing, rerun "pnpm install" from the repo root.',
328+
},
329+
);
307330
runPnpmCommand('Build vite-plus core', ['--filter', '@voidzero-dev/vite-plus-core', 'build']);
308331
runPnpmCommand('Build vite-plus test', ['--filter', '@voidzero-dev/vite-plus-test', 'build']);
309-
runPnpmCommand('Build vite-plus prompts', ['--filter', '@voidzero-dev/vite-plus-prompts', 'build']);
332+
runPnpmCommand('Build vite-plus prompts', [
333+
'--filter',
334+
'@voidzero-dev/vite-plus-prompts',
335+
'build',
336+
]);
310337
runPnpmCommand('Build vite-plus CLI', ['--filter', 'vite-plus', 'build'], {
311338
env: releaseRust ? process.env : localBuildEnv,
312339
});
313-
runCommand(
314-
'Build Rust CLI binaries',
315-
cargoBin,
316-
['build', '-p', 'vite_global_cli', '-p', 'vite_trampoline', ...(releaseRust ? ['--release'] : [])],
317-
);
340+
runCommand('Build Rust CLI binaries', cargoBin, [
341+
'build',
342+
'-p',
343+
'vite_global_cli',
344+
'-p',
345+
'vite_trampoline',
346+
...(releaseRust ? ['--release'] : []),
347+
]);
318348
}

‎packages/tools/src/snap-test.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,8 @@ export async function snapTest() {
210210
for (const caseName of selectedCases) {
211211
const stepsPath = path.join(casesDir, caseName, 'steps.json');
212212
const steps: Steps = JSON.parse(readFileSync(stepsPath, 'utf-8'));
213-
const task = () => runTestCase(caseName, tempTmpDir, casesDir, vitePlusHome, values['bin-dir']);
213+
const task = () =>
214+
runTestCase(caseName, tempTmpDir, casesDir, vitePlusHome, values['bin-dir']);
214215
if (steps.serial) {
215216
serialTasks.push(task);
216217
} else {

‎scripts/setup-local-dev.mjs‎

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const upstreamVersions = JSON.parse(
1616
);
1717

1818
function log(message) {
19-
console.log(`[setup-dev] ${message}`);
19+
process.stdout.write(`[setup-dev] ${message}\n`);
2020
}
2121

2222
function fail(message) {
@@ -103,8 +103,12 @@ function cloneCheckout(name, repoUrl, branch, hash) {
103103
function rolldownBindingCandidates() {
104104
switch (process.platform) {
105105
case 'android':
106-
if (process.arch === 'arm64') return ['@rolldown/binding-android-arm64'];
107-
if (process.arch === 'arm') return ['@rolldown/binding-android-arm-eabi'];
106+
if (process.arch === 'arm64') {
107+
return ['@rolldown/binding-android-arm64'];
108+
}
109+
if (process.arch === 'arm') {
110+
return ['@rolldown/binding-android-arm-eabi'];
111+
}
108112
return [];
109113
case 'darwin':
110114
if (process.arch === 'arm64') {
@@ -115,8 +119,12 @@ function rolldownBindingCandidates() {
115119
}
116120
return [];
117121
case 'freebsd':
118-
if (process.arch === 'arm64') return ['@rolldown/binding-freebsd-arm64'];
119-
if (process.arch === 'x64') return ['@rolldown/binding-freebsd-x64'];
122+
if (process.arch === 'arm64') {
123+
return ['@rolldown/binding-freebsd-arm64'];
124+
}
125+
if (process.arch === 'x64') {
126+
return ['@rolldown/binding-freebsd-x64'];
127+
}
120128
return [];
121129
case 'linux':
122130
if (process.arch === 'arm') {
@@ -128,18 +136,26 @@ function rolldownBindingCandidates() {
128136
if (process.arch === 'loong64') {
129137
return ['@rolldown/binding-linux-loong64-gnu', '@rolldown/binding-linux-loong64-musl'];
130138
}
131-
if (process.arch === 'ppc64') return ['@rolldown/binding-linux-ppc64-gnu'];
139+
if (process.arch === 'ppc64') {
140+
return ['@rolldown/binding-linux-ppc64-gnu'];
141+
}
132142
if (process.arch === 'riscv64') {
133143
return ['@rolldown/binding-linux-riscv64-gnu', '@rolldown/binding-linux-riscv64-musl'];
134144
}
135-
if (process.arch === 's390x') return ['@rolldown/binding-linux-s390x-gnu'];
145+
if (process.arch === 's390x') {
146+
return ['@rolldown/binding-linux-s390x-gnu'];
147+
}
136148
if (process.arch === 'x64') {
137149
return ['@rolldown/binding-linux-x64-gnu', '@rolldown/binding-linux-x64-musl'];
138150
}
139151
return [];
140152
case 'win32':
141-
if (process.arch === 'arm64') return ['@rolldown/binding-win32-arm64-msvc'];
142-
if (process.arch === 'ia32') return ['@rolldown/binding-win32-ia32-msvc'];
153+
if (process.arch === 'arm64') {
154+
return ['@rolldown/binding-win32-arm64-msvc'];
155+
}
156+
if (process.arch === 'ia32') {
157+
return ['@rolldown/binding-win32-ia32-msvc'];
158+
}
143159
if (process.arch === 'x64') {
144160
return ['@rolldown/binding-win32-x64-msvc', '@rolldown/binding-win32-x64-gnu'];
145161
}
@@ -156,7 +172,7 @@ function withRolldownHostBindings(pkg) {
156172
}
157173

158174
const optionalDependencies = {
159-
...(pkg.optionalDependencies ?? {}),
175+
...pkg.optionalDependencies,
160176
};
161177

162178
let changed = false;
@@ -194,9 +210,7 @@ function ensureRolldownHostBindings() {
194210
}
195211

196212
function hasOnlyManagedRolldownBindingsChange(dir) {
197-
const statusEntries = capture(gitBin, ['status', '--porcelain'], dir)
198-
.split('\n')
199-
.filter(Boolean);
213+
const statusEntries = capture(gitBin, ['status', '--porcelain'], dir).split('\n').filter(Boolean);
200214
if (statusEntries.length !== 1 || statusEntries[0].slice(3) !== rolldownPackageJsonRelativePath) {
201215
return false;
202216
}

0 commit comments

Comments
 (0)