diff --git a/jest.config.js b/jest.config.js index 84c97923293a341d430e38adcec23b1b563f5617..6f0249dcb102373741acbf02be53ff03125d54d0 100644 --- a/jest.config.js +++ b/jest.config.js @@ -7,7 +7,7 @@ module.exports = { collectCoverageFrom: ['packages/*/src/**/*.js'], moduleFileExtensions: ['js', 'json'], moduleNameMapper: { - '^@dcloudio/(.*?)$': '/packages/$1/src' + '^@dcloudio/(.*?)$': '/packages/$1' }, rootDir: __dirname, testMatch: ['/packages/**/__tests__/**/*spec.(t|j)s'] diff --git a/packages/uni-template-compiler/lib/app/parser/tag-parser.js b/packages/uni-template-compiler/lib/app/parser/tag-parser.js index 60afecf073e7679d05aa1c5f698bb64943fbe53b..8579e644b7bffb8a83496e330eea45044eb2db18 100644 --- a/packages/uni-template-compiler/lib/app/parser/tag-parser.js +++ b/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) { diff --git a/packages/uni-template-compiler/lib/auto-components.js b/packages/uni-template-compiler/lib/auto-components.js index 72eefd621a514c0a40cc72f16158111f2c15edb5..cc9966cd82959f64c9f5cf860aa2af6e34e7f77e 100644 --- a/packages/uni-template-compiler/lib/auto-components.js +++ b/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) { // 根目录 diff --git a/packages/uni-template-compiler/lib/index.js b/packages/uni-template-compiler/lib/index.js index ba6340bb3361d24f6ed294631a913813fa8261c6..424594a307849fc296976835ee915209d45955a1 100644 --- a/packages/uni-template-compiler/lib/index.js +++ b/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') diff --git a/src/platforms/app-plus/service/api/network/request.js b/src/platforms/app-plus/service/api/network/request.js index 0bd80547e5aed3926aacff9799f22a2b1a693faf..7e3936a2bc704464b94ce3fa40e4b6a098dc2812 100644 --- a/src/platforms/app-plus/service/api/network/request.js +++ b/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)) {