Merge branch 'alpha'

lerna.json

@@ -12,5 +12,5 @@
       "message": "chore(release): publish %s"
     }
   },
-  "version": "2.0.0-alpha-27920200529001"
+  "version": "2.0.0-alpha-27920200602001"
 }

packages/uni-app-plus-nvue/package.json

 {
   "name": "@dcloudio/uni-app-plus-nvue",
-  "version": "2.0.0-alpha-27920200529001",
+  "version": "2.0.0-alpha-27920200602001",
   "description": "uni-app app-plus-nvue",
   "main": "dist/index.js",
   "repository": {

packages/uni-app-plus/package.json

 {
   "name": "@dcloudio/uni-app-plus",
-  "version": "2.0.0-alpha-27920200529001",
+  "version": "2.0.0-alpha-27920200602001",
   "description": "uni-app app-plus",
   "main": "dist/index.js",
   "repository": {

packages/uni-automator/package.json

 {
   "name": "@dcloudio/uni-automator",
-  "version": "2.0.0-alpha-27920200529001",
+  "version": "2.0.0-alpha-27920200602001",
   "description": "uni-app automator",
   "main": "dist/index.js",
   "repository": {

packages/uni-cli-shared/package.json

 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "2.0.0-alpha-27920200529001",
+  "version": "2.0.0-alpha-27920200602001",
   "description": "uni-cli-shared",
   "main": "lib/index.js",
   "repository": {

packages/uni-h5-ui/package.json

 {
   "name": "@dcloudio/uni-h5-ui",
-  "version": "2.0.0-alpha-27920200529001",
+  "version": "2.0.0-alpha-27920200602001",
   "description": "uni-app h5 ui",
   "main": "dist/index.umd.min.js",
   "repository": {

packages/uni-h5/package.json

 {
   "name": "@dcloudio/uni-h5",
-  "version": "2.0.0-alpha-27920200529001",
+  "version": "2.0.0-alpha-27920200602001",
   "description": "uni-app h5",
   "main": "dist/index.umd.min.js",
   "repository": {

packages/uni-migration/package.json

 {
   "name": "@dcloudio/uni-migration",
-  "version": "2.0.0-alpha-27920200529001",
+  "version": "2.0.0-alpha-27920200602001",
   "description": "uni-app migration",
   "main": "lib/index.js",
   "repository": {

packages/uni-mp-alipay/package.json

 {
   "name": "@dcloudio/uni-mp-alipay",
-  "version": "2.0.0-alpha-27920200529001",
+  "version": "2.0.0-alpha-27920200602001",
   "description": "uni-app mp-alipay",
   "main": "dist/index.js",
   "repository": {

packages/uni-mp-baidu/package.json

 {
   "name": "@dcloudio/uni-mp-baidu",
-  "version": "2.0.0-alpha-27920200529001",
+  "version": "2.0.0-alpha-27920200602001",
   "description": "uni-app mp-baidu",
   "main": "dist/index.js",
   "repository": {

packages/uni-mp-qq/package.json

 {
   "name": "@dcloudio/uni-mp-qq",
-  "version": "2.0.0-alpha-27920200529001",
+  "version": "2.0.0-alpha-27920200602001",
   "description": "uni-app mp-qq",
   "main": "dist/index.js",
   "repository": {

packages/uni-mp-toutiao/package.json

 {
   "name": "@dcloudio/uni-mp-toutiao",
-  "version": "2.0.0-alpha-27920200529001",
+  "version": "2.0.0-alpha-27920200602001",
   "description": "uni-app mp-toutiao",
   "main": "dist/index.js",
   "repository": {

packages/uni-mp-weixin/package.json

 {
   "name": "@dcloudio/uni-mp-weixin",
-  "version": "2.0.0-alpha-27920200529001",
+  "version": "2.0.0-alpha-27920200602001",
   "description": "uni-app mp-weixin",
   "main": "dist/index.js",
   "repository": {

packages/uni-quickapp-native/package.json

 {
   "name": "@dcloudio/uni-quickapp-native",
-  "version": "2.0.0-alpha-27920200529001",
+  "version": "2.0.0-alpha-27920200602001",
   "description": "uni-app quickapp-native",
   "main": "dist/vue.prod.js",
   "repository": {

packages/uni-quickapp-webview/package.json

 {
   "name": "@dcloudio/uni-quickapp-webview",
-  "version": "2.0.0-alpha-27920200529001",
+  "version": "2.0.0-alpha-27920200602001",
   "description": "uni-app quickapp-webview",
   "main": "dist/index.js",
   "repository": {

packages/uni-stat/package.json

 {
   "name": "@dcloudio/uni-stat",
-  "version": "2.0.0-alpha-27920200529001",
+  "version": "2.0.0-alpha-27920200602001",
   "description": "",
   "main": "dist/index.js",
   "repository": {

packages/uni-template-compiler/package.json

 {
   "name": "@dcloudio/uni-template-compiler",
-  "version": "2.0.0-alpha-27920200529001",
+  "version": "2.0.0-alpha-27920200602001",
   "description": "uni-template-compiler",
   "main": "lib/index.js",
   "repository": {

packages/vue-cli-plugin-hbuilderx/package.json

 {
   "name": "@dcloudio/vue-cli-plugin-hbuilderx",
-  "version": "2.0.0-alpha-27920200529001",
+  "version": "2.0.0-alpha-27920200602001",
   "description": "HBuilderX plugin for vue-cli 3",
   "main": "index.js",
   "repository": {

packages/vue-cli-plugin-uni-optimize/package.json

 {
   "name": "@dcloudio/vue-cli-plugin-uni-optimize",
-  "version": "2.0.0-alpha-27920200529001",
+  "version": "2.0.0-alpha-27920200602001",
   "description": "uni-app optimize plugin for vue-cli 3",
   "main": "index.js",
   "repository": {

packages/vue-cli-plugin-uni-optimize/packages/babel-plugin-uni-api/index.js

-const path = require('path')
-
-const {
-  normalizePath
-} = require('@dcloudio/uni-cli-shared')
-
 process.UNI_APIS = new Set()
-
-const sourcePath = normalizePath(path.join(require.resolve('@dcloudio/uni-h5'), '../../'))
-
 module.exports = function ({
   types: t
 }) {
@@ -21,10 +12,6 @@ module.exports = function ({
             path.node.object.name === 'wx'
           )
         ) {
-          if (normalizePath(state.file.opts.filename).indexOf(sourcePath) === 0) {
-            path.stop()
-            return
-          }
           process.UNI_APIS.add(path.node.property.name || path.node.property.value)
         }
       }

packages/vue-cli-plugin-uni-optimize/packages/webpack-optimize-plugin/api.js

@@ -118,7 +118,7 @@ const isApiSubscribe = filepath => {
   return filepath.indexOf('/core/view/bridge/subscribe/api') === 0
 }
 
-function parseDeps (apis, manifest) {
+function parseDeps (apis, manifest) {
   const apiPaths = Object.create(null)
   const apiProtocolPaths = Object.create(null)
   const invokeApiPaths = Object.create(null)
@@ -196,7 +196,7 @@ function parseDeps (apis, manifest) {
   }
 }
 
-module.exports = function updateApis (apis = new Set(), userApis = new Set()) {
+module.exports = function updateApis (apis = new Set(), userApis = new Set()) {
   if (!fs.existsSync(tmpDir)) {
     fs.mkdirSync(tmpDir)
   }
@@ -211,6 +211,15 @@ module.exports = function updateApis (apis = new Set(), userApis = new Set()) {
 
   apis = new Set([...apis, ...userApis])
 
+  if (process.UNI_TAGS) {
+    // TODO 临时硬编码
+    if (process.UNI_TAGS.has('map')) {
+      apis.add('getLocation')
+      apis.add('stopCompass')
+      apis.add('onCompassChange')
+    }
+  }
+
   const {
     apiPaths,
     apiProtocolPaths,
@@ -232,4 +241,4 @@ module.exports = function updateApis (apis = new Set(), userApis = new Set()) {
   updateCoreComponents(coreComponentsPaths)
   updateAppMixins(appMixinsPaths)
   updateSystemRoutes(systemRoutesPaths)
-}
+}

packages/vue-cli-plugin-uni/package.json

 {
   "name": "@dcloudio/vue-cli-plugin-uni",
-  "version": "2.0.0-alpha-27920200529001",
+  "version": "2.0.0-alpha-27920200602001",
   "description": "uni-app plugin for vue-cli 3",
   "main": "index.js",
   "repository": {
@@ -17,7 +17,7 @@
   "author": "fxy060608",
   "license": "Apache-2.0",
   "dependencies": {
-    "@dcloudio/uni-stat": "^2.0.0-alpha-27920200529001",
+    "@dcloudio/uni-stat": "^2.0.0-alpha-27920200602001",
     "buffer-json": "^2.0.0",
     "copy-webpack-plugin": "^5.1.1",
     "cross-env": "^5.2.0",

packages/webpack-uni-mp-loader/package.json

 {
   "name": "@dcloudio/webpack-uni-mp-loader",
-  "version": "2.0.0-alpha-27920200529001",
+  "version": "2.0.0-alpha-27920200602001",
   "description": "webpack-uni-mp-loader",
   "main": "index.js",
   "repository": {

packages/webpack-uni-pages-loader/package.json

 {
   "name": "@dcloudio/webpack-uni-pages-loader",
-  "version": "2.0.0-alpha-27920200529001",
+  "version": "2.0.0-alpha-27920200602001",
   "description": "uni-app pages.json loader",
   "main": "lib/index.js",
   "repository": {
@@ -21,7 +21,7 @@
     "strip-json-comments": "^2.0.1"
   },
   "uni-app": {
-    "compilerVersion": "2.7.10"
+    "compilerVersion": "2.7.11"
   },
   "gitHead": "e62f0398362f2f9de0bf5726046d7951c88d6b1d"
 }

src/platforms/h5/service/api/device/get-system-info.js

@@ -18,8 +18,8 @@ export function getSystemInfoSync () {
   var pixelRatio = window.devicePixelRatio
   // 横屏时 iOS 获取的屏幕宽高颠倒，进行纠正
   var landscape = Math.abs(window.orientation) === 90
-  var screenWidth = Math[landscape ? 'max' : 'min'](screen.width, screen.height)
-  var screenHeight = Math[landscape ? 'min' : 'max'](screen.height, screen.width)
+  var screenWidth = typeof window.orientation === 'number' ? Math[landscape ? 'max' : 'min'](screen.width, screen.height) : screen.width
+  var screenHeight = typeof window.orientation === 'number' ? Math[landscape ? 'min' : 'max'](screen.height, screen.width) : screen.height
   var windowWidth = Math.min(window.innerWidth, document.documentElement.clientWidth, screenWidth)
   var windowHeight = window.innerHeight
   var language = navigator.language