@quicktvui/web-cli 1.0.0-beta.11 → 1.0.0-beta.13

package/lib/entry-package.js

@@ -1,12 +1,9 @@
-// @quicktvui/web-cli - web entry (package)
-// 此文件由 CLI 自动加载，使用 @quicktvui/web-renderer 包
-// 主入口路径通过 webpack 多入口配置自动加载，无需在此处 import
-//
-// 初始化流程参考 main-web.js
+// @quicktvui/web-cli - web entry
+// 通过 @quicktvui/web-renderer 导入所有依赖
+// 动态加载主入口，确保初始化顺序正确
 
-console.log('[Web Renderer] === Starting initialization (package) ===')
+console.log('[Web Renderer] === Starting initialization ===')
 
-// 直接从 @quicktvui/web-renderer 导入所有需要的函数
 import {
   initAsyncLocalStorage,
   initAutoProxy,
@@ -19,57 +16,48 @@ import {
   IJKPlayerComponent,
 } from '@quicktvui/web-renderer'
 
-// Step 0: Initialize async localStorage (must be first, before any code uses localStorage)
+// 初始化 async localStorage
 initAsyncLocalStorage()
 
-// Step 0.1: Initialize auto proxy for development
+// 初始化自动代理
 initAutoProxy()
 
-// Step 0.2: Register IJKPlayerComponent for web video
+// 注册 IJKPlayerComponent
 global.__WEB_COMPONENTS__ = global.__WEB_COMPONENTS__ || {}
 global.__WEB_COMPONENTS__['IJKPlayerComponent'] = IJKPlayerComponent
 
-// Step 1: Setup SceneBuilder (must be done before main.ts loads)
+// 设置 SceneBuilder
 setupSceneBuilder()
 
-// Step 2: Create the web engine
+// 创建 Web 引擎
 const engine = createWebEngine()
 
-// Step 3: Apply all patches BEFORE starting
+// 应用所有补丁
 applyAllPatches(engine)
 
-// Step 4: Initialize TV Focus Manager
-const focusManager = new TVFocusManager()
-global.__TV_FOCUS_MANAGER__ = focusManager
+// 初始化 TV 焦点管理器
+global.__TV_FOCUS_MANAGER__ = new TVFocusManager()
 console.log('[Web Renderer] TVFocusManager initialized')
 
-// Step 5: Inject global CSS to match Android layout behavior
+// 注入全局 CSS
 const styleEl = document.createElement('style')
 styleEl.id = 'web-platform-reset'
 styleEl.textContent = `
-  /* Web-Android Layout Compatibility Reset */
-  
-  /* Disable flex cross-axis stretching (Android behavior) */
-  /* In Android, children don't auto-fill parent's cross dimension */
-  #app,
-  #app * {
-    align-items: flex-start;
-  }
-  
-  /* Elements with explicit style should override the reset */
-  [style*="align-items"] {
-    align-items: var(--align-items, center) !important;
-  }
+  #app, #app * { align-items: flex-start; }
+  [style*="align-items"] { align-items: var(--align-items, center) !important; }
 `
 document.head.appendChild(styleEl)
-console.log('[Web Renderer] Global CSS reset injected for Android-compatible layout')
-
-// 注意：主入口文件已通过 webpack 多入口配置自动加载，无需在此处 import
-
-// Step 6: Start the engine
-console.log('[Web Renderer] Starting engine...')
-startWebEngine(engine, APP_NAME)
-
-setTimeout(() => {
-  console.log('[Web Renderer] === Initialization complete ===')
-}, 1000)
+console.log('[Web Renderer] Global CSS reset injected')
+
+// 动态加载主入口，等待加载完成后再启动引擎
+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

@@ -9,7 +9,6 @@ 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 entryType = process.env.QUICKTVUI_ENTRY_TYPE || 'package'
 const port = parseInt(process.env.QUICKTVUI_PORT || '39001', 10)
 
 // 尝试加载项目的 package.json
@@ -87,21 +86,9 @@ function detectCSSLoader() {
 
 const cssLoader = detectCSSLoader()
 
-// 根据类型选择入口文件
-let entryFiles
-
-if (entryType === 'webmain') {
-  // 直接使用 webMain 作为入口
-  entryFiles = ['regenerator-runtime/runtime', mainEntry]
-} else if (entryType === 'local') {
-  // 使用 entry-local.js + main 入口
-  const entryLocalFile = path.resolve(__dirname, 'entry-local.js')
-  entryFiles = ['regenerator-runtime/runtime', entryLocalFile, mainEntry]
-} else {
-  // 使用 entry-package.js + main 入口
-  const entryPackageFile = path.resolve(__dirname, 'entry-package.js')
-  entryFiles = ['regenerator-runtime/runtime', entryPackageFile, mainEntry]
-}
+// 入口文件：只加载 entry-package.js，主入口通过动态 import 加载
+const entryPackageFile = path.resolve(__dirname, 'entry-package.js')
+const entryFiles = ['regenerator-runtime/runtime', entryPackageFile]
 
 module.exports = {
   mode: 'development',
@@ -175,28 +162,10 @@ module.exports = {
       template: path.resolve(__dirname, '../templates/web-renderer.html'),
       title: pkg.name || 'QuickTVUI Web',
     }),
-    // 注入主入口路径和项目根目录，以及预计算的模块路径
+    // 注入主入口路径和环境变量
     new (require('webpack').DefinePlugin)({
       __QUICKTVUI_PROJECT_ROOT__: JSON.stringify(projectRoot),
       __QUICKTVUI_MAIN_ENTRY__: JSON.stringify(mainEntry),
-      // 预计算 src/web 模块路径（浏览器环境无法使用 path 模块）
-      __QUICKTVUI_MODULE_ASYNC_LOCAL_STORAGE__: JSON.stringify(
-        path.join(projectRoot, 'src/web/core/asyncLocalStorage')
-      ),
-      __QUICKTVUI_MODULE_AUTO_PROXY__: JSON.stringify(
-        path.join(projectRoot, 'src/web/core/autoProxy')
-      ),
-      __QUICKTVUI_MODULE_SCENE_BUILDER__: JSON.stringify(
-        path.join(projectRoot, 'src/web/core/SceneBuilder')
-      ),
-      __QUICKTVUI_MODULE_WEB_ENGINE__: JSON.stringify(path.join(projectRoot, 'src/web')),
-      __QUICKTVUI_MODULE_PATCHES__: JSON.stringify(path.join(projectRoot, 'src/web/core/patches')),
-      __QUICKTVUI_MODULE_TV_FOCUS_MANAGER__: JSON.stringify(
-        path.join(projectRoot, 'src/web/core/TVFocusManager')
-      ),
-      __QUICKTVUI_MODULE_PAGE_LIFECYCLE__: JSON.stringify(
-        path.join(projectRoot, 'src/web/core/pageLifecycle')
-      ),
       process: JSON.stringify({
         env: { NODE_ENV: 'development' },
         browser: true,

package/package.json

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