Merge branch 'main' into main

NervJS · Apr 17, 2024 · c51e4bc · c51e4bc
2 parents 9243917 + 7b993ed
commit c51e4bc
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/packages/taro-cli/src/util/defineConfig.ts b/packages/taro-cli/src/util/defineConfig.ts
@@ -9,7 +9,7 @@ export interface ConfigEnv {
   mode: string
 }
 
-export type UserConfigFn = (mergin: WebpackMerge, env: ConfigEnv) => IProjectConfig | Promise<IProjectConfig>
+export type UserConfigFn = (merge: WebpackMerge, env: ConfigEnv) => IProjectConfig | Promise<IProjectConfig>
 export type UserConfigExport = IProjectConfig | Promise<IProjectConfig> | UserConfigFn
 
 /**

diff --git a/packages/taro-platform-harmony-hybrid/src/api/apis/base/index.ts b/packages/taro-platform-harmony-hybrid/src/api/apis/base/index.ts
@@ -20,4 +20,5 @@ export const env = {
  */
 
 export * from './system'
+export * from './update'
 export * from './weapp/life-cycle'
diff --git a/packages/taro-platform-harmony-hybrid/src/api/apis/comments.ts b/packages/taro-platform-harmony-hybrid/src/api/apis/comments.ts
@@ -1496,12 +1496,6 @@
  * @canNotUse getRealtimeLogManager
  */
 
-/**
- * 获取全局唯一的版本更新管理器
- *
- * @canNotUse getUpdateManager
- */
-
 /**
  * 设置是否打开调试开关
  *