@atlaskit/dependency-version-analytics 1.0.0 → 1.2.0

package/dist/cjs/util/statlas.js

@@ -6,110 +6,40 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getMeta = getMeta;
 exports.uploadMeta = uploadMeta;
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _nodeFetch = _interopRequireDefault(require("node-fetch"));
-var STATLAS_BASE_URL = 'https://statlas.prod.atl-paas.net/af-product-analytics';
-function getMeta(_x) {
-  return _getMeta.apply(this, arguments);
-}
-function _getMeta() {
-  _getMeta = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(product) {
-    var response;
-    return _regenerator.default.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            _context.next = 2;
-            return retrieveJSON(getProductMetaPath(product));
-          case 2:
-            response = _context.sent;
-            return _context.abrupt("return", response.json);
-          case 4:
-          case "end":
-            return _context.stop();
-        }
-      }
-    }, _callee);
-  }));
-  return _getMeta.apply(this, arguments);
+const STATLAS_BASE_URL = 'https://statlas.prod.atl-paas.net/af-product-analytics';
+async function getMeta(product) {
+  const response = await retrieveJSON(getProductMetaPath(product));
+  return response.json;
 }
 function uploadMeta(product, lastRunHash) {
   return uploadJSON(getProductMetaPath(product), {
-    lastRunHash: lastRunHash
+    lastRunHash
   });
 }
 function getProductMetaPath(product) {
-  return "product/".concat(product, ".json");
-}
-function retrieveJSON(_x2) {
-  return _retrieveJSON.apply(this, arguments);
+  return `product/${product}.json`;
 }
-function _retrieveJSON() {
-  _retrieveJSON = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(filepath) {
-    var response, json;
-    return _regenerator.default.wrap(function _callee2$(_context2) {
-      while (1) {
-        switch (_context2.prev = _context2.next) {
-          case 0:
-            _context2.next = 2;
-            return (0, _nodeFetch.default)("".concat(STATLAS_BASE_URL, "/").concat(filepath, "?statlasredirect"));
-          case 2:
-            response = _context2.sent;
-            json = null;
-            if (!response.ok) {
-              _context2.next = 8;
-              break;
-            }
-            _context2.next = 7;
-            return response.json();
-          case 7:
-            json = _context2.sent;
-          case 8:
-            return _context2.abrupt("return", {
-              json: json,
-              rawResponse: response
-            });
-          case 9:
-          case "end":
-            return _context2.stop();
-        }
-      }
-    }, _callee2);
-  }));
-  return _retrieveJSON.apply(this, arguments);
+async function retrieveJSON(filepath) {
+  const response = await (0, _nodeFetch.default)(`${STATLAS_BASE_URL}/${filepath}?statlasredirect`);
+  let json = null;
+  if (response.ok) {
+    json = await response.json();
+  }
+  return {
+    json,
+    rawResponse: response
+  };
 }
-function uploadJSON(_x3, _x4) {
-  return _uploadJSON.apply(this, arguments);
-}
-function _uploadJSON() {
-  _uploadJSON = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(filepath, json) {
-    var res;
-    return _regenerator.default.wrap(function _callee3$(_context3) {
-      while (1) {
-        switch (_context3.prev = _context3.next) {
-          case 0:
-            _context3.next = 2;
-            return (0, _nodeFetch.default)("".concat(STATLAS_BASE_URL, "/").concat(filepath), {
-              method: 'PUT',
-              body: JSON.stringify(json),
-              headers: {
-                Authorization: "Bearer ".concat(process.env.bamboo_JWT_TOKEN)
-              }
-            });
-          case 2:
-            res = _context3.sent;
-            if (res.ok) {
-              _context3.next = 5;
-              break;
-            }
-            throw new Error("Statlas upload failed: ".concat(res.statusText));
-          case 5:
-          case "end":
-            return _context3.stop();
-        }
-      }
-    }, _callee3);
-  }));
-  return _uploadJSON.apply(this, arguments);
+async function uploadJSON(filepath, json) {
+  const res = await (0, _nodeFetch.default)(`${STATLAS_BASE_URL}/${filepath}`, {
+    method: 'PUT',
+    body: JSON.stringify(json),
+    headers: {
+      Authorization: `Bearer ${process.env.bamboo_JWT_TOKEN}`
+    }
+  });
+  if (!res.ok) {
+    throw new Error(`Statlas upload failed: ${res.statusText}`);
+  }
 }

