monorepo-next 11.3.0 → 11.4.0

package/README.md

@@ -58,6 +58,8 @@ Options:
                              monorepo dev dep change or manually bumping an
                              external dev dep, don't count it towards a package
                              change.                  [boolean] [default: false]
+  --exclude-deleted          Excluded deleted files from the changeset.
+                                                      [boolean] [default: false]
 
 next changed
 
@@ -73,6 +75,8 @@ Options:
                              monorepo dev dep change or manually bumping an
                              external dev dep, don't count it towards a package
                              change.                  [boolean] [default: false]
+  --exclude-deleted          Excluded deleted files from the changeset.
+                                                      [boolean] [default: false]
 
 next cycles
 
@@ -158,6 +162,8 @@ Options:
                              monorepo dev dep change or manually bumping an
                              external dev dep, don't count it towards a package
                              change.                  [boolean] [default: false]
+  --exclude-deleted          Excluded deleted files from the changeset.
+                                                      [boolean] [default: false]
   --silent                   Don't print logs and errors
                                                       [boolean] [default: false]
 ```

package/bin/commands/changed-files.js

@@ -13,6 +13,7 @@ module.exports = {
     },
     'only-include-releasable': commonArgs['only-include-releasable'],
     'exclude-dev-changes': commonArgs['exclude-dev-changes'],
+    'exclude-deleted': commonArgs['exclude-deleted'],
   },
   async handler(argv) {
     const changedFiles = require('../../src/changed-files');
@@ -21,6 +22,7 @@ module.exports = {
       ...argv,
       shouldOnlyIncludeReleasable: argv['only-include-releasable'],
       shouldExcludeDevChanges: argv['exclude-dev-changes'],
+      shouldExcludeDeleted: argv['exclude-deleted'],
     });
 
     for (let file of _changedFiles) {

package/bin/commands/changed.js

@@ -9,6 +9,7 @@ module.exports = {
   builder: {
     'only-include-releasable': commonArgs['only-include-releasable'],
     'exclude-dev-changes': commonArgs['exclude-dev-changes'],
+    'exclude-deleted': commonArgs['exclude-deleted'],
   },
   async handler(argv) {
     const changed = require('../../src/changed');
@@ -17,6 +18,7 @@ module.exports = {
       ...argv,
       shouldOnlyIncludeReleasable: argv['only-include-releasable'],
       shouldExcludeDevChanges: argv['exclude-dev-changes'],
+      shouldExcludeDeleted: argv['exclude-deleted'],
     });
 
     for (let name of _changed) {

package/bin/commands/run.js

@@ -8,6 +8,7 @@ module.exports = {
   builder: {
     'only-include-releasable': commonArgs['only-include-releasable'],
     'exclude-dev-changes': commonArgs['exclude-dev-changes'],
+    'exclude-deleted': commonArgs['exclude-deleted'],
     'silent': commonArgs['silent'],
   },
   async handler(argv) {
@@ -17,6 +18,7 @@ module.exports = {
       ...argv,
       shouldOnlyIncludeReleasable: argv['only-include-releasable'],
       shouldExcludeDevChanges: argv['exclude-dev-changes'],
+      shouldExcludeDeleted: argv['exclude-deleted'],
       args: process.argv.slice(3),
     });
   },

package/bin/common-args.js

@@ -13,6 +13,11 @@ module.exports = {
     type: 'boolean',
     default: false,
   },
+  'exclude-deleted': {
+    describe: 'Excluded deleted files from the changeset.',
+    type: 'boolean',
+    default: false,
+  },
   'silent': {
     describe: 'Don\'t print logs and errors',
     type: 'boolean',

package/package.json

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

package/src/build-change-graph.js

@@ -27,6 +27,8 @@ async function getPackageChangedFiles({
   // down to 25 seconds from 39 seconds.
   shouldRunPerPackage = true,
 
+  shouldExcludeDeleted,
+
   options,
 }) {
   // Be careful you don't accidentally use `...` instead of `..`.
@@ -35,23 +37,43 @@ async function getPackageChangedFiles({
   //
   // 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}`, ...shouldRunPerPackage ? [packageCwd] : []], options);
