@changesets/cli - npm Package Compare versions

Comparing version 2.27.1 to 2.27.2

dist/changesets-cli.cjs.js

@@ -15,2 +15,4 @@ 'use strict';
 var child_process = require('child_process');
+var git = require('@changesets/git');
+var writeChangeset = require('@changesets/write');
 var termSize = require('term-size');
@@ -20,4 +22,2 @@ var enquirer = require('enquirer');
 var ansiColors = require('ansi-colors');
-var git = require('@changesets/git');
-var writeChangeset = require('@changesets/write');
 var resolveFrom = require('resolve-from');
@@ -63,5 +63,5 @@ var semverLt = require('semver/functions/lt');
 var chalk__default = /*#__PURE__*/_interopDefault(chalk);
-var termSize__default = /*#__PURE__*/_interopDefault(termSize);
 var git__namespace = /*#__PURE__*/_interopNamespace(git);
 var writeChangeset__default = /*#__PURE__*/_interopDefault(writeChangeset);
+var termSize__default = /*#__PURE__*/_interopDefault(termSize);
 var resolveFrom__default = /*#__PURE__*/_interopDefault(resolveFrom);
@@ -236,2 +236,35 @@ var semverLt__default = /*#__PURE__*/_interopDefault(semverLt);
 
+function isVersionablePackage({
+  packageJson
+}, {
+  ignoredPackages,
+  versionPrivatePackages
+}) {
+  if (ignoredPackages.has(packageJson.name)) {
+    return false;
+  }
+
+  if (packageJson.private && !versionPrivatePackages) {
+    return false;
+  }
+
+  const hasVersionField = !!packageJson.version;
+  return hasVersionField;
+}
+
+function filterVersionablePackages(config, packages) {
+  const options = {
+    ignoredPackages: new Set(config.ignore),
+    versionPrivatePackages: config.privatePackages.version
+  };
+  return packages.filter(pkg => isVersionablePackage(pkg, options));
+}
+async function getVersionableChangedPackages(config, options) {
+  const changedPackages = await git.getChangedPackagesSinceRef(_objectSpread({
+    ref: config.baseBranch,
+    changedFilePatterns: config.changedFilePatterns
+  }, options));
+  return filterVersionablePackages(config, changedPackages);
+}
+
 const {
@@ -468,17 +501,2 @@ green,
 
-function isListablePackage(config, packageJson) {
-  const packageIgnoredInConfig = config.ignore.includes(packageJson.name);
-
-  if (packageIgnoredInConfig) {
-    return false;
-  }
-
-  if (!config.privatePackages.version && packageJson.private) {
-    return false;
-  }
-
-  const hasVersionField = !!packageJson.version;
-  return hasVersionField;
-}
-
 async function add(cwd, {
@@ -494,3 +512,3 @@ empty,
 
-  const listablePackages = packages.packages.filter(pkg => isListablePackage(config, pkg.packageJson));
+  const versionablePackages = filterVersionablePackages(config, packages.packages);
   const changesetBase = path__default["default"].resolve(cwd, ".changeset");
@@ -506,10 +524,7 @@ let newChangeset;
   } else {
-    const changedPackages = await git__namespace.getChangedPackagesSinceRef({
-      cwd,
-      ref: config.baseBranch,
-      changedFilePatterns: config.changedFilePatterns
-    });
-    const changedPackagesName = changedPackages.filter(pkg => isListablePackage(config, pkg.packageJson)).map(pkg => pkg.packageJson.name);
-    newChangeset = await createChangeset(changedPackagesName, listablePackages);
-    printConfirmationMessage(newChangeset, listablePackages.length > 1);
+    const changedPackagesNames = (await getVersionableChangedPackages(config, {
+      cwd
+    })).map(pkg => pkg.packageJson.name);
+    newChangeset = await createChangeset(changedPackagesNames, versionablePackages);
+    printConfirmationMessage(newChangeset, versionablePackages.length > 1);
 
@@ -1151,6 +1166,5 @@ if (!newChangeset.confirmed) {
   } = releasePlan;
-  const changedPackages = await git__namespace.getChangedPackagesSinceRef({
+  const changedPackages = await getVersionableChangedPackages(config, {
     cwd,
-    ref: sinceBranch || config.baseBranch,
-    changedFilePatterns: config.changedFilePatterns
+    ref: sinceBranch
   });
@@ -1157,0 +1171,0 @@

dist/changesets-cli.esm.js

@@ -14,2 +14,5 @@ import meow from 'meow';
 import { spawn } from 'child_process';
+import * as git from '@changesets/git';
+import { getChangedPackagesSinceRef, getCurrentCommitId } from '@changesets/git';
+import writeChangeset from '@changesets/write';
 import termSize from 'term-size';
@@ -19,5 +22,2 @@ import { prompt } from 'enquirer';
 import { symbols } from 'ansi-colors';
-import * as git from '@changesets/git';
-import { getCurrentCommitId } from '@changesets/git';
-import writeChangeset from '@changesets/write';
 import resolveFrom from 'resolve-from';
@@ -194,2 +194,35 @@ import semverLt from 'semver/functions/lt';
 
+function isVersionablePackage({
+  packageJson
+}, {
+  ignoredPackages,
+  versionPrivatePackages
+}) {
+  if (ignoredPackages.has(packageJson.name)) {
+    return false;
+  }
+
+  if (packageJson.private && !versionPrivatePackages) {
+    return false;
+  }
+
+  const hasVersionField = !!packageJson.version;
+  return hasVersionField;
+}
+
+function filterVersionablePackages(config, packages) {
+  const options = {
+    ignoredPackages: new Set(config.ignore),
+    versionPrivatePackages: config.privatePackages.version
+  };
+  return packages.filter(pkg => isVersionablePackage(pkg, options));
+}
+async function getVersionableChangedPackages(config, options) {
+  const changedPackages = await getChangedPackagesSinceRef(_objectSpread({
+    ref: config.baseBranch,
+    changedFilePatterns: config.changedFilePatterns
+  }, options));
+  return filterVersionablePackages(config, changedPackages);
+}
+
 const {
@@ -426,17 +459,2 @@ green,
 
-function isListablePackage(config, packageJson) {
-  const packageIgnoredInConfig = config.ignore.includes(packageJson.name);
-
-  if (packageIgnoredInConfig) {
-    return false;
-  }
-
-  if (!config.privatePackages.version && packageJson.private) {
-    return false;
-  }
-
-  const hasVersionField = !!packageJson.version;
-  return hasVersionField;
-}
-
 async function add(cwd, {
@@ -452,3 +470,3 @@ empty,
 
-  const listablePackages = packages.packages.filter(pkg => isListablePackage(config, pkg.packageJson));
+  const versionablePackages = filterVersionablePackages(config, packages.packages);
   const changesetBase = path.resolve(cwd, ".changeset");
@@ -464,10 +482,7 @@ let newChangeset;
   } else {
-    const changedPackages = await git.getChangedPackagesSinceRef({
-      cwd,
-      ref: config.baseBranch,
-      changedFilePatterns: config.changedFilePatterns
-    });
-    const changedPackagesName = changedPackages.filter(pkg => isListablePackage(config, pkg.packageJson)).map(pkg => pkg.packageJson.name);
-    newChangeset = await createChangeset(changedPackagesName, listablePackages);
-    printConfirmationMessage(newChangeset, listablePackages.length > 1);
+    const changedPackagesNames = (await getVersionableChangedPackages(config, {
+      cwd
+    })).map(pkg => pkg.packageJson.name);
+    newChangeset = await createChangeset(changedPackagesNames, versionablePackages);
+    printConfirmationMessage(newChangeset, versionablePackages.length > 1);
 
@@ -1109,6 +1124,5 @@ if (!newChangeset.confirmed) {
   } = releasePlan;
-  const changedPackages = await git.getChangedPackagesSinceRef({
+  const changedPackages = await getVersionableChangedPackages(config, {
     cwd,
-    ref: sinceBranch || config.baseBranch,
-    changedFilePatterns: config.changedFilePatterns
+    ref: sinceBranch
   });
@@ -1115,0 +1129,0 @@

package.json

 {
   "name": "@changesets/cli",
-  "version": "2.27.1",
+  "version": "2.27.2",
   "description": "Organise your package versioning and publishing to make both contributors and maintainers happy",
@@ -70,3 +70,3 @@ "bin": {
     "@babel/runtime": "^7.20.1",
-    "@changesets/apply-release-plan": "^7.0.0",
+    "@changesets/apply-release-plan": "^7.0.1",
     "@changesets/assemble-release-plan": "^6.0.0",
@@ -83,3 +83,3 @@ "@changesets/changelog-git": "^0.2.0",
     "@changesets/types": "^6.0.0",
-    "@changesets/write": "^0.3.0",
+    "@changesets/write": "^0.3.1",
     "@manypkg/get-packages": "^1.1.3",
@@ -86,0 +86,0 @@ "@types/semver": "^7.5.0",

New alerts

SPDX disjunction

License

SPDX disjunction for an artifact's license information

Found 1 instance in 1 package

Fixed alerts

SPDX disjunction

License

SPDX disjunction for an artifact's license information

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

123074

increased by0.46%

Lines of code

2766

increased by1.02%

Dependency changes

• Updated@changesets/apply-release-plan@^7.0.1

• Updated@changesets/write@^0.3.1