@atlaskit/dependency-version-analytics 1.5.1 → 1.6.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/dependency-version-analytics
 
+## 1.6.0
+
+### Minor Changes
+
+- [`d6cf767ff5e`](https://bitbucket.org/atlassian/atlassian-frontend/commits/d6cf767ff5e) - Use subWorkDir flag to get root package.json
+
 ## 1.5.1
 
 ### Patch Changes

package/dist/cjs/commands/populate-historic-data/lib/dependency-store.js

@@ -20,6 +20,12 @@ const debug = (0, _debug.default)('atlaskit:dependency');
  * Stores the state of atlaskit dependencies in a repository
  */
 class DependencyStore {
+  /**
+   * We may want to work not in root, but in specific directory
+   * 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"
+   */
+
   /** Mapping of dependency names to arrays of unique dependency type + versions */
   dependencies = {};
   /** Mapping of workspaces to their dependency map. Each dependency in their map links to an entry in `dependencies` */
@@ -27,8 +33,12 @@ class DependencyStore {
   /** Set of workspace paths to their "package.json". Used to verify that a package.json is a valid workspace */
   workspacePackageJsonPaths = new Set();
   initialised = false;
-  constructor(cwd = process.cwd(), supportedScopes, supportedPackages) {
-    this.cwd = cwd;
+  constructor({
+    subWorkDir,
+    supportedScopes,
+    supportedPackages
+  }) {
+    this.subWorkDir = subWorkDir;
     this.supportedScopes = supportedScopes;
     this.supportedPackages = supportedPackages;
   }
@@ -52,7 +62,7 @@ class DependencyStore {
     const changedPackageJsons = logItem.diff.files.filter(f => f.file.endsWith('package.json')).map(f => f.file);
     const didRootPackageJsonChange = !!changedPackageJsons.find(file => file === 'package.json');
     if (didRootPackageJsonChange) {
-      const workspacePackageJsonPaths = await (0, _yarn.getWorkspacePackageJsonPaths)(hash, this.cwd);
+      const workspacePackageJsonPaths = await (0, _yarn.getWorkspacePackageJsonPaths)(hash, this.subWorkDir);
       const workspacePackageJsonPathsChanged = workspacePackageJsonPaths !== null && (this.workspacePackageJsonPaths.size !== workspacePackageJsonPaths.size || [...this.workspacePackageJsonPaths].some(glob => !workspacePackageJsonPaths.has(glob)));
       if (workspacePackageJsonPathsChanged) {
         debug(`Workspace globs changed: ${[...workspacePackageJsonPaths]}. Resetting store.`);
@@ -107,11 +117,11 @@ class DependencyStore {
   async resetStore(hash) {
     this.dependencies = {};
     this.workspaces = {};
-    const workspaceGlobs = await (0, _yarn.getWorkspacePackageJsonPaths)(hash, this.cwd);
+    const workspaceGlobs = await (0, _yarn.getWorkspacePackageJsonPaths)(hash, this.subWorkDir);
     if (workspaceGlobs !== null) {
       this.workspacePackageJsonPaths = workspaceGlobs;
     }
-    const workspacePaths = await (0, _yarn.getWorkspacePaths)(hash, this.workspacePackageJsonPaths, this.cwd);
+    const workspacePaths = await (0, _yarn.getWorkspacePaths)(hash, this.workspacePackageJsonPaths);
     debug(`Workspace paths: ${workspacePaths}`);
     for (const wsPath of workspacePaths) {
       if (this.workspaces[wsPath]) {
@@ -127,9 +137,7 @@ class DependencyStore {
   async getWorkspaceDependencies(hash, workspacePath) {
     let file;
     try {
-      file = await (0, _git.showFile)(hash, workspacePath, {
-        cwd: this.cwd
-      });
+      file = await (0, _git.showFile)(hash, workspacePath);
     } catch (e) {
       debug(`Could not show file ${workspacePath}@${hash}`);
       return null;

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

@@ -50,13 +50,15 @@ const getUpgradeEventsFromPkgChange = (oldDeps, newDeps, {
   }).filter(e => e != null);
   return [...addOrUpgradeEvents, ...removeEvents];
 };
-const getEventsFromHistory = async (packageChangesLog, prevRunHash, {
-  cwd
-}, supportedScopes, supportedPackages) => {
+const getEventsFromHistory = async (packageChangesLog, prevRunHash, directoryOptions, supportedScopes, supportedPackages) => {
   const allPackageChanges = [];
   let allUpgradeEvents = [];
   (0, _assert.assert)(packageChangesLog.all.length > 0, '');
-  let dependencyStore = new _dependencyStore.DependencyStore(cwd, supportedScopes, supportedPackages);
+  let dependencyStore = new _dependencyStore.DependencyStore({
+    ...directoryOptions,
+    supportedScopes,
+    supportedPackages
+  });
   let dependencies = await dependencyStore.initialise(prevRunHash);
   for (let i = 0; i < packageChangesLog.all.length; i++) {
     let item = packageChangesLog.all[i];
@@ -99,14 +101,10 @@ 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 = getWorkDir(flags.cwd);
+  if (flags.cwd) {
+    process.chdir(flags.cwd);
+  }
   const sinceRef = flags.reset ? undefined : await getSinceRef(flags);
   const log = await (0, _git.getChangesSince)(sinceRef);
   const supportedScopes = (0, _allowedScopes.getSupportedScopes)(flags.includeRestrictedScopes);
@@ -120,7 +118,7 @@ async function populateProduct(flags) {
     allPackageChanges,
     allUpgradeEvents
   } = await getEventsFromHistory(log, sinceRef, {
-    cwd
+    subWorkDir: flags.subWorkDir
   }, supportedScopes, supportedPackages);
   if (!allUpgradeEvents.length) {
     console.log(`Found no dependency changes from supported scopes ${supportedScopes.join(', ')} since last run from ref "${sinceRef}"'`);

package/dist/cjs/util/analytics.js

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

package/dist/cjs/util/yarn.js

@@ -13,19 +13,18 @@ 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 debug = (0, _debug.default)('atlaskit:yarn');
-async function getWorkspacePackageJsonPaths(hash, cwd) {
+async function getWorkspacePackageJsonPaths(hash, subWorkDir) {
   let file;
+  const rootPackageJson = `${subWorkDir ? `${subWorkDir}/` : ''}package.json`;
   try {
     /**
      * 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
-    });
+    file = await git.showFile(hash, rootPackageJson);
   } catch (error) {
-    const errorMessage = `File by hash "${hash}" and path "${cwd}/package.json" does not exist`;
+    const errorMessage = `File by hash "${hash}" and path "${rootPackageJson}" does not exist`;
     debug(errorMessage, {
       error
     });
@@ -41,22 +40,20 @@ async function getWorkspacePackageJsonPaths(hash, cwd) {
   }
   const workspaces = rootPackageJsonFile.workspaces;
   if (!workspaces) {
-    return new Set(['package.json']);
+    return new Set([rootPackageJson]);
   }
   // There are actually two formats for workspaces and they are poorly documented
   const workspacePackages = Array.isArray(workspaces) ? workspaces : workspaces.packages;
-  return new Set(['package.json', ...workspacePackages.map(glob => _path.default.join(glob, 'package.json'))]);
+  return new Set([rootPackageJson, ...workspacePackages.map(glob => _path.default.join(glob, 'package.json'))]);
 }
-async function getWorkspacePaths(ref, workspaceGlobs, cwd) {
+async function getWorkspacePaths(ref, workspaceGlobs) {
   if (workspaceGlobs.size === 0) {
     return [];
   }
-  const workspacePackageJsons = await git.getFiles(ref, '**/package.json', {
-    cwd
-  });
+  const workspacePackageJsons = await git.getFiles(ref, '**/package.json');
   const matchedWorkspaces = (0, _micromatch.default)(workspacePackageJsons, [...workspaceGlobs]);
   if (matchedWorkspaces.length === 0) {
-    throw new Error(`Could not find any workspace or package.json under "${cwd}" for "${ref}" tag`);
+    throw new Error(`Could not find any workspace or package.json under "${process.cwd()}" for "${ref}" tag`);
   }
   return matchedWorkspaces;
 }

package/dist/es2019/commands/populate-historic-data/lib/dependency-store.js

@@ -14,7 +14,16 @@ const debug = debugModule('atlaskit:dependency');
  * Stores the state of atlaskit dependencies in a repository
  */
 export class DependencyStore {
-  constructor(cwd = process.cwd(), supportedScopes, supportedPackages) {
+  constructor({
+    subWorkDir,
+    supportedScopes,
+    supportedPackages
+  }) {
+    /**
+     * We may want to work not in root, but in specific directory
+     * 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"
+     */
     /** Mapping of dependency names to arrays of unique dependency type + versions */
     _defineProperty(this, "dependencies", {});
     /** Mapping of workspaces to their dependency map. Each dependency in their map links to an entry in `dependencies` */
@@ -22,7 +31,7 @@ export class DependencyStore {
     /** Set of workspace paths to their "package.json". Used to verify that a package.json is a valid workspace */
     _defineProperty(this, "workspacePackageJsonPaths", new Set());
     _defineProperty(this, "initialised", false);
-    this.cwd = cwd;
+    this.subWorkDir = subWorkDir;
     this.supportedScopes = supportedScopes;
     this.supportedPackages = supportedPackages;
   }
@@ -46,7 +55,7 @@ export class DependencyStore {
     const changedPackageJsons = logItem.diff.files.filter(f => f.file.endsWith('package.json')).map(f => f.file);
     const didRootPackageJsonChange = !!changedPackageJsons.find(file => file === 'package.json');
     if (didRootPackageJsonChange) {
-      const workspacePackageJsonPaths = await getWorkspacePackageJsonPaths(hash, this.cwd);
+      const workspacePackageJsonPaths = await getWorkspacePackageJsonPaths(hash, this.subWorkDir);
       const workspacePackageJsonPathsChanged = workspacePackageJsonPaths !== null && (this.workspacePackageJsonPaths.size !== workspacePackageJsonPaths.size || [...this.workspacePackageJsonPaths].some(glob => !workspacePackageJsonPaths.has(glob)));
       if (workspacePackageJsonPathsChanged) {
         debug(`Workspace globs changed: ${[...workspacePackageJsonPaths]}. Resetting store.`);
@@ -101,11 +110,11 @@ export class DependencyStore {
   async resetStore(hash) {
     this.dependencies = {};
     this.workspaces = {};
-    const workspaceGlobs = await getWorkspacePackageJsonPaths(hash, this.cwd);
+    const workspaceGlobs = await getWorkspacePackageJsonPaths(hash, this.subWorkDir);
     if (workspaceGlobs !== null) {
       this.workspacePackageJsonPaths = workspaceGlobs;
     }
-    const workspacePaths = await getWorkspacePaths(hash, this.workspacePackageJsonPaths, this.cwd);
+    const workspacePaths = await getWorkspacePaths(hash, this.workspacePackageJsonPaths);
     debug(`Workspace paths: ${workspacePaths}`);
     for (const wsPath of workspacePaths) {
       if (this.workspaces[wsPath]) {
@@ -121,9 +130,7 @@ export class DependencyStore {
   async getWorkspaceDependencies(hash, workspacePath) {
     let file;
     try {
-      file = await showFile(hash, workspacePath, {
-        cwd: this.cwd
-      });
+      file = await showFile(hash, workspacePath);
     } catch (e) {
       debug(`Could not show file ${workspacePath}@${hash}`);
       return null;

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

@@ -41,13 +41,15 @@ const getUpgradeEventsFromPkgChange = (oldDeps, newDeps, {
   }).filter(e => e != null);
   return [...addOrUpgradeEvents, ...removeEvents];
 };
-const getEventsFromHistory = async (packageChangesLog, prevRunHash, {
-  cwd
-}, supportedScopes, supportedPackages) => {
+const getEventsFromHistory = async (packageChangesLog, prevRunHash, directoryOptions, supportedScopes, supportedPackages) => {
   const allPackageChanges = [];
   let allUpgradeEvents = [];
   assert(packageChangesLog.all.length > 0, '');
-  let dependencyStore = new DependencyStore(cwd, supportedScopes, supportedPackages);
+  let dependencyStore = new DependencyStore({
+    ...directoryOptions,
+    supportedScopes,
+    supportedPackages
+  });
   let dependencies = await dependencyStore.initialise(prevRunHash);
   for (let i = 0; i < packageChangesLog.all.length; i++) {
     let item = packageChangesLog.all[i];
@@ -90,14 +92,10 @@ 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 = getWorkDir(flags.cwd);
+  if (flags.cwd) {
+    process.chdir(flags.cwd);
+  }
   const sinceRef = flags.reset ? undefined : await getSinceRef(flags);
   const log = await getChangesSince(sinceRef);
   const supportedScopes = getSupportedScopes(flags.includeRestrictedScopes);
@@ -111,7 +109,7 @@ export default async function populateProduct(flags) {
     allPackageChanges,
     allUpgradeEvents
   } = await getEventsFromHistory(log, sinceRef, {
-    cwd
+    subWorkDir: flags.subWorkDir
   }, supportedScopes, supportedPackages);
   if (!allUpgradeEvents.length) {
     console.log(`Found no dependency changes from supported scopes ${supportedScopes.join(', ')} since last run from ref "${sinceRef}"'`);

package/dist/es2019/util/analytics.js

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

package/dist/es2019/util/yarn.js

@@ -3,19 +3,18 @@ import debugModule from 'debug';
 import micromatch from 'micromatch';
 import * as git from './git';
 const debug = debugModule('atlaskit:yarn');
-export async function getWorkspacePackageJsonPaths(hash, cwd) {
+export async function getWorkspacePackageJsonPaths(hash, subWorkDir) {
   let file;
+  const rootPackageJson = `${subWorkDir ? `${subWorkDir}/` : ''}package.json`;
   try {
     /**
      * 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
-    });
+    file = await git.showFile(hash, rootPackageJson);
   } catch (error) {
-    const errorMessage = `File by hash "${hash}" and path "${cwd}/package.json" does not exist`;
+    const errorMessage = `File by hash "${hash}" and path "${rootPackageJson}" does not exist`;
     debug(errorMessage, {
       error
     });
@@ -31,22 +30,20 @@ export async function getWorkspacePackageJsonPaths(hash, cwd) {
   }
   const workspaces = rootPackageJsonFile.workspaces;
   if (!workspaces) {
-    return new Set(['package.json']);
+    return new Set([rootPackageJson]);
   }
   // There are actually two formats for workspaces and they are poorly documented
   const workspacePackages = Array.isArray(workspaces) ? workspaces : workspaces.packages;
-  return new Set(['package.json', ...workspacePackages.map(glob => path.join(glob, 'package.json'))]);
+  return new Set([rootPackageJson, ...workspacePackages.map(glob => path.join(glob, 'package.json'))]);
 }
-export async function getWorkspacePaths(ref, workspaceGlobs, cwd) {
+export async function getWorkspacePaths(ref, workspaceGlobs) {
   if (workspaceGlobs.size === 0) {
     return [];
   }
-  const workspacePackageJsons = await git.getFiles(ref, '**/package.json', {
-    cwd
-  });
+  const workspacePackageJsons = await git.getFiles(ref, '**/package.json');
   const matchedWorkspaces = micromatch(workspacePackageJsons, [...workspaceGlobs]);
   if (matchedWorkspaces.length === 0) {
-    throw new Error(`Could not find any workspace or package.json under "${cwd}" for "${ref}" tag`);
+    throw new Error(`Could not find any workspace or package.json under "${process.cwd()}" for "${ref}" tag`);
   }
   return matchedWorkspaces;
 }

package/dist/esm/commands/populate-historic-data/lib/dependency-store.js

@@ -25,11 +25,16 @@ var debug = debugModule('atlaskit:dependency');
  * Stores the state of atlaskit dependencies in a repository
  */
 export var DependencyStore = /*#__PURE__*/function () {
-  function DependencyStore() {
-    var cwd = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : process.cwd();
-    var supportedScopes = arguments.length > 1 ? arguments[1] : undefined;
-    var supportedPackages = arguments.length > 2 ? arguments[2] : undefined;
+  function DependencyStore(_ref) {
+    var subWorkDir = _ref.subWorkDir,
+      supportedScopes = _ref.supportedScopes,
+      supportedPackages = _ref.supportedPackages;
     _classCallCheck(this, DependencyStore);
+    /**
+     * We may want to work not in root, but in specific directory
+     * 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"
+     */
     /** Mapping of dependency names to arrays of unique dependency type + versions */
     _defineProperty(this, "dependencies", {});
     /** Mapping of workspaces to their dependency map. Each dependency in their map links to an entry in `dependencies` */
@@ -37,7 +42,7 @@ export var DependencyStore = /*#__PURE__*/function () {
     /** Set of workspace paths to their "package.json". Used to verify that a package.json is a valid workspace */
     _defineProperty(this, "workspacePackageJsonPaths", new Set());
     _defineProperty(this, "initialised", false);
-    this.cwd = cwd;
+    this.subWorkDir = subWorkDir;
     this.supportedScopes = supportedScopes;
     this.supportedPackages = supportedPackages;
   }
@@ -97,7 +102,7 @@ export var DependencyStore = /*#__PURE__*/function () {
                 break;
               }
               _context2.next = 8;
-              return getWorkspacePackageJsonPaths(hash, this.cwd);
+              return getWorkspacePackageJsonPaths(hash, this.subWorkDir);
             case 8:
               workspacePackageJsonPaths = _context2.sent;
               workspacePackageJsonPathsChanged = workspacePackageJsonPaths !== null && (this.workspacePackageJsonPaths.size !== workspacePackageJsonPaths.size || _toConsumableArray(this.workspacePackageJsonPaths).some(function (glob) {
@@ -184,14 +189,14 @@ export var DependencyStore = /*#__PURE__*/function () {
   }, {
     key: "getFlattenedDeps",
     value: function getFlattenedDeps() {
-      var deps = Object.entries(this.dependencies).filter(function (_ref) {
-        var _ref2 = _slicedToArray(_ref, 2),
-          versions = _ref2[1];
+      var deps = Object.entries(this.dependencies).filter(function (_ref2) {
+        var _ref3 = _slicedToArray(_ref2, 2),
+          versions = _ref3[1];
         return versions.length > 0;
-      }).map(function (_ref3) {
-        var _ref4 = _slicedToArray(_ref3, 2),
-          depName = _ref4[0],
-          versions = _ref4[1];
+      }).map(function (_ref4) {
+        var _ref5 = _slicedToArray(_ref4, 2),
+          depName = _ref5[0],
+          versions = _ref5[1];
         return [depName, DependencyStore.getMinimumVersion(versions, depName)];
       });
       return Object.fromEntries(deps);
@@ -216,14 +221,14 @@ export var DependencyStore = /*#__PURE__*/function () {
               this.dependencies = {};
               this.workspaces = {};
               _context3.next = 4;
-              return getWorkspacePackageJsonPaths(hash, this.cwd);
+              return getWorkspacePackageJsonPaths(hash, this.subWorkDir);
             case 4:
               workspaceGlobs = _context3.sent;
               if (workspaceGlobs !== null) {
                 this.workspacePackageJsonPaths = workspaceGlobs;
               }
               _context3.next = 8;
-              return getWorkspacePaths(hash, this.workspacePackageJsonPaths, this.cwd);
+              return getWorkspacePaths(hash, this.workspacePackageJsonPaths);
             case 8:
               workspacePaths = _context3.sent;
               debug("Workspace paths: ".concat(workspacePaths));
@@ -288,9 +293,7 @@ export var DependencyStore = /*#__PURE__*/function () {
             case 0:
               _context4.prev = 0;
               _context4.next = 3;
-              return showFile(hash, workspacePath, {
-                cwd: this.cwd
-              });
+              return showFile(hash, workspacePath);
             case 3:
               file = _context4.sent;
               _context4.next = 10;
@@ -408,10 +411,10 @@ export var DependencyStore = /*#__PURE__*/function () {
     key: "getSupportedDependencies",
     value: function getSupportedDependencies(depMap, dependencyType) {
       var _this = this;
-      return Object.entries(depMap).reduce(function (supportedDependencies, _ref5) {
-        var _ref6 = _slicedToArray(_ref5, 2),
-          rawPackageName = _ref6[0],
-          packageVersion = _ref6[1];
+      return Object.entries(depMap).reduce(function (supportedDependencies, _ref6) {
+        var _ref7 = _slicedToArray(_ref6, 2),
+          rawPackageName = _ref7[0],
+          packageVersion = _ref7[1];
         // Ignore suffixed `--next` deps in jira used for independent upgrades
         if (rawPackageName.endsWith('--next')) {
           return supportedDependencies;

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

@@ -1,7 +1,10 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import { DEFAULT_TAG } from '../../constants';
 import chalk from 'chalk';
 import { createUpgradeEvent, sendAnalytics } from '../../util/analytics';
@@ -57,33 +60,35 @@ var getUpgradeEventsFromPkgChange = function getUpgradeEventsFromPkgChange(oldDe
   return [].concat(_toConsumableArray(addOrUpgradeEvents), _toConsumableArray(removeEvents));
 };
 var getEventsFromHistory = /*#__PURE__*/function () {
-  var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(packageChangesLog, prevRunHash, _ref8, supportedScopes, supportedPackages) {
-    var cwd, allPackageChanges, allUpgradeEvents, dependencyStore, dependencies, i, item, newDependencies, packageChange, upgradeEvents;
+  var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(packageChangesLog, prevRunHash, directoryOptions, supportedScopes, supportedPackages) {
+    var allPackageChanges, allUpgradeEvents, dependencyStore, dependencies, i, item, newDependencies, packageChange, upgradeEvents;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          cwd = _ref8.cwd;
           allPackageChanges = [];
           allUpgradeEvents = [];
           assert(packageChangesLog.all.length > 0, '');
-          dependencyStore = new DependencyStore(cwd, supportedScopes, supportedPackages);
-          _context.next = 7;
+          dependencyStore = new DependencyStore(_objectSpread(_objectSpread({}, directoryOptions), {}, {
+            supportedScopes: supportedScopes,
+            supportedPackages: supportedPackages
+          }));
+          _context.next = 6;
           return dependencyStore.initialise(prevRunHash);
-        case 7:
+        case 6:
           dependencies = _context.sent;
           i = 0;
-        case 9:
+        case 8:
           if (!(i < packageChangesLog.all.length)) {
-            _context.next = 21;
+            _context.next = 20;
             break;
           }
           item = packageChangesLog.all[i];
           if (allPackageChanges.length > 0) {
             dependencies = allPackageChanges[allPackageChanges.length - 1].deps;
           }
-          _context.next = 14;
+          _context.next = 13;
           return dependencyStore.update(item);
-        case 14:
+        case 13:
           newDependencies = _context.sent;
           packageChange = {
             date: new Date(item.date).toISOString(),
@@ -97,23 +102,23 @@ var getEventsFromHistory = /*#__PURE__*/function () {
             allUpgradeEvents.push.apply(allUpgradeEvents, _toConsumableArray(upgradeEvents));
             allPackageChanges.push(packageChange);
           }
-        case 18:
+        case 17:
           i++;
-          _context.next = 9;
+          _context.next = 8;
           break;
-        case 21:
+        case 20:
           return _context.abrupt("return", {
             allPackageChanges: allPackageChanges,
             allUpgradeEvents: allUpgradeEvents
           });
-        case 22:
+        case 21:
         case "end":
           return _context.stop();
       }
     }, _callee);
   }));
   return function getEventsFromHistory(_x, _x2, _x3, _x4, _x5) {
-    return _ref9.apply(this, arguments);
+    return _ref8.apply(this, arguments);
   };
 }();
 function getSinceRef(_x6) {
@@ -164,22 +169,18 @@ 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);
 }
 function _populateProduct() {
   _populateProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(flags) {
-    var cwd, sinceRef, log, supportedScopes, supportedPackages, _yield$getEventsFromH, allPackageChanges, allUpgradeEvents, csv, currentCommit;
+    var sinceRef, log, supportedScopes, supportedPackages, _yield$getEventsFromH, allPackageChanges, allUpgradeEvents, csv, currentCommit;
     return _regeneratorRuntime.wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
-          cwd = getWorkDir(flags.cwd);
+          if (flags.cwd) {
+            process.chdir(flags.cwd);
+          }
           if (!flags.reset) {
             _context3.next = 5;
             break;
@@ -210,7 +211,7 @@ function _populateProduct() {
         case 18:
           _context3.next = 20;
           return getEventsFromHistory(log, sinceRef, {
-            cwd: cwd
+            subWorkDir: flags.subWorkDir
           }, supportedScopes, supportedPackages);
         case 20:
           _yield$getEventsFromH = _context3.sent;

package/dist/esm/util/analytics.js

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

package/dist/esm/util/yarn.js

@@ -10,65 +10,64 @@ export function getWorkspacePackageJsonPaths(_x, _x2) {
   return _getWorkspacePackageJsonPaths.apply(this, arguments);
 }
 function _getWorkspacePackageJsonPaths() {
-  _getWorkspacePackageJsonPaths = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(hash, cwd) {
-    var file, errorMessage, rootPackageJsonFile, workspaces, workspacePackages;
+  _getWorkspacePackageJsonPaths = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(hash, subWorkDir) {
+    var file, rootPackageJson, 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, "./package.json", {
-            cwd: cwd
-          });
-        case 3:
+          rootPackageJson = "".concat(subWorkDir ? "".concat(subWorkDir, "/") : '', "package.json");
+          _context.prev = 1;
+          _context.next = 4;
+          return git.showFile(hash, rootPackageJson);
+        case 4:
           file = _context.sent;
-          _context.next = 12;
+          _context.next = 13;
           break;
-        case 6:
-          _context.prev = 6;
-          _context.t0 = _context["catch"](0);
-          errorMessage = "File by hash \"".concat(hash, "\" and path \"").concat(cwd, "/package.json\" does not exist");
+        case 7:
+          _context.prev = 7;
+          _context.t0 = _context["catch"](1);
+          errorMessage = "File by hash \"".concat(hash, "\" and path \"").concat(rootPackageJson, "\" does not exist");
           debug(errorMessage, {
             error: _context.t0
           });
           console.error(errorMessage, _context.t0);
           return _context.abrupt("return", new Set([]));
-        case 12:
-          _context.prev = 12;
+        case 13:
+          _context.prev = 13;
           rootPackageJsonFile = JSON.parse(file);
-          _context.next = 20;
+          _context.next = 21;
           break;
-        case 16:
-          _context.prev = 16;
-          _context.t1 = _context["catch"](12);
+        case 17:
+          _context.prev = 17;
+          _context.t1 = _context["catch"](13);
           console.error("Error parsing ".concat(file, "@").concat(hash, ": ").concat(_context.t1));
           return _context.abrupt("return", null);
-        case 20:
+        case 21:
           workspaces = rootPackageJsonFile.workspaces;
           if (workspaces) {
-            _context.next = 23;
+            _context.next = 24;
             break;
           }
-          return _context.abrupt("return", new Set(['package.json']));
-        case 23:
+          return _context.abrupt("return", new Set([rootPackageJson]));
+        case 24:
           // 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(['package.json'].concat(_toConsumableArray(workspacePackages.map(function (glob) {
+          return _context.abrupt("return", new Set([rootPackageJson].concat(_toConsumableArray(workspacePackages.map(function (glob) {
             return path.join(glob, 'package.json');
           })))));
-        case 25:
+        case 26:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[0, 6], [12, 16]]);
+    }, _callee, null, [[1, 7], [13, 17]]);
   }));
   return _getWorkspacePackageJsonPaths.apply(this, arguments);
 }
-export function getWorkspacePaths(_x3, _x4, _x5) {
+export function getWorkspacePaths(_x3, _x4) {
   return _getWorkspacePaths.apply(this, arguments);
 }
 function _getWorkspacePaths() {
-  _getWorkspacePaths = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(ref, workspaceGlobs, cwd) {
+  _getWorkspacePaths = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(ref, workspaceGlobs) {
     var workspacePackageJsons, matchedWorkspaces;
     return _regeneratorRuntime.wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
@@ -80,9 +79,7 @@ function _getWorkspacePaths() {
           return _context2.abrupt("return", []);
         case 2:
           _context2.next = 4;
-          return git.getFiles(ref, '**/package.json', {
-            cwd: cwd
-          });
+          return git.getFiles(ref, '**/package.json');
         case 4:
           workspacePackageJsons = _context2.sent;
           matchedWorkspaces = micromatch(workspacePackageJsons, _toConsumableArray(workspaceGlobs));
@@ -90,7 +87,7 @@ function _getWorkspacePaths() {
             _context2.next = 8;
             break;
           }
-          throw new Error("Could not find any workspace or package.json under \"".concat(cwd, "\" for \"").concat(ref, "\" tag"));
+          throw new Error("Could not find any workspace or package.json under \"".concat(process.cwd(), "\" for \"").concat(ref, "\" tag"));
         case 8:
           return _context2.abrupt("return", matchedWorkspaces);
         case 9:

package/dist/types/commands/populate-historic-data/lib/dependency-store.d.ts

@@ -5,7 +5,12 @@ import type { DefaultLogFields, ListLogLine } from 'simple-git';
  * Stores the state of atlaskit dependencies in a repository
  */
 export declare class DependencyStore {
-    private cwd;
+    /**
+     * We may want to work not in root, but in specific directory
+     * 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"
+     */
+    private subWorkDir?;
     /** Mapping of dependency names to arrays of unique dependency type + versions */
     private dependencies;
     /** Mapping of workspaces to their dependency map. Each dependency in their map links to an entry in `dependencies` */
@@ -15,7 +20,11 @@ export declare class DependencyStore {
     private initialised;
     private supportedScopes;
     private supportedPackages;
-    constructor(cwd: string | undefined, supportedScopes: string[], supportedPackages: string[]);
+    constructor({ subWorkDir, supportedScopes, supportedPackages, }: {
+        subWorkDir?: string;
+        supportedScopes: string[];
+        supportedPackages: string[];
+    });
     /** Scans the repo for dependencies at the specified git ref and return the flattened dependency map */
     initialise(gitRef?: string): Promise<DependencyMap>;
     /** Updates the repo dependency store based on the changes in `logItem`.

package/dist/types/commands/populate-historic-data/product.d.ts

@@ -6,5 +6,6 @@ export type PopulateProductFlags = PopulateHistoricDataFlags & {
     statlas?: boolean;
     tag?: string;
     supportedPackages?: string;
+    subWorkDir?: string;
 };
 export default function populateProduct(flags: PopulateProductFlags): Promise<void>;

package/dist/types/util/yarn.d.ts

@@ -1,2 +1,2 @@
-export declare function getWorkspacePackageJsonPaths(hash: string, cwd: string): Promise<Set<string> | null>;
-export declare function getWorkspacePaths(ref: string, workspaceGlobs: Set<string>, cwd: string): Promise<string[]>;
+export declare function getWorkspacePackageJsonPaths(hash: string, subWorkDir?: string): Promise<Set<string> | null>;
+export declare function getWorkspacePaths(ref: string, workspaceGlobs: Set<string>): Promise<string[]>;

package/dist/types-ts4.5/commands/populate-historic-data/lib/dependency-store.d.ts

@@ -5,7 +5,12 @@ import type { DefaultLogFields, ListLogLine } from 'simple-git';
  * Stores the state of atlaskit dependencies in a repository
  */
 export declare class DependencyStore {
-    private cwd;
+    /**
+     * We may want to work not in root, but in specific directory
+     * 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"
+     */
+    private subWorkDir?;
     /** Mapping of dependency names to arrays of unique dependency type + versions */
     private dependencies;
     /** Mapping of workspaces to their dependency map. Each dependency in their map links to an entry in `dependencies` */
@@ -15,7 +20,11 @@ export declare class DependencyStore {
     private initialised;
     private supportedScopes;
     private supportedPackages;
-    constructor(cwd: string | undefined, supportedScopes: string[], supportedPackages: string[]);
+    constructor({ subWorkDir, supportedScopes, supportedPackages, }: {
+        subWorkDir?: string;
+        supportedScopes: string[];
+        supportedPackages: string[];
+    });
     /** Scans the repo for dependencies at the specified git ref and return the flattened dependency map */
     initialise(gitRef?: string): Promise<DependencyMap>;
     /** Updates the repo dependency store based on the changes in `logItem`.

package/dist/types-ts4.5/commands/populate-historic-data/product.d.ts

@@ -6,5 +6,6 @@ export type PopulateProductFlags = PopulateHistoricDataFlags & {
     statlas?: boolean;
     tag?: string;
     supportedPackages?: string;
+    subWorkDir?: string;
 };
 export default function populateProduct(flags: PopulateProductFlags): Promise<void>;

package/dist/types-ts4.5/util/yarn.d.ts

@@ -1,2 +1,2 @@
-export declare function getWorkspacePackageJsonPaths(hash: string, cwd: string): Promise<Set<string> | null>;
-export declare function getWorkspacePaths(ref: string, workspaceGlobs: Set<string>, cwd: string): Promise<string[]>;
+export declare function getWorkspacePackageJsonPaths(hash: string, subWorkDir?: string): Promise<Set<string> | null>;
+export declare function getWorkspacePaths(ref: string, workspaceGlobs: Set<string>): Promise<string[]>;

package/package.json

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

package/report.api.md

@@ -56,6 +56,7 @@ type PopulateProductFlags = PopulateHistoricDataFlags & {
   statlas?: boolean;
   tag?: string;
   supportedPackages?: string;
+  subWorkDir?: string;
 };
 
 // @public (undocumented)

package/tmp/api-report-tmp.d.ts

@@ -39,6 +39,7 @@ type PopulateProductFlags = PopulateHistoricDataFlags & {
     statlas?: boolean;
     tag?: string;
     supportedPackages?: string;
+    subWorkDir?: string;
 };
 
 // @public (undocumented)