@tmsfe/tmskit 0.0.27 → 0.0.28

package/CHANGELOG.md

@@ -55,4 +55,7 @@
   * 支持编译插件
   * 支持npm源配置
 13. [0.0.27]
-  * 添加云函数cloud-dev命令
+  * 添加云函数cloud-dev命令
+14. [0.0.28]
+  * 修复git pull 代码失败的兼容问题
+  * 拉取第三方仓库时，支持按group维度配置账号信息

package/dist/index.cjs.js

@@ -1660,15 +1660,17 @@ const {
  */
 
 function replaceGitUrlAccount(httpRepoUrl, moduleName) {
-  var _tmsConfig$gitAccount, _tmsConfig$gitAccount2;
+  var _tmsConfig$gitAccount, _tmsConfig$gitAccount2, _tmsConfig$gitAccount3;
 
   // 用户本地的私有项目配置（用来配置环境\模块信息\账号信息）
   const tmsConfig = global$8.getData('tmsConfig');
   let gitUrl = httpRepoUrl;
+  const gitGroupReg = /http(s)?:\/\/[^/]+\/[^/]+/;
+  const group = gitUrl.match(gitGroupReg)[0];
   const {
     username = '',
     pass = ''
-  } = (tmsConfig === null || tmsConfig === void 0 ? void 0 : (_tmsConfig$gitAccount = tmsConfig.gitAccount) === null || _tmsConfig$gitAccount === void 0 ? void 0 : _tmsConfig$gitAccount[moduleName]) || (tmsConfig === null || tmsConfig === void 0 ? void 0 : (_tmsConfig$gitAccount2 = tmsConfig.gitAccount) === null || _tmsConfig$gitAccount2 === void 0 ? void 0 : _tmsConfig$gitAccount2[httpRepoUrl]) || {};
+  } = (tmsConfig === null || tmsConfig === void 0 ? void 0 : (_tmsConfig$gitAccount = tmsConfig.gitAccount) === null || _tmsConfig$gitAccount === void 0 ? void 0 : _tmsConfig$gitAccount[moduleName]) || (tmsConfig === null || tmsConfig === void 0 ? void 0 : (_tmsConfig$gitAccount2 = tmsConfig.gitAccount) === null || _tmsConfig$gitAccount2 === void 0 ? void 0 : _tmsConfig$gitAccount2[httpRepoUrl]) || (tmsConfig === null || tmsConfig === void 0 ? void 0 : (_tmsConfig$gitAccount3 = tmsConfig.gitAccount) === null || _tmsConfig$gitAccount3 === void 0 ? void 0 : _tmsConfig$gitAccount3[group]) || {};
   const urlPrefixReg = /http(s)?:\/\//;
 
   if (username && pass && urlPrefixReg.test(gitUrl)) {
@@ -1819,7 +1821,10 @@ function collectDownLoadTasksMap(sourceDir, targetDir, modules) {
         if (fs$d.existsSync(sourcePath) && fs$d.existsSync(`${sourcePath}/.git`)) {
           promiseTask = (gitUrl, sourcePath, branch, httpRepoUrl) => {
             info$d(`git pull:${httpRepoUrl} --branch: ${branch}`);
-            return pullRepoForGit(sourcePath, branch);
+            return pullRepoForGit(sourcePath, branch).catch(e => {
+              info$d(`pull代码失败:${e}, 开始git clone: ${httpRepoUrl}:${branch}`);
+              return downloadRepoForGit(gitUrl, sourcePath, branch);
+            });
           };
         } else {
           promiseTask = (gitUrl, sourcePath, branch, httpRepoUrl) => {
@@ -4195,7 +4200,7 @@ var entry = [{
 
 var require$$12 = {
 	name: "@tmsfe/tmskit",
-	version: "0.0.27",
+	version: "0.0.28",
 	description: "tmskit",
 	main: "dist/index.cjs",
 	bin: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tmsfe/tmskit",
-  "version": "0.0.27",
+  "version": "0.0.28",
   "description": "tmskit",
   "main": "dist/index.cjs",
   "bin": {

package/src/core/cloneModules.js

@@ -21,10 +21,15 @@ function replaceGitUrlAccount(httpRepoUrl, moduleName) {
   const tmsConfig = global.getData('tmsConfig');
 
   let gitUrl = httpRepoUrl;
-
-  const { username = '', pass = '' } = tmsConfig?.gitAccount?.[moduleName] || tmsConfig?.gitAccount?.[httpRepoUrl] || {};
+  const gitGroupReg = /http(s)?:\/\/[^/]+\/[^/]+/;
+  const group = gitUrl.match(gitGroupReg)[0];
+  
+  const { username = '', pass = '' } = tmsConfig?.gitAccount?.[moduleName] 
+    || tmsConfig?.gitAccount?.[httpRepoUrl] 
+    || tmsConfig?.gitAccount?.[group] || {};
 
   const urlPrefixReg = /http(s)?:\/\//;
+  
   if (username && pass && urlPrefixReg.test(gitUrl)) {
     gitUrl = gitUrl.replace(urlPrefixReg, val => `${val}${encodeURIComponent(username)}:${pass}@`);
   }
@@ -160,7 +165,10 @@ function collectDownLoadTasksMap(sourceDir, targetDir,  modules) {
         if (fs.existsSync(sourcePath) && fs.existsSync(`${sourcePath}/.git`)) {
           promiseTask = (gitUrl, sourcePath, branch, httpRepoUrl) => {
             info(`git pull:${httpRepoUrl} --branch: ${branch}`);
-            return pullRepoForGit(sourcePath, branch);
+            return pullRepoForGit(sourcePath, branch).catch((e) => {
+              info(`pull代码失败:${e}, 开始git clone: ${httpRepoUrl}:${branch}`);
+              return downloadRepoForGit(gitUrl, sourcePath, branch);
+            });
           };
         } else {
           promiseTask = (gitUrl, sourcePath, branch, httpRepoUrl) => {