monorepo-next 11.2.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.2.0",
+  "version": "11.4.0",
   "description": "Detach monorepo packages from normal linking",
   "bin": {
     "next": "bin/next.js"
@@ -66,9 +66,11 @@
     "glob": "^8.0.0",
     "inquirer": "^9.0.0",
     "js-yaml": "^4.0.0",
+    "lockfile": "^1.0.4",
     "minimatch": "^9.0.0",
     "npm-packlist": "^8.0.0",
     "rfc6902": "^5.0.0",
+    "sanitize-filename": "^1.6.3",
     "semver": "^7.5.3",
     "standard-version": "9.5.0",
     "superset": "^2.0.1",
@@ -79,6 +81,7 @@
     "@crowdstrike/commitlint": "^7.0.0",
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
+    "chai-fs": "^2.0.0",
     "common-tags": "^1.8.2",
     "eslint": "^8.0.0",
     "eslint-config-crowdstrike": "10.1.0",

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/fs.js

@@ -2,6 +2,7 @@
 
 const fs = { ...require('fs'), ...require('fs').promises };
 const { EOL } = require('os');
+const { dirname } = require('path');
 
 async function replaceFile(path, callback) {
   let oldContents = await fs.readFile(path, 'utf8');
@@ -30,7 +31,42 @@ async function replaceJsonFile(path, callback) {
   });
 }
 
+/**
+ * @param {string} path
+ */
+async function safeReadFile(path) {
+  try {
+    return await fs.readFile(path, 'utf8');
+  } catch (err) {
+    if (err.code !== 'ENOENT') {
+      throw err;
+    }
+
+    return null;
+  }
+}
+
+/**
+ * @param {string} path
+ */
+async function ensureDir(path) {
+  await fs.mkdir(path, { recursive: true });
+}
+
+/**
+ * @param {string} path
+ * @param {string} data
+ */
+async function ensureWriteFile(path, data) {
+  await ensureDir(dirname(path));
+
+  await fs.writeFile(path, data);
+}
+
 module.exports = {
   replaceFile,
   replaceJsonFile,
+  safeReadFile,
+  ensureDir,
+  ensureWriteFile,
 };

package/src/git.js

@@ -2,11 +2,18 @@
 
 const execa = require('execa');
 const debug = require('./debug').extend('git');
+const sanitize = require('sanitize-filename');
+const path = require('path');
+const { safeReadFile, ensureDir, ensureWriteFile } = require('./fs');
+const { promisify } = require('util');
+const lockfile = require('lockfile');
+const lock = promisify(lockfile.lock);
+const unlock = promisify(lockfile.unlock);
 
 let cache = {};
 
 function getCacheKey(args, cwd) {
-  return [cwd, ...args].join();
+  return sanitize([cwd, ...args].join());
 }
 
 async function git(args, options) {
@@ -16,6 +23,7 @@ async function git(args, options) {
   } = options;
 
   let cacheKey;
+  let lockFilePath;
 
   if (cached) {
     cacheKey = getCacheKey(args, cwd);
@@ -26,22 +34,64 @@ async function git(args, options) {
       return cache[cacheKey];
     }
 
-    debug('Git cache miss.');
-  }
+    if (cached !== true) {
+      lockFilePath = path.join(cached, `${cacheKey}.lock`);
 
-  debug(args, options);
+      await ensureDir(cached);
 
-  let stdout = (await execa('git', args, {
-    cwd,
-  })).stdout;
+      debug(`Waiting for git lock at ${lockFilePath}.`);
 
-  if (cached) {
-    cache[cacheKey] = stdout;
+      await lock(lockFilePath, { wait: 10 * 60e3 });
+
+      debug(`Acquired git lock at ${lockFilePath}.`);
+    }
   }
 
-  debug(stdout);
+  try {
+    let cachedFilePath;
+
+    if (cached) {
+      if (cached !== true) {
+        cachedFilePath = path.join(cached, cacheKey);
+
+        let _cache = await safeReadFile(cachedFilePath);
+
+        if (_cache !== null) {
+          debug('Git cache hit.');
+
+          cache[cacheKey] = _cache;
+
+          return _cache;
+        }
+      }
 
-  return stdout;
+      debug('Git cache miss.');
+    }
+
+    debug(args, options);
+
+    let { stdout } = await execa('git', args, {
+      cwd,
+    });
+
+    if (cached) {
+      cache[cacheKey] = stdout;
+
+      if (cached !== true) {
+        await ensureWriteFile(cachedFilePath, stdout);
+      }
+    }
+
+    debug(stdout);
+
+    return stdout;
+  } finally {
+    if (lockFilePath) {
+      await unlock(lockFilePath);
+
+      debug(`Released git lock at ${lockFilePath}.`);
+    }
+  }
 }
 
 async function getCurrentBranch(cwd) {

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,
   });