cloudcc-cli 1.6.4 → 1.6.6

package/template/packagejson

@@ -1,43 +1,43 @@
-{
-  "name": "cloudcc-plugin",
-  "version": "1.0.0",
-  "description": "cloudcc-plugin-dev",
-  "scripts": {
-    "serve": "vue-cli-service serve"
-  },
-  "dependencies": {
-    "element-ui": "2.15.12",
-    "vue": "2.6.14",
-    "vue-custom-element": "3.3.0"
-  },
-  "devDependencies": {
-    "@vue/cli-plugin-babel": "~4.5.0",
-    "@vue/cli-plugin-eslint": "~4.5.0",
-    "@vue/cli-service": "~4.5.0",
-    "babel-eslint": "^10.1.0",
-    "eslint": "^6.7.2",
-    "eslint-plugin-vue": "^6.2.2",
-    "sass": "1.26.8",
-    "sass-loader": "8.0.2",
-    "vue-template-compiler": "2.6.14"
-  },
-  "eslintConfig": {
-    "root": true,
-    "env": {
-      "node": true
-    },
-    "extends": [
-      "plugin:vue/essential",
-      "eslint:recommended"
-    ],
-    "parserOptions": {
-      "parser": "babel-eslint"
-    },
-    "rules": {}
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions",
-    "not dead"
-  ]
+{
+  "name": "cloudcc-plugin",
+  "version": "1.0.0",
+  "description": "cloudcc-plugin-dev",
+  "scripts": {
+    "serve": "vue-cli-service serve"
+  },
+  "dependencies": {
+    "element-ui": "2.15.12",
+    "vue": "2.6.14",
+    "vue-custom-element": "3.3.0"
+  },
+  "devDependencies": {
+    "@vue/cli-plugin-babel": "~4.5.0",
+    "@vue/cli-plugin-eslint": "~4.5.0",
+    "@vue/cli-service": "~4.5.0",
+    "babel-eslint": "^10.1.0",
+    "eslint": "^6.7.2",
+    "eslint-plugin-vue": "^6.2.2",
+    "sass": "1.26.8",
+    "sass-loader": "8.0.2",
+    "vue-template-compiler": "2.6.14"
+  },
+  "eslintConfig": {
+    "root": true,
+    "env": {
+      "node": true
+    },
+    "extends": [
+      "plugin:vue/essential",
+      "eslint:recommended"
+    ],
+    "parserOptions": {
+      "parser": "babel-eslint"
+    },
+    "rules": {}
+  },
+  "browserslist": [
+    "> 1%",
+    "last 2 versions",
+    "not dead"
+  ]
 }

package/template/vueconfigjs

@@ -1,27 +1,27 @@
-// 打包排除依赖包
-const external = process.env.NODE_ENV == 'development' ? {} : {
-            "vue": 'Vue',
-            "vue-router": 'VueRouter',
-            'vue-echarts': 'VueECharts',
-            'element-ui': 'ELEMENT',
-            "axios": 'axios',
-            "d3": 'd3',
-            'echarts': 'echarts',
-            "jschardet": 'jschardet',
-            "crypto-js": 'CryptoJS',
-            "vue-i18n": 'VueI18n',
-}
-module.exports = {
-    publicPath: '/',
-    // 关闭生成Map文件
-    productionSourceMap: false,
-    configureWebpack: {
-    },
-    // css强制内联在js中
-    css: { extract: false },
-    // 精细化修改webpack打包逻辑
-    chainWebpack: config => {
-        // 排除某些包，禁止打包到chunck中
-        config.externals(external)
-    }
+// 打包排除依赖包
+const external = process.env.NODE_ENV == 'development' ? {} : {
+            "vue": 'Vue',
+            "vue-router": 'VueRouter',
+            'vue-echarts': 'VueECharts',
+            'element-ui': 'ELEMENT',
+            "axios": 'axios',
+            "d3": 'd3',
+            'echarts': 'echarts',
+            "jschardet": 'jschardet',
+            "crypto-js": 'CryptoJS',
+            "vue-i18n": 'VueI18n',
+}
+module.exports = {
+    publicPath: '/',
+    // 关闭生成Map文件
+    productionSourceMap: false,
+    configureWebpack: {
+    },
+    // css强制内联在js中
+    css: { extract: false },
+    // 精细化修改webpack打包逻辑
+    chainWebpack: config => {
+        // 排除某些包，禁止打包到chunck中
+        config.externals(external)
+    }
 }

package/tool/branch/index.js

@@ -0,0 +1,25 @@
+const exec = require('child_process').execSync;
+const fs = require("fs")
+function checkBranch(inBranch, notInBranch, condition = '') {
+    exec(`git remote prune origin`)
+    let in_branch = exec(`git branch -r --merged origin/${inBranch}`).toString("utf8").trim().split("\n  ")
+    let guolv = [];
+    in_branch.map((branch) => {
+        try {
+            let containsBranch = ""
+            if (branch.indexOf("origin/HEAD") == -1) {
+                containsBranch = exec(`git branch -r --contains "${branch}"`).toString("utf8").trim().split("\n  ")
+            }
+            if (branch.indexOf(condition) != -1 && containsBranch.includes("origin/" + inBranch) && !containsBranch.includes("origin/" + notInBranch) && ('origin/' + inBranch) != branch) {
+                guolv.push(branch)
+            }
+        } catch (error) {
+            console.log(error)
+        }
+
+    })
+    fs.writeFileSync("./tool/branch/" + inBranch + "_" + notInBranch, guolv.join("\n").toString("utf8").trim(), 'utf-8')
+}
+
+checkBranch("one-master-B", "one-master-A");
+checkBranch("v17-dev-2024-06-14", "one-master-B");

package/tool/checkLange/checkLang.js

@@ -0,0 +1,68 @@
+const fs = require("fs")
+const path = require("path")
+
+const chineseRegex = /[\u4e00-\u9fa5]/;
+
+const folderPath = './';
+
+const excludeFolders = ['.git',"node_modules"];
+const excludeFiles = ['checkLang.js',];
+
+let length = 0;
+
+function checkFilesInFolder(folderPath) {
+  fs.readdir(folderPath, (err, files) => {
+    if (err) {
+      console.error('Error reading directory:', err);
+      return;
+    }
+
+    files.forEach(file => {
+      const filePath = path.join(folderPath, file);
+
+      fs.stat(filePath, (err, stats) => {
+        if (err) {
+          console.error('Error stating file:', err);
+          return;
+        }
+
+        if (stats.isFile() && (file.endsWith('.vue') || file.endsWith('.js')|| file.endsWith('.scss')|| file.endsWith('.css'))) {
+          if (!excludeFiles.includes(file)) {
+            fs.readFile(filePath, 'utf8', (err, data) => {
+              if (err) {
+                console.error('Error reading file:', err);
+                return;
+              }
+
+              if (chineseRegex.test(data)) {
+                length++;
+                console.log(`have "${filePath}"`);
+              } 
+            });
+          } else {
+            // console.log(`jump filePath"${filePath}"`);
+          }
+        } else if (stats.isDirectory()) {
+          if (!excludeFolders.includes(file)) {
+            checkFilesInFolder(filePath);
+          } else {
+            // console.log(`jump filePath"${filePath}"`);
+          }
+        }
+      });
+    });
+
+  });
+}
+
+checkFilesInFolder(folderPath);
+
+function getLength() {
+  setTimeout(() => {
+    console.log(`==============================================================`)
+    console.log(`total ${length} files have chinese`);
+    console.log(`==============================================================`)
+  }, 1000);
+}
+
+getLength();

package/tool/checkLange/clearLang.js

@@ -0,0 +1,85 @@
+const fs = require('fs');
+const path = require('path');
+
+// /* */
+const reg1 = /\/\*[\s\S]*?\*\//g;
+
+// <!-- -->
+const reg2 = /<!--[\s\S]*?-->/gm;
+
+// // 
+const reg3 =/\/\/(?!.*eslint-disable-next-line).*$/gm;
+
+const excludeFolders = ['.git', "node_modules", 'tool', 'public', path.join('src', 'utils', 'i18n')];
+
+function readDirectory(directory) {
+    fs.readdir(directory, (err, files) => {
+        if (err) {
+            console.error('can not read dir:', err);
+            return;
+        }
+
+        files.forEach(file => {
+            const filePath = path.join(directory, file);
+
+            if (excludeFolders.some(folder => filePath.startsWith(folder))) {
+                return;
+            }
+
+            fs.stat(filePath, (err, stats) => {
+                if (err) {
+                    console.error('can not read file:', err);
+                    return;
+                }
+
+                if (stats.isDirectory()) {
+                    readDirectory(filePath);
+                } else if (stats.isFile() && (file.endsWith('.vue') || file.endsWith('.js')|| file.endsWith('.scss')|| file.endsWith('.css'))) {
+                    removeChineseComments(filePath);
+                }
+            });
+        });
+    });
+}
+
+function removeChineseComments(filePath) {
+    fs.readFile(filePath, 'utf8', (err, data) => {
+        if (err) {
+            console.error('can not read file:', err);
+            return;
+        }
+        const newData = data
+        .replace(/\/\*\s*eslint-disable no-useless-escape\s*\*\//g, "https_eslint-disable_no-useless-escape")
+        .replace(/<!--\s*eslint-disable-next-line\s*-->/g, "https_eslint-disable-next-line")
+        .replace(/http:\/\//g, "http_bimo")
+        .replace(/https:\/\//g, "https_bimo")
+        .replace(reg1, '')
+        .replace(reg2, '')
+        .replace(reg3, '')
+        .replace(/http_bimo/g, "http://")
+        .replace(/https_bimo/g, "https://")
+        .replace(/https_eslint-disable_no-useless-escape/g, "/* eslint-disable no-useless-escape */")
+        .replace(/https_eslint-disable-next-line/g, "<!-- eslint-disable-next-line -->")
+
+        fs.writeFile(filePath, newData, 'utf8', (err) => {
+            if (err) {
+                console.error('can not write file:', err);
+                return;
+            }
+
+            console.log(`done: ${filePath}`);
+        });
+    });
+}
+
+function main() {
+    const directory = "./";
+    if (!directory) {
+        console.error('pls set dir');
+        return;
+    }
+
+    readDirectory(directory);
+}
+
+main();

package/utils/checkVersion.js

@@ -1,105 +1,94 @@
-// 导入cli配置文件
-const config = require("../package.json")
-const inquirer = require("inquirer")
-const exec = require('child_process').execSync;
-const chalk = require("chalk")
-
-/**
-* 检查cli版本号
-*/
-function checkNpmVersion() {
-    let currentVersion = Number(config.version.replace(/\./g, ""));
-    let onlineVersionNum
-    let onlineVersion = '0.0.1'
-
-    // 从阿里源获取版本号
-    onlineVersion = exec(`npm view cloudcc-cli version --registry http://registry.npmmirror.com`)
-    onlineVersion = onlineVersion.toString("utf8").trim();
-
-    // 从阿里源获取版本号
-    // try {
-    //     onlineVersion = exec(`curl -s https://npmmirror.com/api/info?pkgName=cloudcc-cli`)
-    //     onlineVersion = JSON.parse(onlineVersion.toString("utf8").trim()).data['dist-tags'].latest
-    // } catch (e) {
-    // }
-    onlineVersionNum = Number(onlineVersion.replace(/\./g, ""));
-
-    console.log(chalk.green(
-        `
-        ********************************************************************************
-        *                                                                              *
-        *                                 CloudCC CLI                                  *
-        *                                                                              * 
-        * 当前版本:V${config.version}                                                              * 
-        * 最新版本:V${onlineVersion}                                                              *
-        * 更新内容:https://npmmirror.com/package/cloudcc-cli/home                      *
-        *                                                                              *
-        * 开发者文档:https://cloudccone.feishu.cn/wiki/JZ7CwcRfriU8taknCKCcwKEmncd     *
-        *                                                                              *
-        ********************************************************************************
-        `
-    ))
-
-    // 如果结果大于0，那么提示升级
-    if (onlineVersionNum - currentVersion > 0) {
-        return onlineVersion;
-    }
-    return null;
-}
-
-/**
-* 是否升级
-* @returns 对象
-*/
-function askUpdate() {
-    console.log();
-    const prompt = [{
-        type: 'list',
-        message: '是否进行自动升级？',
-        name: 'update',
-        choices: [
-            "Yes", 'No'
-        ],
-    }];
-    return inquirer.prompt(prompt)
-}
-
-/**
- * 升级cli
- */
-function update(onlineVersion) {
-    console.log()
-    console.log(chalk.green("升级中，预计3分钟完成，请稍后..."));
-    console.log()
-    let os = process.platform
-    console.log(chalk.yellow(`如无法自动更新，请使用命令更新：${'darwin' == os ? 'sudo' : ''} npm install -g cloudcc-cli@${onlineVersion} --registry http://registry.npmmirror.com`));
-    exec(`${'darwin' == os ? 'sudo' : ''} npm install -g cloudcc-cli@${onlineVersion} --registry http://registry.npmmirror.com`)
-    console.log()
-    console.log(chalk.green("升级完成！请重新运行"));
-}
-
-/**
- * 检查更新
- */
-async function checkUpdate() {
-    let onlineVersion;
-    try {
-        onlineVersion = checkNpmVersion();
-    } catch (error) {
-        console.log("error", error)
-        onlineVersion = false;
-    }
-    if (onlineVersion) {
-        let res = await askUpdate()
-        if ("Yes" == res.update) {
-            update(onlineVersion)
-            return true;
-        } else {
-            return false
-        }
-    }
-    return false
-}
-
-
-module.exports = { checkUpdate }
+
+const config = require("../package.json")
+const inquirer = require("inquirer")
+const exec = require('child_process').execSync;
+const chalk = require("chalk")
+
+
+function checkNpmVersion() {
+    let currentVersion = Number(config.version.replace(/\./g, ""));
+    let onlineVersionNum
+    let onlineVersion = '0.0.1'
+
+    
+    onlineVersion = exec(`npm view cloudcc-cli version --registry http://registry.npmmirror.com`)
+    onlineVersion = onlineVersion.toString("utf8").trim();
+
+    
+    
+    
+    
+    
+    
+    onlineVersionNum = Number(onlineVersion.replace(/\./g, ""));
+
+    console.log(chalk.green(
+        `
+        ********************************************************************************
+        *                                                                              *
+        *                                 CloudCC CLI                                  *
+        *                                                                              * 
+        * Current Version:V${config.version}                                                              * 
+        * Latest Version:V${onlineVersion}                                                              *
+        *                                                                              *
+        *                                                                              *
+        ********************************************************************************
+        `
+    ))
+
+    
+    if (onlineVersionNum - currentVersion > 0) {
+        return onlineVersion;
+    }
+    return null;
+}
+
+
+function askUpdate() {
+    console.log();
+    const prompt = [{
+        type: 'list',
+        message: 'Do you want to perform automatic upgrade?',
+        name: 'update',
+        choices: [
+            "Yes", 'No'
+        ],
+    }];
+    return inquirer.prompt(prompt)
+}
+
+
+function update(onlineVersion) {
+    console.log()
+    console.log(chalk.green("Upgrading, estimated to be completed in 3 minutes, please wait..."));
+    console.log()
+    let os = process.platform
+    console.log(chalk.yellow(`If it fails to update automatically, please use the command to update：${'darwin' == os ? 'sudo' : ''} npm install -g cloudcc-cli@${onlineVersion} --registry http://registry.npmmirror.com`));
+    exec(`${'darwin' == os ? 'sudo' : ''} npm install -g cloudcc-cli@${onlineVersion} --registry http://registry.npmmirror.com`)
+    console.log()
+    console.log(chalk.green("Upgrade completed! Please re-run"));
+}
+
+
+async function checkUpdate() {
+    let onlineVersion;
+    try {
+        onlineVersion = checkNpmVersion();
+    } catch (error) {
+        console.log("error", error)
+        onlineVersion = false;
+    }
+    if (onlineVersion) {
+        let res = await askUpdate()
+        if ("Yes" == res.update) {
+            update(onlineVersion)
+            return true;
+        } else {
+            return false
+        }
+    }
+    return false
+}
+
+
+module.exports = { checkUpdate }