From 5ba05318d3b8d33762ece7780db0ebe115e9edfa Mon Sep 17 00:00:00 2001 From: fxy060608 Date: Thu, 16 Dec 2021 17:22:56 +0800 Subject: [PATCH] chore: lint --- packages/uni-cli-shared/lib/package.js | 2 +- .../lib/template/traverse.js | 2 +- .../build/webpack.nvue.conf.js | 19 +++++----- packages/vue-cli-plugin-uni/commands/build.js | 2 +- .../lib/copy-webpack-options.js | 38 ++++++++++--------- .../lib/plugin/generate-app.js | 2 +- .../lib/platforms/mp-jd/index.js | 6 +-- src/platforms/mp-jd/runtime/api/protocols.js | 10 ++--- .../runtime/wrapper/app-base-parser.js | 2 +- 9 files changed, 43 insertions(+), 40 deletions(-) diff --git a/packages/uni-cli-shared/lib/package.js b/packages/uni-cli-shared/lib/package.js index 89dc01de4..bb33c4c22 100644 --- a/packages/uni-cli-shared/lib/package.js +++ b/packages/uni-cli-shared/lib/package.js @@ -8,7 +8,7 @@ const PLATFORMS = [ 'mp-baidu', 'mp-alipay', 'mp-toutiao', - 'mp-jd', + 'mp-jd' ] module.exports = { diff --git a/packages/uni-template-compiler/lib/template/traverse.js b/packages/uni-template-compiler/lib/template/traverse.js index c49d72197..cfdee9f9b 100644 --- a/packages/uni-template-compiler/lib/template/traverse.js +++ b/packages/uni-template-compiler/lib/template/traverse.js @@ -231,7 +231,7 @@ function traverseDataNode (dataNode, state, node) { let key // 自定义组件不支持 hidden 属性 const platform = state.options.platform.name - const platforms = ['mp-weixin', 'mp-qq','mp-jd', 'mp-toutiao', 'mp-lark'] + const platforms = ['mp-weixin', 'mp-qq', 'mp-jd', 'mp-toutiao', 'mp-lark'] if (isComponent(node.type) && platforms.includes(platform)) { // 字节跳动|飞书小程序自定义属性不会反应在DOM上，只能使用事件格式 key = `${platform === 'mp-toutiao' || platform === 'mp-lark' ? 'bind:-' : ''}${ATTE_DATA_CUSTOM_HIDDEN}` diff --git a/packages/vue-cli-plugin-hbuilderx/build/webpack.nvue.conf.js b/packages/vue-cli-plugin-hbuilderx/build/webpack.nvue.conf.js index da774b5ba..3fc5c0eb3 100644 --- a/packages/vue-cli-plugin-hbuilderx/build/webpack.nvue.conf.js +++ b/packages/vue-cli-plugin-hbuilderx/build/webpack.nvue.conf.js @@ -213,15 +213,16 @@ if (process.env.UNI_USING_NATIVE || process.env.UNI_USING_V3_NATIVE) { from: path.resolve(process.env.UNI_INPUT_DIR, 'static'), to: 'static' }] - - const androidPrivacyPath = path.resolve(process.env.UNI_INPUT_DIR, 'androidPrivacy.json') - if (fs.existsSync(androidPrivacyPath)) { - array.push({ - from: androidPrivacyPath, - to: 'androidPrivacy.json' - }) + // 自动化测试时，不启用androidPrivacy.json + if (!process.env.UNI_AUTOMATOR_WS_ENDPOINT) { + const androidPrivacyPath = path.resolve(process.env.UNI_INPUT_DIR, 'androidPrivacy.json') + if (fs.existsSync(androidPrivacyPath)) { + array.push({ + from: androidPrivacyPath, + to: 'androidPrivacy.json' + }) + } } - const hybridHtmlPath = path.resolve(process.env.UNI_INPUT_DIR, 'hybrid/html') if (fs.existsSync(hybridHtmlPath)) { array.push({ @@ -389,4 +390,4 @@ module.exports = function () { zlib: false } } -} +} diff --git a/packages/vue-cli-plugin-uni/commands/build.js b/packages/vue-cli-plugin-uni/commands/build.js index dc86d0e6d..a390d3224 100644 --- a/packages/vue-cli-plugin-uni/commands/build.js +++ b/packages/vue-cli-plugin-uni/commands/build.js @@ -48,7 +48,7 @@ module.exports = (api, options) => { return buildManifestJson() } - const platforms = ['mp-weixin', 'mp-qq','mp-jd', 'mp-baidu', 'mp-alipay', 'mp-toutiao', 'mp-lark'] + const platforms = ['mp-weixin', 'mp-qq', 'mp-jd', 'mp-baidu', 'mp-alipay', 'mp-toutiao', 'mp-lark'] if (args.subpackage && platforms.includes(process.env.UNI_PLATFORM)) { process.env.UNI_SUBPACKGE = args.subpackage } diff --git a/packages/vue-cli-plugin-uni/lib/copy-webpack-options.js b/packages/vue-cli-plugin-uni/lib/copy-webpack-options.js index 202ca0691..a38ce5e5a 100644 --- a/packages/vue-cli-plugin-uni/lib/copy-webpack-options.js +++ b/packages/vue-cli-plugin-uni/lib/copy-webpack-options.js @@ -1,30 +1,32 @@ const fs = require('fs') const path = require('path') -const { compileI18nJsonStr } = require('@dcloudio/uni-i18n') -const { initI18nOptions } = require('@dcloudio/uni-cli-shared/lib/i18n') +const { + compileI18nJsonStr +} = require('@dcloudio/uni-i18n') +const { + initI18nOptions +} = require('@dcloudio/uni-cli-shared/lib/i18n') const assetsDir = 'static' function getAssetsCopyOption (from, options = {}) { if (path.isAbsolute(from)) { if (fs.existsSync(from)) { - return Object.assign( - { - from, - to: path.resolve(process.env.UNI_OUTPUT_DIR) - }, - options + return Object.assign({ + from, + to: path.resolve(process.env.UNI_OUTPUT_DIR) + }, + options ) } } const to = from from = path.resolve(process.env.UNI_INPUT_DIR, from) if (fs.existsSync(from)) { - return Object.assign( - { - from, - to: path.resolve(process.env.UNI_OUTPUT_DIR, to) - }, - options + return Object.assign({ + from, + to: path.resolve(process.env.UNI_OUTPUT_DIR, to) + }, + options ) } } @@ -50,8 +52,7 @@ function getAssetsCopyOptions (assetsDir) { process.UNI_SUBPACKAGES && Object.keys(process.UNI_SUBPACKAGES).forEach(root => { const subAssetsCopyOption = getAssetsCopyOption( - path.join(root, assetsDir), - { + path.join(root, assetsDir), { ignore } ) @@ -86,7 +87,8 @@ function getCopyWebpackPluginOptions (platformOptions, vueOptions) { copyOption && copyOptions.push(copyOption) }) }) - if (process.env.UNI_PLATFORM === 'app-plus') { + // 自动化测试时，不启用androidPrivacy.json + if (process.env.UNI_PLATFORM === 'app-plus' && !process.env.UNI_AUTOMATOR_WS_ENDPOINT) { copyOptions.push({ from: path.resolve(process.env.UNI_INPUT_DIR, 'android*.json'), to: '[name].[ext]', @@ -116,4 +118,4 @@ function getCopyWebpackPluginOptions (platformOptions, vueOptions) { module.exports = { assetsDir, getCopyWebpackPluginOptions -} +} diff --git a/packages/webpack-uni-mp-loader/lib/plugin/generate-app.js b/packages/webpack-uni-mp-loader/lib/plugin/generate-app.js index b0ce9c025..26ee65804 100644 --- a/packages/webpack-uni-mp-loader/lib/plugin/generate-app.js +++ b/packages/webpack-uni-mp-loader/lib/plugin/generate-app.js @@ -47,7 +47,7 @@ module.exports = function generateApp (compilation) { // 框架预设样式 用于隐藏自定义组件 // TODO 分平台 import 不同 css - const platforms = ['mp-weixin', 'mp-qq', 'mp-jd','mp-toutiao', 'mp-lark'] + const platforms = ['mp-weixin', 'mp-qq', 'mp-jd', 'mp-toutiao', 'mp-lark'] const presetStyle = platforms.includes(process.env.UNI_PLATFORM) ? '[data-custom-hidden="true"],[bind-data-custom-hidden="true"]{display: none !important;}' : '' if (compilation.assets[`common/main${ext}`]) { // 是否存在 main.css diff --git a/packages/webpack-uni-pages-loader/lib/platforms/mp-jd/index.js b/packages/webpack-uni-pages-loader/lib/platforms/mp-jd/index.js index 9924df2e9..be8d11a08 100644 --- a/packages/webpack-uni-pages-loader/lib/platforms/mp-jd/index.js +++ b/packages/webpack-uni-pages-loader/lib/platforms/mp-jd/index.js @@ -3,9 +3,9 @@ module.exports = function (pagesJson, manifestJson) { app, project } = require('../mp')(pagesJson, manifestJson, require('./project.config.json')) - //暂不支持分包，兼容引擎判断 - if(app.content.subPackages && !app.content.subPackages.length){ - delete app.content.subPackages; + // 暂不支持分包，兼容引擎判断 + if (app.content.subPackages && !app.content.subPackages.length) { + delete app.content.subPackages } return [app, project] } diff --git a/src/platforms/mp-jd/runtime/api/protocols.js b/src/platforms/mp-jd/runtime/api/protocols.js index b342c5324..be56514c1 100644 --- a/src/platforms/mp-jd/runtime/api/protocols.js +++ b/src/platforms/mp-jd/runtime/api/protocols.js @@ -1,8 +1,8 @@ -import navigateTo from 'uni-helpers/navigate-to' -import redirectTo from '../../../mp-weixin/helpers/redirect-to' -import previewImage from '../../../mp-weixin/helpers/normalize-preview-image' -import getSystemInfo from '../../../mp-weixin/helpers/system-info' -import getUserProfile from '../../../mp-weixin/helpers/get-user-profile' +// import navigateTo from 'uni-helpers/navigate-to' +// import redirectTo from '../../../mp-weixin/helpers/redirect-to' +// import previewImage from '../../../mp-weixin/helpers/normalize-preview-image' +// import getSystemInfo from '../../../mp-weixin/helpers/system-info' +// import getUserProfile from '../../../mp-weixin/helpers/get-user-profile' // 需要做转换的 API 列表 export const protocols = { diff --git a/src/platforms/mp-weixin/runtime/wrapper/app-base-parser.js b/src/platforms/mp-weixin/runtime/wrapper/app-base-parser.js index f0a709968..83b9ca38d 100644 --- a/src/platforms/mp-weixin/runtime/wrapper/app-base-parser.js +++ b/src/platforms/mp-weixin/runtime/wrapper/app-base-parser.js @@ -110,7 +110,7 @@ export default function parseBaseApp (vm, { initRefs }) { initEventChannel() - if (__PLATFORM__ === 'mp-weixin' || __PLATFORM__ === 'mp-qq'|| __PLATFORM__ === 'mp-jd' || __PLATFORM__ === 'mp-toutiao' || __PLATFORM__ === + if (__PLATFORM__ === 'mp-weixin' || __PLATFORM__ === 'mp-qq' || __PLATFORM__ === 'mp-jd' || __PLATFORM__ === 'mp-toutiao' || __PLATFORM__ === 'mp-kuaishou' || __PLATFORM__ === 'mp-alipay' || __PLATFORM__ === 'mp-baidu' || __PLATFORM__ === 'mp-lark') { initScopedSlotsParams() } -- GitLab