@quicktvui/web-cli 1.0.0 → 1.0.1

package/bin/qt-web-cli.js

@@ -171,14 +171,6 @@ async function main() {
 
   const mainEntryPath = path.resolve(projectRoot, mainEntry)
 
-  // 获取 webpack 配置
-  let webpackConfigPath
-  if (args.config) {
-    webpackConfigPath = path.resolve(projectRoot, args.config)
-  } else {
-    webpackConfigPath = path.resolve(__dirname, '../lib/webpack.config.js')
-  }
-
   // 设置环境变量
   process.env.NODE_ENV = 'development'
   process.env.QUICKTVUI_PROJECT_ROOT = projectRoot
@@ -196,16 +188,32 @@ async function main() {
   signale.pending(`启动开发服务器: http://localhost:${args.port}`)
 
   // 使用 webpack Node API 启动开发服务器
-  startDevServer(webpackConfigPath, args.port, args.open)
+  const defaultConfigPath = path.resolve(__dirname, '../lib/webpack.config.js')
+  const userConfigPath = args.config ? path.resolve(projectRoot, args.config) : null
+  startDevServer(defaultConfigPath, args.port, args.open, userConfigPath)
 }
 
 /**
  * 使用 webpack Node API 启动开发服务器
  */
-function startDevServer(configPath, port, shouldOpen) {
+function startDevServer(configPath, port, shouldOpen, userConfigPath) {
   const webpack = require('webpack')
   const WebpackDevServer = require('webpack-dev-server')
-  const config = require(configPath)
+  const { merge } = require('webpack-merge')
+
+  // 加载内置配置
+  let config = require(configPath)
+
+  // 如果用户指定了自定义配置，进行合并
+  if (userConfigPath) {
+    if (!fs.existsSync(userConfigPath)) {
+      signale.error(`自定义配置文件不存在: ${userConfigPath}`)
+      process.exit(1)
+    }
+    signale.info(`加载用户配置: ${userConfigPath}`)
+    const userConfig = require(userConfigPath)
+    config = merge(config, userConfig)
+  }
 
   config.devServer = config.devServer || {}
   config.devServer.port = port

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quicktvui/web-cli",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "CLI tool for QuickTVUI web development - zero configuration",
   "author": "QuickTVUI Team",
   "license": "Apache-2.0",
@@ -24,6 +24,7 @@
     "minimist": "^1.2.8",
     "shelljs": "^0.10.0",
     "signale": "^1.4.0",
+    "webpack-merge": "^6.0.0",
     "@quicktvui/web-renderer": "^1.0.9",
     "scope-loader": "^1.0.3",
     "chokidar": "^3.5.3",