fix(prepare): make versionUpdated and beforeCommitChanges undefin…

…ed by default (#495)
algolia · Dec 3, 2019 · d9a4c51 · d9a4c51
1 parent efb1704
commit d9a4c51
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 23 deletions.
diff --git a/packages/shipjs-lib/src/lib/config/defaultConfig.js b/packages/shipjs-lib/src/lib/config/defaultConfig.js
@@ -11,8 +11,8 @@ export default {
   conventionalChangelogArgs: '-p angular -i CHANGELOG.md -s',
   installCommand: ({ isYarn }) =>
     isYarn ? 'yarn install --silent' : 'npm install',
-  versionUpdated: ({ version, releaseType, dir, exec }) => {},
-  beforeCommitChanges: ({ nextVersion, releaseType, exec, dir }) => {},
+  versionUpdated: undefined, // ({ version, releaseType, dir, exec }) => {},
+  beforeCommitChanges: undefined, // ({ nextVersion, releaseType, exec, dir }) => {},
   getStagingBranchName: ({ nextVersion, releaseType }) =>
     `releases/v${nextVersion}`,
   formatCommitMessage: ({ version, releaseType, mergeStrategy, baseBranch }) =>

diff --git a/packages/shipjs/src/step/prepare/__tests__/updateVersion.spec.js b/packages/shipjs/src/step/prepare/__tests__/updateVersion.spec.js
@@ -34,7 +34,9 @@ describe('updateVersion', () => {
     const output = [];
     mockPrint(print, output);
     updateVersion({
-      config: {},
+      config: {
+        versionUpdated: () => {},
+      },
       dryRun: true,
     });
     expect(output).toMatchInlineSnapshot(`

diff --git a/packages/shipjs/src/step/prepare/__tests__/updateVersionMonorepo.spec.js b/packages/shipjs/src/step/prepare/__tests__/updateVersionMonorepo.spec.js
@@ -68,6 +68,7 @@ describe('updateVersionMonorepo', () => {
     mockPrint(print, output);
     updateVersionMonorepo({
       config: {
+        versionUpdated: () => {},
         monorepo: {
           packagesToBump: ['packages/*'],
           mainVersionFile: 'lerna.json',

diff --git a/packages/shipjs/src/step/prepare/commitChanges.js b/packages/shipjs/src/step/prepare/commitChanges.js
@@ -27,12 +27,14 @@ export default async ({
       print('  |');
       return;
     }
-    await beforeCommitChanges({
-      nextVersion,
-      releaseType,
-      exec: wrapExecWithDir(dir),
-      dir,
-    });
+    if (beforeCommitChanges) {
+      await beforeCommitChanges({
+        nextVersion,
+        releaseType,
+        exec: wrapExecWithDir(dir),
+        dir,
+      });
+    }
     const filePath = tempWrite.sync(message);
     run({ command: 'git add .', dir });
     run({ command: `git commit --file=${filePath}`, dir });

diff --git a/packages/shipjs/src/step/prepare/updateVersion.js b/packages/shipjs/src/step/prepare/updateVersion.js
@@ -8,14 +8,18 @@ export default async ({ config, nextVersion, releaseType, dir, dryRun }) =>
     const { versionUpdated } = config;
     if (dryRun) {
       print(`-> ${info('package.json')}`);
-      print(`-> execute ${info('versionUpdated()')} callback.`);
+      if (versionUpdated) {
+        print(`-> execute ${info('versionUpdated()')} callback.`);
+      }
       return;
     }
     updateVersion({ nextVersion, dir });
-    await versionUpdated({
-      version: nextVersion,
-      releaseType,
-      dir,
-      exec: wrapExecWithDir(dir),
-    });
+    if (versionUpdated) {
+      await versionUpdated({
+        version: nextVersion,
+        releaseType,
+        dir,
+        exec: wrapExecWithDir(dir),
+      });
+    }
   });
diff --git a/packages/shipjs/src/step/prepare/updateVersionMonorepo.js b/packages/shipjs/src/step/prepare/updateVersionMonorepo.js
@@ -19,7 +19,9 @@ export default async ({ config, nextVersion, releaseType, dir, dryRun }) =>
         packageList.forEach(packageDir =>
           print(`-> ${info(`${packageDir}/package.json`)}`)
         );
-        print(`-> execute ${info('versionUpdated()')} callback.`);
+        if (versionUpdated) {
+          print(`-> execute ${info('versionUpdated()')} callback.`);
+        }
         return;
       }
 
@@ -28,11 +30,13 @@ export default async ({ config, nextVersion, releaseType, dir, dryRun }) =>
         print(`-> ${info(`${packageDir}/package.json`)}`);
         updateVersion({ nextVersion, dir: packageDir });
       });
-      await versionUpdated({
-        version: nextVersion,
-        releaseType,
-        dir,
-        exec: wrapExecWithDir(dir),
-      });
+      if (versionUpdated) {
+        await versionUpdated({
+          version: nextVersion,
+          releaseType,
+          dir,
+          exec: wrapExecWithDir(dir),
+        });
+      }
     }
   );