From 33e8359890c2a9f63826e8e2a7eff9dddb34adb3 Mon Sep 17 00:00:00 2001 From: ClarkXia Date: Sat, 28 Dec 2019 09:46:33 +0800 Subject: [PATCH] feat: support process env to disable pv collect --- CHANGELOG.md | 4 ++ packages/ice-scripts/lib/commands/build.js | 7 +--- packages/ice-scripts/lib/commands/dev.js | 8 +--- packages/ice-scripts/lib/utils/goldlog.js | 44 ---------------------- packages/ice-scripts/package.json | 2 +- 5 files changed, 7 insertions(+), 58 deletions(-) delete mode 100644 packages/ice-scripts/lib/utils/goldlog.js diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f6ebe1..ded2aec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 2.1.16 + +- [feat] support process.env.DISABLE_COLLECT to disable pv collect + ## 2.1.15 - [feat] cli option --skip-compile for skip webpack compile diff --git a/packages/ice-scripts/lib/commands/build.js b/packages/ice-scripts/lib/commands/build.js index bb0c5ec..255b39e 100644 --- a/packages/ice-scripts/lib/commands/build.js +++ b/packages/ice-scripts/lib/commands/build.js @@ -3,7 +3,6 @@ const webpack = require('webpack'); const { collectDetail } = require('@alifd/fusion-collector'); const iceScriptsPkgData = require('../../package.json'); -const goldlog = require('../utils/goldlog'); const log = require('../utils/log'); const checkDepsInstalled = require('../utils/checkDepsInstalled'); @@ -16,10 +15,6 @@ const checkDepsInstalled = require('../utils/checkDepsInstalled'); */ module.exports = async function (context) { const { applyHook, commandArgs, rootDir, webpackConfig, pkg } = context; - goldlog('version', { - version: iceScriptsPkgData.version, - }); - goldlog('build', commandArgs); log.verbose('build cliOptions', commandArgs); await applyHook('beforeBuild'); @@ -29,7 +24,7 @@ module.exports = async function (context) { return Promise.reject(new Error('项目依赖未安装,请先安装依赖。')); } - if (!pkg.componentConfig && !pkg.blockConfig) { + if (!pkg.componentConfig && !pkg.blockConfig && !process.env.DISABLE_COLLECT) { // only collect project try { collectDetail({ diff --git a/packages/ice-scripts/lib/commands/dev.js b/packages/ice-scripts/lib/commands/dev.js index 4d509a2..583e28b 100644 --- a/packages/ice-scripts/lib/commands/dev.js +++ b/packages/ice-scripts/lib/commands/dev.js @@ -14,18 +14,12 @@ const WebpackDevServer = require('webpack-dev-server'); const openBrowser = require('react-dev-utils/openBrowser'); const iceworksClient = require('../utils/iceworksClient'); const prepareUrLs = require('../utils/prepareURLs'); -const goldlog = require('../utils/goldlog'); const pkgData = require('../../package.json'); const log = require('../utils/log'); const checkDepsInstalled = require('../utils/checkDepsInstalled'); module.exports = async function(context, subprocess) { const { applyHook, commandArgs, rootDir, webpackConfig, pkg } = context; - - goldlog('version', { - version: pkgData.version, - }); - goldlog('dev', commandArgs); log.verbose('dev cliOptions', commandArgs); await applyHook('beforeDev'); @@ -43,7 +37,7 @@ module.exports = async function(context, subprocess) { return Promise.reject(new Error('项目依赖未安装,请先安装依赖。')); } - if (!pkg.componentConfig && !pkg.blockConfig) { + if (!pkg.componentConfig && !pkg.blockConfig && !process.env.DISABLE_COLLECT) { // only collect project try { collectDetail({ diff --git a/packages/ice-scripts/lib/utils/goldlog.js b/packages/ice-scripts/lib/utils/goldlog.js deleted file mode 100644 index 4c90fa4..0000000 --- a/packages/ice-scripts/lib/utils/goldlog.js +++ /dev/null @@ -1,44 +0,0 @@ - -const axios = require('axios'); - -module.exports = goldlog; - -/** - * 发送日志埋点,记录到 aplus 平台 - * - * @param {String} action 类型 - * @param {Object} extraData 其他参数 - */ -function goldlog(action, extraData = {}) { - const realData = { - action: `ice-scripts-${action}`, - data: { - ...extraData, - // 这里可以加一些全局参数 - }, - }; - - const dataKeyArray = Object.keys(realData); - const gokey = dataKeyArray.reduce((finnalStr, currentKey, index) => { - const currentData = - typeof realData[currentKey] === 'string' - ? realData[currentKey] - : JSON.stringify(realData[currentKey]); - return `${finnalStr}${currentKey}=${currentData}${ - dataKeyArray.length - 1 === index ? '' : '&' - }`; - }, ''); - - axios({ - method: 'post', - url: 'http://gm.mmstat.com/iceteam.iceworks.log', - data: { - cache: Math.random(), - gmkey: 'CLK', - gokey: encodeURIComponent(gokey), - logtype: '2', - }, - }).then(() => { - }).catch(() => { - }); -} diff --git a/packages/ice-scripts/package.json b/packages/ice-scripts/package.json index 267e503..3042a3a 100644 --- a/packages/ice-scripts/package.json +++ b/packages/ice-scripts/package.json @@ -1,6 +1,6 @@ { "name": "ice-scripts", - "version": "2.1.15", + "version": "2.1.16", "description": "ICE SDK", "main": "index.js", "bin": {