monorepo-next 10.1.0 → 10.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "monorepo-next",
-  "version": "10.1.0",
+  "version": "10.2.1",
   "description": "Detach monorepo packages from normal linking",
   "bin": {
     "next": "bin/next.js"
@@ -96,6 +96,6 @@
     "sinon": "^15.0.0",
     "sinon-chai": "^3.5.0",
     "standard-node-template": "4.0.1",
-    "yargs-help-output": "^3.0.0"
+    "yargs-help-output": "^4.0.0"
   }
 }

package/src/releasable.js

@@ -9,6 +9,7 @@ const { createPatch } = require('rfc6902');
 const {
   getFileAtCommit,
 } = require('./git');
+const { replaceJsonFile } = require('./fs');
 
 const filesContributingToReleasability = new Set([
   '.gitignore',
@@ -53,13 +54,30 @@ async function prepareTmpPackage({
 
     await fs.mkdir(path.dirname(to), { recursive: true });
 
+    let doesExist;
+
     try {
       await fs.copyFile(from, to);
+
+      doesExist = true;
     } catch (err) {
       if (err.code !== 'ENOENT') {
         throw err;
       }
     }
+
+    if (fileName === 'package.json' && doesExist) {
+      await replaceJsonFile(to, packageJson => {
+        // If complete packages are deleted that still match our current workspaces globs,
+        // AND their path basenames happen to be the same (because we zerod out their package.json names below),
+        // packlist will think the packages are duplicates without this line (when it's the monorepo root package).
+        // We already filtered out current package changes before we got to this point,
+        // so everything remaining shouldn't be considered packages anyways.
+        if (packageJson.workspaces) {
+          packageJson.workspaces = [];
+        }
+      });
+    }
   }
 
   let remainingFiles = changedFiles.diff(filesContributingToReleasability);

package/src/release.js

@@ -198,11 +198,7 @@ async function release({
   await handleLifecycleScript('posttag');
 
   async function originalPush() {
-    if (dryRun) {
-      _log('push');
-    } else {
-      await push({ cwd: workspaceCwd });
-    }
+    await push({ cwd: workspaceCwd, silent, dryRun });
   }
 
   if (shouldPush) {
@@ -240,11 +236,7 @@ async function release({
     if (shouldPublish && _shouldPublish) {
       // eslint-disable-next-line no-inner-declarations
       async function originalPublish() {
-        if (dryRun) {
-          _log('publish');
-        } else {
-          await publish({ cwd });
-        }
+        await publish({ cwd, silent, dryRun });
       }
 
       if (publishOverride) {
@@ -268,8 +260,10 @@ async function release({
   }
 }
 
-async function push({ cwd }) {
-  let remoteUrl = (await execa('git', ['config', '--get', 'remote.origin.url'], { cwd })).stdout;
+async function push({ cwd, silent, dryRun }) {
+  let remoteUrl = (await execa('git', ['config', '--get', 'remote.origin.url'], { cwd, silent: true })).stdout;
+
+  let dryRunArgs = dryRun ? ['--dry-run'] : [];
 
   // https://stackoverflow.com/a/55586434
   let doesntSupportAtomic = remoteUrl.includes('https://');
@@ -278,9 +272,9 @@ async function push({ cwd }) {
 
   try {
     if (doesntSupportAtomic) {
-      await execa('git', ['push'], { cwd });
+      await execa('git', ['push', ...dryRunArgs], { cwd, silent });
     } else {
-      await execa('git', ['push', '--follow-tags', '--atomic'], { cwd });
+      await execa('git', ['push', '--follow-tags', '--atomic', ...dryRunArgs], { cwd, silent });
     }
 
     success = true;
@@ -296,12 +290,14 @@ async function push({ cwd }) {
   if (doesntSupportAtomic && success) {
     // only push tags after the commit
     // and hard error if there is a tag collision
-    await execa('git', ['push', '--follow-tags'], { cwd });
+    await execa('git', ['push', '--follow-tags', ...dryRunArgs], { cwd, silent });
   }
 }
 
-async function publish({ cwd }) {
-  await execa('npm', ['publish'], { cwd });
+async function publish({ cwd, silent, dryRun }) {
+  let dryRunArgs = dryRun ? ['--dry-run'] : [];
+
+  await execa('npm', ['publish', ...dryRunArgs], { cwd, silent });
 }
 
 module.exports = release;