Unverified Commit 0fd7d90d authored by Sebastian "Sebbie" Silbermann's avatar Sebastian "Sebbie" Silbermann Committed by GitHub

[scripts] Avoid conflicting type for `pack-next --compress` (#88439)

`type: 'string'` conflicts with `choices: T[]`. It's basically `string |
T` which just collapses to `string` if `T` is a union of string
literals.

Before:
```console
$ p pack-next --help
...
 --compress ... [string] [choices: "none", "strip"]
```

After: 
```console
$ p pack-next --help
...
 --compress ... [choices: "none", "strip"]
parent 608eec05
...@@ -24,14 +24,6 @@ const NEXT_BA_TARBALL = `${TARBALLS}/next-bundle-analyzer.tar` ...@@ -24,14 +24,6 @@ const NEXT_BA_TARBALL = `${TARBALLS}/next-bundle-analyzer.tar`
type CompressOpt = 'none' | 'strip' | 'objcopy-zlib' | 'objcopy-zstd' type CompressOpt = 'none' | 'strip' | 'objcopy-zlib' | 'objcopy-zstd'
interface CliOptions {
jsBuild?: boolean
project?: string
tar?: boolean
compress?: CompressOpt
_: string[]
}
const cliOptions = yargs(hideBin(process.argv)) const cliOptions = yargs(hideBin(process.argv))
.scriptName('pack-next') .scriptName('pack-next')
.command('$0', 'Pack Next.js for testing in external projects') .command('$0', 'Pack Next.js for testing in external projects')
...@@ -50,7 +42,6 @@ const cliOptions = yargs(hideBin(process.argv)) ...@@ -50,7 +42,6 @@ const cliOptions = yargs(hideBin(process.argv))
describe: 'Create tarballs instead of direct reflinks', describe: 'Create tarballs instead of direct reflinks',
}) })
.option('compress', { .option('compress', {
type: 'string',
describe: describe:
'How compress the binary, useful on platforms where tarballs can ' + 'How compress the binary, useful on platforms where tarballs can ' +
'exceed 2 GiB, which causes ERR_FS_FILE_TOO_LARGE with pnpm. Defaults ' + 'exceed 2 GiB, which causes ERR_FS_FILE_TOO_LARGE with pnpm. Defaults ' +
...@@ -59,11 +50,13 @@ const cliOptions = yargs(hideBin(process.argv)) ...@@ -59,11 +50,13 @@ const cliOptions = yargs(hideBin(process.argv))
choices: [ choices: [
'none', 'none',
'strip', 'strip',
...(process.platform === 'linux' ? ['objcopy-zlib', 'objcopy-zstd'] : []), ...(process.platform === 'linux'
? (['objcopy-zlib', 'objcopy-zstd'] as const)
: ([] as const)),
] as const, ] as const,
}) })
.check((opts) => { .check((opts) => {
const compress = opts.compress as CompressOpt | undefined const compress = opts.compress
if (!opts.tar && (compress ?? 'none') !== 'none') { if (!opts.tar && (compress ?? 'none') !== 'none') {
throw new Error('--compress is only valid in combination with --tar') throw new Error('--compress is only valid in combination with --tar')
} }
...@@ -71,10 +64,10 @@ const cliOptions = yargs(hideBin(process.argv)) ...@@ -71,10 +64,10 @@ const cliOptions = yargs(hideBin(process.argv))
}) })
.middleware((opts) => { .middleware((opts) => {
if (opts.tar && process.platform === 'linux' && opts.compress == null) { if (opts.tar && process.platform === 'linux' && opts.compress == null) {
;(opts as CliOptions).compress = 'strip' opts.compress = 'strip'
} }
}) })
.strict().argv as unknown as CliOptions .strict().argv
interface PackageFiles { interface PackageFiles {
nextFile: string nextFile: string
...@@ -97,7 +90,7 @@ async function main(): Promise<void> { ...@@ -97,7 +90,7 @@ async function main(): Promise<void> {
await Promise.all(binaries.map((bin) => fs.rm(bin))) await Promise.all(binaries.map((bin) => fs.rm(bin)))
} }
await buildNative(cliOptions._) await buildNative(cliOptions._ as string[])
if (cliOptions.tar) { if (cliOptions.tar) {
await fs.mkdir(TARBALLS, { recursive: true }) await fs.mkdir(TARBALLS, { recursive: true })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment