fix: publish error

Author: 雅影

src/built-in-plugins/command-publish/plugin/run-publish.ts

@@ -7,7 +7,7 @@ import { pri, tempPath, declarationPath } from '../../../node';
 import { buildComponent } from '../../command-build/plugin/build';
 import { commandBundle } from '../../command-bundle/plugin/command-bundle';
 import { isWorkingTreeClean, getCurrentBranchName } from '../../../utils/git-operate';
-import { logInfo, spinner } from '../../../utils/log';
+import { logInfo, spinner, logFatal } from '../../../utils/log';
 import { getMonoAndNpmDepsOnce, DepMap } from '../../../utils/packages';
 import { PackageInfo } from '../../../utils/define';
 import {
@@ -96,7 +96,9 @@ async function publishByPackageName(
 ) {
   logInfo(`Start publish ${sourceType}.`);
 
-  const { targetPackageJson, targetConfig, targetRoot, targetPackageInfo } = prePareParamsBeforePublish(sourceType);
+  const {
+    targetPackageJson, targetConfig, targetRoot, targetPackageInfo,
+  } = prePareParamsBeforePublish(sourceType);
 
   // Change source config here
   pri.sourceConfig = targetConfig;
@@ -121,8 +123,8 @@ async function publishByPackageName(
 
   // Update version in depMao
   if (depMap) {
-    depMap.forEach(value => {
-      value.depMonoPackages.forEach(eachPackage => {
+    depMap.forEach((value) => {
+      value.depMonoPackages.forEach((eachPackage) => {
         if (eachPackage.name === sourceType) {
           // eslint-disable-next-line no-param-reassign
           eachPackage.packageJson.version = targetPackageJson.version;
@@ -157,7 +159,9 @@ async function publishPackageAndItsMonoPackage(
 ) {
   logInfo(`Start publish ${sourceType}.`);
 
-  const { targetPackageJson, targetConfig, targetRoot, targetPackageInfo } = prePareParamsBeforePublish(sourceType);
+  const {
+    targetPackageJson, targetConfig, targetRoot, targetPackageInfo,
+  } = prePareParamsBeforePublish(sourceType);
 
   // Change source config here
   pri.sourceConfig = targetConfig;
@@ -176,7 +180,7 @@ async function publishPackageAndItsMonoPackage(
 
   // Generate all package version and upgrade
 
-  await depMonoPackages.forEach(async item => {
+  await depMonoPackages.forEach(async (item) => {
     const version = await generateVersion(options, isDevelopBranch, item.packageJson, item.config, currentBranchName);
 
     monoPackageVersion[item.name as string] = version;
@@ -190,8 +194,8 @@ async function publishPackageAndItsMonoPackage(
 
   // Update depMonoPackages version
 
-  depMonoPackages.forEach(item => {
-    depMap.get(item.name).depMonoPackages.forEach(eachPackage => {
+  depMonoPackages.forEach((item) => {
+    depMap.get(item.name).depMonoPackages.forEach((eachPackage) => {
       if (monoPackageVersion[eachPackage.packageJson.name]) {
         eachPackage.packageJson.version = monoPackageVersion[eachPackage.packageJson.name];
       }
@@ -220,23 +224,21 @@ async function publishPackageAndItsMonoPackage(
     });
   }
 
-  try {
-    const publishQueue = [];
-    // async publish & add tag and push
-    depMonoPackages.map(item => {
-      publishQueue.push(buildComponentAndPublish(item, options, depMap, isDevelopBranch));
-    });
+  const publishQueue = [];
+  // async publish & add tag and push
+  depMonoPackages.map((item) => {
+    publishQueue.push(buildComponentAndPublish(item, options, depMap, isDevelopBranch));
+  });
 
-    // publish current package
-    publishQueue.push(buildComponentAndPublish(targetPackageInfo, options, depMap, isDevelopBranch));
+  // publish current package
+  publishQueue.push(buildComponentAndPublish(targetPackageInfo, options, depMap, isDevelopBranch));
 
-    return Promise.all(publishQueue);
-  } catch (e) {
-    logInfo(`publish error ${e} stop publish`);
+  return Promise.all(publishQueue).catch(async (e) => {
     await fs.remove(path.join(pri.projectRootPath, tempPath.dir, declarationPath.dir));
     await exec(`git push origin ${currentBranchName}`);
-    return process.exit(0);
-  }
+    logFatal(`publish error stop publish: ${e}`);
+    process.exit(0);
+  });
 }
 
 async function buildComponentAndPublish(
@@ -245,23 +247,20 @@ async function buildComponentAndPublish(
   depMap: DepMap,
   isDevelopBranch: boolean,
 ) {
-  return new Promise(async resolve => {
-    await buildComponent(packageInfo);
+  await buildComponent(packageInfo);
 
-    if (options.bundle) {
-      await commandBundle({ skipLint: true });
-    }
+  if (options.bundle) {
+    await commandBundle({ skipLint: true });
+  }
 
-    await moveSourceFilesToTempFolderAndPublish(
-      packageInfo.name,
-      options,
-      packageInfo.config,
-      packageInfo.rootPath,
-      depMap,
-      isDevelopBranch,
-    );
-
-    await addTagAndPush(generateTag(packageInfo.name, packageInfo.packageJson), packageInfo.packageJson);
-    resolve();
-  });
+  await moveSourceFilesToTempFolderAndPublish(
+    packageInfo.name,
+    options,
+    packageInfo.config,
+    packageInfo.rootPath,
+    depMap,
+    isDevelopBranch,
+  );
+
+  await addTagAndPush(generateTag(packageInfo.name, packageInfo.packageJson), packageInfo.packageJson);
 }

src/built-in-plugins/command-publish/plugin/utils.ts

@@ -110,24 +110,36 @@ export async function generateVersion(
 
     // Generate beta version if branch is not master or develop
     if (options.tag === 'beta' || !isDevelopBranch) {
-      const basicVersion = execSync(`${targetConfig.npmClient} view ${targetPackageJson.name} version`)
-        .toString()
-        .trim();
+      // fixed basicVersion to 1.0.0
+      const basicVersion = '1.0.0';
 
       const branchNameInVersion = currentBranchName.replace(/\//g, '').replace(/\./g, '');
 
-      // all of package versions
-      const publishedVersions = execSync(`${targetConfig.npmClient} view ${targetPackageJson.name} versions`)
-        .toString()
-        .trim()
-        .replace(/\n|'| |\[|\]/g, '')
-        .split(',');
+      let publishedVersions: string[] = [];
+      try {
+        // all of package versions
+        const tempVersions = execSync(`${targetConfig.npmClient} view ${targetPackageJson.name} versions`);
+        if (tempVersions) {
+          publishedVersions = tempVersions
+            .toString()
+            .trim()
+            .replace(/\n|'| |\[|\]/g, '')
+            .split(',');
+        } else {
+          publishedVersions = [];
+        }
+      } catch (e) {
+        publishedVersions = [];
+      }
 
       let maxBetaVersionNum = 0;
 
+      // 1.0.0-branchName.version
+      const betaVersionReg = new RegExp(`\\d+\\.\\d+\\.\\d+-${branchNameInVersion}\\.\\d+`);
+
       // get max beta version
       publishedVersions.forEach((v: string) => {
-        if (v.includes(branchNameInVersion)) {
+        if (betaVersionReg.test(v)) {
           const tempBetaVersion = Number(v.split(`${branchNameInVersion}.`)[1]);
 
           if (maxBetaVersionNum < tempBetaVersion) {
@@ -136,15 +148,8 @@ export async function generateVersion(
         }
       });
 
-      // basic version include branchName -> use basic version
-      if (basicVersion.includes(branchNameInVersion)) {
-        const tempVersion = basicVersion.split('.').reverse();
-        tempVersion[0] = maxBetaVersionNum.toString();
-        version = tempVersion.reverse().join('.');
-      } else {
-        // basic version without branchName -> use basic version + branch name + beta version
-        version = `${basicVersion}-${branchNameInVersion}.${maxBetaVersionNum + 1}`;
-      }
+      // basic version without branchName -> use basic version + branch name + beta version
+      version = `${basicVersion}-${branchNameInVersion}.${maxBetaVersionNum + 1}`;
     } else if (versionResult) {
       if (!options.semver) {
         const versionPrompt = await inquirer.prompt([
@@ -337,9 +342,7 @@ export async function addMissingDeps(
           .filter(npmName => !['react', 'react-dom', 'antd'].includes(npmName))
           .reduce((root, next) => {
             if (!sourceDeps[next]) {
-              logFatal(
-                `${pri.selectedSourceType}'s code depends on "${next}", but it doesn't exist in root package.json`,
-              );
+              logFatal(`package ${sourceType}'s code depends on "${next}", but it doesn't exist in root package.json`);
             }
 
             return {