Merge branch 'dev' of github.com:dcloudio/uni-app into dev

build/build.js

@@ -40,7 +40,7 @@ service.run('build', {
   formats: process.env.UNI_WATCH === 'true' ? 'umd' : 'umd-min',
   entry,
   'inline-vue': !!process.env.UNI_VIEW,
-  // clean: !process.env.UNI_VIEW,
+  clean: false, //! process.env.UNI_VIEW,
   mode: process.env.NODE_ENV
 }).then(function () {
   if (

packages/uni-quickapp-light/lib/uni.config.js

 const fs = require('fs')
 const path = require('path')
 
+const SIGN_DIR_NAME = 'sign'
+// TODO quickapp ide 有bug，不识别项目根目录 sign，暂时拷贝到 .quickapp 目录
+const SIGN_OUT_DIR_NAME = '.quickapp/sign'
+
+function getSignCopyOption () {
+  const signDir = path.resolve(process.env.UNI_INPUT_DIR, SIGN_DIR_NAME)
+  if (fs.existsSync(signDir)) {
+    return {
+      from: signDir,
+      to: SIGN_OUT_DIR_NAME
+    }
+  }
+}
+
 module.exports = {
   options: {
     cssVars: {
@@ -24,11 +38,19 @@ module.exports = {
     }
   },
   copyWebpackOptions (platformOptions, vueOptions) {
-    const jsConfigPath = path.resolve(process.env.UNI_INPUT_DIR, 'jsconfig.json')
-    if (fs.existsSync(jsConfigPath)) {
-      return [jsConfigPath]
-    }
-    return [path.resolve(__dirname, 'assets/jsconfig.json')]
+    const copyOptions = []
+    let jsConfigPath = path.resolve(process.env.UNI_INPUT_DIR, 'jsconfig.json')
+    if (!fs.existsSync(jsConfigPath)) {
+      jsConfigPath = path.resolve(__dirname, 'assets/jsconfig.json')
+    }
+    copyOptions.push(jsConfigPath)
+
+    const signCopyOption = getSignCopyOption()
+    if (signCopyOption) {
+      copyOptions.push(signCopyOption)
+    }
+
+    return copyOptions
   },
   configureWebpack () {
     return {

packages/vue-cli-plugin-uni/commands/build.js

@@ -35,17 +35,7 @@ module.exports = (api, options) => {
       }
     }
 
-    const port = args['auto-port'] || process.env.UNI_AUTOMATOR_PORT
-    if (port) {
-      const host = args['auto-host'] || process.env.UNI_AUTOMATOR_HOST || '0.0.0.0'
-      const prepareURLs = require('@vue/cli-service/lib/util/prepareURLs')
-      const urls = prepareURLs('ws', host, port, '')
-      if (urls.lanUrlForConfig) {
-        process.env.UNI_AUTOMATOR_WS_ENDPOINT = 'ws://' + urls.lanUrlForConfig + ':' + port
-      } else {
-        process.env.UNI_AUTOMATOR_WS_ENDPOINT = urls.localUrlForBrowser
-      }
-    }
+    require('./util').initAutomator(args)
 
     args.entry = args.entry || args._[0]
 

packages/vue-cli-plugin-uni/commands/serve.js

@@ -21,10 +21,14 @@ module.exports = (api, options) => {
       '--host': `specify host (default: ${defaults.host})`,
       '--port': `specify port (default: ${defaults.port})`,
       '--https': `use https (default: ${defaults.https})`,
-      '--public': 'specify the public network URL for the HMR client'
+      '--public': 'specify the public network URL for the HMR client',
+      '--auto-host': 'specify automator host',
+      '--auto-port': 'specify automator port'
     }
   }, async function serve (args) {
-    info('Starting development server...')
+    info('Starting development server...')
+
+    require('./util').initAutomator(args)
 
     // although this is primarily a dev server, it is possible that we
     // are running it in a mode with a production env, e.g. in E2E tests.

packages/vue-cli-plugin-uni/commands/util.js

+module.exports = {
+  initAutomator (args) {
+    const port = args['auto-port'] || process.env.UNI_AUTOMATOR_PORT
+    if (port) {
+      const host = args['auto-host'] || process.env.UNI_AUTOMATOR_HOST || '0.0.0.0'
+      const prepareURLs = require('@vue/cli-service/lib/util/prepareURLs')
+      const urls = prepareURLs('ws', host, port, '')
+      if (urls.lanUrlForConfig) {
+        process.env.UNI_AUTOMATOR_WS_ENDPOINT = 'ws://' + urls.lanUrlForConfig + ':' + port
+      } else {
+        process.env.UNI_AUTOMATOR_WS_ENDPOINT = urls.localUrlForBrowser
+      }
+    }
+  }
+}

packages/vue-cli-plugin-uni/lib/h5/index.js

@@ -116,7 +116,8 @@ module.exports = {
             loader: path.resolve(__dirname, '../../packages/wrap-loader'),
             options: {
               before: [
-                beforeCode + statCode + getGlobalUsingComponentsCode()
+                beforeCode + require('../util').getAutomatorCode() + statCode +
+                getGlobalUsingComponentsCode()
               ]
             }
           }]
@@ -179,4 +180,4 @@ module.exports = {
       require('./cssnano-options')(webpackConfig)
     }
   }
-}
+}

packages/vue-cli-plugin-uni/lib/mp/index.js

@@ -81,9 +81,6 @@ module.exports = {
 
     const beforeCode = 'import \'uni-pages\';'
 
-    const automator = `@dcloudio/uni-${process.env.UNI_SUB_PLATFORM || process.env.UNI_PLATFORM}/dist/automator`
-    const automatorCode = process.env.UNI_AUTOMATOR_WS_ENDPOINT ? `import '${automator}';` : ''
-
     return {
       mode: process.env.NODE_ENV === 'production' ? 'production' : 'development',
       entry () {
@@ -112,7 +109,7 @@ module.exports = {
             loader: path.resolve(__dirname, '../../packages/wrap-loader'),
             options: {
               before: [
-                beforeCode + automatorCode + statCode
+                beforeCode + require('../util').getAutomatorCode() + statCode
               ]
             }
           }, {
@@ -200,4 +197,4 @@ module.exports = {
     webpackConfig.plugins.delete('preload')
     webpackConfig.plugins.delete('prefetch')
   }
-}
+}

packages/vue-cli-plugin-uni/lib/util.js

@@ -12,5 +12,9 @@ module.exports = {
       })
     }
     return partialIdentifier
+  },
+  getAutomatorCode () {
+    const automator = `@dcloudio/uni-${process.env.UNI_SUB_PLATFORM || process.env.UNI_PLATFORM}/dist/automator`
+    return process.env.UNI_AUTOMATOR_WS_ENDPOINT ? `import '${automator}';` : ''
   }
 }

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

