Merge branch 'dev' into alpha

docs/api/ui/media-query-observer.md

+MediaQueryObserver 对象，用于监听页面 media query 状态的变化，如界面的长宽是不是在某个指定的范围内。
+
+### uni.createMediaQueryObserver([this])
+创建并返回一个 ``MediaQueryObserver`` 对象实例。
+
+**this说明：**
+
+自定义组件实例。**支付宝小程序不支持此参数，传入仅为抹平写法差异**
+
+### MediaQueryObserver 对象的方法列表
+
+|方法|说明|
+|:-|:-|
+|MediaQueryObserver.observe(Object descriptor, function callback)|开始监听页面 media query 变化情况|
+|MediaQueryObserver.disconnect()|停止监听，回调函数将不再触发|
+
+**observe 回调函数包含一个参数**
+
+||类型|说明|
+|:-|:-|:-|
+|intersectionRatio|boolean|页面的当前状态是否满足所指定的 media query|
+
+### 代码示例
+
+```
+<template>
+    <view class="content">
+        <view class="">
+            matches: {{matches}}
+        </view>
+        <view>
+            landscape: {{landscape}}
+        </view>
+            <button type="success" @click="remove">destroy</button>
+        </view>
+    </view>
+</template>
+
+<script>
+    let landscapeObs, interObs
+    export default {
+        data() {
+            return {
+                matches: false,
+                landscape: false,
+            }
+        },
+        onLoad() {
+
+        },
+        mounted() {
+            this.testMediaQueryObserver()
+            this.landscapeObserver()
+
+        },
+
+        methods: {
+            changeMinWidth() {
+                console.log("======= changeMinWidth ======")
+                var that = this
+                setTimeout(() => {
+                    that.minWidth =  420
+                    console.log("that.minwidth", that.minWidth)
+                }, 1000)
+
+            },
+            testMediaQueryObserver() {
+                this.mediaQueryOb = uni.createMediaQueryObserver(this)
+
+                this.mediaQueryOb.observe({
+                    minWidth: 305,
+                    maxWidth: 400,
+                    orientation: 'portrait'  
+                }, matches => {
+                    console.log('######### matches #########', matches)
+                    this.matches = matches;
+                })
+                console.log('########## create mediaQueryOb ###########', this.mediaQueryOb)
+            },
+            landscapeObserver() {
+                // console.log('--------- this----------', this)
+                landscapeObs = uni.createMediaQueryObserver(this)
+                landscapeObs.observe({
+                    }, matches => {
+                        this.landscape = matches
+                })
+                console.log('--------- landscapeObs -------', landscapeObs)
+                return landscapeObs
+            },
+            remove() {
+                this.mediaQueryOb.disconnect()
+                landscapeObs.disconnect()
+                console.log('########## destroy mediaQueryOb ###########', this.mediaQueryOb)
+            }
+        }
+    }
+</script>
+
+<style>
+    .content {
+        text-align: center;
+        height: 400upx;
+    }
+</style>
+```

packages/uni-cli-shared/lib/util.js

