@mpxjs/core 2.6.98 → 2.7.0-alpha.0

package/@types/index.d.ts

@@ -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.98",
+  "version": "2.7.0-alpha.0",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
@@ -40,5 +40,5 @@
     "url": "https://github.com/didi/mpx/issues"
   },
   "sideEffects": false,
-  "gitHead": "c92623625bb16ba8d73c6795fbb36de34570ee51"
+  "gitHead": "43fe072e744b33b841b8e396677711e414bcca8b"
 }

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/core/transferOptions.js

@@ -19,6 +19,10 @@ export default function transferOptions (options, type, builtInMixins = []) {
     // 编译计算属性注入
     options.computed = Object.assign({}, options.computed, currentInject.injectComputed)
   }
+  if (currentInject && currentInject.injectOptions) {
+    // 编译option注入,优先微信中的单独配置
+    options.options = Object.assign({}, currentInject.injectOptions, options.options)
+  }
   // 转换mode
   options.mpxConvertMode = options.mpxConvertMode || getConvertMode(global.currentSrcMode)
   const rawOptions = mergeOptions(options, type)

package/src/helper/MpxScroll/index.js

@@ -196,13 +196,7 @@ export default class MpxScroll {
     )
   }
 
-  pageScrollTo (
-    {
-      scrollTop,
-      selector,
-      duration = 300
-    }
-  ) {
+  pageScrollTo ({ scrollTop, selector, duration = 300 }) {
     let _scrollTop
 
     if (isDef(scrollTop)) {

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) {
@@ -57,10 +60,7 @@ function flushQueue () {
         }
       }
     }
-    // 如果已经销毁，就不再执行
-    if (!watcher.destroyed) {
-      watcher.run()
-    }
+    watcher.run()
   }
   resetQueue()
 }

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

@@ -244,7 +244,7 @@ class NodesRef {
 function getIdentifier (vnode) {
   let identifier = ''
   if (vnode && vnode.data) {
-    if (vnode.data.attrs.id) identifier += `#${vnode.data.attrs.id}`
+    if (vnode.data.attrs && vnode.data.attrs.id) identifier += `#${vnode.data.attrs.id}`
     if (vnode.data.staticClass) identifier += `.${vnode.data.staticClass.split(' ').join('.')}`
   }
   return identifier

package/src/runtime/createFactory.js

@@ -1,6 +1,6 @@
-import mpx from '../index'
+const mpx = require('../index').default
 
-export default (type) => (...args) => {
+module.exports = (type) => (...args) => {
   if (type === 'Behavior') {
     if (args[0]) {
       Object.defineProperty(args[0], '__mpx_behaviors_to_mixins__', {

package/src/runtime/mpx.js

@@ -1,3 +1 @@
-import mpx from '../index'
-
-export default mpx
+module.exports = require('../index').default