monorepo-next 7.1.1 → 7.2.2

package/README.md

@@ -120,6 +120,7 @@ Options:
   --bump-files
   [array] [default: ["package.json","bower.json","manifest.json","package-lock.j
                                                     son","npm-shrinkwrap.json"]]
+  --default-branch                                  [string] [default: "master"]
 
 next run
 

package/bin/commands/release.js

@@ -41,12 +41,16 @@ module.exports = {
       default: defaults.scripts,
     },
     'package-files': {
-      default: defaults.packageFiles,
       type: 'array',
+      default: defaults.packageFiles,
     },
     'bump-files': {
-      default: defaults.bumpFiles,
       type: 'array',
+      default: defaults.bumpFiles,
+    },
+    'default-branch': {
+      type: 'string',
+      default: 'master',
     },
   },
   async handler(argv) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "monorepo-next",
-  "version": "7.1.1",
+  "version": "7.2.2",
   "description": "Detach monorepo packages from normal linking",
   "bin": {
     "next": "bin/next.js"
@@ -30,7 +30,7 @@
     "yarn"
   ],
   "scripts": {
-    "lint:git": "commitlint",
+    "lint:git": "commitlint --default-branch main",
     "lint:js": "eslint . --ext js,json",
     "lint:md": "remark -f README.md",
     "start": "node bin/next",
@@ -64,16 +64,17 @@
     "execa": "^5.0.0",
     "glob": "^7.1.4",
     "inquirer": "^8.0.0",
-    "minimatch": "^3.0.4",
+    "minimatch": "^5.0.0",
     "npm-packlist": "^3.0.0",
-    "rfc6902": "^4.0.2",
+    "rfc6902": "^5.0.0",
     "semver": "7.3.5",
     "standard-version": "9.3.2",
+    "superset": "^2.0.1",
     "tmp": "0.2.1",
     "yargs": "^17.0.0"
   },
   "devDependencies": {
-    "@crowdstrike/commitlint": "^4.0.0",
+    "@crowdstrike/commitlint": "^5.0.0",
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
     "eslint": "^8.0.0",
@@ -89,7 +90,7 @@
     "remark-cli": "^10.0.0",
     "remark-preset-lint-crowdstrike": "^2.0.0",
     "renovate-config-standard": "^2.0.0",
-    "sinon": "^11.0.0",
+    "sinon": "^13.0.0",
     "sinon-chai": "^3.5.0",
     "standard-node-template": "2.0.0",
     "yargs-help-output": "^2.0.0"

package/src/build-change-graph.js

@@ -11,9 +11,7 @@ const {
 const { collectPackages } = require('./build-dep-graph');
 const minimatch = require('minimatch');
 const { getChangedReleasableFiles } = require('./releasable');
-const {
-  union,
-} = require('./set');
+const Set = require('superset');
 
 async function getPackageChangedFiles({
   fromCommit,
@@ -37,7 +35,7 @@ async function getPackageChangedFiles({
   committedChanges = getLinesFromOutput(committedChanges);
   let dirtyChanges = await git(['status', '--porcelain', packageCwd, '-u'], options);
   dirtyChanges = getLinesFromOutput(dirtyChanges).map(line => line.substr(3));
-  let changedFiles = Array.from(union(committedChanges, dirtyChanges));
+  let changedFiles = Array.from(new Set(committedChanges).union(dirtyChanges));
 
   return changedFiles;
 }

package/src/releasable.js

@@ -4,11 +4,7 @@ const packlist = require('npm-packlist');
 const path = require('path');
 const { createTmpDir } = require('./tmp');
 const fs = { ...require('fs'), ...require('fs').promises };
-const {
-  union,
-  intersection,
-  map,
-} = require('./set');
+const Set = require('superset');
 const { createPatch } = require('rfc6902');
 const {
   getFileAtCommit,
@@ -92,13 +88,9 @@ async function _getChangedReleasableFiles({
     }
   }
 
-  changedPublishedFilesNew = intersection(
-    union(
-      changedPublishedFilesOld,
-      filesContributingToReleasability,
-    ),
-    changedFiles,
-  );
+  changedPublishedFilesNew = changedPublishedFilesOld
+    .union(filesContributingToReleasability)
+    .intersect(changedFiles);
 
   return changedPublishedFilesNew;
 }
@@ -140,12 +132,12 @@ async function getChangedReleasableFiles({
 
   let changedPublishedFiles = await _getChangedReleasableFiles({
     cwd: packageCwd,
-    changedFiles: map(changedFiles, file => path.relative(packageCwd, path.join(workspacesCwd, file))),
+    changedFiles: changedFiles.map(file => path.relative(packageCwd, path.join(workspacesCwd, file))),
   });
 
   let relative = path.relative(workspacesCwd, packageCwd);
 
-  changedPublishedFiles = map(changedPublishedFiles, file => path.join(relative, file));
+  changedPublishedFiles = changedPublishedFiles.map(file => path.join(relative, file));
 
   if (shouldExcludeDevChanges) {
     let relativePackageJsonPath = path.join(relative, 'package.json');
@@ -163,7 +155,7 @@ async function getChangedReleasableFiles({
     }
   }
 
-  return Array.from(changedPublishedFiles);
+  return Array.from(changedPublishedFiles).sort();
 }
 
 module.exports = {

package/src/release.js

@@ -30,6 +30,7 @@ async function release({
   scripts = builder['scripts'].default,
   packageFiles = builder['package-files'].default,
   bumpFiles = builder['bump-files'].default,
+  defaultBranch = builder['default-branch'].default,
   versionOverride,
   preCommitCallback = () => {},
   prePushCallback = () => {},
@@ -38,7 +39,7 @@ async function release({
   publishOverride,
 } = {}) {
   let currentBranch = await getCurrentBranch(cwd);
-  if (currentBranch !== 'master') {
+  if (currentBranch !== defaultBranch) {
     return;
   }
 

package/src/set.js

@@ -1,34 +0,0 @@
-'use strict';
-
-function union(a, b) {
-  return new Set([...a, ...b]);
-}
-
-function intersection(a, b) {
-  let set = new Set();
-
-  for (let elem of b) {
-    if (a.has(elem)) {
-      set.add(elem);
-    }
-  }
-
-  return set;
-}
-
-function map(set, callback) {
-  let newSet = new Set();
-  let i = 0;
-
-  for (let value of set) {
-    newSet.add(callback(value, i++));
-  }
-
-  return newSet;
-}
-
-module.exports = {
-  union,
-  intersection,
-  map,
-};