workspace-tools 0.25.2 → 0.26.0

package/CHANGELOG.json

@@ -2,7 +2,96 @@
   "name": "workspace-tools",
   "entries": [
     {
-      "date": "Tue, 02 Aug 2022 23:03:07 GMT",
+      "date": "Thu, 04 Aug 2022 21:47:41 GMT",
+      "tag": "workspace-tools_v0.26.0",
+      "version": "0.26.0",
+      "comments": {
+        "minor": [
+          {
+            "author": "elcraig@microsoft.com",
+            "package": "workspace-tools",
+            "commit": "e74753a50e613d41f62c1e917ceafc2185791e2a",
+            "comment": "Use ES2019 output (compatible with Node 14)"
+          }
+        ],
+        "none": [
+          {
+            "author": "elcraig@microsoft.com",
+            "package": "workspace-tools",
+            "commit": "286b02b981a5bc532560ee17433ef0501f9414ea",
+            "comment": "Use Node 14 in repo and types"
+          },
+          {
+            "author": "renovate@whitesourcesoftware.com",
+            "package": "workspace-tools",
+            "commit": "5cba374fac27ef530d5f80530d3b925577f7e193",
+            "comment": "Lock file maintenance"
+          }
+        ],
+        "patch": [
+          {
+            "author": "boabdelm@microsoft.com",
+            "package": "workspace-tools",
+            "commit": "5577a58d537fe41ca2dd8f74ea243da700ca0840",
+            "comment": "Gracefully handle not having a package.json at git root"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Thu, 04 Aug 2022 08:01:48 GMT",
+      "tag": "workspace-tools_v0.25.4",
+      "version": "0.25.4",
+      "comments": {
+        "none": [
+          {
+            "author": "email not defined",
+            "package": "workspace-tools",
+            "commit": "32e204ebc47d7e619b6b16e6b34873e6b1c7a96f",
+            "comment": "Pin devDependency @types/micromatch to 4.0.2"
+          }
+        ],
+        "patch": [
+          {
+            "author": "elcraig@microsoft.com",
+            "package": "workspace-tools",
+            "commit": "95ad5f346a1ce0c6e4c1b2d5bb173ceeac136aa2",
+            "comment": "Switch from multimatch to micromatch"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Wed, 03 Aug 2022 08:01:34 GMT",
+      "tag": "workspace-tools_v0.25.3",
+      "version": "0.25.3",
+      "comments": {
+        "none": [
+          {
+            "author": "renovate@whitesourcesoftware.com",
+            "package": "workspace-tools",
+            "commit": "c51bca9b331ae106b22ed260b5c045936dd3b723",
+            "comment": "Update devDependency gh-pages to v4"
+          }
+        ],
+        "patch": [
+          {
+            "author": "elcraig@microsoft.com",
+            "package": "workspace-tools",
+            "commit": "ae076192e9010c32fc90a7cb2a6d1488d382cec6",
+            "comment": "Simplify createPackageGraph and getPackageDependencies"
+          },
+          {
+            "author": "elcraig@microsoft.com",
+            "package": "workspace-tools",
+            "commit": "f81a7c1f61ec402febbc1cc1927343dadefbcdd5",
+            "comment": "Update find-up to v5"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Tue, 02 Aug 2022 23:03:14 GMT",
       "tag": "workspace-tools_v0.25.2",
       "version": "0.25.2",
       "comments": {

package/CHANGELOG.md

@@ -1,12 +1,41 @@
 # Change Log - workspace-tools
 
-This log was last generated on Tue, 02 Aug 2022 23:03:07 GMT and should not be manually modified.
+This log was last generated on Thu, 04 Aug 2022 21:47:41 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 0.26.0
+
+Thu, 04 Aug 2022 21:47:41 GMT
+
+### Minor changes
+
+- Use ES2019 output (compatible with Node 14) (elcraig@microsoft.com)
+
+### Patches
+
+- Gracefully handle not having a package.json at git root (boabdelm@microsoft.com)
+
+## 0.25.4
+
+Thu, 04 Aug 2022 08:01:48 GMT
+
+### Patches
+
+- Switch from multimatch to micromatch (elcraig@microsoft.com)
+
+## 0.25.3
+
+Wed, 03 Aug 2022 08:01:34 GMT
+
+### Patches
+
+- Simplify createPackageGraph and getPackageDependencies (elcraig@microsoft.com)
+- Update find-up to v5 (elcraig@microsoft.com)
+
 ## 0.25.2
 
-Tue, 02 Aug 2022 23:03:07 GMT
+Tue, 02 Aug 2022 23:03:14 GMT
 
 ### Patches
 

package/lib/dependencies/index.d.ts

@@ -2,11 +2,9 @@ import { getTransitiveConsumers, getTransitiveProviders } from "./transitiveDeps
 import { getPackageDependencies } from "../graph/getPackageDependencies";
 /** @deprecated Do not use */
 export declare const getTransitiveDependencies: typeof getTransitiveProviders;
-/** @deprecated Do not use */
 export { getTransitiveProviders };
 /** @deprecated Do not use */
 export declare const getTransitiveDependents: typeof getTransitiveConsumers;
-/** @deprecated Do not use */
 export { getTransitiveConsumers };
 /** @deprecated Do not use */
 export declare const getInternalDeps: typeof getPackageDependencies;

package/lib/dependencies/transitiveDeps.d.ts

@@ -4,16 +4,11 @@ export declare function getDependentMap(packages: PackageInfos): Map<string, Set
  * @deprecated Do not use
  *
  * for a package graph of a->b->c (where b depends on a), transitive consumers of a are b & c and their consumers (or what are the consequences of a)
- * @param targets
- * @param packages
- * @param scope
  */
 export declare function getTransitiveConsumers(targets: string[], packages: PackageInfos, scope?: string[]): string[];
 /**
  * @deprecated Do not use
  *
  * for a package graph of a->b->c (where b depends on a), transitive providers of c are a & b and their providers (or what is needed to satisfy c)
- * @param targets
- * @param packages
  */
 export declare function getTransitiveProviders(targets: string[], packages: PackageInfos): string[];

package/lib/dependencies/transitiveDeps.js

@@ -53,9 +53,6 @@ exports.getDependentMap = getDependentMap;
  * @deprecated Do not use
  *
  * for a package graph of a->b->c (where b depends on a), transitive consumers of a are b & c and their consumers (or what are the consequences of a)
- * @param targets
- * @param packages
- * @param scope
  */
 function getTransitiveConsumers(targets, packages, scope = []) {
     const graph = getPackageGraph(packages, scope);
@@ -79,8 +76,6 @@ exports.getTransitiveConsumers = getTransitiveConsumers;
  * @deprecated Do not use
  *
  * for a package graph of a->b->c (where b depends on a), transitive providers of c are a & b and their providers (or what is needed to satisfy c)
- * @param targets
- * @param packages
  */
 function getTransitiveProviders(targets, packages) {
     const graph = getPackageGraph(packages);

package/lib/git/getDefaultRemote.js

@@ -26,7 +26,7 @@ function getDefaultRemote(cwdOrOptions) {
         packageJson = JSON.parse(fs_1.default.readFileSync(packageJsonPath, "utf8").trim());
     }
     catch (e) {
-        throw new Error(`Could not read "${packageJsonPath}"`);
+        logOrThrow(`Could not read "${packageJsonPath}"`);
     }
     const { repository } = packageJson;
     const repositoryUrl = typeof repository === "string" ? repository : (repository && repository.url) || "";

package/lib/git/git.js

@@ -37,7 +37,7 @@ exports.addGitObserver = addGitObserver;
  * Runs git command - use this for read-only commands
  */
 function git(args, options) {
-    const results = (0, child_process_1.spawnSync)("git", args, Object.assign({ maxBuffer: defaultMaxBuffer }, options));
+    const results = (0, child_process_1.spawnSync)("git", args, { maxBuffer: defaultMaxBuffer, ...options });
     const output = {
         stderr: results.stderr.toString().trimRight(),
         stdout: results.stdout.toString().trimRight(),

package/lib/graph/createPackageGraph.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPackageGraph = void 0;
 const createDependencyMap_1 = require("./createDependencyMap");
-const multimatch_1 = __importDefault(require("multimatch"));
+const micromatch_1 = __importDefault(require("micromatch"));
 function createPackageGraph(packages, filters) {
     /** set of packages being accumulated as the graph is filtered */
     const packageSet = new Set();
@@ -83,7 +83,7 @@ function visitPackageGraph(packages, dependencyMap, visitor, filter) {
     var _a, _b;
     const visited = new Set();
     const packageNames = Object.keys(packages);
-    const stack = filter ? (0, multimatch_1.default)(packageNames, filter.namePatterns) : packageNames;
+    const stack = filter ? (0, micromatch_1.default)(packageNames, filter.namePatterns) : packageNames;
     while (stack.length > 0) {
         const pkg = stack.pop();
         if (visited.has(pkg)) {

package/lib/graph/getPackageDependencies.js

@@ -2,7 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPackageDependencies = void 0;
 function getPackageDependencies(info, packages, options = { withDevDependencies: true }) {
-    const deps = Object.assign(Object.assign(Object.assign({}, info.dependencies), (options.withDevDependencies && info.devDependencies)), (options.withPeerDependencies && info.peerDependencies));
+    const deps = {
+        ...info.dependencies,
+        ...(options.withDevDependencies && info.devDependencies),
+        ...(options.withPeerDependencies && info.peerDependencies),
+    };
     return Object.keys(packages).filter((pkg) => !!deps[pkg]);
 }
 exports.getPackageDependencies = getPackageDependencies;

package/lib/helpers/setupFixture.js

@@ -49,7 +49,7 @@ function setupFixture(fixtureName) {
     (0, git_1.gitFailFast)(["config", "init.defaultBranch", "main"], { cwd });
     // Copy and commit the fixture if requested
     if (fixturePath) {
-        fs_extra_1.default.copySync(fixturePath, cwd);
+        fs_extra_1.default.copySync(fixturePath, cwd, { filter: (src) => !/[/\\](node_modules|temp|.rush)([/\\]|$)/.test(src) });
         (0, git_1.stageAndCommit)(["."], "test", cwd);
     }
     return cwd;
@@ -72,7 +72,7 @@ function setupPackageJson(cwd, packageJson = {}) {
     if (fs_extra_1.default.existsSync(pkgJsonPath)) {
         oldPackageJson = JSON.parse(fs_extra_1.default.readFileSync(pkgJsonPath, "utf-8"));
     }
-    fs_extra_1.default.writeFileSync(pkgJsonPath, JSON.stringify(Object.assign(Object.assign({}, oldPackageJson), packageJson), null, 2));
+    fs_extra_1.default.writeFileSync(pkgJsonPath, JSON.stringify({ ...oldPackageJson, ...packageJson }, null, 2));
 }
 exports.setupPackageJson = setupPackageJson;
 function setupLocalRemote(cwd, remoteName, fixtureName) {

package/lib/infoFromPackageJson.js

@@ -2,6 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.infoFromPackageJson = void 0;
 function infoFromPackageJson(packageJson, packageJsonPath) {
-    return Object.assign({ packageJsonPath }, packageJson);
+    return {
+        packageJsonPath,
+        ...packageJson,
+    };
 }
 exports.infoFromPackageJson = infoFromPackageJson;

package/lib/lockfile/index.js

@@ -69,7 +69,7 @@ async function parseLockFile(packageRoot) {
         try {
             npmLockJson = fs_1.default.readFileSync(npmLockPath, "utf-8");
         }
-        catch (_a) {
+        catch {
             throw new Error("Couldn’t parse package-lock.json.");
         }
         const npmLock = JSON.parse(npmLockJson.toString());

package/lib/lockfile/parseNpmLock.d.ts

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

package/lib/lockfile/parseNpmLock.js

@@ -2,21 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseNpmLock = void 0;
 const nameAtVersion_1 = require("./nameAtVersion");
-/**
- * formatNpmLock reformats the dependencies object, so the key includes the version, similarly to yarn.lock. For
- * example, `"@microsoft/task-scheduler": { }` will become `"@microsoft/task-scheduler@2.7.1": { }`.
- */
-const formatNpmLock = (previousValue, currentValue) => {
-    const [key, dependency] = currentValue;
-    previousValue[(0, nameAtVersion_1.nameAtVersion)(key, dependency.version)] = dependency;
-    return previousValue;
-};
-const parseNpmLock = (lock) => {
+function parseNpmLock(lock) {
     var _a;
-    const dependencies = Object.entries((_a = lock.dependencies) !== null && _a !== void 0 ? _a : {}).reduce(formatNpmLock, {});
+    // Re-format the dependencies object so that the key includes the version, similarly to yarn.lock.
+    // For example, `"@microsoft/task-scheduler": { }` will become `"@microsoft/task-scheduler@2.7.1": { }`.
+    const dependencies = Object.fromEntries(Object.entries((_a = lock.dependencies) !== null && _a !== void 0 ? _a : {}).map(([key, dep]) => [(0, nameAtVersion_1.nameAtVersion)(key, dep.version), dep]));
     return {
         object: dependencies,
         type: "success",
     };
-};
+}
 exports.parseNpmLock = parseNpmLock;

package/lib/paths.d.ts

@@ -1,10 +1,7 @@
 /**
  * Starting from `cwd`, searches up the directory hierarchy for `pathName`.
- * @param pathName Path to look for
- * @param cwd Directory to start from
- * @param type If specified, look for only files or only directories. Otherwise accept either.
  */
-export declare function searchUp(pathName: string, cwd: string, type?: "file" | "directory"): string | null;
+export declare function searchUp(pathName: string, cwd: string): string | null;
 /**
  * Starting from `cwd`, uses `git rev-parse --show-toplevel` to find the root of the git repo.
  * Throws if `cwd` is not in a Git repository.

package/lib/paths.js

@@ -10,21 +10,14 @@ const getWorkspaceRoot_1 = require("./workspaces/getWorkspaceRoot");
 const git_1 = require("./git");
 /**
  * Starting from `cwd`, searches up the directory hierarchy for `pathName`.
- * @param pathName Path to look for
- * @param cwd Directory to start from
- * @param type If specified, look for only files or only directories. Otherwise accept either.
  */
-function searchUp(pathName, cwd, type) {
+function searchUp(pathName, cwd) {
     const root = path_1.default.parse(cwd).root;
     let found = false;
     while (!found && cwd !== root) {
-        const current = path_1.default.join(cwd, pathName);
-        if (fs_1.default.existsSync(current)) {
-            const isDir = fs_1.default.statSync(current).isDirectory();
-            if (!((type === "file" && isDir) || (type === "directory" && !isDir))) {
-                found = true;
-                break;
-            }
+        if (fs_1.default.existsSync(path_1.default.join(cwd, pathName))) {
+            found = true;
+            break;
         }
         cwd = path_1.default.dirname(cwd);
     }
@@ -62,7 +55,7 @@ function findProjectRoot(cwd) {
     try {
         workspaceRoot = (0, getWorkspaceRoot_1.getWorkspaceRoot)(cwd);
     }
-    catch (_a) { }
+    catch { }
     return workspaceRoot || findGitRoot(cwd);
 }
 exports.findProjectRoot = findProjectRoot;

package/lib/scope.d.ts

@@ -1,8 +1,6 @@
 /**
- * Searches all package names based on "scoping" (i.e. "scope" in the sense of inclusion)
- * NOTE: scoping is different than package scopes (@scope/package)
- * @param search
- * @param packages
+ * Searches all package names based on "scoping" (i.e. "scope" in the sense of inclusion).
+ * NOTE: this is not the same as package scopes (`@scope/package`).
  */
 export declare function getScopedPackages(search: string[], packages: {
     [pkg: string]: unknown;

package/lib/scope.js

@@ -4,12 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getScopedPackages = void 0;
-const multimatch_1 = __importDefault(require("multimatch"));
+const micromatch_1 = __importDefault(require("micromatch"));
 /**
- * Searches all package names based on "scoping" (i.e. "scope" in the sense of inclusion)
- * NOTE: scoping is different than package scopes (@scope/package)
- * @param search
- * @param packages
+ * Searches all package names based on "scoping" (i.e. "scope" in the sense of inclusion).
+ * NOTE: this is not the same as package scopes (`@scope/package`).
  */
 function getScopedPackages(search, packages) {
     const packageNames = Array.isArray(packages) ? packages : Object.keys(packages);
@@ -17,7 +15,7 @@ function getScopedPackages(search, packages) {
     // perform a package-scoped search (e.g. search is @scope/foo*)
     const scopedSearch = search.filter((needle) => needle.startsWith("@") || needle.startsWith("!@"));
     if (scopedSearch.length > 0) {
-        const matched = (0, multimatch_1.default)(packageNames, scopedSearch);
+        const matched = (0, micromatch_1.default)(packageNames, scopedSearch);
         for (const pkg of matched) {
             results.add(pkg);
         }
@@ -27,7 +25,7 @@ function getScopedPackages(search, packages) {
     if (unscopedSearch.length > 0) {
         // only generate the bare package map if there ARE unscoped searches
         const barePackageMap = generateBarePackageMap(packageNames);
-        let matched = (0, multimatch_1.default)(Object.keys(barePackageMap), unscopedSearch);
+        let matched = (0, micromatch_1.default)(Object.keys(barePackageMap), unscopedSearch);
         for (const bare of matched) {
             for (const pkg of barePackageMap[bare]) {
                 results.add(pkg);

package/lib/workspaces/getPackagesByFiles.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPackagesByFiles = void 0;
-const multimatch_1 = __importDefault(require("multimatch"));
+const micromatch_1 = __importDefault(require("micromatch"));
 const path_1 = __importDefault(require("path"));
 const getWorkspaces_1 = require("./getWorkspaces");
 /**
@@ -18,7 +18,7 @@ const getWorkspaces_1 = require("./getWorkspaces");
  */
 function getPackagesByFiles(workspaceRoot, files, ignoreGlobs = [], returnAllPackagesOnNoMatch = false) {
     const workspaceInfo = (0, getWorkspaces_1.getWorkspaces)(workspaceRoot);
-    const ignoreSet = new Set((0, multimatch_1.default)(files, ignoreGlobs));
+    const ignoreSet = new Set((0, micromatch_1.default)(files, ignoreGlobs));
     files = files.filter((change) => !ignoreSet.has(change));
     const packages = new Set();
     for (const file of files) {

package/lib/workspaces/getWorkspacePackageInfo.js

@@ -16,7 +16,7 @@ function getWorkspacePackageInfo(workspacePaths) {
         try {
             packageJson = JSON.parse(fs_1.default.readFileSync(packageJsonPath, "utf-8"));
         }
-        catch (_a) {
+        catch {
             return returnValue;
         }
         return [
@@ -24,7 +24,10 @@ function getWorkspacePackageInfo(workspacePaths) {
             {
                 name: packageJson.name,
                 path: workspacePath,
-                packageJson: Object.assign(Object.assign({}, packageJson), { packageJsonPath }),
+                packageJson: {
+                    ...packageJson,
+                    packageJsonPath,
+                },
             },
         ];
     }, []);

package/lib/workspaces/implementations/lerna.js

@@ -27,7 +27,7 @@ function getLernaWorkspaces(cwd) {
         const workspaceInfo = (0, getWorkspacePackageInfo_1.getWorkspacePackageInfo)(packagePaths);
         return workspaceInfo;
     }
-    catch (_a) {
+    catch {
         return [];
     }
 }

package/lib/workspaces/implementations/packageJsonWorkspaces.js

@@ -44,7 +44,7 @@ function getWorkspaceInfoFromWorkspaceRoot(packageJsonWorkspacesRoot) {
         const workspaceInfo = (0, getWorkspacePackageInfo_1.getWorkspacePackageInfo)(packagePaths);
         return workspaceInfo;
     }
-    catch (_a) {
+    catch {
         return [];
     }
 }

package/lib/workspaces/implementations/pnpm.js

@@ -26,7 +26,7 @@ function getPnpmWorkspaces(cwd) {
         const workspaceInfo = (0, getWorkspacePackageInfo_1.getWorkspacePackageInfo)(packagePaths);
         return workspaceInfo;
     }
-    catch (_a) {
+    catch {
         return [];
     }
 }

package/lib/workspaces/implementations/rush.js

@@ -25,7 +25,7 @@ function getRushWorkspaces(cwd) {
         const root = path_1.default.dirname(rushJsonPath);
         return (0, getWorkspacePackageInfo_1.getWorkspacePackageInfo)(rushConfig.projects.map((project) => path_1.default.join(root, project.projectFolder)));
     }
-    catch (_a) {
+    catch {
         return [];
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "workspace-tools",
-  "version": "0.25.2",
+  "version": "0.26.0",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -24,29 +24,30 @@
   },
   "dependencies": {
     "@yarnpkg/lockfile": "^1.1.0",
-    "find-up": "^4.1.0",
+    "find-up": "^5.0.0",
     "git-url-parse": "^12.0.0",
     "globby": "^11.0.0",
     "jju": "^1.4.0",
-    "multimatch": "^4.0.0",
+    "micromatch": "^4.0.0",
     "read-yaml-file": "^2.0.0"
   },
   "devDependencies": {
+    "@types/fs-extra": "9.0.13",
     "@types/git-url-parse": "9.0.1",
     "@types/jest": "28.1.6",
     "@types/jju": "1.4.2",
-    "@types/multimatch": "4.0.0",
-    "@types/node": "13.13.5",
+    "@types/micromatch": "4.0.2",
+    "@types/node": "14.18.23",
     "@types/tmp": "0.2.3",
     "@types/yarnpkg__lockfile": "1.1.5",
     "beachball": "2.26.0",
     "fs-extra": "10.1.0",
+    "gh-pages": "3.2.3",
     "jest": "28.1.3",
     "prettier": "2.7.1",
     "tmp": "0.2.1",
     "ts-jest": "28.0.7",
     "typedoc": "0.22.15",
-    "typescript": "4.5.4",
-    "gh-pages": "3.2.3"
+    "typescript": "4.5.4"
   }
 }