refactor platform/patch

packages/core/src/convertor/convertor.js

@@ -1,7 +1,4 @@
-import * as wxLifecycle from '../platform/patch/wx/lifecycle'
-import * as aliLifecycle from '../platform/patch/ali/lifecycle'
-import * as webLifecycle from '../platform/patch/web/lifecycle'
-import * as swanLifecycle from '../platform/patch/swan/lifecycle'
+import { LIFECYCLE, lifecycleProxyMap, pageMode } from '../platform/patch/lifecycle/index'
 import { mergeLifecycle } from './mergeLifecycle'
 import { error } from '@mpxjs/utils'
 import wxToAliRule from './wxToAli'
@@ -13,24 +10,6 @@ import wxToDdRule from './wxToDd'
 import wxToJdRule from './wxToJd'
 import wxToReactRule from './wxToReact'
 
-// 根据当前环境获取的默认生命周期信息
-let lifecycleInfo
-let pageMode
-
-if (__mpx_mode__ === 'web') {
-  lifecycleInfo = webLifecycle
-  pageMode = ''
-} else if (__mpx_mode__ === 'ali') {
-  lifecycleInfo = aliLifecycle
-  pageMode = ''
-} else if (__mpx_mode__ === 'swan') {
-  lifecycleInfo = swanLifecycle
-  pageMode = 'blend'
-} else {
-  lifecycleInfo = wxLifecycle
-  pageMode = 'blend'
-}
-
 /**
  * 转换规则包含四点
  * lifecycle [object] 生命周期
@@ -40,8 +19,8 @@ if (__mpx_mode__ === 'web') {
  * convert [function] 自定义转换函数, 接收一个options
  */
 const defaultConvertRule = {
-  lifecycle: mergeLifecycle(lifecycleInfo.LIFECYCLE),
-  lifecycleProxyMap: lifecycleInfo.lifecycleProxyMap,
+  lifecycle: mergeLifecycle(LIFECYCLE),
+  lifecycleProxyMap: lifecycleProxyMap,
   pageMode,
   support: !!pageMode,
   convert: null

packages/core/src/convertor/wxToAli.js

@@ -1,5 +1,5 @@
-import * as wxLifecycle from '../platform/patch/wx/lifecycle'
-import * as aliLifecycle from '../platform/patch/ali/lifecycle'
+import * as wxLifecycle from '../platform/patch/lifecycle/index.wx'
+import { LIFECYCLE } from '../platform/patch/lifecycle/index'
 import { mergeLifecycle } from './mergeLifecycle'
 import { error, hasOwn, isDev } from '@mpxjs/utils'
 import { implemented } from '../core/implement'
@@ -38,7 +38,7 @@ function notSupportTip (options) {
 
 export default {
   lifecycle: mergeLifecycle(wxLifecycle.LIFECYCLE),
-  lifecycle2: mergeLifecycle(aliLifecycle.LIFECYCLE),
+  lifecycle2: mergeLifecycle(LIFECYCLE),
   pageMode: 'blend',
   support: false,
   lifecycleProxyMap: wxLifecycle.lifecycleProxyMap,

packages/core/src/convertor/wxToSwan.js

@@ -1,8 +1,8 @@
 import { error, isDev } from '@mpxjs/utils'
 import { implemented } from '../core/implement'
 import { mergeLifecycle } from './mergeLifecycle'
-import * as wxLifecycle from '../platform/patch/wx/lifecycle'
-import * as swanLifecycle from '../platform/patch/swan/lifecycle'
+import * as wxLifecycle from '../platform/patch/lifecycle/index.wx'
+import { LIFECYCLE } from '../platform/patch/lifecycle/index'
 
 const BEHAVIORS_MAP = {
   'wx://form-field': 'swan://form-field',
@@ -30,7 +30,7 @@ function notSupportTip (options) {
 
 export default {
   lifecycle: mergeLifecycle(wxLifecycle.LIFECYCLE),
-  lifecycle2: mergeLifecycle(swanLifecycle.LIFECYCLE),
+  lifecycle2: mergeLifecycle(LIFECYCLE),
   pageMode: 'blend',
   support: true,
   lifecycleProxyMap: wxLifecycle.lifecycleProxyMap,

packages/core/src/convertor/wxToWeb.js

@@ -1,5 +1,5 @@
-import * as wxLifecycle from '../platform/patch/wx/lifecycle'
-import * as webLifecycle from '../platform/patch/web/lifecycle'
+import * as wxLifecycle from '../platform/patch/lifecycle/index.wx'
+import { LIFECYCLE } from '../platform/patch/lifecycle/index'
 import { mergeLifecycle } from './mergeLifecycle'
 import {
   isObject,
@@ -32,7 +32,7 @@ function notSupportTip (options) {
 
 export default {
   lifecycle: mergeLifecycle(wxLifecycle.LIFECYCLE),
-  lifecycle2: mergeLifecycle(webLifecycle.LIFECYCLE),
+  lifecycle2: mergeLifecycle(LIFECYCLE),
   pageMode: 'blend',
   support: true,
   lifecycleProxyMap: wxLifecycle.lifecycleProxyMap,

packages/core/src/platform/createApp.ios.js

@@ -2,13 +2,13 @@ import transferOptions from '../core/transferOptions'
 import builtInKeysMap from './patch/builtInKeysMap'
 import { makeMap, spreadProp, parseUrlQuery, getFocusedNavigation } from '@mpxjs/utils'
 import { mergeLifecycle } from '../convertor/mergeLifecycle'
-import * as wxLifecycle from '../platform/patch/wx/lifecycle'
+import { LIFECYCLE } from '../platform/patch/lifecycle/index'
 import Mpx from '../index'
 import { createElement, memo, useRef, useEffect } from 'react'
 import * as ReactNative from 'react-native'
 import { ref } from '../observer/ref'
 
-const appHooksMap = makeMap(mergeLifecycle(wxLifecycle.LIFECYCLE).app)
+const appHooksMap = makeMap(mergeLifecycle(LIFECYCLE).app)
 
 function getOrientation (window = ReactNative.Dimensions.get('window')) {
   return window.width > window.height ? 'landscape' : 'portrait'

packages/core/src/platform/createApp.js

@@ -3,19 +3,19 @@ import mergeOptions from '../core/mergeOptions'
 import builtInKeysMap from './patch/builtInKeysMap'
 import { makeMap, spreadProp, isBrowser } from '@mpxjs/utils'
 import { mergeLifecycle } from '../convertor/mergeLifecycle'
-import * as webLifecycle from '../platform/patch/web/lifecycle'
+import { LIFECYCLE } from '../platform/patch/lifecycle/index'
 import Mpx from '../index'
 import { initAppProvides } from './export/apiInject'
 
-const webAppHooksMap = makeMap(mergeLifecycle(webLifecycle.LIFECYCLE).app)
+const appHooksMap = makeMap(mergeLifecycle(LIFECYCLE).app)
 
 function filterOptions (options, appData) {
   const newOptions = {}
   Object.keys(options).forEach(key => {
     if (builtInKeysMap[key]) {
       return
     }
-    if (__mpx_mode__ === 'web' && !webAppHooksMap[key] && key !== 'provide') {
+    if (__mpx_mode__ === 'web' && !appHooksMap[key] && key !== 'provide') {
       appData[key] = options[key]
     } else {
       newOptions[key] = options[key]