@mpxjs/api-proxy 2.8.46 → 2.8.58

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/api-proxy",
-  "version": "2.8.46",
+  "version": "2.8.58",
   "description": "convert miniprogram API at each end",
   "module": "src/index.js",
   "types": "@types/index.d.ts",
@@ -39,5 +39,5 @@
   "dependencies": {
     "axios": "^0.21.1"
   },
-  "gitHead": "dcf6f000660d56207ff414cb776e8bc6d5ce651f"
+  "gitHead": "42e08109b8890516ea12d47598f42e2c0a9f4682"
 }

package/src/web/api/create-intersection-observer/IntersectionObserver.js

@@ -97,16 +97,8 @@ class WebIntersectionObserver {
     nextTick(() => {
       const marginsTemp = margins || {}
       const { left = 0, right = 0, top = 0, bottom = 0 } = marginsTemp
-      this._root = document.querySelector('html')
-      const viewportWidth = window.innerWidth || document.documentElement.clientWidth
-      const viewportHeight = window.innerHeight || document.documentElement.clientHeight
-      const rootWidth = this._root.offsetWidth || 0
-      const rootHeight = this._root.offsetHeight || 0
-      if (rootHeight >= viewportHeight) {
-        this._rootMargin = `${top}px ${viewportWidth - rootWidth + right}px ${viewportHeight - rootHeight + bottom}px ${left}px`
-      } else {
-        this._rootMargin = `${top}px ${right}px ${bottom}px ${left}px`
-      }
+      this._root = null
+      this._rootMargin = `${top}px ${right}px ${bottom}px ${left}px`
       this._relativeInfo.push({ selector: null, margins })
     })
     return this

package/src/web/api/create-selector-query/SelectQuery.js

@@ -75,7 +75,7 @@ class SelectQuery {
   }
 
   _handleFields (fields, el, selector) {
-    if (!el) return null
+    if (!el || (el && !el.getBoundingClientRect)) return null
     const { id, dataset, rect, size, scrollOffset, properties = [], computedStyle = [], node } = fields
     const { left, right, top, bottom, width, height } = el.getBoundingClientRect()
 

package/src/web/api/request/index.js

@@ -39,7 +39,17 @@ function request (options = { url: '' }) {
     headers: header,
     responseType,
     timeout,
-    cancelToken: source.token
+    cancelToken: source.token,
+    transitional: {
+      // silent JSON parsing mode
+      // `true`  - ignore JSON parsing errors and set response.data to null if parsing failed (old behaviour)
+      // `false` - throw SyntaxError if JSON parsing failed (Note: responseType must be set to 'json')
+      silentJSONParsing: true, // default value for the current Axios version
+      // try to parse the response string as JSON even if `responseType` is not 'json'
+      forcedJSONParsing: false,
+      // throw ETIMEDOUT error instead of generic ECONNABORTED on request timeouts
+      clarifyTimeoutError: false
+    }
   }
 
   if (method === 'GET') {
@@ -49,7 +59,7 @@ function request (options = { url: '' }) {
 
   const promise = axios(rOptions).then(res => {
     let data = res.data
-    if (responseType === 'text' && dataType === 'json') {
+    if (dataType === 'json' && typeof data === 'string') {
       try {
         data = JSON.parse(data)
       } catch (e) {

package/src/web/api/route/index.js

@@ -81,7 +81,11 @@ function navigateTo (options = {}) {
 function navigateBack (options = {}) {
   const router = global.__mpxRouter
   if (router) {
-    const delta = options.delta || 1
+    let delta = options.delta || 1
+    const stackLength = router.stack.length
+    if (stackLength > 1 && delta >= stackLength) {
+      delta = stackLength - 1
+    }
     router.__mpxAction = {
       type: 'back',
       delta