@mpxjs/core 2.7.0-beta.4 → 2.7.1-beta.0

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.4",
+  "version": "2.7.1-beta.0",
   "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": "1a49588a7cca9f5d2d15e0116b6c540b9e804eae"
+  "gitHead": "025a2d1590aec3f8749c1a43090394249393a625"
 }

package/src/core/transferOptions.js

@@ -4,7 +4,7 @@ import { getConvertMode } from '../convertor/getConvertMode'
 import { findItem } from '../helper/utils'
 import { warn } from '../helper/log'
 
-export default function transferOptions (options, type, builtInMixins = []) {
+export default function transferOptions (options, type) {
   let currentInject
   if (global.currentInject && global.currentInject.moduleId === global.currentModuleId) {
     currentInject = global.currentInject
@@ -26,10 +26,9 @@ export default function transferOptions (options, type, builtInMixins = []) {
   // 转换mode
   options.mpxConvertMode = options.mpxConvertMode || getConvertMode(global.currentSrcMode)
   const rawOptions = mergeOptions(options, type)
-  // 注入内建的mixins, 内建mixin是按原始平台编写的，所以合并规则和rootMixins保持一致
-  rawOptions.mixins = builtInMixins
+
   if (currentInject && currentInject.propKeys) {
-    const computedKeys = Object.keys(options.computed || {})
+    const computedKeys = Object.keys(rawOptions.computed || {})
     // 头条和百度小程序由于props传递为异步操作，通过props向子组件传递computed数据时，子组件无法在初始时(created/attached)获取到computed数据，如需进一步处理数据建议通过watch获取
     currentInject.propKeys.forEach(key => {
       if (findItem(computedKeys, key)) {

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/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({
@@ -62,7 +68,8 @@ export default function createApp (option, config = {}) {
       }
     })
   }
-  const { rawOptions } = transferOptions(option, 'app', builtInMixins)
+  const { rawOptions } = transferOptions(option, 'app')
+  rawOptions.mixins = builtInMixins
   const defaultOptions = filterOptions(spreadProp(mergeOptions(rawOptions, 'app', false), 'methods'), appData)
 
   if (__mpx_mode__ === 'web') {

package/src/platform/patch/index.js

@@ -4,6 +4,7 @@ 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 { error } from '../../helper/log'
 
 export default function createFactory (type) {
   return (options, { isNative, customCtor, customCtorType } = {}) => {
@@ -23,6 +24,9 @@ export default function createFactory (type) {
           if (global.currentCtorType === 'page') {
             options.__pageCtor__ = true
           }
+          if (global.currentResourceType && global.currentResourceType !== type) {
+            error(`The ${global.currentResourceType} [${global.currentResource}] is not supported to be created by ${type} constructor.`)
+          }
         } else {
           if (type === 'page') {
             ctor = Page
@@ -45,9 +49,10 @@ export default function createFactory (type) {
       getDefaultOptions = getWxDefaultOptions
     }
 
-    // 获取内建的mixins
-    const builtInMixins = getBuiltInMixins(options, type)
-    const { rawOptions, currentInject } = transferOptions(options, type, builtInMixins)
+    const { rawOptions, currentInject } = transferOptions(options, type)
+    // 注入内建的mixins, 内建mixin是按原始平台编写的，所以合并规则和rootMixins保持一致
+    // 将合并后的用户定义的rawOptions传入获取当前应该注入的内建mixins
+    rawOptions.mixins = getBuiltInMixins(rawOptions, type)
     const defaultOptions = getDefaultOptions(type, { rawOptions, currentInject })
     if (__mpx_mode__ === 'web') {
       global.currentOption = defaultOptions