Merge branch 'fix-drn' of https://github.com/didi/mpx into fix-drn

docs-vuepress/api/compile.md

@@ -88,7 +88,7 @@ mode 为 Mpx 编译的目标平台， 目前支持的有微信小程序(wx)\支
 // 项目 package.json
 {
   "script": {
-    "build:cross": "mpx-cli-service build:mp --targets=wx,ali"
+    "build:cross": "mpx-cli-service build --targets=wx,ali"
   }
 }
 ```

docs-vuepress/guide/advance/platform.md

@@ -65,7 +65,7 @@ new MpxwebpackPlugin({
 // 项目 package.json
 {
   "script": {
-    "build:cross": "mpx-cli-service build:mp --targets=wx,ali"
+    "build:cross": "mpx-cli-service build --targets=wx,ali"
   }
 }
 ```

docs-vuepress/guide/basic/start.md

@@ -5,6 +5,8 @@
 npm i -g @mpxjs/cli
 ```
 
+> @mpxjs/cli文档 https://github.com/mpx-ecology/mpx-cli
+
 ## 创建项目安装依赖
 
 在当前目录下创建mpx项目。
@@ -29,7 +31,7 @@ npm install
 
 ## 编译构建
 
-使用npm script执行mpx的编译构建，在开发模式下我们执行watch命令，将项目源码构建输出到`dist/${平台目录}`下，并且监听源码的改动进行重新编译。
+使用npm script执行mpx的编译构建，在开发模式下我们执行serve命令，将项目源码构建输出到`dist/${平台目录}`下，并且监听源码的改动进行重新编译。
 
 ```shell
 npm run serve

docs-vuepress/guide/platform/index.md