@@ -92,6 +92,8 @@ const NODE_MODULES_REGEX = /(\.\.\/)?node_modules/g
 
 function normalizeNodeModules (str) {
   str = normalizePath(str).replace(NODE_MODULES_REGEX, 'node-modules')
+  // HBuilderX 内置模块路径转换
+  str = str.replace(/.*HBuilderX\/plugins\/uniapp-cli\/node[-_]modules/, 'node-modules')
   if (process.env.UNI_PLATFORM === 'mp-alipay') {
     str = str.replace('node-modules/@', 'node-modules/npm-scope-')
   }

packages/webpack-uni-mp-loader/lib/plugin/generate-component.js

@@ -89,11 +89,7 @@ module.exports = function generateComponent (compilation) {
           let resource = normalizePath(path.resolve(process.env.UNI_INPUT_DIR, '..', modulePath))
           const altResource = normalizePath(path.resolve(process.env.UNI_INPUT_DIR, modulePath))
 
-          if (
-            /^win/.test(process.platform) &&
-            modulePath.includes('@dcloudio') &&
-            isBuiltInComponentPath(modulePath)
-          ) {
+          if (modulePath.includes('@dcloudio') && isBuiltInComponentPath(modulePath)) {
             resource = normalizePath(path.resolve(process.env.UNI_CLI_CONTEXT, modulePath))
           }
 

src/core/helpers/protocol/route/route.js

@@ -95,7 +95,7 @@ function createValidator (type) {
     }
 
     // 主要拦截目标为用户快速点击时触发的多次跳转，该情况，通常前后 url 是一样的
-    if (navigatorLock === url) {
+    if (navigatorLock === url && params.openType !== 'appLaunch') {
       return `${navigatorLock} locked`
     }
     // 至少 onLaunch 之后，再启用lock逻辑（onLaunch之前可能开发者手动调用路由API，来提前跳转）

src/core/service/api/context/canvas.js

@@ -328,38 +328,16 @@ export class CanvasContext {
     }
   }
 
-  measureText (text, callback) {
+  measureText (text) {
     const font = this.state.font
+    let width
     if (__PLATFORM__ === 'h5') {
-      const width = measureText(text, font)
-      const textMetrics = new TextMetrics(width)
-      if (typeof callback === 'function') {
-        setTimeout(() => callback(textMetrics), 0)
-      }
-      return textMetrics
-    } else {
-      let textMetrics = new TextMetrics(0)
-      if (typeof callback === 'function') {
-        const callbackId = canvasEventCallbacks.push(function ({ width }) {
-          callback(new TextMetrics(width))
-        })
-        operateCanvas(this.id, this.pageId, 'measureText', {
-          text,
-          font,
-          callbackId
-        })
+      width = measureText(text, font)
     } else {
       const webview = plus.webview.getWebviewById(String(this.pageId))
-        if (webview && webview.evalJSSync) {
-          const js = `(${measureText.toString()})(${JSON.stringify(text)},${JSON.stringify(font)})`
-          const width = webview.evalJSSync(js) || 0
-          textMetrics = new TextMetrics(width)
-        } else {
-          console.error('warning: measureText missing required arguments: callback')
-        }
-      }
-      return textMetrics
+      width = webview.evalJSSync(`(${measureText.toString()})(${JSON.stringify(text)},${JSON.stringify(font)})`)
     }
+    return new TextMetrics(width)
   }
 
   save () {

src/core/view/components/canvas/index.vue

@@ -277,22 +277,6 @@ export default {
         }, this.$page.id)
       }
     },
-    measureText ({
-      text,
-      font,
-      callbackId
-    }) {
-      const canvas = getTempCanvas()
-      const c2d = canvas.getContext('2d')
-      c2d.font = font
-      UniViewJSBridge.publishHandler('onCanvasMethodCallback', {
-        callbackId,
-        data: {
-          errMsg: 'measureText:ok',
-          width: c2d.measureText(text).width || 0
-        }
-      }, this.$page.id)
-    },
     preloadImage: function (actions) {
       var self = this
       actions.forEach(function (action) {

src/platforms/mp-alipay/runtime/api/protocols.js

@@ -3,7 +3,6 @@ import {
 } from 'uni-shared'
 import navigateTo from 'uni-helpers/navigate-to'
 import redirectTo from '../../../mp-weixin/helpers/redirect-to'
-import createCanvasContext from '../../../mp-weixin/helpers/create-canvas-context'
 
 // 不支持的 API 列表
 const todos = [
@@ -478,8 +477,7 @@ const protocols = { // 需要做转换的 API 列表
       result.telNumber = info.mobilePhone
       result.errMsg = result.resultStatus
     }
-  },
-  createCanvasContext
+  }
 }
 
 export {

src/platforms/mp-baidu/runtime/api/protocols.js

 import navigateTo from 'uni-helpers/navigate-to'
 import redirectTo from '../../../mp-weixin/helpers/redirect-to'
 import previewImage from '../../../mp-weixin/helpers/normalize-preview-image'
-import createCanvasContext from '../../../mp-weixin/helpers/create-canvas-context'
 
 // 不支持的 API 列表
 const todos = [
@@ -120,8 +119,7 @@ const protocols = {
   getAccountInfoSync: {
     name: 'getEnvInfoSync',
     returnValue: _handleEnvInfo
-  },
-  createCanvasContext
+  }
 }
 
 export {

src/platforms/mp-kuaishou/runtime/api/protocols.js

 import navigateTo from 'uni-helpers/navigate-to'
 import redirectTo from '../../../mp-weixin/helpers/redirect-to'
 import previewImage from '../../../mp-weixin/helpers/normalize-preview-image'
-import createCanvasContext from '../../../mp-weixin/helpers/create-canvas-context'
 
 export const protocols = {
   navigateTo,
   redirectTo,
-  previewImage,
-  createCanvasContext
+  previewImage
 }
 export const todos = [
   'vibrate'

src/platforms/mp-qq/runtime/api/protocols.js

 import navigateTo from 'uni-helpers/navigate-to'
 import redirectTo from '../../../mp-weixin/helpers/redirect-to'
 import previewImage from '../../../mp-weixin/helpers/normalize-preview-image'
-import createCanvasContext from '../../../mp-weixin/helpers/create-canvas-context'
 
 export const protocols = {
   navigateTo,
   redirectTo,
-  previewImage,
-  createCanvasContext
+  previewImage
 }
 export const todos = [
   'preloadPage',

src/platforms/mp-toutiao/runtime/api/protocols.js

 import navigateTo from 'uni-helpers/navigate-to'
 import redirectTo from '../../../mp-weixin/helpers/redirect-to'
 import previewImage from '../../../mp-weixin/helpers/normalize-preview-image'
-import createCanvasContext from '../../../mp-weixin/helpers/create-canvas-context'
 
 // 不支持的 API 列表
 const todos = [
@@ -170,8 +169,7 @@ const protocols = {
     args: {
       digestAlgorithm: false
     }
-  },
-  createCanvasContext
+  }
 }
 
 export {

src/platforms/mp-weixin/helpers/create-canvas-context.js

-export default {
-  returnValue (fromRes, toRes) {
-    const measureText = fromRes.measureText
-    toRes.measureText = function (text, callback) {
-      const textMetrics = measureText.call(this, text)
-      if (typeof callback === 'function') {
-        setTimeout(() => callback(textMetrics), 0)
-      }
-      return textMetrics
-    }
-  }
-}

src/platforms/mp-weixin/runtime/api/protocols.js

 import navigateTo from 'uni-helpers/navigate-to'
 import redirectTo from '../../helpers/redirect-to'
 import previewImage from '../../helpers/normalize-preview-image'
-import createCanvasContext from '../../helpers/create-canvas-context'
 
 function addSafeAreaInsets (result) {
   if (result.safeArea) {
@@ -23,8 +22,7 @@ export const protocols = {
   },
   getSystemInfoSync: {
     returnValue: addSafeAreaInsets
-  },
-  createCanvasContext
+  }
 }
 export const todos = [
   'vibrate',

src/platforms/quickapp-webview/runtime/api/protocols.js

 import navigateTo from 'uni-helpers/navigate-to'
 import redirectTo from '../../../mp-weixin/helpers/redirect-to'
 import previewImage from '../../../mp-weixin/helpers/normalize-preview-image'
-import createCanvasContext from '../../../mp-weixin/helpers/create-canvas-context'
 
 export const protocols = {
   navigateTo,
   redirectTo,
-  previewImage,
-  createCanvasContext
+  previewImage
 }
 export const todos = [
   'preloadPage',