@quicktvui/web-cli 1.0.0-beta.36 → 1.0.0-beta.38

package/bin/qt-web-cli.js

@@ -183,33 +183,26 @@ function startDevServer(configPath, port, shouldOpen) {
   const WebpackDevServer = require('webpack-dev-server')
   const config = require(configPath)
 
-  // 确保 devServer 配置正确
   config.devServer = config.devServer || {}
   config.devServer.port = port
-  config.devServer.open = false // 我们自己控制浏览器打开
+  config.devServer.open = false
 
   const compiler = webpack(config)
   const server = new WebpackDevServer(config.devServer, compiler)
 
-  // 监听编译完成事件，在首次编译完成后打开浏览器
-  let isOpened = false
-  compiler.hooks.done.tap('open-browser', (stats) => {
-    if (!isOpened && shouldOpen) {
-      isOpened = true
-      const url = `http://localhost:${port}`
-      openOrRefreshBrowser(url)
-    }
-  })
-
   server.startCallback((err) => {
     if (err) {
       signale.error('启动开发服务器失败:', err.message)
       process.exit(1)
     }
     signale.success(`开发服务器已启动: http://localhost:${port}`)
+
+    if (shouldOpen) {
+      const url = `http://localhost:${port}`
+      openBrowser(url)
+    }
   })
 
-  // 处理退出信号
   process.on('SIGINT', () => {
     server.stopCallback(() => {
       signale.info('开发服务器已停止')
@@ -255,41 +248,24 @@ function waitForServer(url, timeout = 30000) {
 }
 
 /**
- * 打开或刷新浏览器（支持 macOS）
+ * 打开浏览器
  */
-function openOrRefreshBrowser(url) {
+function openBrowser(url) {
   const platform = process.platform
-
-  if (platform === 'darwin') {
-    // macOS: 使用 AppleScript 检查并刷新已存在的标签页
-    const appleScript = `
-      tell application "Safari"
-        activate
-        set found to false
-        repeat with w in windows
-          repeat with t in tabs of w
-            if URL of t starts with "http://localhost:" then
-              set URL of t to "${url}"
-              set found to true
-              exit repeat
-            end if
-          end repeat
-          if found then exit repeat
-        end repeat
-        if not found then
-          open location "${url}"
-        end if
-      end tell
-    `
-
-    exec(`osascript -e '${appleScript.replace(/\n/g, ' ')}'`, { silent: true })
-    signale.success('已打开/刷新浏览器')
-  } else {
-    // 其他平台：直接打开 URL
-    const openCmd = platform === 'win32' ? 'start' : 'xdg-open'
-    exec(`${openCmd} "${url}"`, { silent: true })
+  const command =
+    platform === 'darwin'
+      ? `open "${url}"`
+      : platform === 'win32'
+        ? `cmd /c start "" "${url}"`
+        : `xdg-open "${url}"`
+  const result = exec(command, { silent: true })
+
+  if (result.code === 0) {
     signale.success('已打开浏览器')
+    return
   }
+
+  signale.warn(`自动打开浏览器失败，请手动访问: ${url}`)
 }
 
 function findProjectRoot(startDir = process.cwd()) {

package/lib/entry-package.js

@@ -1,6 +1,6 @@
 // @quicktvui/web-cli - web entry
 // 通过 @quicktvui/web-renderer 导入所有依赖
-// 主入口由 webpack 在本文件之前加载，App 已注册
+// 动态加载主入口，确保初始化顺序正确
 
 console.log('[Web Renderer] === Starting initialization ===')
 
@@ -49,15 +49,17 @@ styleEl.textContent = `
 document.head.appendChild(styleEl)
 console.log('[Web Renderer] Global CSS reset injected')
 
-// 启动引擎（主入口已在前加载并注册 App）
-console.log('[Web Renderer] Starting engine...')
-startWebEngine(engine, APP_NAME)
-console.log('[Web Renderer] === Initialization complete ===')
-
-// HMR 支持
-
-if (module.hot) {
-
-  module.hot.accept()
-
-}
+// 动态加载主入口，等待加载完成后再启动引擎
+console.log('[Web Renderer] Importing main module...')
+import(__QUICKTVUI_MAIN_ENTRY__)
+  .then(() => {
+    console.log('[Web Renderer] Main module loaded')
+    console.log('[Web Renderer] Starting engine...')
+    startWebEngine(engine, APP_NAME)
+    setTimeout(() => {
+      console.log('[Web Renderer] === Initialization complete ===')
+    }, 1000)
+  })
+  .catch((err) => {
+    console.error('[Web Renderer] Failed to load main module:', err)
+  })

package/lib/webpack.config.js

@@ -10,6 +10,7 @@ const fs = require('fs')
 const projectRoot = process.env.QUICKTVUI_PROJECT_ROOT || process.cwd()
 const mainEntry = process.env.QUICKTVUI_MAIN_ENTRY || path.resolve(projectRoot, 'src/main.ts')
 const port = parseInt(process.env.QUICKTVUI_PORT || '39001', 10)
+const watchPoll = parseInt(process.env.QUICKTVUI_WATCH_POLL || '1000', 10)
 
 // 尝试加载项目的 package.json
 let pkg = {}
@@ -104,18 +105,23 @@ const cssLoader = detectCSSLoader()
 const cliDir = path.resolve(__dirname, '..')
 const resolveLoader = (loaderName) => require.resolve(loaderName, { paths: [cliDir] })
 
-// 入口文件：主入口作为静态入口以便 HMR 追踪
+// 入口文件：只加载 entry-package.js，主入口通过动态 import 加载
 const entryPackageFile = path.resolve(__dirname, 'entry-package.js')
-// 手动注入 webpack-dev-server 客户端（全局安装时需要）
-const webpackDevServerPath = require.resolve('webpack-dev-server/client', { paths: [cliDir] })
+const entryFiles = ['regenerator-runtime/runtime', entryPackageFile]
 
 module.exports = {
   mode: 'development',
-  bail: false,
+  bail: true,
 
   devServer: {
     port,
-    hot: true,
+    hot: false,
+    liveReload: true,
+    headers: {
+      'Cache-Control': 'no-store, no-cache, must-revalidate, proxy-revalidate',
+      Pragma: 'no-cache',
+      Expires: '0',
+    },
     proxy: [
       {
         context: ['/proxy'],
@@ -149,35 +155,26 @@ module.exports = {
   },
 
   watchOptions: {
-    aggregateTimeout: 300,
-    poll: 1000,  // 移动硬盘必须使用轮询
+    aggregateTimeout: 1500,
+    poll: watchPoll,
     ignored: /node_modules/,
   },
 
   devtool: 'source-map',
 
-  // 入口配置：主入口在 entry-package 之前加载以确保 App 先注册
-  // webpack 会按顺序执行入口文件
+  // 多入口配置：先加载初始化代码，再加载主入口
   entry: {
-    index: [
-      `${webpackDevServerPath}?http://localhost:${port}`,
-      'webpack/hot/dev-server',
-      'regenerator-runtime/runtime',
-      mainEntry,           // 先加载主入口，注册 App
-      entryPackageFile,    // 再加载初始化代码，启动引擎
-    ],
+    index: entryFiles,
   },
 
   output: {
     filename: 'index.bundle.js',
     path: path.resolve(projectRoot, './dist/web/'),
-    publicPath: '/',
     strictModuleExceptionHandling: true,
     globalObject: '(0, eval)("this")',
   },
 
   plugins: [
-    new (require('webpack').HotModuleReplacementPlugin)(),
     new (require('vue-loader').VueLoaderPlugin)(),
     new (require('html-webpack-plugin'))({
       inject: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quicktvui/web-cli",
-  "version": "1.0.0-beta.36",
+  "version": "1.0.0-beta.38",
   "description": "CLI tool for QuickTVUI web development - zero configuration",
   "author": "QuickTVUI Team",
   "license": "Apache-2.0",