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

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

@@ -35,8 +35,8 @@ function getPagesJson () {
   return processPagesJson(getJson('pages.json', true))
 }
 
-function parsePagesJson (content) {
-  return processPagesJson(parseJson(content, true))
+function parsePagesJson (content, loader) {
+  return processPagesJson(parseJson(content, true), loader)
 }
 
 function filterPages (pages = [], root) {
@@ -48,7 +48,25 @@ function filterPages (pages = [], root) {
   }
 }
 
-function processPagesJson (pagesJson) {
+const pagesJsonJsFileName = 'pages.js'
+
+function processPagesJson (pagesJson, loader = {
+  addDependency: function () {}
+}) {
+  const pagesJsonJsPath = path.resolve(process.env.UNI_INPUT_DIR, pagesJsonJsFileName)
+  if (fs.existsSync(pagesJsonJsPath)) {
+    delete require.cache[pagesJsonJsPath]
+    const pagesJsonJsFn = require(pagesJsonJsPath)
+    if (typeof pagesJsonJsFn === 'function') {
+      pagesJson = pagesJsonJsFn(pagesJson, loader)
+      if (!pagesJson) {
+        console.error(`${pagesJsonJsFileName}  必须返回一个 json 对象`)
+      }
+    } else {
+      console.error(`${pagesJsonJsFileName} 必须导出 function`)
+    }
+  }
+
   let uniNVueEntryPagePath
   if (pagesJson.pages && pagesJson.pages.length) { // 如果首页是 nvue
     if (isNVuePage(pagesJson.pages[0])) {
@@ -193,7 +211,6 @@ function parseEntry (pagesJson) {
   process.UNI_NVUE_ENTRY = {}
 
   if (process.env.UNI_USING_NATIVE) {
-    // TODO 考虑 pages.json.js
     process.UNI_NVUE_ENTRY['app-config'] = path.resolve(process.env.UNI_INPUT_DIR, 'pages.json')
     process.UNI_NVUE_ENTRY['app-service'] = path.resolve(process.env.UNI_INPUT_DIR, getMainEntry())
   }
@@ -231,5 +248,6 @@ module.exports = {
   parsePages,
   parseEntry,
   getPagesJson,
-  parsePagesJson
+  parsePagesJson,
+  pagesJsonJsFileName
 }

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

@@ -238,7 +238,7 @@ const PLATFORMS = {
     vue: megaloRuntime,
     compiler: megaloCompiler,
     megalo: 'alipay',
-    filterTag: 'import-sjs',
+    filterTag: 'sjs',
     subPackages: true,
     cssVars: {
       '--status-bar-height': '25px',

packages/uni-mp-alipay/dist/index.js

@@ -1829,6 +1829,33 @@ function parseApp (vm) {
     }
   });
 
+  Vue.prototype.$onAliGetAuthorize = function onAliGetAuthorize (method, $event) {
+    my.getPhoneNumber({
+      success: (res) => {
+        $event.type = 'getphonenumber';
+        const response = JSON.parse(res.response).response;
+        if (response.code === '10000') { // success
+          $event.detail.errMsg = 'getPhoneNumber:ok';
+          $event.detail.encryptedData = res.response;
+        } else {
+          $event.detail.errMsg = 'getPhoneNumber:fail Error: ' + res.response;
+        }
+        this[method]($event);
+      },
+      fail: (res) => {
+        $event.type = 'getphonenumber';
+        $event.detail.errMsg = 'getPhoneNumber:fail';
+        this[method]($event);
+      }
+    });
+  };
+
+  Vue.prototype.$onAliAuthError = function $onAliAuthError (method, $event) {
+    $event.type = 'getphonenumber';
+    $event.detail.errMsg = 'getPhoneNumber:fail Error: ' + $event.detail.errorMessage;
+    this[method]($event);
+  };
+
   return parseBaseApp(vm, {
     mocks,
     initRefs

packages/uni-mp-baidu/dist/index.js

@@ -415,7 +415,8 @@ const todos = [
   'stopBeaconDiscovery',
   'hideShareMenu',
   'onWindowResize',
-  'offWindowResize'
+  'offWindowResize',
+  'vibrate'
 ];
 
 // 存在兼容性的 API 列表

packages/uni-mp-qq/dist/index.js

@@ -428,7 +428,8 @@ const todos = [
   'checkIsSoterEnrolledInDevice',
   'reportMonitor',
   'getLogManager',
-  'reportAnalytics'
+  'reportAnalytics',
+  'vibrate'
 ];
 const canIUses = [
   'scanCode',

packages/uni-mp-toutiao/dist/index.js

@@ -451,7 +451,8 @@ const todos = [
   'onWindowResize',
   'offWindowResize',
   'compressImage',
-  'createOffscreenCanvas'
+  'createOffscreenCanvas',
+  'vibrate'
 ];
 
 // 存在兼容性的 API 列表

packages/uni-mp-weixin/dist/index.js

@@ -387,7 +387,9 @@ var previewImage = {
 const protocols = {
   previewImage
 };
-const todos = [];
+const todos = [
+  'vibrate'
+];
 const canIUses = [];
 
 const CALLBACKS = ['success', 'fail', 'cancel', 'complete'];

packages/uni-template-compiler/__tests__/compiler-mp-alipay.spec.js

@@ -104,6 +104,13 @@ describe('mp:compiler-mp-alipay', () => {
     )
   })
 
+  it('generate getPhoneNumber', () => {
+    assertCodegen(
+      '<button open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">获取手机号</button>',
+      `<button open-type="getAuthorize" scope="phoneNumber" data-event-opts="{{[['getAuthorize',[['$onAliGetAuthorize',['getPhoneNumber','$event']]]],['error',[['$onAliAuthError',['getPhoneNumber','$event']]]]]}}" onGetAuthorize="__e" onError="__e">获取手机号</button>`
+    )
+  })
+
   it('generate events with v-on directive', () => {
     assertCodegen(
       `<uni-list-item title="标题文字" note="描述信息" show-extra-icon="true" :extra-icon="{color: '#4cd964',size: '22',type: 'spinner'}"></uni-list-item>`,

packages/uni-template-compiler/__tests__/demo.js

 const compiler = require('../lib')
-
 const res = compiler.compile(
   `
-<view @/>
+<button open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">获取手机号</button>
     `, {
     resourcePath: '/User/fxy/Documents/test.wxml',
     mp: {

packages/uni-template-compiler/lib/index.js

@@ -18,6 +18,8 @@ const generateTemplate = require('./template/generate')
 
 const compilerModule = require('./module')
 
+const compilerAlipayModule = require('./module-alipay')
+
 const generateCodeFrame = require('./codeframe')
 
 module.exports = {
@@ -28,6 +30,10 @@ module.exports = {
 
     (options.modules || (options.modules = [])).push(compilerModule)
 
+    if (options.mp.platform === 'mp-alipay') {
+      options.modules.push(compilerAlipayModule)
+    }
+
     const res = compile(source, Object.assign(options, {
       optimize: false
     }))

packages/uni-template-compiler/lib/module-alipay.js

+module.exports = {
+  postTransformNode (el) {
+    const attrsMap = el.attrsMap
+    if (attrsMap['open-type'] !== 'getPhoneNumber') {
+      return
+    }
+    const getPhoneNumberValue = attrsMap['@getphonenumber'] || attrsMap['v-on:getphonenumber']
+    if (!getPhoneNumberValue) {
+      return
+    }
+
+    el.attrs.find(attr => attr.name === 'open-type').value = '"getAuthorize"'
+    el.attrs.push({
+      name: 'scope',
+      value: '"phoneNumber"'
+    })
+
+    delete el.events['getphonenumber']
+    el.events['getAuthorize'] = {
+      value: '$onAliGetAuthorize(\'' + getPhoneNumberValue + '\',$event)'
+    }
+    el.events['error'] = {
+      value: '$onAliAuthError(\'' + getPhoneNumberValue + '\',$event)'
+    }
+  }
+}

packages/uni-template-compiler/lib/platforms/mp-alipay.js

@@ -45,7 +45,7 @@ module.exports = {
   createFilterTag (filterTag, {
     attrs
   }) {
-    return `<${filterTag} name="${attrs.module}" from="${attrs.src}"></${filterTag}>`
+    return `<import-sjs name="${attrs.module}" from="${attrs.src}"></import-sjs>`
   },
   getEventType (eventType) {
     return EVENTS[eventType] || eventType

packages/vue-cli-plugin-hbuilderx/build/webpack.nvue.conf.js

@@ -92,7 +92,9 @@ const rules = [{
   },
   jsPreprocessorLoader
   ],
-  exclude: excludeModuleReg
+  exclude (modulePath) {
+    return excludeModuleReg.test(modulePath) && modulePath.indexOf('@dcloudio') === -1
+  }
 },
 {
   test: /\.nvue(\?[^?]+)?$/,
@@ -171,7 +173,7 @@ if (process.env.UNI_USING_NATIVE) {
 module.exports = function (entry) {
   return {
     target: 'node', // 激活 vue-loader 的 isServer 逻辑
-    mode: 'development', // process.env.NODE_ENV,
+    mode: process.env.NODE_ENV,
     devtool: process.env.NODE_ENV === 'development' ? 'inline-source-map' : false,
     watch: process.env.NODE_ENV === 'development',
     entry,

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

@@ -132,10 +132,10 @@ module.exports = {
           resourceQuery: [
             /lang=wxs/,
             /lang=filter/,
-            /lang=import-sjs/,
+            /lang=sjs/,
             /blockType=wxs/,
             /blockType=filter/,
-            /blockType=import-sjs/
+            /blockType=sjs/
           ],
           use: [{
             loader: require.resolve(

packages/vue-cli-plugin-uni/lib/split-chunks.js

@@ -12,6 +12,13 @@ module.exports = function getSplitChunks () {
       }
     }
   }
+
+  const {
+    normalizePath
+  } = require('@dcloudio/uni-cli-shared')
+
+  const mainPath = normalizePath(path.resolve(process.env.UNI_INPUT_DIR, 'main.'))
+
   if (!process.env.UNI_OPT_SUBPACKAGES) {
     return {
       chunks (chunk) { // 防止 node_modules 内 vue 组件被 split
@@ -27,7 +34,8 @@ module.exports = function getSplitChunks () {
             }
             if (module.resource && (
               module.resource.indexOf('.vue') !== -1 ||
-                module.resource.indexOf('.nvue') !== -1
+                module.resource.indexOf('.nvue') !== -1 ||
+                module.resource.indexOf(mainPath) === 0 // main.js
             )) {
               return false
             }
@@ -40,11 +48,6 @@ module.exports = function getSplitChunks () {
       }
     }
   }
-  const {
-    normalizePath
-  } = require('@dcloudio/uni-cli-shared')
-
-  const mainPath = normalizePath(path.resolve(process.env.UNI_INPUT_DIR, 'main.'))
 
   function baseTest (module) {
     if (module.type === 'css/mini-extract') {

packages/vue-cli-plugin-uni/packages/webpack-custom-block-loader/index.js

@@ -48,7 +48,7 @@ module.exports = function(source) {
 
   descriptor.customBlocks = descriptor.customBlocks.filter(block => {
     if (
-      block.attrs.module ||
+      block.attrs.module &&
       (
         block.type === FILTER_TAG ||
         block.attrs.lang === FILTER_TAG

packages/webpack-uni-mp-loader/lib/plugin/index-new.js

@@ -6,6 +6,10 @@ const {
   normalizePath
 } = require('@dcloudio/uni-cli-shared')
 
+const {
+  pagesJsonJsFileName
+} = require('@dcloudio/uni-cli-shared/lib/pages')
+
 const generateApp = require('./generate-app')
 const generateJson = require('./generate-json')
 const generateComponent = require('./generate-component')
@@ -43,7 +47,8 @@ function addSubPackagesRequire (compilation) {
           name.indexOf(root) === 0 &&
           name !== subPackageVendorPath
         ) {
-          const source = `require('${normalizePath(path.relative(path.dirname(name), subPackageVendorPath))}');` +
+          const source =
+            `require('${normalizePath(path.relative(path.dirname(name), subPackageVendorPath))}');` +
             compilation.assets[name].source()
 
           compilation.assets[name] = {
@@ -82,13 +87,24 @@ class WebpackUniMPPlugin {
     })
 
     compiler.hooks.invalid.tap('webpack-uni-mp-invalid', (fileName, changeTime) => {
-      if (fileName && typeof fileName === 'string' && path.basename(fileName) === 'pages.json') { // 重新解析 entry
+      if (
+        fileName &&
+        typeof fileName === 'string'
+      ) { // 重新解析 entry
+        const basename = path.basename(fileName)
+        const deps = process.UNI_PAGES_DEPS || new Set()
+        if (
+          basename === 'pages.json' ||
+          basename === pagesJsonJsFileName ||
+          deps.has(normalizePath(fileName))
+        ) {
           try {
             parseEntry()
           } catch (e) {
             console.error(e)
           }
         }
+      }
     })
   }
 }

packages/webpack-uni-mp-loader/lib/plugin/index.js

@@ -2,9 +2,14 @@ const path = require('path')
 
 const {
   md5,
-  parseEntry
+  parseEntry,
+  normalizePath
 } = require('@dcloudio/uni-cli-shared')
 
+const {
+  pagesJsonJsFileName
+} = require('@dcloudio/uni-cli-shared/lib/pages')
+
 const {
   getPages,
   getSubPages,
@@ -93,13 +98,24 @@ class WebpackUniMPPlugin {
     })
 
     compiler.hooks.invalid.tap('webpack-uni-mp-invalid', (fileName, changeTime) => {
-      if (fileName && typeof fileName === 'string' && path.basename(fileName) === 'pages.json') { // 重新解析 entry
+      if (
+        fileName &&
+        typeof fileName === 'string'
+      ) { // 重新解析 entry
+        const basename = path.basename(fileName)
+        const deps = process.UNI_PAGES_DEPS || new Set()
+        if (
+          basename === 'pages.json' ||
+          basename === pagesJsonJsFileName ||
+          deps.has(normalizePath(fileName))
+        ) {
           try {
             parseEntry()
           } catch (e) {
             console.error(e)
           }
         }
+      }
     })
   }
 }

packages/webpack-uni-pages-loader/lib/index-new.js

@@ -14,6 +14,10 @@ const {
   updateProjectJson
 } = require('@dcloudio/uni-cli-shared/lib/cache')
 
+const {
+  pagesJsonJsFileName
+} = require('@dcloudio/uni-cli-shared/lib/pages')
+
 const parseStyle = require('./util').parseStyle
 
 // 将开发者手动设置的 usingComponents 调整名称，方便与自动解析到的 usingComponents 做最后合并
@@ -28,12 +32,19 @@ function renameUsingComponents (jsonObj) {
 module.exports = function (content) {
   this.cacheable && this.cacheable()
 
+  const pagesJsonJsPath = path.resolve(process.env.UNI_INPUT_DIR, pagesJsonJsFileName)
   const manifestJsonPath = path.resolve(process.env.UNI_INPUT_DIR, 'manifest.json')
   const manifestJson = parseManifestJson(fs.readFileSync(manifestJsonPath, 'utf8'))
 
+  this.addDependency(pagesJsonJsPath)
   this.addDependency(manifestJsonPath)
 
-  const pagesJson = parsePagesJson(content)
+  const pagesJson = parsePagesJson(content, {
+    addDependency: (file) => {
+      (process.UNI_PAGES_DEPS || (process.UNI_PAGES_DEPS = new Set())).add(normalizePath(file))
+      this.addDependency(file)
+    }
+  })
   // TODO 与 usingComponents 放在一块读取设置
   if (manifestJson.transformPx === false) {
     process.UNI_TRANSFORM_PX = false

packages/webpack-uni-pages-loader/lib/index.js

@@ -13,6 +13,10 @@ const {
   getPagesJson
 } = require('@dcloudio/uni-cli-shared/lib/cache')
 
+const {
+  pagesJsonJsFileName
+} = require('@dcloudio/uni-cli-shared/lib/pages')
+
 const parseStyle = require('./util').parseStyle
 
 const emitFileCaches = {}
@@ -44,11 +48,18 @@ module.exports = function (content) {
   this.cacheable && this.cacheable()
 
   const manifestJsonPath = path.resolve(process.env.UNI_INPUT_DIR, 'manifest.json')
+  const pagesJsonJsPath = path.resolve(process.env.UNI_INPUT_DIR, pagesJsonJsFileName)
   const manifestJson = parseManifestJson(fs.readFileSync(manifestJsonPath, 'utf8'))
 
   this.addDependency(manifestJsonPath)
+  this.addDependency(pagesJsonJsPath)
 
-  const pagesJson = parsePagesJson(content)
+  const pagesJson = parsePagesJson(content, {
+    addDependency: (file) => {
+      (process.UNI_PAGES_DEPS || (process.UNI_PAGES_DEPS = new Set())).add(normalizePath(file))
+      this.addDependency(file)
+    }
+  })
 
   if (manifestJson.transformPx === false) {
     process.UNI_TRANSFORM_PX = false

packages/webpack-uni-pages-loader/lib/platforms/mp-alipay.js

@@ -2,6 +2,10 @@ const {
   parsePages
 } = require('@dcloudio/uni-cli-shared')
 
+const {
+  updateAppJsonUsingComponents
+} = require('@dcloudio/uni-cli-shared/lib/cache')
+
 const {
   hasOwn,
   parseStyle,
@@ -60,6 +64,10 @@ module.exports = function (pagesJson, manifestJson) {
 
   copyToJson(app, pagesJson, pagesJson2AppJson)
 
+  if (app.usingComponents) {
+    updateAppJsonUsingComponents(app.usingComponents)
+  }
+
   return [{
     name: 'app',
     content: app

src/platforms/app-plus/service/api/device/scan-code.js

@@ -12,7 +12,8 @@ import {
 } from '../../constants'
 
 import {
-  registerPlusMessage
+  registerPlusMessage,
+  consumePlusMessage
 } from '../../framework/plus-message'
 
 export const SCAN_ID = '__UNIAPP_SCAN'
@@ -98,11 +99,11 @@ export function scanCode ({
             if (isDark) {
               plus.navigator.setStatusBarStyle('isDark')
             }
-            webview.close('auto')
             result = {
               type,
               code
             }
+            webview.close('auto')
           }, () => {
             plus.nativeUI.toast('识别失败')
           }, filters)
@@ -143,7 +144,7 @@ export function scanCode ({
     })
   })
   webview.addEventListener('close', () => {
-    if (result && 'code' in result) {
+    if (result) {
       invoke(callbackId, {
         result: result.code,
         scanType: SCAN_MAPS[result.type] || '',
@@ -156,6 +157,7 @@ export function scanCode ({
         errMsg: 'scanCode:fail cancel'
       })
     }
+    consumePlusMessage(MESSAGE_TYPE)
   })
   if (isDark) { // 状态栏前景色
     plus.navigator.setStatusBarStyle('light')
@@ -170,15 +172,10 @@ export function scanCode ({
       }
     })
   }
-  // fixed by hxy 注册扫码事件
+
   registerPlusMessage(MESSAGE_TYPE, function (res) {
-    if (res && !res.errMsg) {
+    if (res && 'code' in res) {
       result = res
-    } else {
-      const errMsg = res && res.errMsg ? ' ' + res.errMsg : ''
-      result = {
-        errMsg: 'scanCode:fail' + errMsg
-      }
     }
   }, false)
 }

src/platforms/app-plus/service/api/location/choose-location.js

@@ -11,11 +11,14 @@ import {
 } from '../../constants'
 
 import {
-  registerPlusMessage
+  registerPlusMessage,
+  consumePlusMessage
 } from '../../framework/plus-message'
 
 const CHOOSE_LOCATION_PATH = '_www/__uniappchooselocation.html'
 
+const MESSAGE_TYPE = 'chooseLocation'
+
 export function chooseLocation (params, callbackId) {
   const statusBarStyle = plus.navigator.getStatusBarStyle()
   const webview = plus.webview.create(
@@ -57,26 +60,38 @@ export function chooseLocation (params, callbackId) {
       }
     })
   }
-
-  webview.show('slide-in-bottom', ANI_DURATION, () => {
+  let index = 0
+  let onShow = function () {
+    index++
+    if (index === 2) {
       webview.evalJS(`__chooseLocation__(${JSON.stringify(params)})`)
-  })
+    }
+  }
+  webview.addEventListener('loaded', onShow)
+  webview.show('slide-in-bottom', ANI_DURATION, onShow)
 
-  // fixed by hxy
-  registerPlusMessage('chooseLocation', function (res) {
-    if (res && !res.errMsg) {
+  let result
+
+  webview.addEventListener('close', () => {
+    if (result) {
       invoke(callbackId, {
-        name: res.poiname,
-        address: res.poiaddress,
-        latitude: res.latlng.lat,
-        longitude: res.latlng.lng,
+        name: result.poiname,
+        address: result.poiaddress,
+        latitude: result.latlng.lat,
+        longitude: result.latlng.lng,
         errMsg: 'chooseLocation:ok'
       })
     } else {
-      const errMsg = res && res.errMsg ? ' ' + res.errMsg : ''
+      consumePlusMessage(MESSAGE_TYPE)
       invoke(callbackId, {
-        errMsg: 'chooseLocation:fail' + errMsg
+        errMsg: 'chooseLocation:fail cancel'
+      })
+    }
   })
+
+  registerPlusMessage(MESSAGE_TYPE, function (res) {
+    if (res && 'latlng' in res) {
+      result = res
     }
   }, false)
 }

src/platforms/app-plus/service/framework/app.js

@@ -9,7 +9,8 @@ import {
 } from './page'
 
 import {
-  registerPlusMessage
+  registerPlusMessage,
+  consumePlusMessage
 } from './plus-message'
 
 import {
@@ -69,6 +70,16 @@ function initGlobalListeners () {
       height: event.height
     })
   })
+
+  plus.globalEvent.addEventListener('plusMessage', function (e) {
+    if (process.env.NODE_ENV !== 'production') {
+      console.log('UNIAPP[plusMessage]:[' + Date.now() + ']' + JSON.stringify(e.data))
+    }
+    if (e.data && e.data.type) {
+      const type = e.data.type
+      consumePlusMessage(type, e.data.args || {})
+    }
+  })
 }
 
 function initAppLaunch (appVm) {

src/platforms/mp-alipay/runtime/wrapper/app-parser.js

@@ -25,6 +25,33 @@ export default function parseApp (vm) {
     }
   })
 
+  Vue.prototype.$onAliGetAuthorize = function onAliGetAuthorize (method, $event) {
+    my.getPhoneNumber({
+      success: (res) => {
+        $event.type = 'getphonenumber'
+        const response = JSON.parse(res.response).response
+        if (response.code === '10000') { // success
+          $event.detail.errMsg = 'getPhoneNumber:ok'
+          $event.detail.encryptedData = res.response
+        } else {
+          $event.detail.errMsg = 'getPhoneNumber:fail Error: ' + res.response
+        }
+        this[method]($event)
+      },
+      fail: (res) => {
+        $event.type = 'getphonenumber'
+        $event.detail.errMsg = 'getPhoneNumber:fail'
+        this[method]($event)
+      }
+    })
+  }
+
+  Vue.prototype.$onAliAuthError = function $onAliAuthError (method, $event) {
+    $event.type = 'getphonenumber'
+    $event.detail.errMsg = 'getPhoneNumber:fail Error: ' + $event.detail.errorMessage
+    this[method]($event)
+  }
+
   return parseBaseApp(vm, {
     mocks,
     initRefs