Skip to content

Commit 514469b

Browse files
hulkobaRealtin
authored andcommitted
feat(utils): put license&author-get to a function
1 parent 41984f4 commit 514469b

File tree

3 files changed

+18
-9
lines changed

3 files changed

+18
-9
lines changed

jobs/create-group-version-branch.js

+3-4
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ const {
1818
generateGitHubCompareURL,
1919
hasTooManyPackageJSONs,
2020
getSatisfyingVersions,
21-
getOldVersionResolved
21+
getOldVersionResolved,
22+
getLicenseAndAuthorFromVersions
2223
} = require('../utils/utils')
2324
const {
2425
isPartOfMonorepo,
@@ -361,9 +362,7 @@ module.exports = async function (
361362

362363
const dependencyLink = getFormattedDependencyURL({ repositoryURL: transforms[0].repoURL })
363364

364-
const license = versions[version].license
365-
const licenseHasChanged = oldVersionResolved ? versions[oldVersionResolved].license !== license : false
366-
const publisher = versions[version]['_npmUser'].name
365+
const { license, licenseHasChanged, publisher } = getLicenseAndAuthorFromVersions({ versions, version, oldVersionResolved })
367366

368367
// maybe adapt PR body
369368
const body = prContent({

jobs/create-version-branch.js

+3-4
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ const { createTransformFunction,
2222
generateGitHubCompareURL,
2323
hasTooManyPackageJSONs,
2424
getSatisfyingVersions,
25-
getOldVersionResolved
25+
getOldVersionResolved,
26+
getLicenseAndAuthorFromVersions
2627
} = require('../utils/utils')
2728

2829
const prContent = require('../content/update-pr')
@@ -336,9 +337,7 @@ module.exports = async function (
336337
dependency: dependencyKey,
337338
prTitles: config.prTitles })
338339

339-
const license = versions[version].license
340-
const licenseHasChanged = versions[oldVersionResolved].license !== license
341-
const publisher = versions[version]['_npmUser'].name
340+
const { license, licenseHasChanged, publisher } = getLicenseAndAuthorFromVersions({ versions, version, oldVersionResolved })
342341

343342
const body = prContent({
344343
dependencyLink,

utils/utils.js

+12-1
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,16 @@ const hasTooManyPackageJSONs = function (repo) {
323323
return repo.packages && Object.keys(repo.packages).length > 300
324324
}
325325

326+
const getLicenseAndAuthorFromVersions = function ({ versions, version, oldVersionResolved }) {
327+
const license = versions[version].license
328+
return {
329+
license,
330+
licenseHasChanged: versions[oldVersionResolved].license !== license,
331+
publisher: versions[version]['_npmUser'].name
332+
333+
}
334+
}
335+
326336
module.exports = {
327337
compactArray,
328338
seperateNormalAndMonorepos,
@@ -341,5 +351,6 @@ module.exports = {
341351
updateNodeVersionToNvmrc,
342352
addNewLowestAndDeprecate,
343353
hasTooManyPackageJSONs,
344-
getLockfilePath
354+
getLockfilePath,
355+
getLicenseAndAuthorFromVersions
345356
}

0 commit comments

Comments
 (0)