workspace-tools 0.25.4 → 0.26.0

package/CHANGELOG.json

@@ -2,7 +2,44 @@
   "name": "workspace-tools",
   "entries": [
     {
-      "date": "Thu, 04 Aug 2022 08:01:45 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": {

package/CHANGELOG.md

@@ -1,12 +1,24 @@
 # Change Log - workspace-tools
 
-This log was last generated on Thu, 04 Aug 2022 08:01:45 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:45 GMT
+Thu, 04 Aug 2022 08:01:48 GMT
 
 ### Patches
 

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/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

@@ -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.js

@@ -55,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/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.4",
+  "version": "0.26.0",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -37,7 +37,7 @@
     "@types/jest": "28.1.6",
     "@types/jju": "1.4.2",
     "@types/micromatch": "4.0.2",
-    "@types/node": "13.13.5",
+    "@types/node": "14.18.23",
     "@types/tmp": "0.2.3",
     "@types/yarnpkg__lockfile": "1.1.5",
     "beachball": "2.26.0",