@mpxjs/core 2.8.1 → 2.8.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.8.1",
+  "version": "2.8.3",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
@@ -19,7 +19,7 @@
   ],
   "main": "src/index.js",
   "dependencies": {
-    "@mpxjs/utils": "^2.8.1",
+    "@mpxjs/utils": "^2.8.2",
     "lodash": "^4.1.1",
     "miniprogram-api-typings": "^3.0.2"
   },
@@ -47,5 +47,5 @@
     "url": "https://github.com/didi/mpx/issues"
   },
   "sideEffects": false,
-  "gitHead": "19f21ed57a671536eb1b2e059758118b026bab25"
+  "gitHead": "23705e69a1fa13d696316a3593e4f29692fde376"
 }

package/src/core/mergeOptions.js

@@ -15,7 +15,7 @@ let curType
 let convertRule
 let mpxCustomKeysMap
 
-export default function mergeOptions (options = {}, type, needConvert = true) {
+export default function mergeOptions (options = {}, type, needConvert) {
   // 缓存混合模式下的自定义属性列表
   mpxCustomKeysMap = makeMap(options.mpxCustomKeysForBlend || [])
   // needConvert为false，表示衔接原生的root配置，那么此时的配置都是当前原生环境支持的配置，不需要转换

package/src/core/transferOptions.js

@@ -3,7 +3,7 @@ import mergeOptions from './mergeOptions'
 import { getConvertMode } from '../convertor/getConvertMode'
 import { warn, findItem } from '@mpxjs/utils'
 
-export default function transferOptions (options, type) {
+export default function transferOptions (options, type, needConvert = true) {
   let currentInject
   if (global.currentInject && global.currentInject.moduleId === global.currentModuleId) {
     currentInject = global.currentInject
@@ -28,7 +28,7 @@ export default function transferOptions (options, type) {
   }
   // 转换mode
   options.mpxConvertMode = options.mpxConvertMode || getConvertMode(global.currentSrcMode)
-  const rawOptions = mergeOptions(options, type)
+  const rawOptions = mergeOptions(options, type, needConvert)
 
   if (currentInject && currentInject.propKeys) {
     const computedKeys = Object.keys(rawOptions.computed || {})

package/src/observer/array.js

@@ -1,5 +1,5 @@
 import { getObserver } from './reactive'
-import { def } from '@mpxjs/utils/src/base'
+import { def } from '@mpxjs/utils'
 
 const arrayProto = Array.prototype
 

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

@@ -4,8 +4,7 @@ import {
   ONSHOW,
   ONLOAD
 } from '../../core/innerLifecycle'
-import { isFunction } from '@mpxjs/utils'
-import { isBrowser } from '@mpxjs/utils/src/env'
+import { isFunction, isBrowser } from '@mpxjs/utils'
 
 let systemInfo = {}
 

package/src/platform/builtInMixins/refsMixin.js

@@ -1,6 +1,5 @@
 import { CREATED, BEFORECREATE, BEFOREUPDATE, UNMOUNTED } from '../../core/innerLifecycle'
-import { noop, error } from '@mpxjs/utils'
-import { getEnvObj } from '@mpxjs/utils/src/env'
+import { noop, error, getEnvObj } from '@mpxjs/utils'
 
 const envObj = getEnvObj()
 

package/src/platform/createApp.js

@@ -1,8 +1,7 @@
 import transferOptions from '../core/transferOptions'
 import mergeOptions from '../core/mergeOptions'
 import builtInKeysMap from './patch/builtInKeysMap'
-import { spreadProp } from '@mpxjs/utils'
-import { makeMap } from '@mpxjs/utils/src/array'
+import { makeMap, spreadProp } from '@mpxjs/utils'
 import * as webLifecycle from '../platform/patch/web/lifecycle'
 import Mpx from '../index'
 
@@ -69,7 +68,8 @@ export default function createApp (option, config = {}) {
       }
     })
   }
-  const { rawOptions } = transferOptions(option, 'app')
+  // app选项目前不需要进行转换
+  const { rawOptions } = transferOptions(option, 'app', false)
   rawOptions.mixins = builtInMixins
   const defaultOptions = filterOptions(spreadProp(mergeOptions(rawOptions, 'app', false), 'methods'), appData)
 

package/src/platform/patch/builtInKeysMap.js

@@ -1,5 +1,5 @@
 import { INNER_LIFECYCLES } from '../../core/innerLifecycle'
-import { makeMap } from '@mpxjs/utils/src/array'
+import { makeMap } from '@mpxjs/utils'
 
 let bulitInKeys