monorepo-next 9.2.6 → 9.3.1

package/README.md

@@ -115,6 +115,8 @@ Options:
   --version                       Show version number                  [boolean]
   --silent                        Don't print logs and errors
                                                       [boolean] [default: false]
+  --dry-run                       log to console instead of modifying files
+                                                      [boolean] [default: false]
   --push                          git push + tags when done
                                                        [boolean] [default: true]
   --publish                       npm publish when done[boolean] [default: true]

package/bin/commands/release.js

@@ -10,6 +10,7 @@ module.exports = {
   describe: 'release all packages as needed',
   builder: {
     'silent': commonArgs['silent'],
+    'dry-run': commonArgs['dry-run'],
     'push': {
       describe: 'git push + tags when done',
       type: 'boolean',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "monorepo-next",
-  "version": "9.2.6",
+  "version": "9.3.1",
   "description": "Detach monorepo packages from normal linking",
   "bin": {
     "next": "bin/next.js"
@@ -68,7 +68,7 @@
     "minimatch": "^5.0.0",
     "npm-packlist": "^6.0.0",
     "rfc6902": "^5.0.0",
-    "semver": "7.5.0",
+    "semver": "7.5.1",
     "standard-version": "9.5.0",
     "superset": "^2.0.1",
     "tmp": "0.2.1",
@@ -86,6 +86,7 @@
     "eslint-plugin-mocha": "^10.0.0",
     "eslint-plugin-node": "^11.0.0",
     "fixturify": "^3.0.0",
+    "fs-extra": "^11.1.1",
     "git-fixtures": "^5.0.0",
     "mocha": "^10.0.0",
     "mocha-helpers": "^7.0.0",

package/src/build-change-graph.js

@@ -24,11 +24,14 @@ async function getPackageChangedFiles({
   // Be careful you don't accidentally use `...` instead of `..`.
   // `...` finds the merge-base and uses that instead of `fromCommit`.
   // https://stackoverflow.com/a/60496462
+  //
+  // I tried using ls-tree instead of diff when it is a new package (fromCommit is first commit in repo),
+  // but it took the same amount of time.
   let committedChanges = await git(['diff', '--name-only', `${fromCommit}..${toCommit}`, packageCwd], options);
 
   committedChanges = getLinesFromOutput(committedChanges);
 
-  let dirtyChanges = await git(['status', '--porcelain', packageCwd, '-u'], options);
+  let dirtyChanges = await git(['status', '--porcelain', '--untracked-files', packageCwd], options);
 
   dirtyChanges = getLinesFromOutput(dirtyChanges).map(line => line.substr(3));
 

package/src/release.js

@@ -15,12 +15,13 @@ const {
   getWorkspaceCwd,
   getCurrentCommit,
 } = require('./git');
-
+const semver = require('semver');
 const { builder } = require('../bin/commands/release');
 
 async function release({
   cwd = process.cwd(),
   silent,
+  dryRun = builder['dry-run'].default,
   shouldPush = builder['push'].default,
   shouldPublish = builder['publish'].default,
   shouldBumpInRangeDependencies = builder['bump-in-range-dependencies'].default,
@@ -37,6 +38,7 @@ async function release({
   pushOverride,
   prePublishCallback = () => {},
   publishOverride,
+  cached,
 } = {}) {
   let currentBranch = await getCurrentBranch(cwd);
   if (currentBranch !== defaultBranch) {
@@ -50,6 +52,7 @@ async function release({
   let packagesWithChanges = await buildChangeGraph({
     workspaceMeta,
     shouldExcludeDevChanges,
+    cached,
   });
 
   packagesWithChanges = packagesWithChanges.filter(({ dag }) => {
@@ -75,7 +78,9 @@ async function release({
     let packageJsonPath = path.join(cwd, 'package.json');
     let packageJson = await readJson(packageJsonPath);
 
-    if (releaseTree.oldVersion) {
+    if (releaseTree.oldVersion && releaseTree.oldVersion !== packageJson.version) {
+      log(`Updating ${packageJson.name} from ${packageJson.version} to ${releaseTree.oldVersion}.`);
+
       packageJson.version = releaseTree.oldVersion;
     }
 
@@ -83,11 +88,19 @@ async function release({
       let deps = releaseTree[type];
 
       for (let [name, newRange] of Object.entries(deps)) {
-        packageJson[type][name] = newRange;
+        let oldRange = packageJson[type][name];
+
+        if (newRange !== oldRange) {
+          log(`Updating ${packageJson.name} ${type} ${name} from ${oldRange} to ${newRange}.`);
+
+          packageJson[type][name] = newRange;
+        }
       }
     }
 
-    await writeJson(packageJsonPath, packageJson);
+    if (!dryRun) {
+      await writeJson(packageJsonPath, packageJson);
+    }
 
     // eslint-disable-next-line no-inner-declarations
     async function originalVersion(options) {
@@ -98,6 +111,7 @@ async function release({
           tag: true,
         },
         silent,
+        dryRun,
         tagPrefix: `${name}@`,
         releaseAs: releaseTree.releaseType,
         scripts,
@@ -125,7 +139,13 @@ async function release({
         process.chdir(originalCwd);
       }
 
-      let { version } = await readJson(packageJsonPath);
+      let version;
+
+      if (dryRun) {
+        version = semver.inc(releaseTree.oldVersion, releaseTree.releaseType);
+      } else {
+        version = (await readJson(packageJsonPath)).version;
+      }
 
       // eslint-disable-next-line require-atomic-updates
       releaseTree.newVersion = version;
@@ -135,7 +155,7 @@ async function release({
   async function handleLifecycleScript(lifecycle) {
     let script = scripts[lifecycle];
     if (script) {
-      await execa.command(script, {
+      await exec(execa.command, script, {
         shell: true,
       });
     }
@@ -147,38 +167,45 @@ async function release({
 
   let commitMessage = `chore(release): ${tags.join()}`;
 
-  await execa('git', ['add', '-A'], { cwd: workspaceCwd });
+  if (!dryRun) {
+    await execa('git', ['add', '-A'], { cwd: workspaceCwd });
+  }
 
-  await preCommitCallback();
+  await preCommitCallback({ dryRun });
 
   await handleLifecycleScript('precommit');
 
   let previousCommit = await getCurrentCommit(workspaceCwd);
 
-  await execa('git', ['commit', '-m', commitMessage], { cwd: workspaceCwd });
+  await exec(execa, 'git', ['commit', '-m', commitMessage], { cwd: workspaceCwd });
 
   await handleLifecycleScript('postcommit');
 
   await handleLifecycleScript('pretag');
 
   for (let tag of tags) {
-    await execa('git', ['tag', '-a', tag, '-m', tag], { cwd: workspaceCwd });
+    await exec(execa, 'git', ['tag', '-a', tag, '-m', tag], { cwd: workspaceCwd });
   }
 
   await handleLifecycleScript('posttag');
 
   async function originalPush() {
-    await push({ cwd: workspaceCwd });
+    if (dryRun) {
+      log('push');
+    } else {
+      await push({ cwd: workspaceCwd });
+    }
   }
 
   if (shouldPush) {
-    await prePushCallback();
+    await prePushCallback({ dryRun });
 
     try {
       if (pushOverride) {
         await pushOverride({
           cwd: workspaceCwd,
           originalPush,
+          dryRun,
         });
       } else {
         await originalPush();
@@ -195,7 +222,7 @@ async function release({
   }
 
   if (shouldPublish) {
-    await prePublishCallback();
+    await prePublishCallback({ dryRun });
   }
 
   // eslint-disable-next-line require-atomic-updates
@@ -203,19 +230,40 @@ async function release({
     if (shouldPublish && _shouldPublish) {
       // eslint-disable-next-line no-inner-declarations
       async function originalPublish() {
-        await publish({ cwd });
+        if (dryRun) {
+          log('publish');
+        } else {
+          await publish({ cwd });
+        }
       }
 
       if (publishOverride) {
         await publishOverride({
           cwd,
           originalPublish,
+          dryRun,
         });
       } else {
         await originalPublish();
       }
     }
   }
+
+  function exec(execa, ...args) {
+    if (dryRun) {
+      log(...args);
+    } else {
+      return execa.apply(this, args);
+    }
+  }
+
+  function log() {
+    if (silent) {
+      return;
+    }
+
+    console.log(...arguments);
+  }
 }
 
 async function push({ cwd }) {

package/src/run.js

@@ -15,6 +15,7 @@ async function run({
   shouldExcludeDevChanges = builder['exclude-dev-changes'].default,
   silent,
   args,
+  cached,
 }) {
   let workspaceCwd = await getWorkspaceCwd(cwd);
 
@@ -24,6 +25,7 @@ async function run({
     workspaceMeta,
     shouldOnlyIncludeReleasable,
     shouldExcludeDevChanges,
+    cached,
   });
 
   let stdout = '';