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

jest.config.js

@@ -7,7 +7,7 @@ module.exports = {
     collectCoverageFrom: ['packages/*/src/**/*.js'],
     moduleFileExtensions: ['js', 'json'],
     moduleNameMapper: {
-        '^@dcloudio/(.*?)$': '<rootDir>/packages/$1/src'
+        '^@dcloudio/(.*?)$': '<rootDir>/packages/$1'
     },
     rootDir: __dirname,
     testMatch: ['<rootDir>/packages/**/__tests__/**/*spec.(t|j)s']

packages/uni-template-compiler/lib/app/parser/tag-parser.js

@@ -6,7 +6,7 @@ const {
   getTagName
 } = require('../../h5')
 
-const tags = require('../../../../uni-cli-shared/lib/tags')
+const tags = require('@dcloudio/uni-cli-shared/lib/tags')
 
 // 仅限 view 层
 module.exports = function parseTag (el) {

packages/uni-template-compiler/lib/auto-components.js

@@ -6,15 +6,15 @@ const {
 
 const {
   removeExt
-} = require('../../uni-cli-shared/lib/util')
+} = require('@dcloudio/uni-cli-shared/lib/util')
 
 const {
   getAutoComponents
-} = require('../../uni-cli-shared/lib/pages')
+} = require('@dcloudio/uni-cli-shared/lib/pages')
 
 const {
   updateUsingAutoImportComponents
-} = require('../../uni-cli-shared/lib/cache')
+} = require('@dcloudio/uni-cli-shared/lib/cache')
 
 function formatSource (source) {
   if (source.indexOf('@/') === 0) { // 根目录

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

@@ -8,7 +8,7 @@ const {
   compileToFunctions,
   ssrCompile,
   ssrCompileToFunctions
-} = require('../../vue-cli-plugin-uni/packages/vue-template-compiler')
+} = require('@dcloudio/vue-cli-plugin-uni/packages/vue-template-compiler')
 
 const platforms = require('./platforms')
 const traverseScript = require('./script/traverse')

src/platforms/app-plus/service/api/network/request.js

@@ -31,7 +31,7 @@ export function createRequestTaskById (requestTaskId, {
       hasContentType = true
       headers['Content-Type'] = header[name]
       // TODO 需要重构
-      if (method === 'POST' && header[name].indexOf('application/x-www-form-urlencoded') === 0) {
+      if (method !== 'GET' && header[name].indexOf('application/x-www-form-urlencoded') === 0 && typeof data !== 'string' && !(data instanceof ArrayBuffer)) {
         let bodyArray = []
         for (let key in data) {
           if (data.hasOwnProperty(key)) {