workspace-tools 0.15.1 → 0.17.0

package/CHANGELOG.json

@@ -2,7 +2,82 @@
   "name": "workspace-tools",
   "entries": [
     {
-      "date": "Wed, 19 May 2021 21:05:04 GMT",
+      "date": "Thu, 02 Dec 2021 17:11:04 GMT",
+      "tag": "workspace-tools_v0.17.0",
+      "version": "0.17.0",
+      "comments": {
+        "minor": [
+          {
+            "author": "riacarmin@microsoft.com",
+            "package": "workspace-tools",
+            "comment": "Implements NPM workspaces support to parseLockFile utility.",
+            "commit": "0d9b3bd5c091e238d302f4a6912692e2eda95385"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Thu, 21 Oct 2021 20:01:33 GMT",
+      "tag": "workspace-tools_v0.16.2",
+      "version": "0.16.2",
+      "comments": {
+        "none": [
+          {
+            "author": "elcraig@microsoft.com",
+            "package": "workspace-tools",
+            "comment": "Update beachball and add ignorePatterns",
+            "commit": "1aca866df2443581ce221c08b8e783a7054fcd7d"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Thu, 03 Jun 2021 20:23:22 GMT",
+      "tag": "workspace-tools_v0.16.2",
+      "version": "0.16.2",
+      "comments": {
+        "patch": [
+          {
+            "comment": "get the right default remote branch",
+            "author": "kchau@microsoft.com",
+            "commit": "cb3c26d432f838805190f9afb65181f682c0145a",
+            "package": "workspace-tools"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Thu, 27 May 2021 20:04:05 GMT",
+      "tag": "workspace-tools_v0.16.1",
+      "version": "0.16.1",
+      "comments": {
+        "patch": [
+          {
+            "comment": "getting rid of console logs from the library",
+            "author": "kchau@microsoft.com",
+            "commit": "7f47e421c14b9122d19f848f8039ae266c55e692",
+            "package": "workspace-tools"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Tue, 25 May 2021 21:47:27 GMT",
+      "tag": "workspace-tools_v0.16.0",
+      "version": "0.16.0",
+      "comments": {
+        "minor": [
+          {
+            "comment": "Fix #24: Add support for different upstream branches",
+            "author": "dannyvv@microsoft.com",
+            "commit": "83546ce7c0ff54f588ad1fca54f2620d8f071708",
+            "package": "workspace-tools"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Wed, 19 May 2021 21:05:10 GMT",
       "tag": "workspace-tools_v0.15.1",
       "version": "0.15.1",
       "comments": {

package/CHANGELOG.md

@@ -1,12 +1,44 @@
 # Change Log - workspace-tools
 
-This log was last generated on Wed, 19 May 2021 21:05:04 GMT and should not be manually modified.
+This log was last generated on Thu, 02 Dec 2021 17:11:04 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 0.17.0
+
+Thu, 02 Dec 2021 17:11:04 GMT
+
+### Minor changes
+
+- Implements NPM workspaces support to parseLockFile utility. (riacarmin@microsoft.com)
+
+## 0.16.2
+
+Thu, 03 Jun 2021 20:23:22 GMT
+
+### Patches
+
+- get the right default remote branch (kchau@microsoft.com)
+
+## 0.16.1
+
+Thu, 27 May 2021 20:04:05 GMT
+
+### Patches
+
+- getting rid of console logs from the library (kchau@microsoft.com)
+
+## 0.16.0
+
+Tue, 25 May 2021 21:47:27 GMT
+
+### Minor changes
+
+- Fix #24: Add support for different upstream branches (dannyvv@microsoft.com)
+
 ## 0.15.1
 
-Wed, 19 May 2021 21:05:04 GMT
+Wed, 19 May 2021 21:05:10 GMT
 
 ### Patches
 

package/README.md

@@ -2,10 +2,11 @@
 
 A collection of tools that are useful in a git-controlled monorepo that is managed by one of these software:
 
+- lerna
+- npm workspaces
+- pnpm workspaces
 - rush
 - yarn workspaces
-- pnpm workspaces
-- lerna
 
 # Environment Variables
 
@@ -17,7 +18,7 @@ default node.js maxBuffer of 1MB)
 ## PREFERRED_WORKSPACE_MANAGER
 
 Sometimes multiple package manager files are checked in. It is necessary to hint to `workspace-tools` which manager
-is used: `yarn`, `pnpm`, `rush`, or `lerna`
+is used: `npm`, `yarn`, `pnpm`, `rush`, or `lerna`
 
 # Contributing
 

package/beachball.config.js

@@ -1,3 +1,12 @@
 module.exports = {
   scope: ["!src/__fixtures__/**/*"],
+  ignorePatterns: [
+    ".github/**",
+    ".prettierrc",
+    "jest.config.js",
+    "src/__fixtures__/**",
+    "src/__tests__/**",
+    // This prevents dependabot from being blocked by change file requirements for lock file-only changes
+    "yarn.lock",
+  ],
 };

package/lib/__tests__/getChangedPackages.test.js

@@ -18,7 +18,7 @@ describe("getChangedPackages()", () => {
         const newFile = path_1.default.join(root, "packages/package-a/footest.txt");
         fs_1.default.writeFileSync(newFile, "hello foo test");
         // act
-        const changedPkgs = getChangedPackages_1.getChangedPackages(root, "master");
+        const changedPkgs = getChangedPackages_1.getChangedPackages(root, "main");
         // assert
         expect(changedPkgs).toContain("package-a");
     });
@@ -28,7 +28,7 @@ describe("getChangedPackages()", () => {
         const newFile = path_1.default.join(root, "packages/package-a/footest.txt");
         fs_1.default.writeFileSync(newFile, "hello foo test");
         // act
-        const changedPkgs = getChangedPackages_1.getChangedPackages(root, "master");
+        const changedPkgs = getChangedPackages_1.getChangedPackages(root, "main");
         // assert
         expect(changedPkgs).toEqual(["package-a"]);
     });
@@ -38,7 +38,7 @@ describe("getChangedPackages()", () => {
         const newFile = path_1.default.join(root, "packages/package-a/src/index.ts");
         fs_1.default.writeFileSync(newFile, "hello foo test");
         // act
-        const changedPkgs = getChangedPackages_1.getChangedPackages(root, "master");
+        const changedPkgs = getChangedPackages_1.getChangedPackages(root, "main");
         // assert
         expect(changedPkgs).toContain("package-a");
     });
@@ -48,7 +48,7 @@ describe("getChangedPackages()", () => {
         const newFile = path_1.default.join(root, "packages/package-a/src/index.ts");
         fs_1.default.writeFileSync(newFile, "hello foo test");
         // act
-        const changedPkgs = getChangedPackages_1.getChangedPackages(root, "master");
+        const changedPkgs = getChangedPackages_1.getChangedPackages(root, "main");
         // assert
         expect(changedPkgs).toEqual(["package-a"]);
     });
@@ -59,7 +59,7 @@ describe("getChangedPackages()", () => {
         fs_1.default.writeFileSync(newFile, "hello foo test");
         git_1.git(["add", newFile], { cwd: root });
         // act
-        const changedPkgs = getChangedPackages_1.getChangedPackages(root, "master");
+        const changedPkgs = getChangedPackages_1.getChangedPackages(root, "main");
         // assert
         expect(changedPkgs).toContain("package-a");
     });
@@ -70,7 +70,7 @@ describe("getChangedPackages()", () => {
         fs_1.default.writeFileSync(newFile, "hello foo test");
         git_1.git(["add", newFile], { cwd: root });
         // act
-        const changedPkgs = getChangedPackages_1.getChangedPackages(root, "master");
+        const changedPkgs = getChangedPackages_1.getChangedPackages(root, "main");
         // assert
         expect(changedPkgs).toEqual(["package-a"]);
     });
@@ -82,7 +82,7 @@ describe("getChangedPackages()", () => {
         git_1.git(["checkout", "-b", "newbranch"], { cwd: root });
         git_1.stageAndCommit(["add", newFile], "test commit", root);
         // act
-        const changedPkgs = getChangedPackages_1.getChangedPackages(root, "master");
+        const changedPkgs = getChangedPackages_1.getChangedPackages(root, "main");
         // assert
         expect(changedPkgs).toContain("package-a");
     });
@@ -94,10 +94,23 @@ describe("getChangedPackages()", () => {
         git_1.git(["checkout", "-b", "newbranch"], { cwd: root });
         git_1.stageAndCommit(["add", newFile], "test commit", root);
         // act
-        const changedPkgs = getChangedPackages_1.getChangedPackages(root, "master");
+        const changedPkgs = getChangedPackages_1.getChangedPackages(root, "main");
         // assert
         expect(changedPkgs).toEqual(["package-a"]);
     });
+    it("can detect changes inside a file that has been committed in a different branch using default remote", () => {
+        // arrange
+        const root = setupFixture_1.setupFixture("monorepo");
+        setupFixture_1.setupLocalRemote(root, "origin", "basic");
+        const newFile = path_1.default.join(root, "packages/package-a/footest.txt");
+        fs_1.default.writeFileSync(newFile, "hello foo test");
+        git_1.git(["checkout", "-b", "newbranch"], { cwd: root });
+        git_1.stageAndCommit(["add", newFile], "test commit", root);
+        // act
+        const changedPkgs = getChangedPackages_1.getChangedPackages(root, undefined);
+        // assert
+        expect(changedPkgs).toContain("package-a");
+    });
     it("can ignore glob patterns in detecting changes", () => {
         // arrange
         const root = setupFixture_1.setupFixture("monorepo");
@@ -105,7 +118,7 @@ describe("getChangedPackages()", () => {
         fs_1.default.writeFileSync(newFile, "hello foo test");
         git_1.git(["add", newFile], { cwd: root });
         // act
-        const changedPkgs = getChangedPackages_1.getChangedPackages(root, "master", ["packages/package-a/*"]);
+        const changedPkgs = getChangedPackages_1.getChangedPackages(root, "main", ["packages/package-a/*"]);
         // assert
         expect(changedPkgs).toEqual([]);
     });

package/lib/__tests__/getDefaultRemote.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/__tests__/getDefaultRemote.test.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const setupFixture_1 = require("../helpers/setupFixture");
+const git_1 = require("../git");
+describe("getDefaultRemote()", () => {
+    afterAll(() => {
+        setupFixture_1.cleanupFixtures();
+    });
+    it("is origin in the default test repo", () => {
+        // arrange
+        const cwd = setupFixture_1.setupFixture("basic");
+        // act
+        const remote = git_1.getDefaultRemote(cwd);
+        // assert
+        expect(remote).toBe("origin");
+    });
+    it("is myMain when default branch is different", () => {
+        // arrange
+        const cwd = setupFixture_1.setupFixture("basic");
+        setupFixture_1.setupLocalRemote(cwd, "myRemote", "basic");
+        // act
+        const remote = git_1.getDefaultRemote(cwd);
+        // assert
+        expect(remote).toBe("myRemote");
+    });
+});

package/lib/__tests__/getInitDefaultBranch.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/__tests__/getInitDefaultBranch.test.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const setupFixture_1 = require("../helpers/setupFixture");
+const git_1 = require("../git");
+describe("getDefaultBranch()", () => {
+    afterAll(() => {
+        setupFixture_1.cleanupFixtures();
+    });
+    it("is main in the default test repo", () => {
+        // arrange
+        const cwd = setupFixture_1.setupFixture("basic");
+        // act
+        const branch = git_1.getDefaultBranch(cwd);
+        // assert
+        expect(branch).toBe("main");
+    });
+    it("is myMain when default branch is different", () => {
+        // arrange
+        const cwd = setupFixture_1.setupFixture("basic");
+        git_1.git(['config', 'init.defaultBranch', 'myMain'], { cwd });
+        // act
+        const branch = git_1.getDefaultBranch(cwd);
+        // assert
+        expect(branch).toBe("myMain");
+    });
+});

package/lib/__tests__/lockfile.test.js

@@ -2,22 +2,39 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const setupFixture_1 = require("../helpers/setupFixture");
 const lockfile_1 = require("../lockfile");
+const ERROR_MESSAGES = {
+    NO_LOCK: "You do not have yarn.lock, pnpm-lock.yaml or package-lock.json. Please use one of these package managers.",
+    UNSUPPORTED: "Your package-lock.json version is not supported: lockfileVersion is 1. You need npm version 7 or above and package-lock version 2 or above. Please, upgrade npm or choose a different package manager.",
+};
 describe("parseLockFile()", () => {
+    // General
+    it("throws if it cannot find lock file", async () => {
+        const packageRoot = await setupFixture_1.setupFixture("basic-without-lock-file");
+        await expect(lockfile_1.parseLockFile(packageRoot)).rejects.toThrow(ERROR_MESSAGES.NO_LOCK);
+    });
+    // NPM
+    it("parses package-lock.json file when it is found", async () => {
+        const packageRoot = await setupFixture_1.setupFixture("monorepo-npm");
+        const parsedLockeFile = await lockfile_1.parseLockFile(packageRoot);
+        expect(parsedLockeFile).toHaveProperty("type", "success");
+    });
+    it("throws if npm version is unsupported", async () => {
+        const packageRoot = await setupFixture_1.setupFixture("monorepo-npm-unsupported");
+        await expect(lockfile_1.parseLockFile(packageRoot)).rejects.toThrow(ERROR_MESSAGES.UNSUPPORTED);
+    });
+    // Yarn
     it("parses yarn.lock file when it is found", async () => {
         const packageRoot = await setupFixture_1.setupFixture("basic");
         const parsedLockeFile = await lockfile_1.parseLockFile(packageRoot);
         expect(parsedLockeFile).toHaveProperty("type", "success");
     });
-    it("throws if it cannot find a yarn.lock file", async () => {
-        const packageRoot = await setupFixture_1.setupFixture("basic-without-lock-file");
-        await expect(lockfile_1.parseLockFile(packageRoot)).rejects.toThrow("You do not have either yarn.lock nor pnpm-lock.yaml. Please use one of these package managers");
-    });
     it("parses combined ranges in yarn.lock", async () => {
         const packageRoot = await setupFixture_1.setupFixture("basic-yarn");
         const parsedLockeFile = await lockfile_1.parseLockFile(packageRoot);
         expect(parsedLockeFile.object["@babel/code-frame@^7.0.0"].version).toBe(parsedLockeFile.object["@babel/code-frame@^7.8.3"].version);
     });
-    it("parses pnpm-lock.yaml properly", async () => {
+    // PNPM
+    it("parses pnpm-lock.yaml file when it is found", async () => {
         const packageRoot = await setupFixture_1.setupFixture("basic-pnpm");
         const parsedLockeFile = await lockfile_1.parseLockFile(packageRoot);
         expect(Object.keys(parsedLockeFile.object["yargs@16.2.0"].dependencies)).toContain("cliui");

package/lib/getPackageInfos.js

@@ -17,7 +17,7 @@ function getPackageInfos(cwd) {
             }
             catch (e) {
                 // Pass, the package.json is invalid
-                console.warn(`Invalid package.json file detected ${packageJsonPath}: `, e);
+                throw new Error(`Invalid package.json file detected ${packageJsonPath}: ${e.message}`);
             }
         });
         return packageInfos;

package/lib/git.d.ts

@@ -23,25 +23,25 @@ export declare function gitFailFast(args: string[], options?: {
     cwd: string;
     maxBuffer?: number;
 }): void;
-export declare function getUntrackedChanges(cwd: string): string[] | undefined;
+export declare function getUntrackedChanges(cwd: string): string[];
 export declare function fetchRemote(remote: string, cwd: string): void;
 export declare function fetchRemoteBranch(remote: string, remoteBranch: string, cwd: string): void;
 /**
  * Gets all the changes that have not been staged yet
  * @param cwd
  */
-export declare function getUnstagedChanges(cwd: string): string[] | undefined;
-export declare function getChanges(branch: string, cwd: string): string[] | undefined;
+export declare function getUnstagedChanges(cwd: string): string[];
+export declare function getChanges(branch: string, cwd: string): string[];
 /**
  * Gets all the changes between the branch and the merge-base
  * @param branch
  * @param cwd
  */
 export declare function getBranchChanges(branch: string, cwd: string): string[];
-export declare function getChangesBetweenRefs(fromRef: string, toRef: string, options: string[], pattern: string, cwd: string): string[] | undefined;
-export declare function getStagedChanges(cwd: string): string[] | undefined;
-export declare function getRecentCommitMessages(branch: string, cwd: string): string[] | undefined;
-export declare function getUserEmail(cwd: string): string | null | undefined;
+export declare function getChangesBetweenRefs(fromRef: string, toRef: string, options: string[], pattern: string, cwd: string): string[];
+export declare function getStagedChanges(cwd: string): string[];
+export declare function getRecentCommitMessages(branch: string, cwd: string): string[];
+export declare function getUserEmail(cwd: string): string | null;
 export declare function getBranchName(cwd: string): string | null;
 export declare function getFullBranchRef(branch: string, cwd: string): string | null;
 export declare function getShortBranchName(fullBranchRef: string, cwd: string): string | null;
@@ -62,6 +62,7 @@ export declare function parseRemoteBranch(branch: string): {
     remoteBranch: string;
 };
 export declare function getDefaultRemoteBranch(branch: string | undefined, cwd: string): string;
+export declare function getDefaultBranch(cwd: string): string;
 export declare function getDefaultRemote(cwd: string): string;
 export declare function listAllTrackedFiles(patterns: string[], cwd: string): string[];
 export {};

package/lib/git.js

@@ -61,10 +61,10 @@ exports.git = git;
 function gitFailFast(args, options) {
     const gitResult = git(args, options);
     if (!gitResult.success) {
-        console.error(`CRITICAL ERROR: running git command: git ${args.join(" ")}!`);
-        console.error(gitResult.stdout && gitResult.stdout.toString().trimRight());
-        console.error(gitResult.stderr && gitResult.stderr.toString().trimRight());
-        process.exit(1);
+        process.exitCode = 1;
+        throw new Error(`CRITICAL ERROR: running git command: git ${args.join(" ")}!
+${gitResult.stdout && gitResult.stdout.toString().trimRight()}
+${gitResult.stderr && gitResult.stderr.toString().trimRight()}`);
     }
 }
 exports.gitFailFast = gitFailFast;
@@ -92,7 +92,7 @@ function getUntrackedChanges(cwd) {
         return untracked;
     }
     catch (e) {
-        console.error("Cannot gather information about changes: ", e.message);
+        throw new Error(`Cannot gather information about untracked changes: ${e.message}`);
     }
 }
 exports.getUntrackedChanges = getUntrackedChanges;
@@ -119,7 +119,7 @@ function getUnstagedChanges(cwd) {
         return processGitOutput(git(["--no-pager", "diff", "--name-only", "--relative"], { cwd }));
     }
     catch (e) {
-        console.error("Cannot gather information about changes: ", e.message);
+        throw new Error(`Cannot gather information about unstaged changes: ${e.message}`);
     }
 }
 exports.getUnstagedChanges = getUnstagedChanges;
@@ -128,7 +128,7 @@ function getChanges(branch, cwd) {
         return processGitOutput(git(["--no-pager", "diff", "--relative", "--name-only", branch + "..."], { cwd }));
     }
     catch (e) {
-        console.error("Cannot gather information about changes: ", e.message);
+        throw new Error(`Cannot gather information about changes: ${e.message}`);
     }
 }
 exports.getChanges = getChanges;
@@ -142,7 +142,7 @@ function getBranchChanges(branch, cwd) {
         return processGitOutput(git(["--no-pager", "diff", "--name-only", "--relative", branch + "..."], { cwd }));
     }
     catch (e) {
-        throw new Error(e.message);
+        throw new Error(`Cannot gather information about branch changes: ${e.message}`);
     }
 }
 exports.getBranchChanges = getBranchChanges;
@@ -153,7 +153,7 @@ function getChangesBetweenRefs(fromRef, toRef, options, pattern, cwd) {
         }));
     }
     catch (e) {
-        console.error("Cannot gather information about changes: ", e.message);
+        throw new Error(`Cannot gather information about change between refs changes (${fromRef} to ${toRef}): ${e.message}`);
     }
 }
 exports.getChangesBetweenRefs = getChangesBetweenRefs;
@@ -162,7 +162,7 @@ function getStagedChanges(cwd) {
         return processGitOutput(git(["--no-pager", "diff", "--relative", "--staged", "--name-only"], { cwd }));
     }
     catch (e) {
-        console.error("Cannot gather information about changes: ", e.message);
+        throw new Error(`Cannot gather information about staged changes: ${e.message}`);
     }
 }
 exports.getStagedChanges = getStagedChanges;
@@ -177,7 +177,7 @@ function getRecentCommitMessages(branch, cwd) {
         return lines.map((line) => line.trim());
     }
     catch (e) {
-        console.error("Cannot gather information about recent commits: ", e.message);
+        throw new Error(`Cannot gather information about recent commits: ${e.message}`);
     }
 }
 exports.getRecentCommitMessages = getRecentCommitMessages;
@@ -190,7 +190,7 @@ function getUserEmail(cwd) {
         return results.stdout;
     }
     catch (e) {
-        console.error("Cannot gather information about user.email: ", e.message);
+        throw new Error(`Cannot gather information about user.email: ${e.message}`);
     }
 }
 exports.getUserEmail = getUserEmail;
@@ -202,7 +202,7 @@ function getBranchName(cwd) {
         }
     }
     catch (e) {
-        console.error("Cannot get branch name: ", e.message);
+        throw new Error(`Cannot get branch name: ${e.message}`);
     }
     return null;
 }
@@ -233,7 +233,7 @@ function getCurrentHash(cwd) {
         }
     }
     catch (e) {
-        console.error("Cannot get current git hash");
+        throw new Error(`Cannot get current git hash: ${e.message}`);
     }
     return null;
 }
@@ -273,7 +273,7 @@ function stage(patterns, cwd) {
         });
     }
     catch (e) {
-        console.error("Cannot stage changes", e.message);
+        throw new Error(`Cannot stage changes: ${e.message}`);
     }
 }
 exports.stage = stage;
@@ -281,13 +281,11 @@ function commit(message, cwd, options = []) {
     try {
         const commitResults = git(["commit", "-m", message, ...options], { cwd });
         if (!commitResults.success) {
-            console.error("Cannot commit changes");
-            console.log(commitResults.stdout);
-            console.error(commitResults.stderr);
+            throw new Error(`Cannot commit changes: ${commitResults.stdout} ${commitResults.stderr}`);
         }
     }
     catch (e) {
-        console.error("Cannot commit changes", e.message);
+        throw new Error(`Cannot commit changes: ${e.message}`);
     }
 }
 exports.commit = commit;
@@ -365,18 +363,42 @@ function normalizeRepoUrl(repositoryUrl) {
         return "";
     }
 }
-function getDefaultRemoteBranch(branch = "master", cwd) {
+function getDefaultRemoteBranch(branch, cwd) {
     const defaultRemote = getDefaultRemote(cwd);
+    const showRemote = git(["remote", "show", defaultRemote], { cwd });
+    /**
+     * The `showRemote` returns something like this in stdout:
+     *
+     * * remote origin
+     *   Fetch URL: ../monorepo-upstream/
+     *   Push  URL: ../monorepo-upstream/
+     *   HEAD branch: main
+     *
+     */
+    const headBranchLine = showRemote.stdout.split(/\n/).find(line => line.includes('HEAD branch'));
+    let remoteDefaultBranch;
+    if (headBranchLine) {
+        remoteDefaultBranch = headBranchLine.replace(/^\s*HEAD branch:\s+/, '');
+    }
+    branch = branch || remoteDefaultBranch || getDefaultBranch(cwd);
     return `${defaultRemote}/${branch}`;
 }
 exports.getDefaultRemoteBranch = getDefaultRemoteBranch;
+function getDefaultBranch(cwd) {
+    const result = git(["config", "init.defaultBranch"], { cwd });
+    if (!result.success) {
+        // Default to the legacy 'master' for backwards compat and old git clients
+        return "master";
+    }
+    return result.stdout.trim();
+}
+exports.getDefaultBranch = getDefaultBranch;
 function getDefaultRemote(cwd) {
     let packageJson;
     try {
         packageJson = JSON.parse(fs_1.default.readFileSync(path_1.default.join(paths_1.findGitRoot(cwd), "package.json")).toString());
     }
     catch (e) {
-        console.log("failed to read package.json");
         throw new Error("invalid package.json detected");
     }
     const { repository } = packageJson;
@@ -402,7 +424,6 @@ function getDefaultRemote(cwd) {
             }
         }
     }
-    console.log(`Defaults to "origin"`);
     return "origin";
 }
 exports.getDefaultRemote = getDefaultRemote;

package/lib/helpers/setupFixture.d.ts

@@ -4,3 +4,4 @@
  */
 export declare function setupFixture(fixtureName: string): string;
 export declare function cleanupFixtures(): void;
+export declare function setupLocalRemote(cwd: string, remoteName: string, fixtureName: string): void;

package/lib/helpers/setupFixture.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const path_1 = __importDefault(require("path"));
 const find_up_1 = __importDefault(require("find-up"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
+const fs_extra_2 = __importDefault(require("fs-extra"));
 const tmp_1 = __importDefault(require("tmp"));
 const git_1 = require("../git");
 // tmp is supposed to be able to clean up automatically, but this doesn't always work within jest.
@@ -34,6 +35,12 @@ function setupFixture(fixtureName) {
     fs_extra_1.default.mkdirpSync(cwd);
     fs_extra_1.default.copySync(fixturePath, cwd);
     git_1.init(cwd, "test@test.email", "test user");
+    // Make the 'main' branch the default in the test repo
+    // ensure that the configuration for this repo does not collide
+    // with any global configuration the user had made, so we have
+    // a 'fixed' value for our tests, regardless of user configuration
+    git_1.gitFailFast(['symbolic-ref', 'HEAD', 'refs/heads/main'], { cwd });
+    git_1.gitFailFast(['config', 'init.defaultBranch', 'main'], { cwd });
     git_1.stageAndCommit(["."], "test", cwd);
     return cwd;
 }
@@ -45,3 +52,16 @@ function cleanupFixtures() {
     }
 }
 exports.cleanupFixtures = cleanupFixtures;
+function setupLocalRemote(cwd, remoteName, fixtureName) {
+    // Create a seperate repo and configure it as a remote
+    const remoteCwd = setupFixture(fixtureName);
+    const remoteUrl = remoteCwd.replace(/\\/g, "/");
+    git_1.gitFailFast(["remote", "add", remoteName, remoteUrl], { cwd });
+    // Configure url in package.json
+    const pkgJsonPath = path_1.default.join(cwd, "package.json");
+    const pkgJson = fs_extra_2.default.readJSONSync(pkgJsonPath);
+    fs_extra_2.default.writeJSONSync(pkgJsonPath, Object.assign(Object.assign({}, pkgJson), { repository: {
+            url: remoteUrl
+        } }));
+}
+exports.setupLocalRemote = setupLocalRemote;

package/lib/lockfile/index.d.ts

@@ -3,4 +3,4 @@ import { nameAtVersion } from "./nameAtVersion";
 export declare function parseLockFile(packageRoot: string): Promise<ParsedLock>;
 export { nameAtVersion };
 export { queryLockFile } from "./queryLockFile";
-export * from './types';
+export * from "./types";

package/lib/lockfile/index.js

@@ -10,12 +10,14 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+// NOTE: never place the import of lockfile implementation here, as it slows down the library as a whole
 const find_up_1 = __importDefault(require("find-up"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const read_yaml_file_1 = __importDefault(require("read-yaml-file"));
 const nameAtVersion_1 = require("./nameAtVersion");
 exports.nameAtVersion = nameAtVersion_1.nameAtVersion;
 const parsePnpmLock_1 = require("./parsePnpmLock");
+const parseNpmLock_1 = require("./parseNpmLock");
 const memoization = {};
 async function parseLockFile(packageRoot) {
     const yarnLockPath = await find_up_1.default(["yarn.lock", "common/config/rush/yarn.lock"], { cwd: packageRoot });
@@ -41,7 +43,27 @@ async function parseLockFile(packageRoot) {
         memoization[pnpmLockPath] = parsed;
         return memoization[pnpmLockPath];
     }
-    throw new Error("You do not have either yarn.lock nor pnpm-lock.yaml. Please use one of these package managers");
+    // Third, try for npm workspaces
+    let npmLockPath = await find_up_1.default(["package-lock.json"], { cwd: packageRoot });
+    if (npmLockPath) {
+        if (memoization[npmLockPath]) {
+            return memoization[npmLockPath];
+        }
+        let npmLockJson;
+        try {
+            npmLockJson = fs_extra_1.default.readFileSync(npmLockPath);
+        }
+        catch (_a) {
+            throw new Error("Couldn’t parse package-lock.json.");
+        }
+        const npmLock = JSON.parse(npmLockJson.toString());
+        if (!(npmLock === null || npmLock === void 0 ? void 0 : npmLock.lockfileVersion) || npmLock.lockfileVersion < 2) {
+            throw new Error(`Your package-lock.json version is not supported: lockfileVersion is ${npmLock.lockfileVersion}. You need npm version 7 or above and package-lock version 2 or above. Please, upgrade npm or choose a different package manager.`);
+        }
+        memoization[npmLockPath] = parseNpmLock_1.parseNpmLock(npmLock);
+        return memoization[npmLockPath];
+    }
+    throw new Error("You do not have yarn.lock, pnpm-lock.yaml or package-lock.json. Please use one of these package managers.");
 }
 exports.parseLockFile = parseLockFile;
 var queryLockFile_1 = require("./queryLockFile");

package/lib/lockfile/parseNpmLock.d.ts

@@ -0,0 +1,2 @@
+import { ParsedLock, NpmLockFile } from "./types";
+export declare const parseNpmLock: (lock: NpmLockFile) => ParsedLock;

package/lib/lockfile/parseNpmLock.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseNpmLock = (lock) => {
+    var _a;
+    return ({
+        object: (_a = lock.dependencies) !== null && _a !== void 0 ? _a : {},
+        type: "success",
+    });
+};

package/lib/lockfile/types.d.ts

@@ -16,3 +16,34 @@ export interface PnpmLockFile {
         [name: string]: any;
     };
 }
+export interface NpmWorkspacesInfo {
+    version: string;
+    workspaces: {
+        packages: string[];
+    };
+}
+export interface NpmSymlinkInfo {
+    resolved: string;
+    link: boolean;
+    integrity?: "sha512" | "sha1";
+    dev?: boolean;
+    optional?: boolean;
+    devOptional?: boolean;
+    dependencies?: {
+        [key: string]: LockDependency;
+    };
+}
+export interface NpmLockFile {
+    name: string;
+    version: string;
+    lockfileVersion?: 1 | 2 | 3;
+    requires?: boolean;
+    packages?: {
+        ""?: NpmWorkspacesInfo;
+    } & {
+        [key: string]: NpmSymlinkInfo | LockDependency;
+    };
+    dependencies?: {
+        [key: string]: LockDependency;
+    };
+}

package/lib/workspaces/getChangedPackages.d.ts

@@ -15,4 +15,4 @@
  *
  * @returns string[] of package names that have changed
  */
-export declare function getChangedPackages(cwd: string, target?: string, ignoreGlobs?: string[]): string[];
+export declare function getChangedPackages(cwd: string, target: string | undefined, ignoreGlobs?: string[]): string[];

package/lib/workspaces/getChangedPackages.js

@@ -24,8 +24,9 @@ const path_1 = __importDefault(require("path"));
  *
  * @returns string[] of package names that have changed
  */
-function getChangedPackages(cwd, target = "origin/master", ignoreGlobs = []) {
+function getChangedPackages(cwd, target, ignoreGlobs = []) {
     const workspaceInfo = getWorkspaces_1.getWorkspaces(cwd);
+    target = target || git_1.getDefaultRemoteBranch(undefined, cwd);
     let changes = [
         ...new Set([
             ...(git_1.getUntrackedChanges(cwd) || []),

package/lib/workspaces/getWorkspaces.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const implementations_1 = require("./implementations");
+const lerna_1 = require("./implementations/lerna");
+const npm_1 = require("./implementations/npm");
 const pnpm_1 = require("./implementations/pnpm");
-const yarn_1 = require("./implementations/yarn");
 const rush_1 = require("./implementations/rush");
-const npm_1 = require("./implementations/npm");
-const lerna_1 = require("./implementations/lerna");
+const yarn_1 = require("./implementations/yarn");
 const workspaceGetter = {
     yarn: yarn_1.getYarnWorkspaces,
     pnpm: pnpm_1.getPnpmWorkspaces,

package/lib/workspaces/implementations/npm.js

@@ -10,7 +10,7 @@ function getNpmWorkspaceRoot(cwd) {
 }
 exports.getNpmWorkspaceRoot = getNpmWorkspaceRoot;
 function getNpmWorkspaces(cwd) {
-    const yarnWorkspacesRoot = getNpmWorkspaceRoot(cwd);
-    return packageJsonWorkspaces_1.getWorkspaceInfoFromWorkspaceRoot(yarnWorkspacesRoot);
+    const npmWorkspacesRoot = getNpmWorkspaceRoot(cwd);
+    return packageJsonWorkspaces_1.getWorkspaceInfoFromWorkspaceRoot(npmWorkspacesRoot);
 }
 exports.getNpmWorkspaces = getNpmWorkspaces;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "workspace-tools",
-  "version": "0.15.1",
+  "version": "0.17.0",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -37,7 +37,7 @@
     "@types/node": ">=12.0.0",
     "@types/tmp": "^0.2.0",
     "@types/yarnpkg__lockfile": "^1.1.3",
-    "beachball": "^2.2.0",
+    "beachball": "^2.17.0",
     "jest": "^25.0.0",
     "tmp": "^0.2.1",
     "ts-jest": "^25.5.1",