fix(semver): sync versioning when skipProjectChangelog (#446)

closes #408
jscutlery · Feb 18, 2022 · b0cdc58 · b0cdc58
1 parent 46768f4
commit b0cdc58
Showing 1 changed file with 20 additions and 21 deletions.
diff --git a/packages/semver/src/executors/version/version.ts b/packages/semver/src/executors/version/version.ts
@@ -1,5 +1,5 @@
 import { resolve } from 'path';
-import { forkJoin, noop, Observable, of } from 'rxjs';
+import { concat, forkJoin, noop, Observable, of } from 'rxjs';
 import { concatMap, reduce, switchMap } from 'rxjs/operators';
 import * as standardVersion from 'standard-version';
 
@@ -45,27 +45,26 @@ export function versionWorkspace({
 }: {
   skipRootChangelog: boolean;
 } & CommonVersionOptions) {
-  return getProjectRoots(options.workspaceRoot).pipe(
-    concatMap((projectRoots) =>
-      _generateProjectChangelogs({
-        projectRoots,
-        ...options,
-      })
-    ),
-    /* Run Git add only once, after changelogs get generated in parallel. */
-    concatMap((changelogPaths) =>
-      addToStage({ paths: changelogPaths, dryRun: options.dryRun })
+  return concat(
+    getProjectRoots(options.workspaceRoot).pipe(
+      concatMap((projectRoots) =>
+        _generateProjectChangelogs({
+          projectRoots,
+          ...options,
+        })
+      ),
+      /* Run Git add only once, after changelogs get generated in parallel. */
+      concatMap((changelogPaths) =>
+        addToStage({ paths: changelogPaths, dryRun: options.dryRun })
+      )
     ),
-    reduce(noop),
-    concatMap(() =>
-      getPackageFiles(options.workspaceRoot).pipe(
-        switchMap((packageFiles) =>
-          _runStandardVersion({
-            bumpFiles: packageFiles,
-            skipChangelog: skipRootChangelog,
-            ...options,
-          })
-        )
+    getPackageFiles(options.workspaceRoot).pipe(
+      switchMap((packageFiles) =>
+        _runStandardVersion({
+          bumpFiles: packageFiles,
+          skipChangelog: skipRootChangelog,
+          ...options,
+        })
       )
     )
   );