Handle indirect dependencies

alphagov · Jan 6, 2025 · 47fec86 · 47fec86
1 parent 4f25cb2
commit 47fec86
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/build-filtered-data.mjs b/build-filtered-data.mjs
@@ -120,8 +120,21 @@ export async function analyseRepo (repo) {
       repoData.log('looks like an instance of the prototype kit.')
       repoData.isPrototype = true
     }
+
     if (!repoData.checkDirectDependency(packageObjects)) {
       repoData.log('govuk-frontend is not a direct dependency.')
+      repoData.log('searching for version in lockfile')
+      repoData.versionDoubt = true
+      const lockfileType = repoData.getLockfileType()
+      repoData.log(`using ${lockfileType}`)
+      repoData.lockfileFrontendVersion = await repoData.getVersionFromLockfile(lockfileType)
+      if (repoData.lockfileFrontendVersion) {
+        repoData.log(
+            `using GOV.UK Frontend version ${repoData.lockfileFrontendVersion}`
+        )
+      } else {
+        repoData.log('exact GOV.UK Frontend version could not be determined from lockfile.')
+      }
     } else {
       for (const versionData of repoData.frontendVersions) {
         repoData.log(

diff --git a/helpers/repo-data.mjs b/helpers/repo-data.mjs
@@ -241,7 +241,7 @@ export class RepoData {
    * @throws {UnsupportedLockFileError} - If the lockfile is not supported
    * @throws {RequestError} - If the request for the file data fails
    */
-  async getVersionFromLockfile (lockfileType, packagePath) {
+  async getVersionFromLockfile (lockfileType, packagePath = '') {
     let lockfile
     try {
       lockfile = await this.getRepoFileContent(lockfileType)
@@ -280,7 +280,7 @@ export class RepoData {
           if (packageData.dependencies?.['govuk-frontend']) {
             deps.push({
               parent: packageName,
-              version: packageData.dependencies['govuk-frontend'].version
+              version: packageData.dependencies['govuk-frontend']
             })
           }
         }

diff --git a/helpers/repo-data.test.mjs b/helpers/repo-data.test.mjs
@@ -276,7 +276,7 @@ describe('RepoData', () => {
             packages: {
               'parent-dependency': {
                 dependencies: {
-                  'govuk-frontend': { version: '3.11.0' }
+                  'govuk-frontend': '3.11.0'
                 }
               }
             }