feat(run-lifecycle): Resolve target package to aid chaining

lerna · Aug 27, 2018 · 8e0aa96 · 8e0aa96
1 parent 928a707
commit 8e0aa96
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/commands/__mocks__/@lerna/run-lifecycle.js b/commands/__mocks__/@lerna/run-lifecycle.js
@@ -1,12 +1,12 @@
 "use strict";
 
-const mockRunLifecycle = jest.fn(() => Promise.resolve());
+const mockRunLifecycle = jest.fn(pkg => Promise.resolve(pkg));
 const mockCreateRunner = jest.fn(() => (pkg, stage) => {
   if (pkg.scripts[stage]) {
     return mockRunLifecycle(pkg, stage);
   }
 
-  return Promise.resolve();
+  return Promise.resolve(pkg);
 });
 
 function getOrderedCalls() {

diff --git a/utils/run-lifecycle/__tests__/run-lifecycle.test.js b/utils/run-lifecycle/__tests__/run-lifecycle.test.js
@@ -17,8 +17,9 @@ describe("default export", () => {
     const stage = "preversion";
     const config = npmConf({ "custom-cli-flag": true });
 
-    await runLifecycle(pkg, stage, config);
+    const result = await runLifecycle(pkg, stage, config);
 
+    expect(result).toBe(pkg);
     expect(npmLifecycle).lastCalledWith(
       expect.objectContaining({
         name: pkg.name,
@@ -54,8 +55,9 @@ describe("createRunner", () => {
     };
     const stage = "version";
 
-    await runPackageLifecycle(pkg, stage);
+    const result = await runPackageLifecycle(pkg, stage);
 
+    expect(result).toBe(pkg);
     expect(npmLifecycle).lastCalledWith(
       expect.any(Object),
       stage,

diff --git a/utils/run-lifecycle/run-lifecycle.js b/utils/run-lifecycle/run-lifecycle.js
@@ -34,7 +34,7 @@ function runLifecycle(pkg, stage, opts) {
     failOk: false,
     log,
     unsafePerm: true,
-  });
+  }).then(() => pkg);
 }
 
 function createRunner(commandOptions) {
@@ -47,6 +47,6 @@ function createRunner(commandOptions) {
       });
     }
 
-    return Promise.resolve();
+    return Promise.resolve(pkg);
   };
 }