@@ -22,7 +22,7 @@ new MpxwebpackPlugin({
 // 项目 package.json
 {
   "script": {
-    "build:cross": "mpx-cli-service build:mp --targets=wx,ali,ios,android"
+    "build:cross": "mpx-cli-service build --targets=wx,ali,ios,android"
   }
 }
 ```

packages/api-proxy/@types/index.d.ts

@@ -110,6 +110,12 @@ export const createVideoContext: WechatMiniprogram.Wx['createVideoContext']
 export const onWindowResize: WechatMiniprogram.Wx['onWindowResize']
 export const offWindowResize: WechatMiniprogram.Wx['offWindowResize']
 export const createAnimation: WechatMiniprogram.Wx['createAnimation']
+export const vibrateShort: WechatMiniprogram.Wx['vibrateShort']
+export const vibrateLong: WechatMiniprogram.Wx['vibrateLong']
+export const getExtConfig: WechatMiniprogram.Wx['getExtConfig']
+export const getExtConfigSync: WechatMiniprogram.Wx['getExtConfigSync']
+export const openLocation: WechatMiniprogram.Wx['openLocation']
+export const chooseLocation: WechatMiniprogram.Wx['chooseLocation']
 
 declare const install: (...args: any) => any
 

packages/api-proxy/src/platform/api/app/index.web.js

@@ -3,8 +3,27 @@ import { isBrowser, isReact } from '@mpxjs/utils'
 global.__mpxAppCbs = global.__mpxAppCbs || {
   show: [],
   hide: [],
-  error: []
+  error: [],
+  rejection: []
+}
+
+function off (cbs, cb) {
+  if (cb) {
+    const idx = cbs.indexOf(cb)
+    if (idx > -1) cbs.splice(idx, 1)
+  } else {
+    cbs.length = 0
+  }
+}
+
+function onUnhandledRejection (callback) {
+  if (isBrowser || isReact) {
+    global.__mpxAppCbs.rejection.push(callback)
+  }
+}
 
+function offUnhandledRejection (callback) {
+  off(global.__mpxAppCbs.rejection, callback)
 }
 
 function onError (callback) {
@@ -14,9 +33,7 @@ function onError (callback) {
 }
 
 function offError (callback) {
-  const cbs = global.__mpxAppCbs.error
-  const index = cbs.indexOf(callback)
-  if (index > -1) cbs.splice(index, 1)
+  off(global.__mpxAppCbs.error, callback)
 }
 
 function onAppShow (callback) {
@@ -26,9 +43,7 @@ function onAppShow (callback) {
 }
 
 function offAppShow (callback) {
-  const cbs = global.__mpxAppCbs.show
-  const index = cbs.indexOf(callback)
-  if (index > -1) cbs.splice(index, 1)
+  off(global.__mpxAppCbs.show, callback)
 }
 
 function onAppHide (callback) {
@@ -38,9 +53,7 @@ function onAppHide (callback) {
 }
 
 function offAppHide (callback) {
-  const cbs = global.__mpxAppCbs.hide
-  const index = cbs.indexOf(callback)
-  if (index > -1) cbs.splice(index, 1)
+  off(global.__mpxAppCbs.hide, callback)
 }
 
 export {
@@ -49,5 +62,7 @@ export {
   offAppShow,
   offAppHide,
   onError,
-  offError
+  offError,
+  onUnhandledRejection,
+  offUnhandledRejection
 }

packages/api-proxy/src/platform/api/toast/rnToast.jsx

@@ -14,8 +14,8 @@ const styles = StyleSheet.create({
     backgroundColor: 'rgba(20, 20, 20, 0.7)',
     paddingTop: 15,
     paddingBottom: 15,
-    paddingLeft: 10,
-    paddingRight: 10,
+    paddingLeft: 20,
+    paddingRight: 20,
     borderRadius: 5,
     display: 'flex',
     flexDirection: 'column',

packages/core/package.json

@@ -32,6 +32,7 @@
     "@react-navigation/stack": "^7.0.4",
     "react": "*",
     "react-native": "*",
+    "promise": "^8.3.0",
     "react-native-gesture-handler": "^2.19.0",
     "react-native-linear-gradient": "^2.8.3",
     "react-native-safe-area-context": "^4.14.0",
@@ -61,6 +62,9 @@
     "react-native": {
       "optional": true
     },
+    "promise": {
+      "optional": true
+    },
     "@react-navigation/native": {
       "optional": true
     },
@@ -106,4 +110,4 @@
   },
   "sideEffects": false,
   "gitHead": "2d37697869b9bdda3efab92dda8c910b68fd05c0"
-}
+}

packages/core/src/core/proxy.js

@@ -51,7 +51,7 @@ import {
 } from './innerLifecycle'
 import contextMap from '../dynamic/vnode/context'
 import { getAst } from '../dynamic/astCache'
-import { inject, provide } from '../platform/export/apiInject'
+import { inject, provide } from '../platform/export/inject'
 
 let uid = 0
 

packages/core/src/index.js

@@ -1,8 +1,7 @@
-import Vue from './external/vue'
+
 import { error, diffAndCloneA, hasOwn, makeMap } from '@mpxjs/utils'
 import { APIs, InstanceAPIs } from './platform/export/api'
-
-import { createI18n } from './platform/builtInMixins/i18nMixin'
+import { init } from './platform/env/index'
 
 export * from './platform/export/index'
 
@@ -123,10 +122,6 @@ function factory () {
 
   Object.assign(Mpx, APIs)
   Object.assign(Mpx.prototype, InstanceAPIs)
-  // 输出web时在mpx上挂载Vue对象
-  if (__mpx_mode__ === 'web') {
-    Mpx.__vue = Vue
-  }
   return Mpx
 }
 
@@ -156,12 +151,6 @@ Mpx.config = {
   rnConfig: {}
 }
 
-global.__mpx = Mpx
-
-if (__mpx_mode__ !== 'web') {
-  if (global.i18n) {
-    Mpx.i18n = createI18n(global.i18n)
-  }
-}
+init(Mpx)
 
 export default Mpx

packages/core/src/platform/createApp.ios.js

@@ -81,12 +81,6 @@ export default function createApp (option, config = {}) {
     }
   }
 
-  global.__mpxAppCbs = global.__mpxAppCbs || {
-    show: [],
-    hide: [],
-    error: []
-  }
-
   global.__mpxAppLaunched = false
 
   global.__mpxAppFocusedState = ref('show')
@@ -137,6 +131,9 @@ export default function createApp (option, config = {}) {
       if (defaultOptions.onError) {
         global.__mpxAppCbs.error.push(defaultOptions.onError.bind(instance))
       }
+      if (defaultOptions.onUnhandledRejection) {
+        global.__mpxAppCbs.rejection.push(defaultOptions.onUnhandledRejection.bind(instance))
+      }
 
       const changeSubscription = ReactNative.AppState.addEventListener('change', (currentState) => {
         if (currentState === 'active') {

packages/core/src/platform/createApp.js

@@ -5,7 +5,7 @@ import { makeMap, spreadProp, isBrowser } from '@mpxjs/utils'
 import { mergeLifecycle } from '../convertor/mergeLifecycle'
 import { LIFECYCLE } from '../platform/patch/lifecycle/index'
 import Mpx from '../index'
-import { initAppProvides } from './export/apiInject'
+import { initAppProvides } from './export/inject'
 
 const appHooksMap = makeMap(mergeLifecycle(LIFECYCLE).app)
 
@@ -47,11 +47,6 @@ export default function createApp (option, config = {}) {
         }
         global.__mpxEnterOptions = options
         this.$options.onLaunch && this.$options.onLaunch.call(this, options)
-        global.__mpxAppCbs = global.__mpxAppCbs || {
-          show: [],
-          hide: [],
-          error: []
-        }
         if (isBrowser) {
           if (this.$options.onShow) {
             this.$options.onShow.call(this, options)
@@ -63,6 +58,9 @@ export default function createApp (option, config = {}) {
           if (this.$options.onError) {
             global.__mpxAppCbs.error.push(this.$options.onError.bind(this))
           }
+          if (this.$options.onUnhandledRejection) {
+            global.__mpxAppCbs.rejection.push(this.$options.onUnhandledRejection.bind(this))
+          }
         }
       }
     })