monorepo-next 8.2.0 → 8.3.2

package/README.md

@@ -4,6 +4,15 @@
 
 Detach monorepo packages from normal linking. Work on breaking changes while gradually updating consumers.
 
+Each package can have a `monorepo-next.config.js` with the following options:
+
+```js
+module.exports = {
+  // Set this to false to opt-out of change detection and versioning.
+  shouldBumpVersion: true,
+}
+```
+
 <!-- CODEGEN_CLI_HELP -->
 
 ```

package/package.json

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

package/src/build-change-graph.js

@@ -9,9 +9,11 @@ const {
   getCommitSinceLastRelease,
 } = require('./git');
 const { collectPackages } = require('./build-dep-graph');
-const minimatch = require('minimatch');
+const { isSubDir } = require('./path');
 const { getChangedReleasableFiles } = require('./releasable');
 const Set = require('superset');
+const { loadPackageConfig } = require('./config');
+const path = require('path');
 
 async function getPackageChangedFiles({
   fromCommit,
@@ -19,22 +21,17 @@ async function getPackageChangedFiles({
   packageCwd,
   options,
 }) {
-  let isAncestor = await isCommitAncestorOf(fromCommit, toCommit, options);
-
-  let olderCommit;
-  let newerCommit;
-  if (isAncestor) {
-    olderCommit = fromCommit;
-    newerCommit = toCommit;
-  } else {
-    olderCommit = toCommit;
-    newerCommit = fromCommit;
-  }
+  // Be careful you don't accidentally use `...` instead of `..`.
+  // `...` finds the merge-base and uses that instead of `fromCommit`.
+  // https://stackoverflow.com/a/60496462
+  let committedChanges = await git(['diff', '--name-only', `${fromCommit}..${toCommit}`, packageCwd], options);
 
-  let committedChanges = await git(['diff', '--name-only', `${olderCommit}...${newerCommit}`, packageCwd], options);
   committedChanges = getLinesFromOutput(committedChanges);
+
   let dirtyChanges = await git(['status', '--porcelain', packageCwd, '-u'], options);
+
   dirtyChanges = getLinesFromOutput(dirtyChanges).map(line => line.substr(3));
+
   let changedFiles = Array.from(new Set(committedChanges).union(dirtyChanges));
 
   return changedFiles;
@@ -71,11 +68,21 @@ async function buildChangeGraph({
   let packagesWithChanges = {};
   let sinceBranchCommit;
 
+  let packagePaths = Object.values(workspaceMeta.packages).map(({ cwd }) => {
+    return path.relative(workspaceMeta.cwd, cwd);
+  });
+
   for (let _package of collectPackages(workspaceMeta)) {
     if (!_package.packageName || !_package.version) {
       continue;
     }
 
+    let nextConfig = loadPackageConfig(_package.cwd);
+
+    if (!nextConfig.shouldBumpVersion) {
+      continue;
+    }
+
     let _fromCommit;
     if (fromCommit) {
       _fromCommit = fromCommit;
@@ -129,8 +136,8 @@ async function buildChangeGraph({
     // remove package changes from the workspace root's changed files
     if (_package.cwd === workspaceMeta.cwd) {
       newFiles = newFiles.filter(file => {
-        return !workspaceMeta.packagesGlobs.some(glob => {
-          return minimatch(file, `${glob}/**`, { dot: true });
+        return !packagePaths.some((packagePath) => {
+          return isSubDir(packagePath, file);
         });
       });
     }

package/src/build-dep-graph.js

@@ -81,17 +81,13 @@ async function buildDepGraph({
 
   let { workspaces } = workspacePackageJson;
 
-  let packagesGlobs;
-
   let _1dFilesArray;
   if (!workspaces) {
     _1dFilesArray = (await execa('pnpm', ['recursive', 'exec', '--', 'node', '-e', 'console.log(process.cwd())'], { cwd: workspaceCwd })).stdout
       .split(/\r?\n/)
       .map(workspace => path.relative(workspaceCwd, workspace));
-
-    packagesGlobs = [];
   } else {
-    packagesGlobs = workspaces.packages || workspaces;
+    let packagesGlobs = workspaces.packages || workspaces;
 
     let _2dFilesArray = await Promise.all(packagesGlobs.map(packagesGlob => {
       return glob(packagesGlob, {
@@ -108,7 +104,6 @@ async function buildDepGraph({
 
   let workspaceMeta = {
     cwd: workspaceCwd,
-    packagesGlobs,
   };
 
   await firstPass(workspaceMeta, workspacePackageJson, packageDirs);

package/src/build-release-graph.js

@@ -10,6 +10,7 @@ const { trackNewVersion } = require('./version');
 const semver = require('semver');
 const dependencyTypes = require('./dependency-types');
 const { isCycle } = require('./build-dag');
+const { loadPackageConfig } = require('./config');
 
 const defaultReleaseType = 'patch';
 
@@ -139,6 +140,12 @@ async function secondPass({
 
       visitedNodes.add(dag.node.packageName);
 
+      let nextConfig = loadPackageConfig(dag.node.cwd);
+
+      if (!nextConfig.shouldBumpVersion) {
+        return;
+      }
+
       let doesPackageHaveChanges = !!releaseTrees[dag.node.packageName];
       if (!doesPackageHaveChanges) {
         let isDevDep = dag.dependencyType === 'devDependencies';

package/src/config.js

@@ -0,0 +1,26 @@
+'use strict';
+
+const path = require('path');
+
+function loadPackageConfig(cwd) {
+  let nextConfig;
+
+  try {
+    nextConfig = require(path.join(cwd, 'monorepo-next.config.js'));
+  } catch (err) {
+    if (err.code !== 'MODULE_NOT_FOUND') {
+      throw err;
+    }
+
+    nextConfig = {};
+  }
+
+  return {
+    shouldBumpVersion: true,
+    ...nextConfig,
+  };
+}
+
+module.exports = {
+  loadPackageConfig,
+};

package/src/path.js

@@ -0,0 +1,13 @@
+'use strict';
+
+const path = require('path');
+
+function isSubDir(dir, subDir) {
+  let relative = path.relative(dir, subDir);
+
+  return !relative.startsWith(`..${path.sep}`);
+}
+
+module.exports = {
+  isSubDir,
+};