monorepo-next 9.3.5 → 9.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "monorepo-next",
-  "version": "9.3.5",
+  "version": "9.4.1",
   "description": "Detach monorepo packages from normal linking",
   "bin": {
     "next": "bin/next.js"

package/src/build-dag.js

@@ -87,13 +87,13 @@ function createPackageNode({
   parent,
   branch,
 }) {
-  let _package = workspaceMeta.packages[packageName];
+  let _package = workspaceMeta.packages[packageName] || workspaceMeta;
 
   let node = {
-    isPackage: !!(_package && !_package.isPrivate),
-    cwd: _package ? _package.cwd : workspaceMeta.cwd,
+    isPackage: !_package.isPrivate,
+    cwd: _package.cwd,
     packageName,
-    version: _package ? _package.version : workspaceMeta.version,
+    version: _package.version,
     dependents: [],
   };
 

package/src/build-dep-graph.js

@@ -24,7 +24,7 @@ function firstPass(workspaceMeta, workspacePackageJson, workspacesPackageJsons)
       cwd: path.join(workspaceMeta.cwd, workspace),
       packageName,
       version: packageJson.version,
-      isPrivate: packageJson.private,
+      isPrivate: packageJson.private || false,
     };
     copyDeps(workspaceMeta.packages[packageName], packageJson);
   }

package/src/build-release-graph.js

@@ -10,6 +10,8 @@ const { trackNewVersion } = require('./version');
 const semver = require('semver');
 const dependencyTypes = require('./dependency-types');
 const { loadPackageConfig } = require('./config');
+const debug = require('./debug');
+const { createLogger } = require('./log');
 
 const defaultReleaseType = 'patch';
 
@@ -298,21 +300,24 @@ function fourthPass({
 }
 
 async function buildReleaseGraph({
+  debug: _debug = debug,
   packagesWithChanges,
   shouldBumpInRangeDependencies,
   shouldInheritGreaterReleaseType,
   shouldExcludeDevChanges,
 }) {
+  let log = createLogger(_debug);
+
   let releaseTrees = {};
 
-  await firstPass({
+  await log(firstPass, {
     releaseTrees,
     packagesWithChanges,
   });
 
   // only packages with changes have been analyzed
 
-  await secondPass({
+  await log(secondPass, {
     releaseTrees,
     packagesWithChanges,
     shouldBumpInRangeDependencies,
@@ -322,7 +327,7 @@ async function buildReleaseGraph({
 
   // packages without changes, but need to be analyzed because of options
 
-  thirdPass({
+  log(thirdPass, {
     releaseTrees,
     packagesWithChanges,
     shouldInheritGreaterReleaseType,
@@ -331,7 +336,7 @@ async function buildReleaseGraph({
 
   // dependents have now inherited release type
 
-  fourthPass({
+  log(fourthPass, {
     releaseTrees,
     packagesWithChanges,
     shouldBumpInRangeDependencies,

package/src/debug.js

@@ -1,10 +1,6 @@
 'use strict';
 
-const _debug = require('debug');
+const debug = require('debug');
 const { name } = require('../package');
 
-function debug(scope) {
-  return _debug(`${name}:${scope}`);
-}
-
-module.exports = debug;
+module.exports = debug(name);

package/src/git.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const execa = require('execa');
-const debug = require('./debug')('git');
+const debug = require('./debug').extend('git');
 
 let cache = {};
 

package/src/log.js

@@ -0,0 +1,25 @@
+'use strict';
+
+const _debug = require('./debug');
+
+function createLogger(debug = _debug) {
+  return async function log(callback, ...args) {
+    let _debug = debug.extend(callback.name);
+
+    _debug('begin');
+
+    let before = new Date();
+
+    try {
+      return await callback(...args);
+    } finally {
+      let elapsed = new Date() - before;
+
+      _debug(`end in ${elapsed}ms`);
+    }
+  };
+}
+
+module.exports = {
+  createLogger,
+};

package/src/release.js

@@ -17,6 +17,8 @@ const {
 } = require('./git');
 const semver = require('semver');
 const { builder } = require('../bin/commands/release');
+const debug = require('./debug');
+const { createLogger } = require('./log');
 
 async function release({
   cwd = process.cwd(),
@@ -40,6 +42,9 @@ async function release({
   publishOverride,
   cached,
 } = {}) {
+  let _debug = debug.extend(release.name);
+  let log = createLogger(_debug);
+
   let currentBranch = await getCurrentBranch(cwd);
   if (currentBranch !== defaultBranch) {
     return;
@@ -47,9 +52,9 @@ async function release({
 
   let workspaceCwd = await getWorkspaceCwd(cwd);
 
-  let workspaceMeta = await buildDepGraph({ workspaceCwd });
+  let workspaceMeta = await log(buildDepGraph, { workspaceCwd });
 
-  let packagesWithChanges = await buildChangeGraph({
+  let packagesWithChanges = await log(buildChangeGraph, {
     workspaceMeta,
     shouldExcludeDevChanges,
     cached,
@@ -64,7 +69,8 @@ async function release({
     return;
   }
 
-  let releaseTrees = await buildReleaseGraph({
+  let releaseTrees = await log(buildReleaseGraph, {
+    debug: _debug,
     packagesWithChanges,
     shouldBumpInRangeDependencies,
     shouldInheritGreaterReleaseType,
@@ -79,7 +85,7 @@ async function release({
     let packageJson = await readJson(packageJsonPath);
 
     if (releaseTree.oldVersion && releaseTree.oldVersion !== packageJson.version) {
-      log(`Updating ${packageJson.name} from ${packageJson.version} to ${releaseTree.oldVersion}.`);
+      _log(`Updating ${packageJson.name} from ${packageJson.version} to ${releaseTree.oldVersion}.`);
 
       packageJson.version = releaseTree.oldVersion;
     }
@@ -91,7 +97,7 @@ async function release({
         let oldRange = packageJson[type][name];
 
         if (newRange !== oldRange) {
-          log(`Updating ${packageJson.name} ${type} ${name} from ${oldRange} to ${newRange}.`);
+          _log(`Updating ${packageJson.name} ${type} ${name} from ${oldRange} to ${newRange}.`);
 
           packageJson[type][name] = newRange;
         }
@@ -191,7 +197,7 @@ async function release({
 
   async function originalPush() {
     if (dryRun) {
-      log('push');
+      _log('push');
     } else {
       await push({ cwd: workspaceCwd });
     }
@@ -233,7 +239,7 @@ async function release({
       // eslint-disable-next-line no-inner-declarations
       async function originalPublish() {
         if (dryRun) {
-          log('publish');
+          _log('publish');
         } else {
           await publish({ cwd });
         }
@@ -253,13 +259,13 @@ async function release({
 
   function exec(execa, ...args) {
     if (dryRun) {
-      log(...args);
+      _log(...args);
     } else {
       return execa.apply(this, args);
     }
   }
 
-  function log() {
+  function _log() {
     if (silent) {
       return;
     }