@mpxjs/core 2.6.96 → 2.6.102

package/@types/index.d.ts

@@ -93,14 +93,14 @@ interface ObserversDefs {
 type GetDataType<T> = T extends () => any ? ReturnType<T> : T
 
 type PropValueType<Def> = Def extends {
-  type: (...args: any[]) => infer T;
-  optionalType?: ((...args: any[]) => infer T)[];
-  value?: infer T;
-}
+    type: (...args: any[]) => infer T;
+    optionalType?: ((...args: any[]) => infer T)[];
+    value?: infer T;
+  }
   ? T
   : Def extends (...args: any[]) => infer T
-  ? T
-  : any;
+    ? T
+    : any;
 
 type GetPropsType<T> = {
   readonly [K in keyof T]: PropValueType<T[K]>
@@ -286,7 +286,7 @@ export function createActionsWithThis<S = {}, G = {}, M extends MutationsAndActi
 
 type MixinType = 'app' | 'page' | 'component'
 
-export function injectMixins (mixins: object | Array<object>, options?: { type?: MixinType | MixinType[], stage?: number }): void
+export function injectMixins (mixins: object | Array<object>, options?: MixinType | MixinType[] | { types?: MixinType | MixinType[], stage?: number }): void
 
 export function watch (expr: string | (() => any), handler: WatchHandler | WatchOptWithHandler, options?: WatchOpt): () => void
 
@@ -304,6 +304,7 @@ interface MpxConfig {
   hookErrorHandler: (e: Error, target: ComponentIns<{}, {}, {}, {}, []>, hookName: string) => any | null
   proxyEventHandler: (e: Event) => any | null
   setDataHandler: (data: object, target: ComponentIns<{}, {}, {}, {}, []>) => any | null
+  forceRunWatcherSync: boolean
 }
 
 type SupportedMode = 'wx' | 'ali' | 'qq' | 'swan' | 'tt' | 'web' | 'qa'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.6.96",
+  "version": "2.6.102",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
@@ -40,5 +40,5 @@
     "url": "https://github.com/didi/mpx/issues"
   },
   "sideEffects": false,
-  "gitHead": "5aa3f8e4f249737f8901054ac3cba1de4a5ded68"
+  "gitHead": "377633613e39511e147269e988e3459f50421de5"
 }

package/src/convertor/wxToTt.js

@@ -10,13 +10,5 @@ export default {
         }
       })
     }
-    if (options.pageLifetimes && options.pageLifetimes.resize) {
-      error(`Options.pageLifetimes.resize is not supported in tt environment!`, global.currentResource)
-      delete options.pageLifetimes.resize
-    }
-    if (options.onResize) {
-      error(`Options.onResize is not supported in tt environment!`, global.currentResource)
-      delete options.onResize
-    }
   }
 }

package/src/index.js

@@ -204,7 +204,8 @@ EXPORT_MPX.config = {
   observeClassInstance: false,
   hookErrorHandler: null,
   proxyEventHandler: null,
-  setDataHandler: null
+  setDataHandler: null,
+  forceRunWatcherSync: false
 }
 
 if (__mpx_mode__ === 'web') {

package/src/observer/scheduler.js

@@ -1,5 +1,6 @@
 import { asyncLock } from '../helper/utils'
 import { error } from '../helper/log'
+import EXPORT_MPX from '../index'
 
 const queue = []
 let has = {}
@@ -16,6 +17,8 @@ export function queueWatcher (watcher) {
       run: watcher
     }
   }
+  // 开启EXPORT_MPX.config.forceRunWatcherSync时，queueWatcher同步执行，便于调试排查问题
+  if (EXPORT_MPX.config.forceRunWatcherSync) return watcher.run()
   if (!has[watcher.id] || watcher.id === Infinity) {
     has[watcher.id] = true
     if (!flushing) {