@mpxjs/core 2.8.61 → 2.8.64-bridgetest

package/@types/index.d.ts

@@ -46,7 +46,7 @@ type FullPropType<T> = {
 }
 
 interface Properties {
-  [key: string]: WechatMiniprogram.Component.AllProperty | PropType<any> | FullPropType<any>
+  [key: string]: WechatMiniprogram.Component.AllProperty
 }
 
 interface Methods {
@@ -82,12 +82,12 @@ type PropValueType<Def> = Def extends {
   }
   ? T
   : Def extends (...args: any[]) => infer T
-  ? T
-  : Def extends FullPropType<infer T>
-  ? T
-  : Def extends PropType<infer T>
-  ? T
-  : any;
+    ? T
+    : Def extends FullPropType<infer T>
+      ? T
+      : Def extends PropType<infer T>
+        ? T
+        : any;
 
 type GetPropsType<T> = {
   readonly [K in keyof T]: PropValueType<T[K]>
@@ -240,7 +240,10 @@ export function createApp<T extends WechatMiniprogram.IAnyObject> (opt: WechatMi
 
 type MixinType = 'app' | 'page' | 'component'
 
-export function injectMixins (mixins: object | Array<object>, options?: MixinType | MixinType[] | { types?: MixinType | MixinType[], stage?: number }): Mpx
+export function injectMixins (mixins: object | Array<object>, options?: MixinType | MixinType[] | {
+  types?: MixinType | MixinType[],
+  stage?: number
+}): Mpx
 
 // export function watch (expr: string | (() => any), handler: WatchHandler | WatchOptWithHandler, options?: WatchOpt): () => void
 
@@ -339,7 +342,7 @@ export interface Ref<T = any> {
    * We need this to be in public d.ts but don't want it to show up in IDE
    * autocomplete, so we use a private Symbol instead.
    */
-    [RefSymbol]: true
+  [RefSymbol]: true
 }
 
 type CollectionTypes = IterableCollections | WeakCollections
@@ -448,7 +451,11 @@ export interface WatchOptions extends WatchEffectOptions {
 
 interface EffectScope {
   run<T> (fn: () => T): T | undefined // 如果作用域不活跃就为 undefined
-  stop (): void
+  stop (fromParent?: boolean): void
+
+  pause (): void
+
+  resume (ignoreDirty?: boolean): void
 }
 
 
@@ -614,7 +621,7 @@ export function onTabItemTap (callback: WechatMiniprogram.Page.ILifetime['onTabI
 export function onSaveExitState (callback: () => void): void
 
 // get instance
-export function getCurrentInstance<T extends ComponentIns<{}, {}, {}>> (): T
+export function getCurrentInstance<T extends ComponentIns<{}, {}, {}>> (): { proxy: T, [x: string]: any }
 
 // I18n
 export function useI18n<Options extends {

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.8.61",
+  "version": "2.8.64-bridgetest",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
     "mpx"
   ],
   "author": "donghongping",
-  "license": "Apache",
+  "license": "Apache-2.0",
   "module": "src/index.js",
   "types": "@types/index.d.ts",
   "directories": {
@@ -19,7 +19,7 @@
   ],
   "main": "src/index.js",
   "dependencies": {
-    "@mpxjs/utils": "^2.8.60",
+    "@mpxjs/utils": "^2.8.64-bridgetest",
     "lodash": "^4.1.1",
     "miniprogram-api-typings": "^3.10.0"
   },
@@ -47,5 +47,5 @@
     "url": "https://github.com/didi/mpx/issues"
   },
   "sideEffects": false,
-  "gitHead": "f393ffc439f21b24f5f09a65ef99db20b145e19a"
+  "gitHead": "4080623bc3f493d1cfb7a506dffaec0f79084af6"
 }

package/src/core/innerLifecycle.js

@@ -10,6 +10,7 @@ export const ONLOAD = '__onLoad__'
 export const ONSHOW = '__onShow__'
 export const ONHIDE = '__onHide__'
 export const ONRESIZE = '__onResize__'
+export const SERVERPREFETCH = '__serverPrefetch__'
 
 export const INNER_LIFECYCLES = [
   BEFORECREATE,
@@ -19,6 +20,7 @@ export const INNER_LIFECYCLES = [
   BEFOREUPDATE,
   UPDATED,
   BEFOREUNMOUNT,
+  SERVERPREFETCH,
   UNMOUNTED,
   ONLOAD,
   ONSHOW,

package/src/core/mergeOptions.js

@@ -314,17 +314,19 @@ export function mergeToArray (parent, child, key) {
 function composeHooks (target, includes) {
   Object.keys(target).forEach(key => {
     if (!includes || includes[key]) {
-      const hooksArr = target[key]
-      hooksArr && (target[key] = function (...args) {
-        let result
-        for (let i = 0; i < hooksArr.length; i++) {
-          if (typeof hooksArr[i] === 'function') {
-            const data = hooksArr[i].apply(this, args)
-            data !== undefined && (result = data)
+      const hooks = target[key]
+      if (Array.isArray(hooks)) {
+        target[key] = function (...args) {
+          let result
+          for (let i = 0; i < hooks.length; i++) {
+            if (typeof hooks[i] === 'function') {
+              const data = hooks[i].apply(this, args)
+              data !== undefined && (result = data)
+            }
           }
+          return result
         }
-        return result
-      })
+      }
     }
   })
 }
@@ -352,7 +354,7 @@ function transformHOOKS (options) {
     const componentHooksMap = makeMap(convertRule.lifecycle.component)
     for (const key in options) {
       // 使用Component创建page实例，页面专属生命周期&自定义方法需写在methods内部
-      if (typeof options[key] === 'function' && key !== 'dataFn' && key !== 'setup' && !componentHooksMap[key]) {
+      if (typeof options[key] === 'function' && key !== 'dataFn' && key !== 'setup' && key !== 'serverPrefetch' && !componentHooksMap[key]) {
         if (!options.methods) options.methods = {}
         options.methods[key] = options[key]
         delete options[key]

package/src/core/proxy.js

@@ -37,6 +37,7 @@ import {
   BEFOREUPDATE,
   UPDATED,
   BEFOREUNMOUNT,
+  SERVERPREFETCH,
   UNMOUNTED,
   ONLOAD,
   ONSHOW,
@@ -659,6 +660,7 @@ export const onLoad = createHook(ONLOAD)
 export const onShow = createHook(ONSHOW)
 export const onHide = createHook(ONHIDE)
 export const onResize = createHook(ONRESIZE)
+export const onServerPrefetch = createHook(SERVERPREFETCH)
 export const onPullDownRefresh = createHook('__onPullDownRefresh__')
 export const onReachBottom = createHook('__onReachBottom__')
 export const onShareAppMessage = createHook('__onShareAppMessage__')

package/src/index.js

@@ -29,6 +29,7 @@ export {
   UPDATED,
   BEFOREUNMOUNT,
   UNMOUNTED,
+  SERVERPREFETCH,
   ONLOAD,
   ONSHOW,
   ONHIDE,
@@ -42,6 +43,7 @@ export {
   onUpdated,
   onBeforeUnmount,
   onUnmounted,
+  onServerPrefetch,
   onLoad,
   onShow,
   onHide,

package/src/observer/effect.js

@@ -119,7 +119,9 @@ export class ReactiveEffect {
   }
 
   pause () {
-    this.pausedState = PausedState.paused
+    if (this.pausedState !== PausedState.dirty) {
+      this.pausedState = PausedState.paused
+    }
   }
 
   resume (ignoreDirty = false) {

package/src/platform/builtInMixins/pageStatusMixin.web.js

@@ -63,7 +63,7 @@ export default function pageStatusMixin (mixinType) {
       },
       created () {
         // onLoad应该在用户声明周期CREATED后再执行，故此处使用原生created声明周期来触发onLoad
-        const query = (global.__mpxRouter && global.__mpxRouter.currentRoute && global.__mpxRouter.currentRoute.query) || {}
+        const query = this.$root.$options?.router?.currentRoute?.query || {}
         this.__mpxProxy.callHook(ONLOAD, [query])
       }
     })
@@ -71,25 +71,27 @@ export default function pageStatusMixin (mixinType) {
 
   Object.assign(mixin, {
     [CREATED] () {
-      const pageInstance = mixinType === 'page' ? this : getCurrentPageInstance()
-      if (pageInstance) {
-        this.$watch(() => pageInstance.mpxPageStatus, status => {
-          if (!status) return
-          if (status === 'show') this.__mpxProxy.callHook(ONSHOW)
-          if (status === 'hide') this.__mpxProxy.callHook(ONHIDE)
-          const pageLifetimes = this.__mpxProxy.options.pageLifetimes
-          if (pageLifetimes) {
-            if (/^resize/.test(status) && isFunction(pageLifetimes.resize)) {
-              // resize
-              pageLifetimes.resize.call(this, systemInfo)
-            } else if (isFunction(pageLifetimes[status])) {
-              // show & hide
-              pageLifetimes[status].call(this)
+      if (isBrowser) {
+        const pageInstance = mixinType === 'page' ? this : getCurrentPageInstance()
+        if (pageInstance) {
+          this.$watch(() => pageInstance.mpxPageStatus, status => {
+            if (!status) return
+            if (status === 'show') this.__mpxProxy.callHook(ONSHOW)
+            if (status === 'hide') this.__mpxProxy.callHook(ONHIDE)
+            const pageLifetimes = this.__mpxProxy.options.pageLifetimes
+            if (pageLifetimes) {
+              if (/^resize/.test(status) && isFunction(pageLifetimes.resize)) {
+                // resize
+                pageLifetimes.resize.call(this, systemInfo)
+              } else if (isFunction(pageLifetimes[status])) {
+                // show & hide
+                pageLifetimes[status].call(this)
+              }
             }
-          }
-        }, {
-          sync: true
-        })
+          }, {
+            sync: true
+          })
+        }
       }
     }
   })

package/src/platform/createApp.js

@@ -1,11 +1,12 @@
 import transferOptions from '../core/transferOptions'
 import mergeOptions from '../core/mergeOptions'
 import builtInKeysMap from './patch/builtInKeysMap'
-import { makeMap, spreadProp } from '@mpxjs/utils'
+import { makeMap, spreadProp, isBrowser } from '@mpxjs/utils'
+import { mergeLifecycle } from '../convertor/mergeLifecycle'
 import * as webLifecycle from '../platform/patch/web/lifecycle'
 import Mpx from '../index'
 
-const webAppHooksMap = makeMap(webLifecycle.LIFECYCLE.APP_HOOKS)
+const webAppHooksMap = makeMap(mergeLifecycle(webLifecycle.LIFECYCLE).app)
 
 function filterOptions (options, appData) {
   const newOptions = {}
@@ -35,7 +36,7 @@ export default function createApp (option, config = {}) {
       created () {
         Object.assign(this, Mpx.prototype)
         Object.assign(this, appData)
-        const current = (global.__mpxRouter && global.__mpxRouter.currentRoute) || {}
+        const current = this.$root.$options?.router?.currentRoute || {}
         const options = {
           path: current.path && current.path.replace(/^\//, ''),
           query: current.query,
@@ -49,19 +50,24 @@ export default function createApp (option, config = {}) {
           hide: [],
           error: []
         }
-        if (this.$options.onShow) {
-          this.$options.onShow.call(this, options)
-          global.__mpxAppCbs.show.push(this.$options.onShow.bind(this))
-        }
-        if (this.$options.onHide) {
-          global.__mpxAppCbs.hide.push(this.$options.onHide.bind(this))
-        }
-        if (this.$options.onError) {
-          global.__mpxAppCbs.error.push(this.$options.onError.bind(this))
+        if (isBrowser) {
+          if (this.$options.onShow) {
+            this.$options.onShow.call(this, options)
+            global.__mpxAppCbs.show.push(this.$options.onShow.bind(this))
+          }
+          if (this.$options.onHide) {
+            global.__mpxAppCbs.hide.push(this.$options.onHide.bind(this))
+          }
+          if (this.$options.onError) {
+            global.__mpxAppCbs.error.push(this.$options.onError.bind(this))
+          }
         }
       }
     })
   } else {
+    if (option.onAppInit) {
+      option.onAppInit()
+    }
     builtInMixins.push({
       onLaunch () {
         Object.assign(this, Mpx.prototype)
@@ -77,6 +83,9 @@ export default function createApp (option, config = {}) {
     global.__mpxOptionsMap = global.__mpxOptionsMap || {}
     global.__mpxOptionsMap[global.currentModuleId] = defaultOptions
     global.getApp = function () {
+      if (!isBrowser) {
+        console.error('[Mpx runtime error]: Dangerous API! global.getApp method is running in non browser environments')
+      }
       return appData
     }
   } else {

package/src/platform/export/index.web.js

@@ -1,8 +1,60 @@
-import {
-  effectScope as vueEffectScope,
-  getCurrentScope as vueGetCurrentScope,
-  onScopeDispose
-} from 'vue'
+import { EffectScope } from 'vue'
+import { hasOwn } from '@mpxjs/utils'
+import { PausedState } from '../../helper/const'
+
+const hackEffectScope = () => {
+  EffectScope.prototype.pause = function () {
+    if (this.active) {
+      let i, l
+      for (i = 0, l = this.effects.length; i < l; i++) {
+        const effect = this.effects[i]
+        // vue2.7中存在对于watcher实例方法的重写(doWatch)，因此无法通过修改Watcher.prototype统一实现pause和resume，只能逐个实例修改实现
+        if (!hasOwn(effect, 'pausedState')) {
+          effect.pausedState = PausedState.resumed
+          const rawUpdate = effect.update
+          effect.update = function () {
+            if (effect.pausedState !== PausedState.resumed) {
+              effect.pausedState = PausedState.dirty
+            } else {
+              rawUpdate.call(effect)
+            }
+          }
+        }
+        if (effect.pausedState !== PausedState.dirty) {
+          effect.pausedState = PausedState.paused
+        }
+      }
+      if (this.scopes) {
+        for (i = 0, l = this.scopes.length; i < l; i++) {
+          this.scopes[i].pause()
+        }
+      }
+    }
+  }
+
+  EffectScope.prototype.resume = function (ignoreDirty = false) {
+    if (this.active) {
+      let i, l
+      for (i = 0, l = this.effects.length; i < l; i++) {
+        const effect = this.effects[i]
+        if (hasOwn(effect, 'pausedState')) {
+          const lastPausedState = effect.pausedState
+          effect.pausedState = PausedState.resumed
+          if (!ignoreDirty && lastPausedState === PausedState.dirty) {
+            effect.update()
+          }
+        }
+      }
+      if (this.scopes) {
+        for (i = 0, l = this.scopes.length; i < l; i++) {
+          this.scopes[i].resume(ignoreDirty)
+        }
+      }
+    }
+  }
+}
+
+hackEffectScope()
 
 export {
   // watch
@@ -29,27 +81,12 @@ export {
   // computed
   computed,
   // instance
-  getCurrentInstance
-} from 'vue'
-
-const noop = () => {
-}
-
-const fixEffectScope = (scope) => {
-  scope.pause = noop
-  scope.resume = noop
-  return scope
-}
-
-const effectScope = (detached) => fixEffectScope(vueEffectScope(detached))
-const getCurrentScope = () => fixEffectScope(vueGetCurrentScope())
-
-export {
+  getCurrentInstance,
   // effectScope
   effectScope,
   getCurrentScope,
   onScopeDispose
-}
+} from 'vue'
 
 export {
   // i18n

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

@@ -3,7 +3,7 @@ import mergeOptions from '../../../core/mergeOptions'
 import { diffAndCloneA, hasOwn } from '@mpxjs/utils'
 import { getCurrentInstance as getCurrentVueInstance } from '../../export/index'
 import MpxProxy, { setCurrentInstance, unsetCurrentInstance } from '../../../core/proxy'
-import { BEFORECREATE, BEFOREUPDATE, UPDATED, BEFOREUNMOUNT, UNMOUNTED } from '../../../core/innerLifecycle'
+import { BEFORECREATE, BEFOREUPDATE, UPDATED, BEFOREUNMOUNT, UNMOUNTED, SERVERPREFETCH } from '../../../core/innerLifecycle'
 
 function filterOptions (options) {
   const newOptions = {}
@@ -79,6 +79,9 @@ export function getDefaultOptions (type, { rawOptions = {} }) {
     },
     destroyed () {
       if (this.__mpxProxy) this.__mpxProxy.callHook(UNMOUNTED)
+    },
+    serverPrefetch () {
+      if (this.__mpxProxy) return this.__mpxProxy.callHook(SERVERPREFETCH)
     }
   }]
   // 为了在builtMixin中可以使用某些rootMixin实现的特性（如数据响应等），此处builtInMixin在rootMixin之后执行，但是当builtInMixin使用存在对应内建生命周期的目标平台声明周期写法时，可能会出现用户生命周期比builtInMixin中的生命周期先执行的情况，为了避免这种情况发生，builtInMixin应该尽可能使用内建生命周期来编写

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

@@ -9,7 +9,8 @@ const COMPONENT_HOOKS = [
   'deactivated',
   'beforeDestroy',
   'destroyed',
-  'errorCaptured'
+  'errorCaptured',
+  'serverPrefetch'
 ]
 
 const PAGE_HOOKS = [
@@ -38,7 +39,9 @@ const APP_HOOKS = [
   'onError',
   'onPageNotFound',
   'onUnhandledRejection',
-  'onThemeChange'
+  'onThemeChange',
+  'onSSRAppCreated',
+  'onAppInit'
 ]
 
 export const LIFECYCLE = {

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

@@ -14,7 +14,8 @@ const APP_HOOKS = [
   'onError',
   'onPageNotFound',
   'onUnhandledRejection',
-  'onThemeChange'
+  'onThemeChange',
+  'onAppInit'
 ]
 
 const PAGE_HOOKS = [