@tarojs/plugin-platform-harmony-ets 4.0.0-alpha.43 → 4.0.0-alpha.45

package/dist/runtime-ets/current.ts

@@ -3,7 +3,6 @@ export const context: any = {
   value: null
 }
 
-// @ts-nocheck
 export const Current: any = {
   app: null,
   uiContext: null,

package/dist/runtime-ets/dom/document.ts

@@ -1,10 +1,10 @@
-import { eventSource } from '@tarojs/runtime/dist/runtime.esm'
 import { isUndefined } from '@tarojs/shared'
 
 import { Current } from '../current'
 import { findChildNodeWithDFS, getPageScrollerOrNode } from '../utils'
 import { TaroComment } from './comment'
 import { TaroElement } from './element/element'
+import { eventSource } from './event-source'
 import { NodeType, TaroNode, TaroTextNode } from './node'
 
 import type { Window } from '../bom/window'

package/dist/runtime-ets/dom/element/canvas.ts

@@ -1,8 +1,9 @@
-import { eventSource, TaroAny, TaroNode } from '@tarojs/runtime'
-
+import { eventSource } from '../event-source'
+import { TaroNode } from '../node'
 import { TaroElement } from './element'
 
 import type { CanvasProps, CanvasTouchEvent } from '@tarojs/components/types'
+import type { TaroAny } from '../../interface'
 
 export class CanvasRenderingContext2DWXAdapter extends CanvasRenderingContext2D {
   // constructor(settings?: RenderingContextSetting) {

package/dist/runtime-ets/dom/element/element.ts

@@ -1,20 +1,22 @@
 // @ts-ignore
 import { getPageById } from '@tarojs/plugin-framework-react/dist/runtime'
-import { eventCenter, eventSource } from '@tarojs/runtime/dist/runtime.esm'
 import { EMPTY_OBJ, toCamelCase } from '@tarojs/shared'
 
 import { ATTRIBUTES_CALLBACK_TRIGGER_MAP, ID } from '../../constant'
 import { Current } from '../../current'
+import { eventCenter } from '../../emitter/emitter'
 import { findChildNodeWithDFS } from '../../utils'
 import { initComponentNodeInfo, triggerAttributesCallback } from '../../utils/info'
 import { bindAnimation } from '../bind'
 import { ClassList } from '../class-list'
-import { type ICSSStyleDeclaration, createCSSStyleDeclaration } from '../cssStyleDeclaration'
+import { createCSSStyleDeclaration } from '../cssStyleDeclaration'
+import { eventSource } from '../event-source'
 import { NodeType, TaroNode } from '../node'
 import StyleSheet, { HarmonyStyle, TaroStyleType } from '../stylesheet'
 
 import type { BaseTouchEvent, ITouchEvent, StandardProps } from '@tarojs/components/types'
-import type { TaroAny } from '../../utils'
+import type { TaroAny } from '../../interface'
+import type { ICSSStyleDeclaration } from '../cssStyleDeclaration'
 
 type NamedNodeMap = { name: string, value: string }[]
 
@@ -91,7 +93,7 @@ export class TaroElement<
   }
 
   public get id(): string {
-    return this.getAttribute('id') || this._nid
+    return this.getAttribute('id') || `${this._nid}`
   }
 
   public set className(value: string) {
@@ -338,7 +340,6 @@ export class TaroElement<
   public setLayer (value: number) {
     if (!this.parentNode) return // 没有父节点，不需要设置层级关系
 
-
     const currentPage = getPageById(this.getAttribute('__fixed'))
     if (currentPage) {
       this._page = currentPage

package/dist/runtime-ets/dom/element/form.ts

@@ -56,6 +56,12 @@ class TaroFormWidgetElement<T extends FormWidgetProps = FormWidgetProps> extends
     }
   }
 
+  public removeAttribute(name: string): void {
+    if (name === 'value') {
+      this.value = ''
+    }
+  }
+
   public get name () {
     return this._attrs.name || ''
   }

package/dist/runtime-ets/dom/element/movableView.ts

@@ -231,14 +231,18 @@ export class TaroMovableViewElement extends TaroElement<MovableViewProps & { ani
   public callTouchEventFnFromGesture(eventName: string, gestureEvent: GestureEvent) {
     const touchFns = (this?.__listeners?.[eventName] || []) as Function[]
     touchFns.forEach(fn => {
-      fn({
-        _hmEvent: gestureEvent,
-        target: this,
-        changedTouches: gestureEvent.fingerList.map(finger => ({
-          clientX: finger.globalX,
-          clientY: finger.globalY
-        }))
-      })
+      try {
+        fn({
+          _hmEvent: gestureEvent,
+          target: this,
+          changedTouches: gestureEvent.fingerList.map(finger => ({
+            clientX: finger.globalX,
+            clientY: finger.globalY
+          }))
+        })
+      } catch (error) {
+        console.error(error)
+      }
     })
   }
 }

package/dist/runtime-ets/dom/event-source.ts

@@ -0,0 +1 @@
+export { eventSource } from '@tarojs/runtime/dist/runtime.esm'

package/dist/runtime-ets/dom/eventTarget.ts

@@ -1,6 +1,6 @@
-import { Events } from '@tarojs/runtime/dist/runtime.esm'
 import { isArray } from '@tarojs/shared'
 
+import { Events } from '../emitter/emitter'
 import { TaroEvent } from './event'
 
 import type { EventHandler } from '../interface'

package/dist/runtime-ets/dom/node.ts

@@ -1,9 +1,8 @@
-import { eventSource } from '@tarojs/runtime/dist/runtime.esm'
-
 import TaroDataSourceElement from './dataSource'
+import { eventSource } from './event-source'
 
 import type { StandardProps } from '@tarojs/components/types'
-import type { TaroAny } from '../utils'
+import type { TaroAny } from '../interface'
 import type { TaroDocument } from './document'
 import type { TaroElement } from './element/element'
 
@@ -99,7 +98,7 @@ export class TaroNode extends TaroDataSourceElement {
 
   // 提供唯一标识，方便与小程序一致，能根据uid获取到对应的节点
   public get uid (): string {
-    return this._nid
+    return `${this._nid}`
   }
 
   public get firstChild (): TaroNode | null {

package/dist/runtime-ets/emitter/emitter.ts

@@ -0,0 +1 @@
+export { eventCenter, Events, EventsType } from '@tarojs/runtime/dist/runtime.esm'

package/dist/runtime-ets/env.ts

@@ -0,0 +1 @@
+export { env } from '@tarojs/runtime/dist/runtime.esm'

package/dist/runtime-ets/index.ts

@@ -1,18 +1,33 @@
+/* eslint-disable simple-import-sort/exports */
 // Current必须放在前面初始化
-// eslint-disable-next-line simple-import-sort/exports
 export * from './current'
+export { hooks } from '@tarojs/shared'
+// bom
 export * from './bom/document'
 export * from './bom/getComputedStyle'
-export { nav as navigator } from './bom/navigator'
-export { caf as cancelAnimationFrame, now, raf as requestAnimationFrame } from './bom/raf'
+export * from './bom/history'
+export * from './bom/location'
+export * from './bom/navigator'
+export * from './bom/raf'
+export * from './bom/URL'
 export * from './bom/window'
+// dom
 export * from './dom/element'
 export * from './dom/event'
+export * from './dom/event-source'
 export * from './dom/node'
 export * from './dom/stylesheet'
 export * from './dom/cssNesting'
-export * from './interface'
+// others
+export * from './env'
+export * from './constant'
+export * from './emitter/emitter'
 export * from './utils'
-export * from './utils/info'
-export { URL, URLSearchParams, eventSource, Events } from '@tarojs/runtime/dist/runtime.esm'
-export { hooks } from '@tarojs/shared'
+// typings
+export * from './interface'
+export {
+  Instance, PageProps,
+  ReactPageComponent, ReactPageInstance, ReactAppInstance,
+  PageLifeCycle, PageInstance,
+  AppInstance,
+} from '@tarojs/runtime/dist/runtime.esm'

package/dist/runtime-ets/interface/index.ts

@@ -1 +1,7 @@
 export * from './event'
+export { PageConfig, TFunc } from '@tarojs/runtime/dist/runtime.esm'
+
+export type TaroAny = any
+export type TaroFunc = (...args: TaroAny[]) => TaroAny
+export type TaroIndent = string | number | boolean | undefined | null
+export type TaroObject = Record<string | number | symbol, TaroAny>

package/dist/runtime-ets/utils/index.ts

@@ -161,9 +161,9 @@ export function findChildNodeWithDFS<T extends TaroElement = TaroElement> (node:
 export function findChildNodeWithDFS<T extends TaroElement = TaroElement> (node: TaroElement, selector: string | ((ele: T) => boolean), selectAll): T[] | T | null {
   const queue = [node]
 
-  const nodeList: TaroElement[] = []
+  const nodeList: T[] = []
   while (queue.length) {
-    const currentNode = queue.shift()
+    const currentNode = queue.shift() as T
     if (currentNode) {
       if (typeof selector === 'string') {
         if (selector.startsWith('#')) {
@@ -200,7 +200,5 @@ export function findChildNodeWithDFS<T extends TaroElement = TaroElement> (node:
   return null
 }
 
-export type TaroAny = any
-export type TaroFunc = (...args: TaroAny[]) => TaroAny
-export type TaroIndent = string | number | boolean | undefined | null
-export type TaroObject = Record<string | number | symbol, TaroAny>
+export * from './info'
+export * from './router'

package/dist/runtime-ets/utils/router.ts

@@ -0,0 +1,9 @@
+export {
+  addLeadingSlash,
+  getCurrentPage,
+  getHomePage,
+  hasBasename,
+  stripBasename,
+  stripSuffix,
+  stripTrailing
+} from '@tarojs/runtime/dist/runtime.esm'

package/dist/runtime-framework/react/app.ts

@@ -1,5 +1,4 @@
-import { Current, document } from '@tarojs/runtime' // eslint-disable-line import/no-duplicates
-import { eventCenter } from '@tarojs/runtime/dist/runtime.esm' // eslint-disable-line import/no-duplicates
+import { Current, document, eventCenter } from '@tarojs/runtime'
 
 import { setReconciler } from './connect'
 import { injectPageInstance } from './page'

package/dist/runtime-framework/react/hooks.ts

@@ -11,7 +11,7 @@ import type {
   PageLifeCycle,
   PageProps,
   TFunc
-} from '@tarojs/runtime/dist/runtime.esm'
+} from '@tarojs/runtime'
 
 const createTaroHook = (lifecycle: keyof PageLifeCycle | keyof AppInstance) => {
   return (fn: TFunc) => {

package/dist/runtime-framework/react/native-page.ts

@@ -1,5 +1,4 @@
-import { Current, document, requestAnimationFrame, TaroElement, window } from '@tarojs/runtime' // eslint-disable-line import/no-duplicates
-import { addLeadingSlash, CONTEXT_ACTIONS, env, eventCenter, TFunc } from '@tarojs/runtime/dist/runtime.esm' // eslint-disable-line import/no-duplicates
+import { addLeadingSlash, CONTEXT_ACTIONS, Current, document, env, eventCenter, requestAnimationFrame, TaroElement, TFunc, window } from '@tarojs/runtime'
 import { ensure, hooks, isUndefined } from '@tarojs/shared'
 
 import { ReactMeta as reactMeta } from './app'
@@ -29,10 +28,11 @@ interface InitNativeComponentEntryParams {
   cb?: TFunc
   // 是否使用默认的 DOM 入口 - app；默认为true，false的时候，会创建一个新的dom并且把它挂载在 app 下面
   isDefaultEntryDom?: boolean
+  isUseReact18?: boolean
 }
 
 function initNativeComponentEntry (params: InitNativeComponentEntryParams) {
-  const { R, ReactDOM, cb, isDefaultEntryDom = true } = params
+  const { R, ReactDOM, cb, isDefaultEntryDom = true, isUseReact18 = false } = params
   interface IEntryState {
     components: {
       compId: string
@@ -60,8 +60,8 @@ function initNativeComponentEntry (params: InitNativeComponentEntryParams) {
     // React 16 uncaught error 会导致整个应用 crash，
     // 目前把错误缩小到页面
     componentDidCatch (error, info: React.ErrorInfo) {
-      console.warn(error)
-      console.error(info.componentStack)
+      console.warn(`Taro Error Page 报错信息：${error}`)
+      console.error(`Taro Error Page 报错堆栈：${info.componentStack}`)
     }
 
     render () {
@@ -134,14 +134,23 @@ function initNativeComponentEntry (params: InitNativeComponentEntryParams) {
         }),
       }
 
-      ReactDOM.flushSync(() => {
+      if (isUseReact18) {
+        ReactDOM.flushSync(() => {
+          this.setState(
+            {
+              components: [...this.state.components, item],
+            },
+            () => cb && cb()
+          )
+        })
+      } else {
         this.setState(
           {
             components: [...this.state.components, item],
           },
           () => cb && cb()
         )
-      })
+      }
     }
 
     unmount (compId, cb?) {
@@ -149,7 +158,20 @@ function initNativeComponentEntry (params: InitNativeComponentEntryParams) {
       const index = components.findIndex((item) => item.compId === compId)
       const next = [...components.slice(0, index), ...components.slice(index + 1)]
 
-      ReactDOM.flushSync(() => {
+
+      if (isUseReact18) {
+        ReactDOM.flushSync(() => {
+          this.setState(
+            {
+              components: next,
+            },
+            () => {
+              removePageInstance(compId)
+              cb && cb()
+            }
+          )
+        })
+      } else {
         this.setState(
           {
             components: next,
@@ -159,7 +181,7 @@ function initNativeComponentEntry (params: InitNativeComponentEntryParams) {
             cb && cb()
           }
         )
-      })
+      }
     }
 
     render () {
@@ -180,11 +202,16 @@ function initNativeComponentEntry (params: InitNativeComponentEntryParams) {
     app = nativeApp
   }
 
-  const root = ReactDOM.createRoot(app)
+  if (isUseReact18) {
+    const root = ReactDOM.createRoot(app)
 
-  ReactDOM.flushSync(() => {
-    root.render?.(h(Entry))
-  })
+    ReactDOM.flushSync(() => {
+      root.render?.(h(Entry))
+    })
+  } else {
+    // eslint-disable-next-line react/no-deprecated
+    ReactDOM.render(h(Entry, {}), app)
+  }
 }
 
 
@@ -260,7 +287,7 @@ export function createNativePageConfig (
       const mountCallback = () => {
         pageElement = document.getElementById($taroPath)
 
-        ensure(pageElement !== null, '没有找到页面实例。')
+        ensure(pageElement !== null, `Taro Error Page: ${$taroPath}, 该页面执行时出现了报错，导致没有找到页面实例。`)
 
         safeExecute($taroPath, ONLOAD, this.$taroParams)
         loadResolver()
@@ -273,6 +300,7 @@ export function createNativePageConfig (
           initNativeComponentEntry({
             R: react,
             ReactDOM,
+            isUseReact18: pageConfig?.isUseReact18,
             cb: () => {
               Current.app!.mount!(Component, $taroPath, () => this, mountCallback)
             },
@@ -397,7 +425,7 @@ export function createNativeComponentConfig (
   h = react.createElement
   ReactDOM = reactdom
   setReconciler(ReactDOM)
-  const { isNewBlended } = componentConfig
+  const { isNewBlended, isUseReact18 } = componentConfig
 
   const componentObj: Record<string, any> = {
     options: componentConfig,
@@ -434,6 +462,7 @@ export function createNativeComponentConfig (
           R: react,
           ReactDOM,
           isDefaultEntryDom: !isNewBlended,
+          isUseReact18,
           cb: mountComponent,
         })
       } else {

package/dist/runtime-framework/react/page.ts

@@ -1,5 +1,4 @@
-import { Current, document, requestAnimationFrame, window } from '@tarojs/runtime' // eslint-disable-line import/no-duplicates
-import { addLeadingSlash, CONTEXT_ACTIONS, env, eventCenter } from '@tarojs/runtime/dist/runtime.esm' // eslint-disable-line import/no-duplicates
+import { addLeadingSlash, CONTEXT_ACTIONS, Current, document, env, eventCenter, requestAnimationFrame, window } from '@tarojs/runtime'
 import { hooks, isArray, isFunction, isUndefined } from '@tarojs/shared'
 
 import { ON_HIDE, ON_LOAD, ON_READY, ON_SHOW, ON_UNLOAD } from './constant'

package/dist/runtime-framework/solid/app.ts

@@ -1,6 +1,5 @@
 import { createComponent, h, render } from '@tarojs/plugin-framework-solid/dist/reconciler'
-import { Current, document } from '@tarojs/runtime' // eslint-disable-line import/no-duplicates
-import { eventCenter } from '@tarojs/runtime/dist/runtime.esm' // eslint-disable-line import/no-duplicates
+import { Current, document, eventCenter } from '@tarojs/runtime'
 import { hooks } from '@tarojs/shared'
 import { batch, createContext, createRoot, createSignal, For } from 'solid-js'
 

package/dist/runtime-framework/solid/hooks.ts

@@ -14,7 +14,7 @@ import type {
   AppInstance,
   PageLifeCycle,
   TFunc
-} from '@tarojs/runtime/dist/runtime.esm'
+} from '@tarojs/runtime'
 
 const createTaroHook = (lifecycle: keyof PageLifeCycle | keyof AppInstance) => {
   return (fn: TFunc) => {

package/dist/runtime-framework/solid/page.ts

@@ -1,5 +1,4 @@
-import { Current, document, requestAnimationFrame, window } from '@tarojs/runtime' // eslint-disable-line import/no-duplicates
-import { addLeadingSlash, CONTEXT_ACTIONS, env, eventCenter } from '@tarojs/runtime/dist/runtime.esm' // eslint-disable-line import/no-duplicates
+import { addLeadingSlash, CONTEXT_ACTIONS, Current, document, env, eventCenter, requestAnimationFrame, window } from '@tarojs/runtime'
 import { hooks, isArray, isFunction, isUndefined } from '@tarojs/shared'
 
 import { ON_HIDE, ON_LOAD, ON_READY, ON_SHOW, ON_UNLOAD } from './constant'

package/dist/runtime-framework/solid/reconciler/props.ts

@@ -1,11 +1,10 @@
 import { convertNumber2PX, FormElement } from '@tarojs/runtime'
-import { capitalize, internalComponents, isFunction, isNumber, isObject, isString, toCamelCase } from '@tarojs/shared'
+import { capitalize, internalComponents, isFunction, isNumber, isObject, isString, PLATFORM_TYPE, toCamelCase } from '@tarojs/shared'
 
 import type { Style, TaroElement } from '@tarojs/runtime'
 
 export type Props = Record<string, unknown>
 
-const isHarmony = process.env.TARO_PLATFORM === 'harmony'
 const IS_NON_DIMENSIONAL = /max|aspect|acit|ex(?:s|g|n|p|$)|rph|grid|ows|mnc|ntw|ine[ch]|zoo|^ord|itera/i
 
 function isEventName (s: string) {
@@ -64,16 +63,16 @@ function setEvent (dom: TaroElement, name: string, value: unknown, oldValue?: un
 
   const compName = capitalize(toCamelCase(dom.tagName.toLowerCase()))
 
-  if (eventName === 'click' && !isHarmony && compName in internalComponents) {
+  if (eventName === 'click' && process.env.TARO_PLATFORM !== PLATFORM_TYPE.HARMONY && compName in internalComponents) {
     eventName = 'tap'
   }
 
   if (isFunction(value)) {
     if (oldValue) {
-      dom.removeEventListener(eventName, oldValue as any, !isHarmony ? false : undefined)
-      dom.addEventListener(eventName, value, !isHarmony ? { isCapture, sideEffect: false } : undefined)
+      dom.removeEventListener(eventName, oldValue as any, process.env.TARO_PLATFORM !== PLATFORM_TYPE.HARMONY ? false : undefined)
+      dom.addEventListener(eventName, value, process.env.TARO_PLATFORM !== PLATFORM_TYPE.HARMONY ? { isCapture, sideEffect: false } : undefined)
     } else {
-      dom.addEventListener(eventName, value, !isHarmony ? isCapture : undefined)
+      dom.addEventListener(eventName, value, process.env.TARO_PLATFORM !== PLATFORM_TYPE.HARMONY ? isCapture : undefined)
     }
   } else {
     dom.removeEventListener(eventName, oldValue as any)
@@ -81,13 +80,13 @@ function setEvent (dom: TaroElement, name: string, value: unknown, oldValue?: un
 }
 
 function setStyle (style: Style, key: string, value: unknown) {
-  if (key[0] === '-' && !isHarmony) {
+  if (key[0] === '-' && process.env.TARO_PLATFORM !== PLATFORM_TYPE.HARMONY) {
     // css variables need not further judgment
     style.setProperty(key, (value as string).toString())
     return
   }
 
-  if (isHarmony && key.startsWith('_')) {
+  if (process.env.TARO_PLATFORM === PLATFORM_TYPE.HARMONY && key.startsWith('_')) {
     // harmony样式已处理
     style[key] = value == null ? '' : value
   } else {
@@ -145,7 +144,7 @@ export function setProperty (dom: TaroElement, name: string, value: unknown, old
       for (const i in oldValue) {
         if (!(value && i in (value as StyleValue))) {
           // 鸿蒙伪类特殊处理
-          if (isHarmony && (i === '::after' || i === '::before')) {
+          if (process.env.TARO_PLATFORM === PLATFORM_TYPE.HARMONY && (i === '::after' || i === '::before')) {
             setPseudo(dom, i, null)
           } else {
             style[i] = ''
@@ -157,7 +156,7 @@ export function setProperty (dom: TaroElement, name: string, value: unknown, old
       for (const i in value) {
         if (!oldValue || !isEqual(value[i], (oldValue as StyleValue)[i])) {
           // 鸿蒙伪类特殊处理
-          if (isHarmony && (i === '::after' || i === '::before')) {
+          if (process.env.TARO_PLATFORM === PLATFORM_TYPE.HARMONY && (i === '::after' || i === '::before')) {
             setPseudo(dom, i, value[i] as unknown as StyleValue)
           } else {
             style[i] = value[i]