diff --git a/packages/vue-cli-plugin-uni/lib/chain-webpack.js b/packages/vue-cli-plugin-uni/lib/chain-webpack.js index 9bb76a27276eb729b1d9d52f4fb12b904ce558cf..871e6e20b2d1626f3cd7b5a73ce67b5d2e74a218 100644 --- a/packages/vue-cli-plugin-uni/lib/chain-webpack.js +++ b/packages/vue-cli-plugin-uni/lib/chain-webpack.js @@ -8,11 +8,11 @@ const { getPartialIdentifier } = require('./util') -function resolve(dir) { +function resolve (dir) { return path.resolve(__dirname, '..', dir) } -module.exports = function chainWebpack(platformOptions, vueOptions, api) { +module.exports = function chainWebpack (platformOptions, vueOptions, api) { const { runByHBuilderX, // 使用 HBuilderX 运行 cssPreprocessOptions @@ -154,8 +154,8 @@ module.exports = function chainWebpack(platformOptions, vueOptions, api) { .delete('@') .set( '@/pages.json', - path.resolve(process.env.UNI_INPUT_DIR, 'pages.json') - + '?' + JSON.stringify({ + path.resolve(process.env.UNI_INPUT_DIR, 'pages.json') + + '?' + JSON.stringify({ type: 'origin-pages-json' }) ) diff --git a/packages/vue-cli-plugin-uni/lib/mp/index.js b/packages/vue-cli-plugin-uni/lib/mp/index.js index f6ea592a48fcbaddaca7e6f77c3bca395ba08a7e..745a17d87494c124289d91b6001250e4c042168f 100644 --- a/packages/vue-cli-plugin-uni/lib/mp/index.js +++ b/packages/vue-cli-plugin-uni/lib/mp/index.js @@ -189,7 +189,9 @@ module.exports = { ? process.env.UNI_MP_PLUGIN_MAIN : JSON.parse(process.env.UNI_MP_PLUGIN_EXPORT) ).forEach(fileName => addToUniEntry(fileName)) - beforeCode += `${globalEnv}.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;` + beforeCode += ` +// @ts-ignore +${globalEnv}.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;` } const alias = { // 仅 mp-weixin @@ -218,8 +220,7 @@ module.exports = { output.pathinfo = false } return { - mode: process.env.NODE_ENV === 'production' ? 'production' - : 'development', + mode: process.env.NODE_ENV === 'production' ? 'production' : 'development', entry () { return process.UNI_ENTRY }, diff --git a/src/platforms/mp-alipay/runtime/web-view.js b/src/platforms/mp-alipay/runtime/web-view.js index 9eac462d6c9bbaad37bdb416a553f5e0c853d2a1..f027c92cc794dd97d6361ee34a7fcdab6b268dd1 100644 --- a/src/platforms/mp-alipay/runtime/web-view.js +++ b/src/platforms/mp-alipay/runtime/web-view.js @@ -1,4 +1,4 @@ -const AC = ['t', 'n', 'e', 'i', 'l', 'C', 'y', 'a', 'p', 'i', 'l', 'A']; +const AC = ['t', 'n', 'e', 'i', 'l', 'C', 'y', 'a', 'p', 'i', 'l', 'A'] const isAlipay = window.my && navigator.userAgent.indexOf(AC.reverse().join('')) > -1 export function initWebviewApi (readyCallback) {