@atlaskit/dependency-version-analytics 1.6.4 → 1.6.5

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/dependency-version-analytics
 
+## 1.6.5
+
+### Patch Changes
+
+- [#68871](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/68871) [`1cb2b8f4e1d7`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/1cb2b8f4e1d7) - Take subWorkDir into consideration when checking for root package.json changes
+
 ## 1.6.4
 
 ### Patch Changes

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

@@ -55,12 +55,16 @@ class DependencyStore {
   /** Updates the repo dependency store based on the changes in `logItem`.
    * Returns the updated flattened dependencies
    */
-  async update(logItem) {
+  async update({
+    item,
+    subWorkDir
+  }) {
     this.assertInitialised();
-    const hash = logItem.hash;
-    (0, _assert.assert)(!!logItem.diff, `Diff must exist in log ${logItem} ${hash}`);
-    const changedPackageJsons = logItem.diff.files.filter(f => f.file.endsWith('package.json')).map(f => f.file);
-    const didRootPackageJsonChange = !!changedPackageJsons.find(file => file === 'package.json');
+    const hash = item.hash;
+    (0, _assert.assert)(!!item.diff, `Diff must exist in log ${item} ${hash}`);
+    const changedPackageJsons = item.diff.files.filter(f => f.file.endsWith('package.json')).map(f => f.file);
+    const rootPackageJson = `${subWorkDir ? `${subWorkDir}/` : ''}package.json`;
+    const didRootPackageJsonChange = !!changedPackageJsons.find(file => file === rootPackageJson);
     if (didRootPackageJsonChange) {
       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)));

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

@@ -67,7 +67,10 @@ const getEventsFromHistory = async (packageChangesLog, prevRunHash, directoryOpt
     if (allPackageChanges.length > 0) {
       dependencies = allPackageChanges[allPackageChanges.length - 1].deps;
     }
-    const newDependencies = await dependencyStore.update(item);
+    const newDependencies = await dependencyStore.update({
+      item,
+      subWorkDir: directoryOptions.subWorkDir
+    });
     const packageChange = {
       date: new Date(item.date).toISOString(),
       deps: newDependencies

package/dist/cjs/util/analytics.js

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

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

@@ -48,12 +48,16 @@ export class DependencyStore {
   /** Updates the repo dependency store based on the changes in `logItem`.
    * Returns the updated flattened dependencies
    */
-  async update(logItem) {
+  async update({
+    item,
+    subWorkDir
+  }) {
     this.assertInitialised();
-    const hash = logItem.hash;
-    assert(!!logItem.diff, `Diff must exist in log ${logItem} ${hash}`);
-    const changedPackageJsons = logItem.diff.files.filter(f => f.file.endsWith('package.json')).map(f => f.file);
-    const didRootPackageJsonChange = !!changedPackageJsons.find(file => file === 'package.json');
+    const hash = item.hash;
+    assert(!!item.diff, `Diff must exist in log ${item} ${hash}`);
+    const changedPackageJsons = item.diff.files.filter(f => f.file.endsWith('package.json')).map(f => f.file);
+    const rootPackageJson = `${subWorkDir ? `${subWorkDir}/` : ''}package.json`;
+    const didRootPackageJsonChange = !!changedPackageJsons.find(file => file === rootPackageJson);
     if (didRootPackageJsonChange) {
       const workspacePackageJsonPaths = await getWorkspacePackageJsonPaths(hash, this.subWorkDir);
       const workspacePackageJsonPathsChanged = workspacePackageJsonPaths !== null && (this.workspacePackageJsonPaths.size !== workspacePackageJsonPaths.size || [...this.workspacePackageJsonPaths].some(glob => !workspacePackageJsonPaths.has(glob)));

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

@@ -58,7 +58,10 @@ const getEventsFromHistory = async (packageChangesLog, prevRunHash, directoryOpt
     if (allPackageChanges.length > 0) {
       dependencies = allPackageChanges[allPackageChanges.length - 1].deps;
     }
-    const newDependencies = await dependencyStore.update(item);
+    const newDependencies = await dependencyStore.update({
+      item,
+      subWorkDir: directoryOptions.subWorkDir
+    });
     const packageChange = {
       date: new Date(item.date).toISOString(),
       deps: newDependencies

package/dist/es2019/util/analytics.js

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

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

@@ -81,68 +81,70 @@ export var DependencyStore = /*#__PURE__*/function () {
   }, {
     key: "update",
     value: function () {
-      var _update = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(logItem) {
-        var hash, changedPackageJsons, didRootPackageJsonChange, workspacePackageJsonPaths, workspacePackageJsonPathsChanged, changedWorkspaces, _iterator, _step, workspacePath, workspaceDeps, validWorkspace, noLongerWorkspace;
+      var _update = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(_ref2) {
+        var item, subWorkDir, hash, changedPackageJsons, rootPackageJson, didRootPackageJsonChange, workspacePackageJsonPaths, workspacePackageJsonPathsChanged, changedWorkspaces, _iterator, _step, workspacePath, workspaceDeps, validWorkspace, noLongerWorkspace;
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
+              item = _ref2.item, subWorkDir = _ref2.subWorkDir;
               this.assertInitialised();
-              hash = logItem.hash;
-              assert(!!logItem.diff, "Diff must exist in log ".concat(logItem, " ").concat(hash));
-              changedPackageJsons = logItem.diff.files.filter(function (f) {
+              hash = item.hash;
+              assert(!!item.diff, "Diff must exist in log ".concat(item, " ").concat(hash));
+              changedPackageJsons = item.diff.files.filter(function (f) {
                 return f.file.endsWith('package.json');
               }).map(function (f) {
                 return f.file;
               });
+              rootPackageJson = "".concat(subWorkDir ? "".concat(subWorkDir, "/") : '', "package.json");
               didRootPackageJsonChange = !!changedPackageJsons.find(function (file) {
-                return file === 'package.json';
+                return file === rootPackageJson;
               });
               if (!didRootPackageJsonChange) {
-                _context2.next = 15;
+                _context2.next = 17;
                 break;
               }
-              _context2.next = 8;
+              _context2.next = 10;
               return getWorkspacePackageJsonPaths(hash, this.subWorkDir);
-            case 8:
+            case 10:
               workspacePackageJsonPaths = _context2.sent;
               workspacePackageJsonPathsChanged = workspacePackageJsonPaths !== null && (this.workspacePackageJsonPaths.size !== workspacePackageJsonPaths.size || _toConsumableArray(this.workspacePackageJsonPaths).some(function (glob) {
                 return !workspacePackageJsonPaths.has(glob);
               }));
               if (!workspacePackageJsonPathsChanged) {
-                _context2.next = 15;
+                _context2.next = 17;
                 break;
               }
               debug("Workspace globs changed: ".concat(_toConsumableArray(workspacePackageJsonPaths), ". Resetting store."));
-              _context2.next = 14;
+              _context2.next = 16;
               return this.resetStore(hash);
-            case 14:
+            case 16:
               return _context2.abrupt("return", this.getFlattenedDeps());
-            case 15:
+            case 17:
               changedWorkspaces = micromatch(changedPackageJsons, _toConsumableArray(this.workspacePackageJsonPaths));
               debug("Updating changed workspaces@".concat(hash, ": ").concat(changedWorkspaces));
 
               // Iterate over all changed package.jsons rather than only valid workspaces so that we can
               // remove older workspaces that are no longer valid
               _iterator = _createForOfIteratorHelper(changedPackageJsons);
-              _context2.prev = 18;
+              _context2.prev = 20;
               _iterator.s();
-            case 20:
+            case 22:
               if ((_step = _iterator.n()).done) {
-                _context2.next = 33;
+                _context2.next = 35;
                 break;
               }
               workspacePath = _step.value;
-              _context2.next = 24;
+              _context2.next = 26;
               return this.getWorkspaceDependencies(hash, workspacePath);
-            case 24:
+            case 26:
               workspaceDeps = _context2.sent;
               validWorkspace = changedWorkspaces.includes(workspacePath);
               if (!(!validWorkspace && !this.workspaces[workspacePath])) {
-                _context2.next = 28;
+                _context2.next = 30;
                 break;
               }
-              return _context2.abrupt("continue", 31);
-            case 28:
+              return _context2.abrupt("continue", 33);
+            case 30:
               // For workspaces that are no longer a valid workspace but were previously, explicitly remove them
               noLongerWorkspace = !validWorkspace && this.workspaces[workspacePath];
               if (workspaceDeps == null || noLongerWorkspace) {
@@ -155,27 +157,27 @@ export var DependencyStore = /*#__PURE__*/function () {
                 workspaceDeps = {};
               }
               this.updateWorkspaces(workspacePath, workspaceDeps);
-            case 31:
-              _context2.next = 20;
-              break;
             case 33:
-              _context2.next = 38;
+              _context2.next = 22;
               break;
             case 35:
-              _context2.prev = 35;
-              _context2.t0 = _context2["catch"](18);
+              _context2.next = 40;
+              break;
+            case 37:
+              _context2.prev = 37;
+              _context2.t0 = _context2["catch"](20);
               _iterator.e(_context2.t0);
-            case 38:
-              _context2.prev = 38;
+            case 40:
+              _context2.prev = 40;
               _iterator.f();
-              return _context2.finish(38);
-            case 41:
+              return _context2.finish(40);
+            case 43:
               return _context2.abrupt("return", this.getFlattenedDeps());
-            case 42:
+            case 44:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, this, [[18, 35, 38, 41]]);
+        }, _callee2, this, [[20, 37, 40, 43]]);
       }));
       function update(_x2) {
         return _update.apply(this, arguments);
@@ -189,14 +191,14 @@ export var DependencyStore = /*#__PURE__*/function () {
   }, {
     key: "getFlattenedDeps",
     value: function getFlattenedDeps() {
-      var deps = Object.entries(this.dependencies).filter(function (_ref2) {
-        var _ref3 = _slicedToArray(_ref2, 2),
-          versions = _ref3[1];
+      var deps = Object.entries(this.dependencies).filter(function (_ref3) {
+        var _ref4 = _slicedToArray(_ref3, 2),
+          versions = _ref4[1];
         return versions.length > 0;
-      }).map(function (_ref4) {
-        var _ref5 = _slicedToArray(_ref4, 2),
-          depName = _ref5[0],
-          versions = _ref5[1];
+      }).map(function (_ref5) {
+        var _ref6 = _slicedToArray(_ref5, 2),
+          depName = _ref6[0],
+          versions = _ref6[1];
         return [depName, DependencyStore.getMinimumVersion(versions, depName)];
       });
       return Object.fromEntries(deps);
@@ -411,10 +413,10 @@ export var DependencyStore = /*#__PURE__*/function () {
     key: "getSupportedDependencies",
     value: function getSupportedDependencies(depMap, dependencyType) {
       var _this = this;
-      return Object.entries(depMap).reduce(function (supportedDependencies, _ref6) {
-        var _ref7 = _slicedToArray(_ref6, 2),
-          rawPackageName = _ref7[0],
-          packageVersion = _ref7[1];
+      return Object.entries(depMap).reduce(function (supportedDependencies, _ref7) {
+        var _ref8 = _slicedToArray(_ref7, 2),
+          rawPackageName = _ref8[0],
+          packageVersion = _ref8[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

@@ -91,7 +91,10 @@ var getEventsFromHistory = /*#__PURE__*/function () {
             dependencies = allPackageChanges[allPackageChanges.length - 1].deps;
           }
           _context.next = 13;
-          return dependencyStore.update(item);
+          return dependencyStore.update({
+            item: item,
+            subWorkDir: directoryOptions.subWorkDir
+          });
         case 13:
           newDependencies = _context.sent;
           packageChange = {

package/dist/esm/util/analytics.js

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

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

@@ -30,7 +30,10 @@ export declare class DependencyStore {
     /** Updates the repo dependency store based on the changes in `logItem`.
      * Returns the updated flattened dependencies
      */
-    update(logItem: DefaultLogFields & ListLogLine): Promise<DependencyMap>;
+    update({ item, subWorkDir, }: {
+        item: DefaultLogFields & ListLogLine;
+        subWorkDir?: string;
+    }): Promise<DependencyMap>;
     /** Retrieve a flattened list of p repo dependencies.
      * If multiple versions of a dependency exist, the lowest version is returned.
      * If the dependency is listed under multiple dependency types, 'dependencies' is prioritised over 'devDependencies'

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

@@ -30,7 +30,10 @@ export declare class DependencyStore {
     /** Updates the repo dependency store based on the changes in `logItem`.
      * Returns the updated flattened dependencies
      */
-    update(logItem: DefaultLogFields & ListLogLine): Promise<DependencyMap>;
+    update({ item, subWorkDir, }: {
+        item: DefaultLogFields & ListLogLine;
+        subWorkDir?: string;
+    }): Promise<DependencyMap>;
     /** Retrieve a flattened list of p repo dependencies.
      * If multiple versions of a dependency exist, the lowest version is returned.
      * If the dependency is listed under multiple dependency types, 'dependencies' is prioritised over 'devDependencies'

package/package.json

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