Skip to content
Merged
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
3 changes: 3 additions & 0 deletions .changeset/lovely-pots-tap.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---

---
25 changes: 3 additions & 22 deletions packages/rspeedy/core/src/cli/build.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@ import { logger } from '@rsbuild/core'
import type { Command } from 'commander'

import type { CommonOptions } from './commands.js'
import type { CreateRspeedyOptions } from '../create-rspeedy.js'
import { exit } from './exit.js'
import { loadConfig } from '../config/loadConfig.js'
import { createRspeedy } from '../create-rspeedy.js'
import { init } from './init.js'
import { isCI } from '../utils/is-ci.js'

export type BuildOptions = CommonOptions & {
Expand All @@ -26,27 +25,9 @@ export async function build(
const shouldExit = process.env['RSDOCTOR'] !== 'true' || isCI()

try {
const { content: rspeedyConfig } = await loadConfig({
cwd,
configPath: buildOptions.config,
})

const options: CreateRspeedyOptions = {
cwd,
rspeedyConfig,
}

if (buildOptions.noEnv) {
options.loadEnv = false
} else if (buildOptions.envMode) {
options.loadEnv = { mode: buildOptions.envMode }
}

if (buildOptions.environment) {
options.environment = buildOptions.environment
}
const { createRspeedyOptions } = await init(cwd, buildOptions)

const rspeedy = await createRspeedy(options)
const rspeedy = await createRspeedy(createRspeedyOptions)

await rspeedy.build()
} catch (error) {
Expand Down
33 changes: 5 additions & 28 deletions packages/rspeedy/core/src/cli/dev.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,9 @@ import type { Command } from 'commander'
import color from 'picocolors'

import type { CommonOptions } from './commands.js'
import { loadConfig, resolveConfigPath } from '../config/loadConfig.js'
import { createRspeedy } from '../create-rspeedy.js'
import type { CreateRspeedyOptions } from '../create-rspeedy.js'
import { exit } from './exit.js'
import { init } from './init.js'

export interface DevOptions extends CommonOptions {
base?: string | undefined
Expand All @@ -26,17 +25,10 @@ export async function dev(
): Promise<void> {
let onBeforeRestart: (() => Promise<void>)[] = []
try {
const configPath = resolveConfigPath(cwd, devOptions.config)

const { content: rspeedyConfig } = await loadConfig({
const { rspeedyConfig, configPath, createRspeedyOptions } = await init(
cwd,
configPath,
})

if (devOptions.base) {
rspeedyConfig.server ??= {}
rspeedyConfig.server.base = devOptions.base
}
devOptions,
)

const watchedFiles = [configPath]

Expand Down Expand Up @@ -65,22 +57,7 @@ export async function dev(
},
)

const options: CreateRspeedyOptions = {
cwd,
rspeedyConfig,
}

if (devOptions.noEnv) {
options.loadEnv = false
} else if (devOptions.envMode) {
options.loadEnv = { mode: devOptions.envMode }
}

if (devOptions.environment) {
options.environment = devOptions.environment
}

const rspeedy = await createRspeedy(options)
const rspeedy = await createRspeedy(createRspeedyOptions)

const server = await rspeedy.createDevServer()

Expand Down
46 changes: 46 additions & 0 deletions packages/rspeedy/core/src/cli/init.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
// Copyright 2024 The Lynx Authors. All rights reserved.
// Licensed under the Apache License Version 2.0 that can be found in the
// LICENSE file in the root directory of this source tree.
import type { Config } from '../config/index.js'
import { loadConfig } from '../config/loadConfig.js'
import type { CreateRspeedyOptions } from '../create-rspeedy.js'
import type { BuildOptions } from './build.js'
import type { DevOptions } from './dev.js'
import type { InspectOptions } from './inspect.js'
import type { PreviewOptions } from './preview.js'

export async function init(
cwd: string,
options: BuildOptions | DevOptions | InspectOptions | PreviewOptions,
): Promise<{
configPath: string
createRspeedyOptions: CreateRspeedyOptions
rspeedyConfig: Config
}> {
const { content: rspeedyConfig, configPath } = await loadConfig({
cwd,
configPath: options.config,
})

const createRspeedyOptions: CreateRspeedyOptions = {
cwd,
rspeedyConfig,
}

if (options.noEnv) {
createRspeedyOptions.loadEnv = false
} else if (options.envMode) {
createRspeedyOptions.loadEnv = { mode: options.envMode }
}

if ('base' in options && options.base) {
rspeedyConfig.server ??= {}
rspeedyConfig.server.base = options.base
}

if ('environment' in options && options.environment) {
createRspeedyOptions.environment = options.environment
}

return { createRspeedyOptions, configPath, rspeedyConfig }
}
22 changes: 3 additions & 19 deletions packages/rspeedy/core/src/cli/inspect.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@ import type { Command } from 'commander'

import type { CommonOptions } from './commands.js'
import { exit } from './exit.js'
import { loadConfig } from '../config/loadConfig.js'
import { createRspeedy } from '../create-rspeedy.js'
import type { CreateRspeedyOptions } from '../create-rspeedy.js'
import { init } from './init.js'

export interface InspectOptions extends CommonOptions {
mode?: 'production' | 'development' | undefined
Expand All @@ -24,23 +23,8 @@ export async function inspect(
inspectOptions: InspectOptions,
): Promise<void> {
try {
const { content: rspeedyConfig } = await loadConfig({
cwd,
configPath: inspectOptions.config,
})

const options: CreateRspeedyOptions = {
cwd,
rspeedyConfig,
}

if (inspectOptions.noEnv) {
options.loadEnv = false
} else if (inspectOptions.envMode) {
options.loadEnv = { mode: inspectOptions.envMode }
}

const rspeedy = await createRspeedy(options)
const { createRspeedyOptions } = await init(cwd, inspectOptions)
const rspeedy = await createRspeedy(createRspeedyOptions)

await rspeedy.inspectConfig({
mode: inspectOptions.mode
Expand Down
28 changes: 3 additions & 25 deletions packages/rspeedy/core/src/cli/preview.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@ import color from 'picocolors'

import type { CommonOptions } from './commands.js'
import { exit } from './exit.js'
import { loadConfig, resolveConfigPath } from '../config/loadConfig.js'
import { createRspeedy } from '../create-rspeedy.js'
import type { CreateRspeedyOptions } from '../create-rspeedy.js'
import { init } from './init.js'

export interface PreviewOptions extends CommonOptions {
base?: string | undefined
Expand All @@ -23,30 +22,9 @@ export async function preview(
previewOptions: PreviewOptions,
): Promise<void> {
try {
const configPath = resolveConfigPath(cwd, previewOptions.config)
const { createRspeedyOptions } = await init(cwd, previewOptions)

const { content: rspeedyConfig } = await loadConfig({
cwd,
configPath,
})

if (previewOptions.base) {
rspeedyConfig.server ??= {}
rspeedyConfig.server.base = previewOptions.base
}

const options: CreateRspeedyOptions = {
cwd,
rspeedyConfig,
}

if (previewOptions.noEnv) {
options.loadEnv = false
} else if (previewOptions.envMode) {
options.loadEnv = { mode: previewOptions.envMode }
}

const rspeedy = await createRspeedy(options)
const rspeedy = await createRspeedy(createRspeedyOptions)

await rspeedy.initConfigs()

Expand Down
Loading