feat: publish support async

Author: 雅影

src/built-in-plugins/command-build/plugin/build.ts

@@ -16,6 +16,7 @@ import { runWebpack } from '../../../utils/webpack';
 import { getStaticHtmlPaths } from './generate-static-html';
 import { IOpts } from './interface';
 import { tsPlusBabel } from '../../../utils/ts-plus-babel';
+import { PackageInfo } from '../../../utils/define';
 
 export const buildProject = async (opts: IOpts = {}) => {
   const result = await spinner('Analyse project', async () => {
@@ -72,7 +73,7 @@ export const buildProject = async (opts: IOpts = {}) => {
   });
 };
 
-export const buildComponent = async () => {
+export const buildComponent = async (packageInfo: PackageInfo = null) => {
   // FIXME:
   // Do not minimize in cloud build(def envirenment), because commnets will lead to
   // build error in cloud build.
@@ -112,8 +113,8 @@ export const buildComponent = async () => {
   // );
 
   // TODO:
-  await spinner(`build source files`, async () => {
-    await tsPlusBabel(false);
+  await spinner(`build source files ${(packageInfo && packageInfo.name) || ''}`, async () => {
+    await tsPlusBabel(false, false, packageInfo);
   });
 
   // TODO: add back after upgrade to webpack5

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

@@ -9,17 +9,18 @@ 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 { logFatal, logInfo, spinner } from '../../../utils/log';
+import { logInfo, spinner } from '../../../utils/log';
 import { getMonoAndNpmDepsOnce, DepMap } from '../../../utils/packages';
 import { PackageInfo } from '../../../utils/define';
 import {
   buildDeclaration,
   generateVersion,
   addTagAndPush,
   moveSourceFilesToTempFolderAndPublish,
-  cleanWorkingTree,
   upgradePackageVersionAndPush,
   generateTag,
+  prePareParamsBeforePublish,
+  checkEnvBeforePublish,
 } from './utils.js';
 
 export const publish = async (options: PublishOption) => {
@@ -58,8 +59,8 @@ export const publish = async (options: PublishOption) => {
 
           await buildDeclaration();
 
-          if (installAllPrompt.publishAllPackages && currentSelectedSourceType === 'root') {
-            // parallel publish root
+          if (installAllPrompt.publishAllPackages) {
+            // async publish
             await publishPackageAndItsMonoPackage(
               currentSelectedSourceType,
               options,
@@ -68,11 +69,8 @@ export const publish = async (options: PublishOption) => {
               isDevelopBranch,
               currentBranchName,
             );
-          } else if (installAllPrompt.publishAllPackages && currentSelectedSourceType !== 'root') {
-            // Serial publish non root situation TODO: change to parallel
-            for (const eachPackage of depMonoPackages) {
-              await publishByPackageName(eachPackage.name, options, depMap, isDevelopBranch, currentBranchName);
-            }
+          } else {
+            await publishByPackageName(currentSelectedSourceType, options, depMap, isDevelopBranch, currentBranchName);
           }
         } else {
           await buildDeclaration();
@@ -103,42 +101,16 @@ async function publishByPackageName(
 ) {
   logInfo(`Start publish ${sourceType}.`);
 
-  const targetPackageJson =
-    sourceType === 'root'
-      ? pri.projectPackageJson || {}
-      : pri.packages.find(eachPackage => eachPackage.name === sourceType).packageJson || {};
-
-  const targetConfig =
-    sourceType === 'root'
-      ? pri.projectConfig
-      : pri.packages.find(eachPackage => eachPackage.name === sourceType).config;
-
-  const targetRoot =
-    sourceType === 'root'
-      ? pri.projectRootPath
-      : pri.packages.find(eachPackage => eachPackage.name === sourceType).rootPath;
-
-  await fs.remove(path.join(pri.projectRootPath, pri.sourceConfig.distDir));
+  const { targetPackageJson, targetConfig, targetRoot, targetPackageInfo } = prePareParamsBeforePublish(sourceType);
 
   // Change source config here
   pri.sourceConfig = targetConfig;
   pri.sourceRoot = targetRoot;
   pri.selectedSourceType = sourceType;
 
-  if (!targetPackageJson.name) {
-    logFatal(`No name found in ${sourceType} package.json`);
-  }
-
-  if (!targetPackageJson.version) {
-    logFatal(`No version found in ${sourceType} package.json`);
-  }
-
-  // clean workingTree before publish
-  if (!(await isWorkingTreeClean())) {
-    await cleanWorkingTree();
-  }
+  await fs.remove(path.join(pri.projectRootPath, pri.sourceConfig.distDir));
 
-  logInfo('Check if npm package exist');
+  await checkEnvBeforePublish(targetPackageJson, sourceType);
 
   targetPackageJson.version = await generateVersion(
     options,
@@ -162,7 +134,7 @@ async function publishByPackageName(
     });
   }
 
-  await buildComponent();
+  await buildComponent(targetPackageInfo);
 
   if (options.bundle) {
     await commandBundle({ skipLint: true });
@@ -188,102 +160,79 @@ async function publishPackageAndItsMonoPackage(
 ) {
   logInfo(`Start publish ${sourceType}.`);
 
-  const currentPackageJson =
-    sourceType === 'root'
-      ? pri.projectPackageJson || {}
-      : pri.packages.find(eachPackage => eachPackage.name === sourceType).packageJson || {};
-
-  const currentConfig =
-    sourceType === 'root'
-      ? pri.projectConfig
-      : pri.packages.find(eachPackage => eachPackage.name === sourceType).config;
-
-  const currentRoot =
-    sourceType === 'root'
-      ? pri.projectRootPath
-      : pri.packages.find(eachPackage => eachPackage.name === sourceType).rootPath;
-
-  await fs.remove(path.join(pri.projectRootPath, pri.sourceConfig.distDir));
+  const { targetPackageJson, targetConfig, targetRoot, targetPackageInfo } = prePareParamsBeforePublish(sourceType);
 
   // Change source config here
-  pri.sourceConfig = currentConfig;
-  pri.sourceRoot = currentRoot;
+  pri.sourceConfig = targetConfig;
+  pri.sourceRoot = targetRoot;
   pri.selectedSourceType = sourceType;
 
-  if (!currentPackageJson.name) {
-    logFatal(`No name found in ${sourceType} package.json`);
-  }
+  await fs.remove(path.join(pri.projectRootPath, pri.sourceConfig.distDir));
 
-  if (!currentPackageJson.version) {
-    logFatal(`No version found in ${sourceType} package.json`);
-  }
+  await checkEnvBeforePublish(targetPackageJson, sourceType);
 
   const monoPackageVersion: {
     [key in string]: string;
   } = {};
 
-  if (sourceType === 'root') {
-    // Generate all package version and upgrade
-    await depMonoPackages.forEach(async item => {
-      const version = await generateVersion(options, isDevelopBranch, item.packageJson, item.config, currentBranchName);
+  // Generate all package version and upgrade
 
-      monoPackageVersion[item.name as string] = version;
+  await depMonoPackages.forEach(async item => {
+    const version = await generateVersion(options, isDevelopBranch, item.packageJson, item.config, currentBranchName);
 
-      item.packageJson.version = version;
+    monoPackageVersion[item.name as string] = version;
 
-      const rootPath = depMonoPackages.find(eachPackage => eachPackage.name === item.name).rootPath;
+    item.packageJson.version = version;
 
-      await fs.outputFile(path.join(rootPath, 'package.json'), `${JSON.stringify(item.packageJson, null, 2)}\n`);
-    });
+    const rootPath = item.rootPath;
 
-    // Update depMonoPackages version
-    if (depMap) {
-      depMap.forEach(value => {
-        value.depMonoPackages.forEach(eachPackage => {
-          eachPackage.packageJson.version = monoPackageVersion[eachPackage.packageJson.name];
-        });
-      });
-    }
-  } else {
-    // TODO: add non root situation, the packages dep relation
-  }
+    await fs.outputFile(path.join(rootPath, 'package.json'), `${JSON.stringify(item.packageJson, null, 2)}\n`);
+  });
+
+  // Update depMonoPackages version
+
+  depMonoPackages.forEach(item => {
+    depMap.get(item.name).depMonoPackages.forEach(eachPackage => {
+      eachPackage.packageJson.version = monoPackageVersion[eachPackage.packageJson.name];
+    });
+  });
 
   // current package version
-  const projectVersion = await generateVersion(
+  const currentVersion = await generateVersion(
     options,
     isDevelopBranch,
-    currentPackageJson,
-    currentConfig,
+    targetPackageJson,
+    targetConfig,
     currentBranchName,
   );
 
-  currentPackageJson.version = projectVersion;
+  targetPackageJson.version = currentVersion;
 
-  await fs.outputFile(path.join(currentRoot, 'package.json'), `${JSON.stringify(currentPackageJson, null, 2)}\n`);
+  await fs.outputFile(path.join(targetRoot, 'package.json'), `${JSON.stringify(targetPackageJson, null, 2)}\n`);
 
   if (!(await isWorkingTreeClean())) {
-    const commitMessage = `upgrade ${sourceType} version to ${currentPackageJson.version} \n\n${depMonoPackages
+    const commitMessage = `upgrade ${sourceType} version to ${targetPackageJson.version} \n\n${depMonoPackages
       .map(i => `upgrade ${i.name} version to ${i.packageJson.version} \n\n`)
       .join('')}`;
     await exec(`git add -A; git commit -m "${commitMessage}" -n`, {
       cwd: pri.projectRootPath,
     });
   }
 
-  await buildComponent();
-
-  if (options.bundle) {
-    await commandBundle({ skipLint: true });
-  }
-
-  /** parallel publish queue & tag with push */
+  // async publish queue & add tag and push
   const publishQueue = depMonoPackages.map(item => {
     return new Promise(async resolve => {
+      await buildComponent(item);
+
+      if (options.bundle) {
+        await commandBundle({ skipLint: true });
+      }
+
       await moveSourceFilesToTempFolderAndPublish(
         item.name,
         options,
         item.config,
-        pri.packages.find(eachPackage => eachPackage.name === item.name).rootPath,
+        item.rootPath,
         depMap,
         isDevelopBranch,
       );
@@ -296,16 +245,22 @@ async function publishPackageAndItsMonoPackage(
   // push current package into publishQueue
   publishQueue.push(
     new Promise(async resolve => {
+      await buildComponent(targetPackageInfo);
+
+      if (options.bundle) {
+        await commandBundle({ skipLint: true });
+      }
+
       await moveSourceFilesToTempFolderAndPublish(
         sourceType,
         options,
-        currentConfig,
-        currentRoot,
+        targetConfig,
+        targetRoot,
         depMap,
         isDevelopBranch,
       );
 
-      await addTagAndPush(generateTag(sourceType, currentPackageJson), currentPackageJson);
+      await addTagAndPush(generateTag(sourceType, targetPackageJson), targetPackageJson);
 
       resolve();
     }),

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

@@ -11,9 +11,54 @@ import { PublishOption } from './interface';
 import { exec } from '../../../utils/exec';
 import { pri, tempPath, declarationPath, srcPath } from '../../../node';
 import { isWorkingTreeClean } from '../../../utils/git-operate';
-import { logFatal, spinner, logText } from '../../../utils/log';
+import { logFatal, spinner, logText, logInfo } from '../../../utils/log';
 import { DepMap } from '../../../utils/packages';
-import { ProjectConfig, PackageJson } from '../../../utils/define';
+import { ProjectConfig, PackageJson, PackageInfo } from '../../../utils/define';
+
+// prePare the info before publish
+export function prePareParamsBeforePublish(sourceType: string) {
+  const targetPackageJson =
+    sourceType === 'root'
+      ? pri.projectPackageJson || {}
+      : pri.packages.find(eachPackage => eachPackage.name === sourceType).packageJson || {};
+
+  const targetConfig =
+    sourceType === 'root'
+      ? pri.projectConfig
+      : pri.packages.find(eachPackage => eachPackage.name === sourceType).config;
+
+  const targetRoot =
+    sourceType === 'root'
+      ? pri.projectRootPath
+      : pri.packages.find(eachPackage => eachPackage.name === sourceType).rootPath;
+
+  const targetPackageInfo: PackageInfo = {
+    name: sourceType,
+    rootPath: targetRoot,
+    packageJson: targetPackageJson as PackageJson,
+    config: targetConfig,
+  };
+
+  return { targetPackageJson, targetConfig, targetRoot, targetPackageInfo };
+}
+
+// check package.json and env etc.
+export async function checkEnvBeforePublish(targetPackageJson: Partial<PackageJson>, sourceType: string) {
+  if (!targetPackageJson.name) {
+    logFatal(`No name found in ${sourceType} package.json`);
+  }
+
+  if (!targetPackageJson.version) {
+    logFatal(`No version found in ${sourceType} package.json`);
+  }
+
+  // clean workingTree before publish
+  if (!(await isWorkingTreeClean())) {
+    await cleanWorkingTree();
+  }
+
+  logInfo('Check if npm package exist');
+}
 
 export async function addTagAndPush(tagName: string, targetPackageJson: Partial<PackageJson>) {
   await spinner(`Add tag`, async () => {
@@ -170,7 +215,10 @@ export async function moveSourceFilesToTempFolderAndPublish(
 
   await fs.remove(tempRoot);
 
-  await fs.copy(path.join(pri.projectRootPath, targetConfig.distDir), path.join(tempRoot, targetConfig.distDir));
+  await fs.copy(
+    path.join(pri.projectRootPath, targetConfig.distDir, sourceType),
+    path.join(tempRoot, targetConfig.distDir),
+  );
   await copyDeclaration(sourceType, publishTempName);
   await fs.copy(path.join(targetRoot, 'package.json'), path.join(tempRoot, 'package.json'));
 
@@ -314,7 +362,7 @@ export async function copyDeclaration(sourceType: string, publishTempName: strin
       const targetPath = path.relative(path.join(declarationRoot, 'packages', sourceType, srcPathExtra), eachFile);
       fs.copySync(
         eachFile,
-        path.join(pri.projectRootPath, tempPath.dir, publishTempName, declarationPath.dir, targetPath),
+        path.join(pri.projectRootPath, tempPath.dir, publishTempName, sourceType, declarationPath.dir, targetPath),
       );
     });
   } else {
@@ -325,7 +373,7 @@ export async function copyDeclaration(sourceType: string, publishTempName: strin
       const targetPath = path.relative(path.join(declarationRoot, srcPathExtra), eachFile);
       fs.copySync(
         eachFile,
-        path.join(pri.projectRootPath, tempPath.dir, publishTempName, declarationPath.dir, targetPath),
+        path.join(pri.projectRootPath, tempPath.dir, publishTempName, sourceType, declarationPath.dir, targetPath),
       );
     });
   }