package/dist/cjs/util/yarn.js

@@ -1,115 +1,54 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getWorkspaceGlobs = getWorkspaceGlobs;
 exports.getWorkspacePaths = getWorkspacePaths;
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _path = _interopRequireDefault(require("path"));
 var _debug = _interopRequireDefault(require("debug"));
 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 _getRequireWildcardCache(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; }
-var rootPackageJsonPath = 'package.json';
-var debug = (0, _debug.default)('atlaskit:yarn');
-function getWorkspaceGlobs(_x, _x2) {
-  return _getWorkspaceGlobs.apply(this, arguments);
+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 getWorkspaceGlobs(ref, cwd) {
+  let file;
+  try {
+    file = await git.showFile(ref, rootPackageJsonPath, {
+      cwd
+    });
+  } catch (e) {
+    debug(`${rootPackageJsonPath} does not exist`);
+    return new Set([]);
+  }
+  let rootPackageJsonFile;
+  try {
+    rootPackageJsonFile = JSON.parse(file);
+  } catch (e) {
+    console.error(`Error parsing ${file}@${ref}: ${e}`);
+    return null;
+  }
+  const workspaces = rootPackageJsonFile.workspaces;
+  if (!workspaces) {
+    return new Set([rootPackageJsonPath]);
+  }
+  // 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'))]);
 }
-function _getWorkspaceGlobs() {
-  _getWorkspaceGlobs = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(ref, cwd) {
-    var file, rootPackageJsonFile, workspaces, workspacePackages;
-    return _regenerator.default.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            _context.prev = 0;
-            _context.next = 3;
-            return git.showFile(ref, rootPackageJsonPath, {
-              cwd: cwd
-            });
-          case 3:
-            file = _context.sent;
-            _context.next = 10;
-            break;
-          case 6:
-            _context.prev = 6;
-            _context.t0 = _context["catch"](0);
-            debug("".concat(rootPackageJsonPath, " does not exist"));
-            return _context.abrupt("return", new Set([]));
-          case 10:
-            _context.prev = 10;
-            rootPackageJsonFile = JSON.parse(file);
-            _context.next = 18;
-            break;
-          case 14:
-            _context.prev = 14;
-            _context.t1 = _context["catch"](10);
-            console.error("Error parsing ".concat(file, "@").concat(ref, ": ").concat(_context.t1));
-            return _context.abrupt("return", null);
-          case 18:
-            workspaces = rootPackageJsonFile.workspaces;
-            if (workspaces) {
-              _context.next = 21;
-              break;
-            }
-            return _context.abrupt("return", new Set([rootPackageJsonPath]));
-          case 21:
-            // 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((0, _toConsumableArray2.default)(workspacePackages.map(function (glob) {
-              return _path.default.join(glob, 'package.json');
-            })))));
-          case 23:
-          case "end":
-            return _context.stop();
-        }
-      }
-    }, _callee, null, [[0, 6], [10, 14]]);
-  }));
-  return _getWorkspaceGlobs.apply(this, arguments);
-}
-function getWorkspacePaths(_x3, _x4, _x5) {
-  return _getWorkspacePaths.apply(this, arguments);
-}
-function _getWorkspacePaths() {
-  _getWorkspacePaths = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(ref, workspaceGlobs, cwd) {
-    var workspacePackageJsons, matchedWorkspaces;
-    return _regenerator.default.wrap(function _callee2$(_context2) {
-      while (1) {
-        switch (_context2.prev = _context2.next) {
-          case 0:
-            if (!(workspaceGlobs.size === 0)) {
-              _context2.next = 2;
-              break;
-            }
-            return _context2.abrupt("return", []);
-          case 2:
-            _context2.next = 4;
-            return git.getFiles(ref, '**/package.json', {
-              cwd: cwd
-            });
-          case 4:
-            workspacePackageJsons = _context2.sent;
-            matchedWorkspaces = (0, _micromatch.default)(workspacePackageJsons, (0, _toConsumableArray2.default)(workspaceGlobs));
-            if (!(matchedWorkspaces.length === 0)) {
-              _context2.next = 8;
-              break;
-            }
-            throw new Error("Could not find any workspace or package.json under ".concat(cwd));
-          case 8:
-            return _context2.abrupt("return", matchedWorkspaces);
-          case 9:
-          case "end":
-            return _context2.stop();
-        }
-      }
-    }, _callee2);
-  }));
-  return _getWorkspacePaths.apply(this, arguments);
+async function getWorkspacePaths(ref, workspaceGlobs, cwd) {
+  if (workspaceGlobs.size === 0) {
+    return [];
+  }
+  const workspacePackageJsons = await git.getFiles(ref, '**/package.json', {
+    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}`);
+  }
+  return matchedWorkspaces;
 }

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/dependency-version-analytics",
-	"version": "1.0.0",
+	"version": "1.2.0",
 	"sideEffects": false
 }

package/dist/es2019/cli.js

@@ -11,6 +11,7 @@ ${chalk.green('Global options')}
      ${chalk.yellow('--dryRun')}         Performs a dry run, prints analytics events to console in JSON format instead of sending them
      ${chalk.yellow('--limit')}          Limit the number of events sent, used for validation purposes
      ${chalk.yellow('--no-interactive')} Disable any interactive prompts
+     ${chalk.yellow('--include-restricted-scopes')}    Include analytics for @atlassian and @atlassiansox scoped packages as well
 
 ${chalk.yellow.bold('[populate-product] <product>')}
    Sends analytics events for atlaskit dependency versions changes in package.json.
@@ -20,7 +21,7 @@ ${chalk.yellow.bold('[populate-product] <product>')}
    If running the tool for the first time (last run does not exist), --reset must be used to detect changes since the beginning of the repo.
 
    ${chalk.green('Options')}
-     ${chalk.yellow('--csv')}         Prints AK dependency history in CSV format
+     ${chalk.yellow('--csv')}         Prints dependency history in CSV format
      ${chalk.yellow('--reset')}       Reset change detection to detect changes from the beginning of time
      ${chalk.yellow('--tag')}         Specify a different tag to mark when the tool was last run
      ${chalk.yellow('--statlas')}     Use statlas rather than git tags for storing and sourcing last run info
@@ -29,7 +30,7 @@ ${chalk.yellow.bold('[populate-product] <product>')}
      ${chalk.dim('$ atlaskit-version-analytics populate-product jira')}
 
 ${chalk.yellow.bold('[populate-package] <package>')}
-   Sends analytics events for published versions of the specified atlaskit package.
+   Sends analytics events for published versions of the specified package.
 
    ${chalk.green('Options')}
      ${chalk.yellow('--since')}       Only publish versions since the following JS date string (exclusive)
@@ -70,6 +71,9 @@ export function run({
       },
       statlas: {
         type: 'boolean'
+      },
+      includeRestrictedScopes: {
+        type: 'boolean'
       }
     }
   });
@@ -90,7 +94,8 @@ export function run({
       product,
       reset: cli.flags.reset || false,
       statlas: cli.flags.statlas,
-      tag: cli.flags.tag
+      tag: cli.flags.tag,
+      includeRestrictedScopes: cli.flags.includeRestrictedScopes || false
     });
   } else if (command === 'populate-package') {
     const pkg = inputs[0];
@@ -104,7 +109,8 @@ export function run({
       interactive: cli.flags.interactive,
       limit,
       pkg,
-      since: cli.flags.since
+      since: cli.flags.since,
+      includeRestrictedScopes: cli.flags.includeRestrictedScopes || false
     });
   }
 

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

@@ -8,6 +8,7 @@ import { showFile } from '../../../util/git';
 import { DEP_TYPES } from '../../../constants';
 import { assert } from '../../../util/assert';
 import micromatch from 'micromatch';
+import { isPackageFromSupportedScopes } from '../util/allowed-scopes';
 const debug = debugModule('atlaskit:dependency');
 /**
  * Stores the state of atlaskit dependencies in a repository
@@ -19,12 +20,13 @@ export class DependencyStore {
 
   /** Set of workspace globs. Used to verify that a package.json is a valid workspace */
 
-  constructor(cwd = process.cwd()) {
+  constructor(cwd = process.cwd(), supportedScopes) {
     _defineProperty(this, "dependencies", {});
     _defineProperty(this, "workspaces", {});
     _defineProperty(this, "workspaceGlobs", new Set());
     _defineProperty(this, "initialised", false);
     this.cwd = cwd;
+    this.supportedScopes = supportedScopes;
   }
 
   /** Scans the repo for dependencies at the specified git ref and return the flattened dependency map */
@@ -140,7 +142,7 @@ export class DependencyStore {
       packageJsonKey,
       depTypeName
     } of DEP_TYPES) {
-      const wsDeps = DependencyStore.getAkDependencies(json[packageJsonKey] || {}, depTypeName);
+      const wsDeps = this.getSupportedDependencies(json[packageJsonKey] || {}, depTypeName);
       workspaceDeps = {
         ...workspaceDeps,
         ...wsDeps
@@ -203,10 +205,10 @@ export class DependencyStore {
       this.dependencies[depName] = this.dependencies[depName].filter(entry => entry !== depEntry);
     }
   }
-  static getAkDependencies(depMap, type) {
+  getSupportedDependencies(depMap, type) {
     return fromEntries(Object.entries(depMap).filter(
     // Ignore suffixed `--next` deps in jira used for independent upgrades
-    ([name]) => name.includes('@atlaskit') && !name.endsWith('--next')).map(([name, version]) => [DependencyStore.transformDepName(name), {
+    ([name]) => isPackageFromSupportedScopes(name, this.supportedScopes) && !name.endsWith('--next')).map(([name, version]) => [DependencyStore.transformDepName(name), {
       version: DependencyStore.transformDepVersion(version),
       type
     }]));

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

@@ -1,7 +1,10 @@
 import semver from 'semver';
-import getPackageVersionHistory from '../../util/get-package-version-history';
+import getPackageVersionHistoryAndTags from '../../util/get-package-version-history';
 import { createUpgradeEvent, sendAnalytics } from '../../util/analytics';
-const createAnalyticsEvents = (packageName, packageVersionHistory, since) => {
+import { getSupportedScopes, isPackageFromSupportedScopes } from './util/allowed-scopes';
+const createAnalyticsEvents = (packageName, packageVersionHistoryAndTags, since) => {
+  const packageVersionHistory = packageVersionHistoryAndTags['time'];
+  const tags = packageVersionHistoryAndTags['dist-tags'];
   const sortedPackageVersionHistory = Object.entries(packageVersionHistory).filter(([version]) => semver.valid(version)).sort((a, b) => Number(new Date(a[1])) - Number(new Date(b[1])));
   const upgradeEvents = sortedPackageVersionHistory.map(([version, time], i) => {
     if (since && Number(new Date(time)) <= Number(new Date(since))) {
@@ -9,16 +12,18 @@ const createAnalyticsEvents = (packageName, packageVersionHistory, since) => {
     }
     const previousVersion = sortedPackageVersionHistory[i - 1] && sortedPackageVersionHistory[i - 1][0];
     return createUpgradeEvent(packageName, version, previousVersion, time, {
-      historical: true
+      historical: true,
+      tags
     });
   }).filter(e => e != null);
   return upgradeEvents;
 };
 export default async function populatePackage(flags) {
-  if (!flags.pkg.startsWith('@atlaskit/')) {
-    throw new Error(`Package must start with '@atlaskit/'`);
+  const supportedScopes = getSupportedScopes(flags.includeRestrictedScopes);
+  if (!isPackageFromSupportedScopes(flags.pkg, supportedScopes)) {
+    throw new Error(`Package must start with ${supportedScopes.join(', ')}`);
   }
-  const packageVersionHistory = await getPackageVersionHistory(flags.pkg);
+  const packageVersionHistory = await getPackageVersionHistoryAndTags(flags.pkg);
   if (flags.since && Number.isNaN(Number(new Date(flags.since)))) {
     throw new Error(`'since' flag is an invalid date`);
   }

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

@@ -6,6 +6,8 @@ import * as statlas from '../../util/statlas';
 import { generateCSV } from './util/generate-csv';
 import { assert } from '../../util/assert';
 import { DependencyStore } from './lib/dependency-store';
+import getPackageVersionHistoryAndTags from '../../util/get-package-version-history';
+import { getSupportedScopes } from './util/allowed-scopes';
 const getUpgradeEventsFromPkgChange = (oldDeps, newDeps, {
   date,
   commitHash
@@ -42,21 +44,21 @@ const getUpgradeEventsFromPkgChange = (oldDeps, newDeps, {
 };
 const getEventsFromHistory = async (packageChangesLog, prevRunHash, {
   cwd
-}) => {
+}, supportedScopes) => {
   const allPackageChanges = [];
-  const allUpgradeEvents = [];
+  let allUpgradeEvents = [];
   assert(packageChangesLog.all.length > 0, '');
-  let dependencyStore = new DependencyStore(cwd);
+  let dependencyStore = new DependencyStore(cwd, supportedScopes);
   let dependencies = await dependencyStore.initialise(prevRunHash);
   for (let i = 0; i < packageChangesLog.all.length; i++) {
     let item = packageChangesLog.all[i];
     if (allPackageChanges.length > 0) {
-      dependencies = allPackageChanges[allPackageChanges.length - 1].akDeps;
+      dependencies = allPackageChanges[allPackageChanges.length - 1].deps;
     }
     const newDependencies = await dependencyStore.update(item);
     const packageChange = {
       date: new Date(item.date).toISOString(),
-      akDeps: newDependencies
+      deps: newDependencies
     };
     const upgradeEvents = getUpgradeEventsFromPkgChange(dependencies, newDependencies, {
       date: packageChange.date,
@@ -67,6 +69,21 @@ const getEventsFromHistory = async (packageChangesLog, prevRunHash, {
       allPackageChanges.push(packageChange);
     }
   }
+  // add dist-tags to upgrade event
+  allUpgradeEvents = await Promise.all(allUpgradeEvents.map(async upgradeEvent => {
+    var _distTags$hotfix, _distTags$latest, _distTags$next;
+    const getPackageTags = await getPackageVersionHistoryAndTags(upgradeEvent.dependencyName);
+    const distTags = getPackageTags['dist-tags'];
+    Object.keys(distTags).forEach(key => {
+      if (key.startsWith('rc')) {
+        upgradeEvent.rcTag = distTags[key];
+      }
+    });
+    upgradeEvent.hotfixTag = (_distTags$hotfix = distTags['hotfix']) !== null && _distTags$hotfix !== void 0 ? _distTags$hotfix : null;
+    upgradeEvent.latestTag = (_distTags$latest = distTags['latest']) !== null && _distTags$latest !== void 0 ? _distTags$latest : null;
+    upgradeEvent.nextTag = (_distTags$next = distTags['next']) !== null && _distTags$next !== void 0 ? _distTags$next : null;
+    return upgradeEvent;
+  }));
   return {
     allPackageChanges,
     allUpgradeEvents
@@ -93,6 +110,7 @@ export default async function populateProduct(flags) {
   const cwd = flags.cwd || process.cwd();
   const sinceRef = flags.reset ? undefined : await getSinceRef(flags);
   const log = await getChangesSince(sinceRef);
+  const supportedScopes = getSupportedScopes(flags.includeRestrictedScopes);
   if (log.all.length === 0) {
     console.log(`No package.json changes found since '${sinceRef}'.`);
     return;
@@ -102,7 +120,7 @@ export default async function populateProduct(flags) {
     allUpgradeEvents
   } = await getEventsFromHistory(log, sinceRef, {
     cwd
-  });
+  }, supportedScopes);
   if (flags.csv) {
     const csv = generateCSV(allPackageChanges);
     console.log(csv);
@@ -120,7 +138,7 @@ export default async function populateProduct(flags) {
       skipPrompt: !flags.interactive
     });
   } else {
-    console.log(`Found no AK dependency changes since last run from ref "${sinceRef}"'`);
+    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/commands/populate-historic-data/util/allowed-scopes.js

@@ -0,0 +1,7 @@
+const defaultScopes = ['@atlaskit', '@atlassian', '@atlassiansox'];
+export const getSupportedScopes = (enableNonAtlaskitPackages = false) => {
+  return enableNonAtlaskitPackages ? defaultScopes : ['@atlaskit'];
+};
+export const isPackageFromSupportedScopes = (packageName, supportedScopes = defaultScopes) => {
+  return supportedScopes.some(scope => packageName.startsWith(scope));
+};

package/dist/es2019/commands/populate-historic-data/util/generate-csv.js

@@ -4,7 +4,7 @@ export const generateCSV = packageChanges => {
   packageChanges.forEach(packageChange => {
     const firstColumn = csvData[0];
     const currentRow = firstColumn.push(packageChange.date) - 1;
-    Object.entries(packageChange.akDeps).forEach(([name, {
+    Object.entries(packageChange.deps).forEach(([name, {
       version
     }]) => {
       let depColumnIndex = csvData.findIndex(item => item[0] === name);

package/dist/es2019/util/analytics.js

@@ -39,6 +39,7 @@ function getUpgradeSubType(version, previousVersion) {
   return upgradeSubType;
 }
 export function createUpgradeEvent(name, version, previousVersion, date, optionalArgs = {}) {
+  var _optionalArgs$tags, _ref, _tags$next, _tags$hotfix, _ref2;
   if (Number.isNaN(Date.parse(date))) {
     throw new Error(`Invalid date: '${date}'`);
   }
@@ -50,6 +51,14 @@ export function createUpgradeEvent(name, version, previousVersion, date, optiona
   const upgradeSubType = getUpgradeSubType(version, previousVersion);
   const eventVersion = upgradeType !== 'remove' ? version : previousVersion;
   const parsedVersion = semver.coerce(eventVersion);
+  let rcKey = null;
+  const tags = (_optionalArgs$tags = optionalArgs === null || optionalArgs === void 0 ? void 0 : optionalArgs.tags) !== null && _optionalArgs$tags !== void 0 ? _optionalArgs$tags : {};
+  Object.keys(tags).forEach(key => {
+    if (key.startsWith('rc')) {
+      rcKey = key;
+      return;
+    }
+  });
   return {
     cliVersion: packageVersion,
     dependencyName: name,
@@ -60,6 +69,10 @@ export function createUpgradeEvent(name, version, previousVersion, date, optiona
     date: new Date(date).toISOString(),
     upgradeType,
     upgradeSubType,
+    latestTag: (_ref = tags && tags['latest']) !== null && _ref !== void 0 ? _ref : null,
+    nextTag: (_tags$next = tags['next']) !== null && _tags$next !== void 0 ? _tags$next : null,
+    hotfixTag: (_tags$hotfix = tags['hotfix']) !== null && _tags$hotfix !== void 0 ? _tags$hotfix : null,
+    rcTag: (_ref2 = rcKey && tags[rcKey]) !== null && _ref2 !== void 0 ? _ref2 : null,
     ...optionalArgs
   };
 }

package/dist/es2019/util/get-package-version-history.js

@@ -1,7 +1,7 @@
 import { exec } from 'child_process';
-export default function getPackageVersionHistory(packageName) {
+export default function getPackageVersionHistoryAndTags(packageName) {
   return new Promise((resolve, reject) => {
-    exec(`yarn info ${packageName} --json time`, (error, stdout, stderr) => {
+    exec(`yarn info ${packageName} --json`, (error, stdout, stderr) => {
       if (error) {
         reject(error);
       }
@@ -10,7 +10,11 @@ export default function getPackageVersionHistory(packageName) {
       }
       let json;
       try {
-        json = JSON.parse(stdout).data;
+        const parseData = JSON.parse(stdout).data;
+        json = {
+          time: parseData['time'],
+          'dist-tags': parseData['dist-tags']
+        };
       } catch (e) {
         reject(`Error parsing json output: ${e}`);
       }

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/dependency-version-analytics",
-	"version": "1.0.0",
+	"version": "1.2.0",
 	"sideEffects": false
 }

package/dist/esm/cli.js

@@ -6,7 +6,7 @@ import meow from 'meow';
 import { populateProduct, populatePackage } from './commands/populate-historic-data';
 
 // prettier-ignore
-var HELP_MSG = "\n".concat(chalk.green('Global options'), "\n     ").concat(chalk.yellow('--dev'), "            Send analytics to dev analytics pipeline instead of prod\n     ").concat(chalk.yellow('--dryRun'), "         Performs a dry run, prints analytics events to console in JSON format instead of sending them\n     ").concat(chalk.yellow('--limit'), "          Limit the number of events sent, used for validation purposes\n     ").concat(chalk.yellow('--no-interactive'), " Disable any interactive prompts\n\n").concat(chalk.yellow.bold('[populate-product] <product>'), "\n   Sends analytics events for atlaskit dependency versions changes in package.json.\n\n   Detects changes since the last time the tool was run by storing the last run in either statlas (--statlas flag) or using the\n   'atlaskit-dependency-version-analytics-last-run' git tag.\n   If running the tool for the first time (last run does not exist), --reset must be used to detect changes since the beginning of the repo.\n\n   ").concat(chalk.green('Options'), "\n     ").concat(chalk.yellow('--csv'), "         Prints AK dependency history in CSV format\n     ").concat(chalk.yellow('--reset'), "       Reset change detection to detect changes from the beginning of time\n     ").concat(chalk.yellow('--tag'), "         Specify a different tag to mark when the tool was last run\n     ").concat(chalk.yellow('--statlas'), "     Use statlas rather than git tags for storing and sourcing last run info\n\n   ").concat(chalk.green('Examples'), "\n     ").concat(chalk.dim('$ atlaskit-version-analytics populate-product jira'), "\n\n").concat(chalk.yellow.bold('[populate-package] <package>'), "\n   Sends analytics events for published versions of the specified atlaskit package.\n\n   ").concat(chalk.green('Options'), "\n     ").concat(chalk.yellow('--since'), "       Only publish versions since the following JS date string (exclusive)\n\n   ").concat(chalk.green('Examples'), "\n     ").concat(chalk.dim('$ atlaskit-version-analytics populate-package @atlaskit/button'), "\n");
+var HELP_MSG = "\n".concat(chalk.green('Global options'), "\n     ").concat(chalk.yellow('--dev'), "            Send analytics to dev analytics pipeline instead of prod\n     ").concat(chalk.yellow('--dryRun'), "         Performs a dry run, prints analytics events to console in JSON format instead of sending them\n     ").concat(chalk.yellow('--limit'), "          Limit the number of events sent, used for validation purposes\n     ").concat(chalk.yellow('--no-interactive'), " Disable any interactive prompts\n     ").concat(chalk.yellow('--include-restricted-scopes'), "    Include analytics for @atlassian and @atlassiansox scoped packages as well\n\n").concat(chalk.yellow.bold('[populate-product] <product>'), "\n   Sends analytics events for atlaskit dependency versions changes in package.json.\n\n   Detects changes since the last time the tool was run by storing the last run in either statlas (--statlas flag) or using the\n   'atlaskit-dependency-version-analytics-last-run' git tag.\n   If running the tool for the first time (last run does not exist), --reset must be used to detect changes since the beginning of the repo.\n\n   ").concat(chalk.green('Options'), "\n     ").concat(chalk.yellow('--csv'), "         Prints dependency history in CSV format\n     ").concat(chalk.yellow('--reset'), "       Reset change detection to detect changes from the beginning of time\n     ").concat(chalk.yellow('--tag'), "         Specify a different tag to mark when the tool was last run\n     ").concat(chalk.yellow('--statlas'), "     Use statlas rather than git tags for storing and sourcing last run info\n\n   ").concat(chalk.green('Examples'), "\n     ").concat(chalk.dim('$ atlaskit-version-analytics populate-product jira'), "\n\n").concat(chalk.yellow.bold('[populate-package] <package>'), "\n   Sends analytics events for published versions of the specified package.\n\n   ").concat(chalk.green('Options'), "\n     ").concat(chalk.yellow('--since'), "       Only publish versions since the following JS date string (exclusive)\n\n   ").concat(chalk.green('Examples'), "\n     ").concat(chalk.dim('$ atlaskit-version-analytics populate-package @atlaskit/button'), "\n");
 export function run(_ref) {
   var dev = _ref.dev;
   var cli = meow(HELP_MSG, {
@@ -39,6 +39,9 @@ export function run(_ref) {
       },
       statlas: {
         type: 'boolean'
+      },
+      includeRestrictedScopes: {
+        type: 'boolean'
       }
     }
   });
@@ -61,7 +64,8 @@ export function run(_ref) {
       product: product,
       reset: cli.flags.reset || false,
       statlas: cli.flags.statlas,
-      tag: cli.flags.tag
+      tag: cli.flags.tag,
+      includeRestrictedScopes: cli.flags.includeRestrictedScopes || false
     });
   } else if (command === 'populate-package') {
     var pkg = inputs[0];
@@ -75,7 +79,8 @@ export function run(_ref) {
       interactive: cli.flags.interactive,
       limit: limit,
       pkg: pkg,
-      since: cli.flags.since
+      since: cli.flags.since,
+      includeRestrictedScopes: cli.flags.includeRestrictedScopes || false
     });
   }