+  let committedChanges = await git(['diff', '--name-status', `${fromCommit}..${toCommit}`, ...shouldRunPerPackage ? [packageCwd] : []], options);
+
+  committedChanges = getLinesFromOutput(committedChanges).reduce((committedChanges, line) => {
+    let isDeleted = line[0] === 'D';
+    let shouldExclude = shouldExcludeDeleted && isDeleted;
+
+    if (!shouldExclude) {
+      line = line.substr(2);
+
+      committedChanges.add(line);
+    }
 
-  committedChanges = getLinesFromOutput(committedChanges);
+    return committedChanges;
+  }, new Set());
 
   let dirtyChanges = await git(['status', '--porcelain', '--untracked-files', ...shouldRunPerPackage ? [packageCwd] : []], options);
 
-  dirtyChanges = getLinesFromOutput(dirtyChanges).map(line => {
+  dirtyChanges = getLinesFromOutput(dirtyChanges).reduce((dirtyChanges, line) => {
+    let isDeleted = line[1] === 'D';
+    let shouldExclude = shouldExcludeDeleted && isDeleted;
+
     line = line.substr(3);
 
     // if filename has space like `sample index.js`, if its modified and uncommited, that file will have double quotes in git status
     // example: '"packages/package-a/sample index.js"'. We need to strip `"` for that reason.
     line = line.replaceAll('"', '');
 
-    return line;
-  });
+    if (shouldExclude) {
+      committedChanges.delete(line);
+    } else {
+      dirtyChanges.add(line);
+    }
+
+    return dirtyChanges;
+  }, new Set());
 
-  let changedFiles = new Set(committedChanges).union(dirtyChanges);
+  let changedFiles = committedChanges.union(dirtyChanges);
 
   if (!shouldRunPerPackage) {
     let packageChangedFiles = new Set();
@@ -94,6 +116,7 @@ async function buildChangeGraph({
   workspaceMeta,
   shouldOnlyIncludeReleasable,
   shouldExcludeDevChanges,
+  shouldExcludeDeleted,
   fromCommit,
   fromCommitIfNewer,
   toCommit = 'HEAD',
@@ -161,6 +184,7 @@ async function buildChangeGraph({
       toCommit,
       packageCwd: _package.cwd,
       shouldRunPerPackage: false,
+      shouldExcludeDeleted,
       options: {
         cwd: workspaceMeta.cwd,
         cached,

package/src/changed-files.js

@@ -19,6 +19,7 @@ async function changedFiles({
   cwd = process.cwd(),
   shouldOnlyIncludeReleasable = builder['only-include-releasable'].default,
   shouldExcludeDevChanges = builder['exclude-dev-changes'].default,
+  shouldExcludeDeleted = builder['exclude-deleted'].default,
   fromCommit,
   fromCommitIfNewer,
   toCommit,
@@ -38,6 +39,7 @@ async function changedFiles({
     workspaceMeta,
     shouldOnlyIncludeReleasable,
     shouldExcludeDevChanges,
+    shouldExcludeDeleted,
     fromCommit,
     fromCommitIfNewer,
     toCommit,

package/src/changed.js

@@ -12,6 +12,7 @@ async function changed({
   cwd = process.cwd(),
   shouldOnlyIncludeReleasable = builder['only-include-releasable'].default,
   shouldExcludeDevChanges = builder['exclude-dev-changes'].default,
+  shouldExcludeDeleted = builder['exclude-deleted'].default,
   fromCommit,
   fromCommitIfNewer,
   toCommit,
@@ -26,6 +27,7 @@ async function changed({
     workspaceMeta,
     shouldOnlyIncludeReleasable,
     shouldExcludeDevChanges,
+    shouldExcludeDeleted,
     fromCommit,
     fromCommitIfNewer,
     toCommit,

package/src/run.js

@@ -13,6 +13,7 @@ async function run({
   cwd = process.cwd(),
   shouldOnlyIncludeReleasable = builder['only-include-releasable'].default,
   shouldExcludeDevChanges = builder['exclude-dev-changes'].default,
+  shouldExcludeDeleted = builder['exclude-deleted'].default,
   silent,
   args,
   cached,
@@ -25,6 +26,7 @@ async function run({
     workspaceMeta,
     shouldOnlyIncludeReleasable,
     shouldExcludeDevChanges,
+    shouldExcludeDeleted,
     cached,
   });