fix(semver): 🐞 fix dryRun mode

Closes #497
jscutlery · Apr 29, 2022 · 0dd4366 · 0dd4366
1 parent bd5b40f
commit 0dd4366
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 10 deletions.
diff --git a/packages/semver/src/executors/version/index.spec.ts b/packages/semver/src/executors/version/index.spec.ts
@@ -172,6 +172,24 @@ describe('@jscutlery/semver:version', () => {
     );
   });
 
+  it('should skip changelog and package.json update with --dryRun', async () => {
+    const { success } = await version(
+      {
+        ...options,
+        dryRun: true,
+      },
+      context
+    );
+
+    expect(success).toBe(true);
+    expect(mockUpdatePackageJson).toBeCalledWith(
+      expect.objectContaining({ dryRun: true })
+    );
+    expect(mockUpdateChangelog).toBeCalledWith(
+      expect.objectContaining({ dryRun: true })
+    );
+  });
+
   describe('--syncVersions=false (independent mode)', () => {
     it('should run semver independently on a project', async () => {
       const { success } = await version(options, context);

diff --git a/packages/semver/src/executors/version/utils/git.spec.ts b/packages/semver/src/executors/version/utils/git.spec.ts
@@ -302,20 +302,18 @@ describe('git', () => {
       );
     });
 
-    it('should pass --dryRun', async () => {
-      await lastValueFrom(
+    it('should pass --dryRun', (done) => {
         commit({
           dryRun: true,
           noVerify: false,
           commitMessage: 'chore(release): 1.0.0',
           projectName: 'p',
-        })
-      );
-
-      expect(cp.exec).toBeCalledWith(
-        'git',
-        expect.arrayContaining(['--dry-run'])
-      );
+        }).subscribe({
+          complete: () => {
+            expect(cp.exec).not.toBeCalled();
+            done();
+          },
+        });
     });
 
     it('should pass --noVerify', async () => {

diff --git a/packages/semver/src/executors/version/utils/git.ts b/packages/semver/src/executors/version/utils/git.ts
@@ -153,9 +153,12 @@ export function commit({
   commitMessage: string;
   projectName: string;
 }): Observable<void> {
+  if (dryRun) {
+    return EMPTY;
+  }
+
   return exec('git', [
     'commit',
-    ...(dryRun ? ['--dry-run'] : []),
     ...(noVerify ? ['--no-verify'] : []),
     '-m',
     commitMessage,

diff --git a/packages/semver/src/executors/version/utils/project.ts b/packages/semver/src/executors/version/utils/project.ts
@@ -20,11 +20,17 @@ export function updatePackageJson({
   newVersion,
   projectRoot,
   projectName,
+  dryRun,
 }: {
   newVersion: string;
   projectRoot: string;
   projectName: string;
+  dryRun: boolean;
 }): Observable<string | null> {
+  if (dryRun) {
+    return of(null);
+  }
+
   const packageJsonPath = getPackageJsonPath(projectRoot);
   return readFileIfExists(packageJsonPath).pipe(
     switchMap((packageJson) => {

diff --git a/packages/semver/src/executors/version/version.ts b/packages/semver/src/executors/version/version.ts
@@ -77,6 +77,7 @@ export function versionWorkspace({
               projectRoot,
               newVersion,
               projectName,
+              dryRun,
             })
           )
         )
@@ -154,6 +155,7 @@ export function versionProject({
         newVersion,
         projectRoot,
         projectName,
+        dryRun,
       }).pipe(
         concatMap((packageFile) =>
           packageFile !== null