beachball - npm Package Compare versions

Comparing version 1.11.6 to 1.11.7

CHANGELOG.json

@@ -5,3 +5,17 @@ {
     {
-      "date": "Wed, 07 Aug 2019 00:23:34 GMT",
+      "date": "Tue, 20 Aug 2019 15:18:33 GMT",
+      "tag": "beachball_v1.11.7",
+      "version": "1.11.7",
+      "comments": {
+        "patch": [
+          {
+            "comment": "fixes the issue with change command not generating change files due to the master having their change files deleted by publishing",
+            "author": "[e-mail]",
+            "commit": "4d5fa644a4c9ea7abcf4d482c63f52c2649a4835"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Wed, 07 Aug 2019 00:23:45 GMT",
       "tag": "beachball_v1.11.6",
@@ -8,0 +22,0 @@ "version": "1.11.6",

CHANGELOG.md

 # Change Log - beachball
 
-This log was last generated on Wed, 07 Aug 2019 00:23:34 GMT and should not be manually modified.
+This log was last generated on Tue, 20 Aug 2019 15:18:33 GMT and should not be manually modified.
 
+## 1.11.7
+Tue, 20 Aug 2019 15:18:33 GMT
+
+### Patches
+
+- fixes the issue with change command not generating change files due to the master having their change files deleted by publishing ([e-mail])
+
 ## 1.11.6
-Wed, 07 Aug 2019 00:23:34 GMT
+Wed, 07 Aug 2019 00:23:45 GMT
 
@@ -8,0 +15,0 @@ ### Patches

lib/getChangedPackages.js

@@ -48,17 +48,13 @@ "use strict";
     const changedPackages = getAllChangedPackages(branch, cwd);
-    const changeFileResult = git_1.git(['ls-tree', '-r', '--name-only', '--full-tree', branch, 'change'], { cwd });
-    if (!changePath || !fs_1.default.existsSync(changePath) || !changeFileResult.success) {
+    const changeFilesResult = git_1.git(['diff', '--name-only', '--no-renames', '--diff-filter=A', `${branch}...`], { cwd });
+    if (!changePath || !fs_1.default.existsSync(changePath) || !changeFilesResult.success) {
         return changedPackages;
     }
-    const remoteChangeFiles = changeFileResult.stdout.split(/\n/).map(line => path_1.default.basename(line.trim()));
-    const changeFiles = fs_1.default.readdirSync(changePath).filter(entry => fs_1.default.statSync(path_1.default.join(changePath, entry)).isFile);
+    const changes = changeFilesResult.stdout.split(/\n/);
+    const changeFiles = changes.filter(name => path_1.default.dirname(name) === 'change');
     const changeFilePackageSet = new Set();
     // Loop through the change files, building up a set of packages that we can skip
     changeFiles.forEach(file => {
-        // Skip change files that are in remote branch - do NOT skip the packages that are present in those remote change files
-        if (remoteChangeFiles.includes(file)) {
-            return;
-        }
         try {
-            const changeInfo = JSON.parse(fs_1.default.readFileSync(path_1.default.join(changePath, file)).toString());
+            const changeInfo = JSON.parse(fs_1.default.readFileSync(file, 'utf-8'));
             changeFilePackageSet.add(changeInfo.packageName);
@@ -65,0 +61,0 @@ }

lib/git.js

@@ -77,3 +77,3 @@ "use strict";
     try {
-        const results = git(['--no-pager', 'diff', '--name-only', branch + '..'], { cwd });
+        const results = git(['--no-pager', 'diff', '--name-only', branch + '...'], { cwd });
         if (!results.success) {
@@ -80,0 +80,0 @@ return [];

package.json

 {
   "name": "beachball",
-  "version": "1.11.6",
+  "version": "1.11.7",
   "main": "index.js",
@@ -5,0 +5,0 @@ "license": "MIT",

src/getChangedPackages.ts

@@ -52,10 +52,10 @@ import { ChangeInfo } from './ChangeInfo';
 
-  const changeFileResult = git(['ls-tree', '-r', '--name-only', '--full-tree', branch, 'change'], { cwd });
+  const changeFilesResult = git(['diff', '--name-only', '--no-renames', '--diff-filter=A', `${branch}...`], { cwd });
 
-  if (!changePath || !fs.existsSync(changePath) || !changeFileResult.success) {
+  if (!changePath || !fs.existsSync(changePath) || !changeFilesResult.success) {
     return changedPackages;
   }
 
-  const remoteChangeFiles = changeFileResult.stdout.split(/\n/).map(line => path.basename(line.trim()));
-  const changeFiles = fs.readdirSync(changePath).filter(entry => fs.statSync(path.join(changePath, entry)).isFile);
+  const changes = changeFilesResult.stdout.split(/\n/);
+  const changeFiles = changes.filter(name => path.dirname(name) === 'change');
   const changeFilePackageSet = new Set<string>();
@@ -65,9 +65,4 @@
   changeFiles.forEach(file => {
-    // Skip change files that are in remote branch - do NOT skip the packages that are present in those remote change files
-    if (remoteChangeFiles.includes(file)) {
-      return;
-    }
-
     try {
-      const changeInfo: ChangeInfo = JSON.parse(fs.readFileSync(path.join(changePath, file)).toString());
+      const changeInfo: ChangeInfo = JSON.parse(fs.readFileSync(file, 'utf-8'));
       changeFilePackageSet.add(changeInfo.packageName);
@@ -74,0 +69,0 @@ } catch (e) {

src/git.ts

@@ -78,3 +78,3 @@ import { spawnSync } from 'child_process';
   try {
-    const results = git(['--no-pager', 'diff', '--name-only', branch + '..'], { cwd });
+    const results = git(['--no-pager', 'diff', '--name-only', branch + '...'], { cwd });
 
@@ -81,0 +81,0 @@ if (!results.success) {

No alert changes

Improved metrics

Total package byte prevSize

116541

increased by0.04%

Lines of code

2826

increased by0.21%

No dependency changes