monorepo-next 11.1.0 → 11.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "monorepo-next",
-  "version": "11.1.0",
+  "version": "11.3.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/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) {
@@ -15,27 +22,76 @@ async function git(args, options) {
     cached,
   } = options;
 
-  let stdout;
+  let cacheKey;
+  let lockFilePath;
 
-  let cacheKey = getCacheKey(args, cwd);
+  if (cached) {
+    cacheKey = getCacheKey(args, cwd);
+
+    if (cacheKey in cache) {
+      debug('Git cache hit.');
+
+      return cache[cacheKey];
+    }
+
+    if (cached !== true) {
+      lockFilePath = path.join(cached, `${cacheKey}.lock`);
+
+      await ensureDir(cached);
+
+      debug(`Waiting for git lock at ${lockFilePath}.`);
+
+      await lock(lockFilePath, { wait: 10 * 60e3 });
+
+      debug(`Acquired git lock at ${lockFilePath}.`);
+    }
+  }
+
+  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;
+        }
+      }
+
+      debug('Git cache miss.');
+    }
 
-  if (cached && cacheKey in cache) {
-    stdout = cache[cacheKey];
-  } else {
     debug(args, options);
 
-    stdout = (await execa('git', args, {
+    let { stdout } = await execa('git', args, {
       cwd,
-    })).stdout;
+    });
 
     if (cached) {
       cache[cacheKey] = stdout;
+
+      if (cached !== true) {
+        await ensureWriteFile(cachedFilePath, stdout);
+      }
     }
 
     debug(stdout);
-  }
 
-  return stdout;
+    return stdout;
+  } finally {
+    if (lockFilePath) {
+      await unlock(lockFilePath);
+
+      debug(`Released git lock at ${lockFilePath}.`);
+    }
+  }
 }
 
 async function getCurrentBranch(cwd) {