@mpxjs/core 2.8.23-alpha → 2.8.23-alpha.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.8.23-alpha",
+  "version": "2.8.23-alpha.1",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
@@ -49,5 +49,5 @@
     "url": "https://github.com/didi/mpx/issues"
   },
   "sideEffects": false,
-  "gitHead": "3a6dff432fd46bab36a9866f92cffb6501e69909"
+  "gitHead": "7c267ed965671fa83836ab099c3ccac59d69baa3"
 }

package/src/convertor/wxToTenon.js

@@ -2,9 +2,9 @@ import * as wxLifecycle from '../platform/patch/wx/lifecycle'
 import * as tenonLifecycle from '../platform/patch/tenon/lifecycle'
 import { mergeLifecycle } from './mergeLifecycle'
 import { error } from '../helper/log'
-import { isObject, diffAndCloneA, hasOwn } from '../helper/utils'
+import { isObject, diffAndCloneA, hasOwn } from '@mpxjs/utils'
 import { implemented } from '../core/implement'
-import { CREATED, DESTROYED } from '../core/innerLifecycle'
+import { CREATED, UNMOUNTED } from '../core/innerLifecycle'
 
 // 暂不支持的wx选项，后期需要各种花式支持
 const unsupported = [
@@ -50,7 +50,7 @@ export default {
   // wx输出tenon时额外将onLoad代理到CREATED
   lifecycleProxyMap: Object.assign({}, wxLifecycle.lifecycleProxyMap, {
     [CREATED]: ['created', 'attached', 'onLoad'],
-    [DESTROYED]: ['destroyed', 'detached', 'onUnload', 'unmounted']
+    [UNMOUNTED]: ['destroyed', 'detached', 'onUnload', 'unmounted']
   }),
   convert (options) {
     const props = Object.assign({}, options.properties, options.props)

package/src/core/proxy.js

@@ -102,7 +102,7 @@ export default class MpxProxy {
     this.ignoreProxyMap = makeMap(Mpx.config.ignoreProxyWhiteList)
     // 收集setup中动态注册的hooks，小程序与web环境都需要
     this.hooks = {}
-    if (__mpx_mode__ !== 'web' || __mpx_mode__ !== 'tenon') {
+    if (__mpx_mode__ !== 'web' && __mpx_mode__ !== 'tenon') {
       this.scope = effectScope(true)
       // props响应式数据代理
       this.props = {}
@@ -124,7 +124,7 @@ export default class MpxProxy {
   }
 
   created () {
-    if (__mpx_mode__ !== 'web' || __mpx_mode__ !== 'tenon') {
+    if (__mpx_mode__ !== 'web' && __mpx_mode__ !== 'tenon') {
       // web和tenon中BEFORECREATE钩子通过vue的beforeCreate钩子单独驱动
       this.callHook(BEFORECREATE)
       setCurrentInstance(this)
@@ -139,7 +139,7 @@ export default class MpxProxy {
     this.state = CREATED
     this.callHook(CREATED)
 
-    if (__mpx_mode__ !== 'web' || __mpx_mode__ !== 'tenon') {
+    if (__mpx_mode__ !== 'web' && __mpx_mode__ !== 'tenon') {
       this.initRender()
     }
 
@@ -210,7 +210,7 @@ export default class MpxProxy {
     }
     // 挂载$rawOptions
     this.target.$rawOptions = this.options
-    if (__mpx_mode__ !== 'web' || __mpx_mode__ !== 'tenon') {
+    if (__mpx_mode__ !== 'web' && __mpx_mode__ !== 'tenon') {
       // 挂载$watch
       this.target.$watch = this.watch.bind(this)
       // 强制执行render

package/src/platform/builtInMixins/proxyEventMixin.tenon.js

@@ -1,4 +1,4 @@
-import { setByPath } from '../../helper/utils'
+import { setByPath } from '@mpxjs/utils'
 
 export default function proxyEventMixin () {
   const methods = {

package/src/platform/patch/tenon/getDefaultOptions.js

@@ -1,7 +1,7 @@
 import builtInKeysMap from '../builtInKeysMap'
 import mergeOptions from '../../../core/mergeOptions'
 import MPXProxy from '../../../core/proxy'
-import { diffAndCloneA } from '../../../helper/utils'
+import { diffAndCloneA } from '@mpxjs/utils'
 
 function filterOptions (options) {
   const newOptions = {}
@@ -46,7 +46,7 @@ export function getDefaultOptions (type, { rawOptions = {}, currentInject }) {
       this.__mpxProxy && this.__mpxProxy.updated()
     },
     [hookNames[2]] () {
-      this.__mpxProxy && this.__mpxProxy.destroyed()
+      this.__mpxProxy && this.__mpxProxy.unmounted()
     }
   }]
   // 为了在builtMixin中可以使用某些rootMixin实现的特性（如数据响应等），此处builtInMixin在rootMixin之后执行，但是当builtInMixin使用存在对应内建生命周期的目标平台声明周期写法时，可能会出现用户生命周期比builtInMixin中的生命周期先执行的情况，为了避免这种情况发生，builtInMixin应该尽可能使用内建生命周期来编写