@atlaskit/dependency-version-analytics 1.4.8 → 1.5.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/dependency-version-analytics
 
+## 1.5.0
+
+### Minor Changes
+
+- [`d23cb258eb0`](https://bitbucket.org/atlassian/atlassian-frontend/commits/d23cb258eb0) - Using flags.cwd to set current workDir and use package.json from current workDir instead of root
+
+## 1.4.9
+
+### Patch Changes
+
+- [`0fd070e4bba`](https://bitbucket.org/atlassian/atlassian-frontend/commits/0fd070e4bba) - Improved logs
+
 ## 1.4.8
 
 ### Patch Changes

package/dist/cjs/commands/populate-historic-data/product.js

@@ -99,8 +99,14 @@ async function getSinceRef(flags) {
     return tag;
   }
 }
+const getWorkDir = cwd => {
+  const workDir = cwd ?? process.cwd();
+  // Make sure that we're working in needed directory
+  process.chdir(workDir);
+  return workDir;
+};
 async function populateProduct(flags) {
-  const cwd = flags.cwd || process.cwd();
+  const cwd = getWorkDir(flags.cwd);
   const sinceRef = flags.reset ? undefined : await getSinceRef(flags);
   const log = await (0, _git.getChangesSince)(sinceRef);
   const supportedScopes = (0, _allowedScopes.getSupportedScopes)(flags.includeRestrictedScopes);
@@ -116,13 +122,16 @@ async function populateProduct(flags) {
   } = await getEventsFromHistory(log, sinceRef, {
     cwd
   }, supportedScopes, supportedPackages);
+  if (!allUpgradeEvents.length) {
+    console.log(`Found no dependency changes from supported scopes ${supportedScopes.join(', ')} since last run from ref "${sinceRef}"'`);
+  }
   if (flags.csv) {
     const csv = (0, _generateCsv.generateCSV)(allPackageChanges);
-    console.log(csv);
+    console.log('Generated csv: ', csv);
     return;
   }
   if (flags.dryRun) {
-    console.log(JSON.stringify(allUpgradeEvents));
+    console.log('All upgrade events: ', JSON.stringify(allUpgradeEvents));
     return;
   }
   if (allUpgradeEvents.length > 0) {
@@ -132,8 +141,6 @@ async function populateProduct(flags) {
       product: flags.product,
       skipPrompt: !flags.interactive
     });
-  } else {
-    console.log(`Found no dependency changes from supported scopes ${supportedScopes.join(', ')} since last run from ref "${sinceRef}"'`);
   }
   if (flags.statlas) {
     // Upload latest commit to statlas

package/dist/cjs/util/analytics.js

@@ -67,7 +67,7 @@ function createUpgradeEvent(name, version, previousVersion, date, optionalEventA
     }
   });
   return {
-    cliVersion: "1.4.8",
+    cliVersion: "1.5.0",
     dependencyName: name,
     versionString: eventVersion,
     major: parsedVersion ? `${parsedVersion.major}` : null,

package/dist/cjs/util/yarn.js

@@ -12,16 +12,24 @@ var _micromatch = _interopRequireDefault(require("micromatch"));
 var git = _interopRequireWildcard(require("./git"));
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-const rootPackageJsonPath = 'package.json';
 const debug = (0, _debug.default)('atlaskit:yarn');
 async function getWorkspacePackageJsonPaths(hash, cwd) {
   let file;
   try {
-    file = await git.showFile(hash, rootPackageJsonPath, {
+    /**
+     * We need to use package.json from current working directory, not from root
+     * The reason is - some repositories have their package.json not in root
+     * For example "confluence-frontend" repo has package.json at "confluence-frontend/confluence/package.json"
+     */
+    file = await git.showFile(hash, `./package.json`, {
       cwd
     });
-  } catch (e) {
-    debug(`${rootPackageJsonPath} does not exist`);
+  } catch (error) {
+    const errorMessage = `File by hash "${hash}" and path "${cwd}/package.json" does not exist`;
+    debug(errorMessage, {
+      error
+    });
+    console.error(errorMessage, error);
     return new Set([]);
   }
   let rootPackageJsonFile;
@@ -33,11 +41,11 @@ async function getWorkspacePackageJsonPaths(hash, cwd) {
   }
   const workspaces = rootPackageJsonFile.workspaces;
   if (!workspaces) {
-    return new Set([rootPackageJsonPath]);
+    return new Set(['package.json']);
   }
   // There are actually two formats for workspaces and they are poorly documented
   const workspacePackages = Array.isArray(workspaces) ? workspaces : workspaces.packages;
-  return new Set([rootPackageJsonPath, ...workspacePackages.map(glob => _path.default.join(glob, 'package.json'))]);
+  return new Set(['package.json', ...workspacePackages.map(glob => _path.default.join(glob, 'package.json'))]);
 }
 async function getWorkspacePaths(ref, workspaceGlobs, cwd) {
   if (workspaceGlobs.size === 0) {
@@ -48,7 +56,7 @@ async function getWorkspacePaths(ref, workspaceGlobs, cwd) {
   });
   const matchedWorkspaces = (0, _micromatch.default)(workspacePackageJsons, [...workspaceGlobs]);
   if (matchedWorkspaces.length === 0) {
-    throw new Error(`Could not find any workspace or package.json under ${cwd}`);
+    throw new Error(`Could not find any workspace or package.json under "${cwd}" for "${ref}" tag`);
   }
   return matchedWorkspaces;
 }

package/dist/es2019/commands/populate-historic-data/product.js

@@ -90,8 +90,14 @@ async function getSinceRef(flags) {
     return tag;
   }
 }
+const getWorkDir = cwd => {
+  const workDir = cwd !== null && cwd !== void 0 ? cwd : process.cwd();
+  // Make sure that we're working in needed directory
+  process.chdir(workDir);
+  return workDir;
+};
 export default async function populateProduct(flags) {
-  const cwd = flags.cwd || process.cwd();
+  const cwd = getWorkDir(flags.cwd);
   const sinceRef = flags.reset ? undefined : await getSinceRef(flags);
   const log = await getChangesSince(sinceRef);
   const supportedScopes = getSupportedScopes(flags.includeRestrictedScopes);
@@ -107,13 +113,16 @@ export default async function populateProduct(flags) {
   } = await getEventsFromHistory(log, sinceRef, {
     cwd
   }, supportedScopes, supportedPackages);
+  if (!allUpgradeEvents.length) {
+    console.log(`Found no dependency changes from supported scopes ${supportedScopes.join(', ')} since last run from ref "${sinceRef}"'`);
+  }
   if (flags.csv) {
     const csv = generateCSV(allPackageChanges);
-    console.log(csv);
+    console.log('Generated csv: ', csv);
     return;
   }
   if (flags.dryRun) {
-    console.log(JSON.stringify(allUpgradeEvents));
+    console.log('All upgrade events: ', JSON.stringify(allUpgradeEvents));
     return;
   }
   if (allUpgradeEvents.length > 0) {
@@ -123,8 +132,6 @@ export default async function populateProduct(flags) {
       product: flags.product,
       skipPrompt: !flags.interactive
     });
-  } else {
-    console.log(`Found no dependency changes from supported scopes ${supportedScopes.join(', ')} since last run from ref "${sinceRef}"'`);
   }
   if (flags.statlas) {
     // Upload latest commit to statlas

package/dist/es2019/util/analytics.js

@@ -59,7 +59,7 @@ export function createUpgradeEvent(name, version, previousVersion, date, optiona
     }
   });
   return {
-    cliVersion: "1.4.8",
+    cliVersion: "1.5.0",
     dependencyName: name,
     versionString: eventVersion,
     major: parsedVersion ? `${parsedVersion.major}` : null,

package/dist/es2019/util/yarn.js

@@ -2,16 +2,24 @@ import path from 'path';
 import debugModule from 'debug';
 import micromatch from 'micromatch';
 import * as git from './git';
-const rootPackageJsonPath = 'package.json';
 const debug = debugModule('atlaskit:yarn');
 export async function getWorkspacePackageJsonPaths(hash, cwd) {
   let file;
   try {
-    file = await git.showFile(hash, rootPackageJsonPath, {
+    /**
+     * We need to use package.json from current working directory, not from root
+     * The reason is - some repositories have their package.json not in root
+     * For example "confluence-frontend" repo has package.json at "confluence-frontend/confluence/package.json"
+     */
+    file = await git.showFile(hash, `./package.json`, {
       cwd
     });
-  } catch (e) {
-    debug(`${rootPackageJsonPath} does not exist`);
+  } catch (error) {
+    const errorMessage = `File by hash "${hash}" and path "${cwd}/package.json" does not exist`;
+    debug(errorMessage, {
+      error
+    });
+    console.error(errorMessage, error);
     return new Set([]);
   }
   let rootPackageJsonFile;
@@ -23,11 +31,11 @@ export async function getWorkspacePackageJsonPaths(hash, cwd) {
   }
   const workspaces = rootPackageJsonFile.workspaces;
   if (!workspaces) {
-    return new Set([rootPackageJsonPath]);
+    return new Set(['package.json']);
   }
   // There are actually two formats for workspaces and they are poorly documented
   const workspacePackages = Array.isArray(workspaces) ? workspaces : workspaces.packages;
-  return new Set([rootPackageJsonPath, ...workspacePackages.map(glob => path.join(glob, 'package.json'))]);
+  return new Set(['package.json', ...workspacePackages.map(glob => path.join(glob, 'package.json'))]);
 }
 export async function getWorkspacePaths(ref, workspaceGlobs, cwd) {
   if (workspaceGlobs.size === 0) {
@@ -38,7 +46,7 @@ export async function getWorkspacePaths(ref, workspaceGlobs, cwd) {
   });
   const matchedWorkspaces = micromatch(workspacePackageJsons, [...workspaceGlobs]);
   if (matchedWorkspaces.length === 0) {
-    throw new Error(`Could not find any workspace or package.json under ${cwd}`);
+    throw new Error(`Could not find any workspace or package.json under "${cwd}" for "${ref}" tag`);
   }
   return matchedWorkspaces;
 }

package/dist/esm/commands/populate-historic-data/product.js

@@ -164,6 +164,12 @@ function _getSinceRef() {
   }));
   return _getSinceRef.apply(this, arguments);
 }
+var getWorkDir = function getWorkDir(cwd) {
+  var workDir = cwd !== null && cwd !== void 0 ? cwd : process.cwd();
+  // Make sure that we're working in needed directory
+  process.chdir(workDir);
+  return workDir;
+};
 export default function populateProduct(_x7) {
   return _populateProduct.apply(this, arguments);
 }
@@ -173,7 +179,7 @@ function _populateProduct() {
     return _regeneratorRuntime.wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
-          cwd = flags.cwd || process.cwd();
+          cwd = getWorkDir(flags.cwd);
           if (!flags.reset) {
             _context3.next = 5;
             break;
@@ -210,59 +216,57 @@ function _populateProduct() {
           _yield$getEventsFromH = _context3.sent;
           allPackageChanges = _yield$getEventsFromH.allPackageChanges;
           allUpgradeEvents = _yield$getEventsFromH.allUpgradeEvents;
+          if (!allUpgradeEvents.length) {
+            console.log("Found no dependency changes from supported scopes ".concat(supportedScopes.join(', '), " since last run from ref \"").concat(sinceRef, "\"'"));
+          }
           if (!flags.csv) {
-            _context3.next = 27;
+            _context3.next = 28;
             break;
           }
           csv = generateCSV(allPackageChanges);
-          console.log(csv);
+          console.log('Generated csv: ', csv);
           return _context3.abrupt("return");
-        case 27:
+        case 28:
           if (!flags.dryRun) {
-            _context3.next = 30;
+            _context3.next = 31;
             break;
           }
-          console.log(JSON.stringify(allUpgradeEvents));
+          console.log('All upgrade events: ', JSON.stringify(allUpgradeEvents));
           return _context3.abrupt("return");
-        case 30:
+        case 31:
           if (!(allUpgradeEvents.length > 0)) {
-            _context3.next = 35;
+            _context3.next = 34;
             break;
           }
-          _context3.next = 33;
+          _context3.next = 34;
           return sendAnalytics(allUpgradeEvents, {
             dev: flags.dev,
             limit: flags.limit,
             product: flags.product,
             skipPrompt: !flags.interactive
           });
-        case 33:
-          _context3.next = 36;
-          break;
-        case 35:
-          console.log("Found no dependency changes from supported scopes ".concat(supportedScopes.join(', '), " since last run from ref \"").concat(sinceRef, "\"'"));
-        case 36:
+        case 34:
           if (!flags.statlas) {
-            _context3.next = 45;
+            _context3.next = 43;
             break;
           }
-          _context3.next = 39;
+          _context3.next = 37;
           return getHash('HEAD');
-        case 39:
+        case 37:
           currentCommit = _context3.sent;
-          _context3.next = 42;
+          _context3.next = 40;
           return statlas.uploadMeta(flags.product, currentCommit);
-        case 42:
+        case 40:
           console.log('Finished');
-          _context3.next = 49;
+          _context3.next = 47;
           break;
-        case 45:
+        case 43:
           console.log('Updating tag to current commit...');
-          _context3.next = 48;
+          _context3.next = 46;
           return tagCommit(DEFAULT_TAG);
-        case 48:
+        case 46:
           console.log("Finished. Run 'git push origin tag ".concat(sinceRef, "'."));
-        case 49:
+        case 47:
         case "end":
           return _context3.stop();
       }

package/dist/esm/util/analytics.js

@@ -66,7 +66,7 @@ export function createUpgradeEvent(name, version, previousVersion, date) {
     }
   });
   return _objectSpread({
-    cliVersion: "1.4.8",
+    cliVersion: "1.5.0",
     dependencyName: name,
     versionString: eventVersion,
     major: parsedVersion ? "".concat(parsedVersion.major) : null,

package/dist/esm/util/yarn.js

@@ -5,59 +5,62 @@ import path from 'path';
 import debugModule from 'debug';
 import micromatch from 'micromatch';
 import * as git from './git';
-var rootPackageJsonPath = 'package.json';
 var debug = debugModule('atlaskit:yarn');
 export function getWorkspacePackageJsonPaths(_x, _x2) {
   return _getWorkspacePackageJsonPaths.apply(this, arguments);
 }
 function _getWorkspacePackageJsonPaths() {
   _getWorkspacePackageJsonPaths = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(hash, cwd) {
-    var file, rootPackageJsonFile, workspaces, workspacePackages;
+    var file, errorMessage, rootPackageJsonFile, workspaces, workspacePackages;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           _context.prev = 0;
           _context.next = 3;
-          return git.showFile(hash, rootPackageJsonPath, {
+          return git.showFile(hash, "./package.json", {
             cwd: cwd
           });
         case 3:
           file = _context.sent;
-          _context.next = 10;
+          _context.next = 12;
           break;
         case 6:
           _context.prev = 6;
           _context.t0 = _context["catch"](0);
-          debug("".concat(rootPackageJsonPath, " does not exist"));
+          errorMessage = "File by hash \"".concat(hash, "\" and path \"").concat(cwd, "/package.json\" does not exist");
+          debug(errorMessage, {
+            error: _context.t0
+          });
+          console.error(errorMessage, _context.t0);
           return _context.abrupt("return", new Set([]));
-        case 10:
-          _context.prev = 10;
+        case 12:
+          _context.prev = 12;
           rootPackageJsonFile = JSON.parse(file);
-          _context.next = 18;
+          _context.next = 20;
           break;
-        case 14:
-          _context.prev = 14;
-          _context.t1 = _context["catch"](10);
+        case 16:
+          _context.prev = 16;
+          _context.t1 = _context["catch"](12);
           console.error("Error parsing ".concat(file, "@").concat(hash, ": ").concat(_context.t1));
           return _context.abrupt("return", null);
-        case 18:
+        case 20:
           workspaces = rootPackageJsonFile.workspaces;
           if (workspaces) {
-            _context.next = 21;
+            _context.next = 23;
             break;
           }
-          return _context.abrupt("return", new Set([rootPackageJsonPath]));
-        case 21:
+          return _context.abrupt("return", new Set(['package.json']));
+        case 23:
           // There are actually two formats for workspaces and they are poorly documented
           workspacePackages = Array.isArray(workspaces) ? workspaces : workspaces.packages;
-          return _context.abrupt("return", new Set([rootPackageJsonPath].concat(_toConsumableArray(workspacePackages.map(function (glob) {
+          return _context.abrupt("return", new Set(['package.json'].concat(_toConsumableArray(workspacePackages.map(function (glob) {
             return path.join(glob, 'package.json');
           })))));
-        case 23:
+        case 25:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[0, 6], [10, 14]]);
+    }, _callee, null, [[0, 6], [12, 16]]);
   }));
   return _getWorkspacePackageJsonPaths.apply(this, arguments);
 }
@@ -87,7 +90,7 @@ function _getWorkspacePaths() {
             _context2.next = 8;
             break;
           }
-          throw new Error("Could not find any workspace or package.json under ".concat(cwd));
+          throw new Error("Could not find any workspace or package.json under \"".concat(cwd, "\" for \"").concat(ref, "\" tag"));
         case 8:
           return _context2.abrupt("return", matchedWorkspaces);
         case 9:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/dependency-version-analytics",
-  "version": "1.4.8",
+  "version": "1.5.0",
   "description": "Tool to pull atlaskit version history from a repo",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"