@@ -60,8 +60,8 @@ function createValidator (type) {
       }
     }
 
-    // tabBar不允许传递参数
-    if (routeOptions.meta.isTabBar) {
+    // switchTab不允许传递参数,reLaunch到一个tabBar页面是可以的
+    if (type === 'switchTab' && routeOptions.meta.isTabBar) {
       url = pagePath
     }
 

src/core/service/plugins/page/create-page.js

 import {
   hasOwn
-} from 'uni-shared'
+} from 'uni-shared'
 
-export default function createPage (pageVm) {
+export default function createPage (pageVm, options) {
   const $route = pageVm.$route
   pageVm.route = $route.meta.pagePath
+  if (!pageVm.options) { // 可能开发者会声明 options 属性
+    pageVm.options = options
+  }
 
   const id = hasOwn($route.params, '__id__') ? $route.params.__id__ : $route.meta.id
   pageVm.__page__ = {
     id,
     path: $route.path,
     route: $route.meta.pagePath,
+    options: options,
     meta: Object.assign({}, $route.meta)
   }
   // 兼容 mpvue

src/core/service/plugins/page/index.js

@@ -20,8 +20,9 @@ function getDecodedQuery (query = {}) {
 export function createPageMixin () {
   return {
     created: function pageCreated () {
-      createPage(this)
-      callPageHook(this, 'onLoad', getDecodedQuery(this.$route.query))
+      const options = getDecodedQuery(this.$route.query)
+      createPage(this, options)
+      callPageHook(this, 'onLoad', options)
       callPageHook(this, 'onShow')
     }
   }