@mpxjs/core 2.9.69 → 2.9.70

package/src/platform/patch/index.js

@@ -1,18 +1,14 @@
 import transferOptions from '../../core/transferOptions'
 import getBuiltInMixins from '../builtInMixins/index'
-import { getDefaultOptions as getWxDefaultOptions } from './wx/getDefaultOptions'
-import { getDefaultOptions as getAliDefaultOptions } from './ali/getDefaultOptions'
-import { getDefaultOptions as getSwanDefaultOptions } from './swan/getDefaultOptions'
-import { getDefaultOptions as getWebDefaultOptions } from './web/getDefaultOptions'
-import { getDefaultOptions as getReactDefaultOptions } from './react/getDefaultOptions'
-import { error } from '@mpxjs/utils'
+import { getDefaultOptions } from './getDefaultOptions'
+import { error, isReact, isWeb } from '@mpxjs/utils'
 
 export default function createFactory (type) {
   return (options = {}, { isNative, customCtor, customCtorType } = {}) => {
     options.__nativeRender__ = !!isNative
     options.__type__ = type
     let ctor
-    if (__mpx_mode__ !== 'web' && __mpx_mode__ !== 'ios' && __mpx_mode__ !== 'android') {
+    if (!isWeb && !isReact) {
       if (customCtor) {
         ctor = customCtor
         customCtorType = customCtorType || type
@@ -39,19 +35,6 @@ export default function createFactory (type) {
       }
     }
 
-    let getDefaultOptions
-    if (__mpx_mode__ === 'ios' || __mpx_mode__ === 'android') {
-      getDefaultOptions = getReactDefaultOptions
-    } else if (__mpx_mode__ === 'web') {
-      getDefaultOptions = getWebDefaultOptions
-    } else if (__mpx_mode__ === 'ali') {
-      getDefaultOptions = getAliDefaultOptions
-    } else if (__mpx_mode__ === 'swan') {
-      getDefaultOptions = getSwanDefaultOptions
-    } else {
-      getDefaultOptions = getWxDefaultOptions
-    }
-
     const { setup } = options
     const { rawOptions, currentInject } = transferOptions(options, type)
     rawOptions.setup = setup
@@ -60,7 +43,7 @@ export default function createFactory (type) {
     // 将合并后的用户定义的rawOptions传入获取当前应该注入的内建mixins
     rawOptions.mixins = getBuiltInMixins({ type, rawOptions, currentInject })
     const defaultOptions = getDefaultOptions({ type, rawOptions, currentInject })
-    if (__mpx_mode__ === 'web' || __mpx_mode__ === 'ios' || __mpx_mode__ === 'android') {
+    if (isWeb || isReact) {
       global.__mpxOptionsMap = global.__mpxOptionsMap || {}
       global.__mpxOptionsMap[currentInject.moduleId] = defaultOptions
     } else if (ctor) {

package/src/platform/patch/{ali/lifecycle.js → lifecycle/index.ali.js}

@@ -59,3 +59,5 @@ export const LIFECYCLE = {
   PAGE_HOOKS,
   COMPONENT_HOOKS
 }
+
+export const pageMode = ''

package/src/platform/patch/lifecycle/index.js

@@ -0,0 +1 @@
+export * from './index.wx'

package/src/platform/patch/{swan/lifecycle.js → lifecycle/index.swan.js}

@@ -57,3 +57,5 @@ export const LIFECYCLE = {
   PAGE_HOOKS,
   COMPONENT_HOOKS
 }
+
+export const pageMode = 'blend'

package/src/platform/patch/{web/lifecycle.js → lifecycle/index.web.js}

@@ -49,3 +49,7 @@ export const LIFECYCLE = {
   PAGE_HOOKS,
   COMPONENT_HOOKS
 }
+
+export const pageMode = ''
+
+export const lifecycleProxyMap = {}

package/src/platform/patch/{wx/lifecycle.js → lifecycle/index.wx.js}

@@ -69,3 +69,5 @@ export const LIFECYCLE = {
   PAGE_HOOKS,
   COMPONENT_HOOKS
 }
+
+export const pageMode = 'blend'

package/src/external/vue.js

@@ -1 +0,0 @@
-export default {}

package/src/external/vue.web.js

@@ -1,6 +0,0 @@
-import Vue from 'vue'
-import install from './vuePlugin'
-
-Vue.use(install)
-
-export default Vue

package/src/platform/patch/react/getDefaultOptions.js

@@ -1 +0,0 @@
-export function getDefaultOptions () {}

package/src/platform/patch/swan/getDefaultOptions.js

@@ -1,34 +0,0 @@
-import mergeOptions from '../../../core/mergeOptions'
-import { initProxy, filterOptions } from '../wx/getDefaultOptions'
-
-export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
-  let hookNames = ['attached', 'ready', 'detached']
-  // 当用户传入page作为构造器构造页面时，修改所有关键hooks
-  if (rawOptions.__pageCtor__) {
-    hookNames = ['onLoad', 'onReady', 'onUnload']
-  }
-
-  const rootMixin = {
-    [hookNames[0]] () {
-      initProxy(this, rawOptions, currentInject)
-    },
-    [hookNames[1]] () {
-      if (this.__mpxProxy) this.__mpxProxy.mounted()
-    },
-    [hookNames[2]] () {
-      if (this.__mpxProxy) this.__mpxProxy.unmounted()
-    }
-  }
-
-  // 如构造页面，优先使用onInit进行初始化
-  if (type === 'page') {
-    rootMixin.onInit = function (...params) {
-      initProxy(this, rawOptions, currentInject, params)
-    }
-  }
-
-  const rootMixins = [rootMixin]
-  rawOptions.mixins = rawOptions.mixins ? rootMixins.concat(rawOptions.mixins) : rootMixins
-  rawOptions = mergeOptions(rawOptions, type, false)
-  return filterOptions(rawOptions)
-}