@mpxjs/core 2.7.0-beta.5 → 2.7.1-beta.1

package/@types/index.d.ts

@@ -304,7 +304,8 @@ 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
+  forceRunWatcherSync: boolean,
+  webRouteConfig: object
 }
 
 type SupportedMode = 'wx' | 'ali' | 'qq' | 'swan' | 'tt' | 'web' | 'qa'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.7.0-beta.5",
+  "version": "2.7.1-beta.1",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
@@ -17,6 +17,7 @@
     "src",
     "@types"
   ],
+  "main": "src/index.js",
   "dependencies": {
     "lodash": "^4.1.1",
     "miniprogram-api-typings": "^3.0.2"
@@ -40,5 +41,5 @@
     "url": "https://github.com/didi/mpx/issues"
   },
   "sideEffects": false,
-  "gitHead": "9807009df09138c9882bca67db15787d1c769335"
+  "gitHead": "0ea8bcfff2ccfc433cb2ce43275b7e2af2bc8a61"
 }

package/src/index.js

@@ -205,12 +205,13 @@ EXPORT_MPX.config = {
   hookErrorHandler: null,
   proxyEventHandler: null,
   setDataHandler: null,
-  forceRunWatcherSync: false
+  forceRunWatcherSync: false,
+  webRouteConfig: {}
 }
 
-if (__mpx_mode__ === 'web') {
-  global.__mpx = EXPORT_MPX
-} else {
+global.__mpx = EXPORT_MPX
+
+if (__mpx_mode__ !== 'web') {
   if (global.i18n) {
     observe(global.i18n)
     // 挂载翻译方法

package/src/platform/builtInMixins/pageRouteMixin.js

@@ -3,9 +3,7 @@ export default function pageRouteMixin (mixinType) {
   if (mixinType === 'page') {
     return {
       beforeCreate () {
-        if (this.$options.__mpxPageRoute) {
-          this.route = this.$options.__mpxPageRoute.slice(1)
-        }
+        this.route = this.$options.__mpxPageRoute || ''
       }
     }
   }

package/src/platform/builtInMixins/proxyEventMixin.js

@@ -20,6 +20,8 @@ export default function proxyEventMixin () {
       if (type === 'begin' || type === 'end') {
         // 地图的 regionchange 事件会派发 e.type 为 begin 和 end 的事件
         fallbackType = 'regionchange'
+      } else if (__mpx_mode__ === 'ali') {
+        fallbackType = type.replace(/^./, i => i.toLowerCase())
       }
       const target = $event.currentTarget || $event.target
       if (!target) {

package/src/platform/createApp.js

@@ -3,6 +3,7 @@ import mergeOptions from '../core/mergeOptions'
 import builtInKeysMap from './patch/builtInKeysMap'
 import { makeMap, spreadProp } from '../helper/utils'
 import * as webLifecycle from '../platform/patch/web/lifecycle'
+import EXPORT_MPX from '../index'
 
 const webAppHooksMap = makeMap(webLifecycle.LIFECYCLE.APP_HOOKS)
 
@@ -22,7 +23,12 @@ function filterOptions (options, appData) {
 }
 
 export default function createApp (option, config = {}) {
-  const builtInMixins = []
+  // 在App中挂载mpx对象供周边工具访问，如e2e测试
+  const builtInMixins = [{
+    getMpx () {
+      return EXPORT_MPX
+    }
+  }]
   const appData = {}
   if (__mpx_mode__ === 'web') {
     builtInMixins.push({