Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(nightly): remove useless option #1869

Open
wants to merge 2 commits into
base: v2-dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 12 additions & 33 deletions packages/cli/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ import { cac } from 'cac';

import {
VERSION,
cleanGlobalCliOptions,
filterDuplicateOptions,
handleAsyncOperationErrors,
resolveCliConfig,
resolveCommandOptions,
resolveCore
} from './utils.js';

Expand Down Expand Up @@ -51,52 +52,25 @@ cli
)
.alias('start')
.alias('dev')
.option('-l, --lazy', '[boolean] lazyCompilation (default: true)')
.option('--host <host>', '[string] specify host')
.option('--port <port>', '[string] specify port')
.option('--open', '[boolean] open browser on server start')
.option('--hmr', '[boolean] enable hot module replacement')
.option('--cors', '[boolean] enable cors')
.option(
'--strictPort',
'[boolean] specified port is already in use, exit with error (default: true)'
)
.option('--target <target>', '[string] transpile targetEnv node, browser')
.option('--format <format>', '[string] transpile format esm, commonjs')
.option('--sourcemap', '[boolean] output source maps for build')
.option(
'--treeShaking',
'[boolean] Eliminate useless code without side effects'
)
.option('--minify', '[boolean] code compression at build time')
.action(
async (
root: string,
options: CliServerOptions & CliBuildOptions & GlobalCliOptions
) => {
const resolveOptions = resolveCommandOptions(options);
async (root: string, options: CliServerOptions & GlobalCliOptions) => {
filterDuplicateOptions(options);

const defaultOptions = {
root,
server: resolveOptions,
server: cleanGlobalCliOptions(options),
clearScreen: options.clearScreen,
configFile: options.config,
mode: options.mode,
timeUnit: options.timeUnit,
compilation: {
lazyCompilation: options.lazy,
output: {
path: options?.outDir,
targetEnv: options?.target,
format: options?.format
},
input: {
index: options?.input
},
sourcemap: options.sourcemap,
minify: options.minify,
treeShaking: options.treeShaking
}
timeUnit: options.timeUnit
};

const { start } = await resolveCore();
Expand All @@ -116,13 +90,17 @@ cli
.option('-w, --watch', '[boolean] watch file change and rebuild')
.option('--target <target>', '[string] transpile targetEnv node, browser')
.option('--format <format>', '[string] transpile format esm, commonjs')
.option('--sourcemap', '[boolean] output source maps for build')
.option(
'--sourcemap [output]',
`[boolean | "inline" | "all" | "all-inline"] output source maps for build (default: true)`
)
.option(
'--treeShaking',
'[boolean] Eliminate useless code without side effects'
)
.option('--minify', '[boolean] code compression at build time')
.action(async (root: string, options: CliBuildOptions & GlobalCliOptions) => {
filterDuplicateOptions(options);
const defaultOptions = {
root,
configFile: options.config,
Expand Down Expand Up @@ -157,6 +135,7 @@ cli
.option('--strictPort', `[boolean] exit if specified port is already in use`)
.action(
async (root: string, options: CliPreviewOptions & GlobalCliOptions) => {
filterDuplicateOptions(options);
const defaultOptions = {
root,
mode: options.mode,
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export interface CliBuildOptions {
watch?: boolean;
l?: boolean;
lazy?: boolean;
sourcemap?: boolean;
sourcemap?: boolean | 'inline' | 'all' | 'all-inline';
minify?: boolean;
treeShaking?: boolean;
format?: 'cjs' | 'esm';
Expand Down
30 changes: 5 additions & 25 deletions packages/cli/src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,42 +48,22 @@ export function filterDuplicateOptions<T>(options: T) {
}
}
}
/**
* @param options The cli passes parameters
* @returns Remove parameters that are not required
*/
export function cleanOptions(
options: GlobalCliOptions & CliServerOptions & CliBuildOptions
) {
const resolveOptions = { ...options };

export function cleanGlobalCliOptions<Options extends GlobalCliOptions>(
options: Options
): Omit<Options, keyof GlobalCliOptions> {
const resolveOptions = { ...options };
delete resolveOptions['--'];
delete resolveOptions.m;
delete resolveOptions.c;
delete resolveOptions.w;
delete resolveOptions.l;
delete resolveOptions.lazy;
delete resolveOptions.mode;
delete resolveOptions.base;
delete resolveOptions.config;
delete resolveOptions.clearScreen;
delete resolveOptions.timeUnit;

return resolveOptions;
}

/**
*
* @param options cli parameters
* @returns resolve command options
*/
export function resolveCommandOptions(
options: GlobalCliOptions & CliServerOptions
): GlobalCliOptions & CliServerOptions {
const resolveOptions = { ...options };
filterDuplicateOptions(resolveOptions);
return cleanOptions(resolveOptions);
}

/**
*
* @param root root path
Expand Down
Loading