@repository-settings/app 3.0.9 → 3.1.0

package/lib/plugins/environments.js

@@ -38,7 +38,9 @@ function deploymentBranchPolicyToString (attrs) {
     return JSON.stringify(
       shouldUseProtectedBranches(attrs.protected_branches, attrs.custom_branches)
         ? { protected_branches: true }
-        : { custom_branches: attrs.custom_branches.sort() }
+        : {
+            custom_branches: attrs.custom_branches.sort((a, b) => JSON.stringify(a).localeCompare(JSON.stringify(b)))
+          }
     )
   }
 }
@@ -66,6 +68,14 @@ module.exports = class Environments extends Diffable {
       // Force all names to lowercase to avoid comparison issues.
       this.entries.forEach(environment => {
         environment.name = environment.name.toLowerCase()
+        if (environment.deployment_branch_policy && environment.deployment_branch_policy.custom_branches) {
+          environment.deployment_branch_policy.custom_branches = environment.deployment_branch_policy.custom_branches.map(
+            rule => ({
+              name: rule.name || rule,
+              type: rule.type || 'branch'
+            })
+          )
+        }
       })
     }
   }
@@ -88,7 +98,10 @@ module.exports = class Environments extends Diffable {
               environment.name
             )
             environment.deployment_branch_policy = {
-              custom_branches: branchPolicies.map(_ => _.name)
+              custom_branches: branchPolicies.map(_ => ({
+                name: _.name,
+                type: _.type
+              }))
             }
           } else {
             environment.deployment_branch_policy = {
@@ -147,12 +160,13 @@ module.exports = class Environments extends Diffable {
 
     if (attrs.deployment_branch_policy && attrs.deployment_branch_policy.custom_branches) {
       await Promise.all(
-        attrs.deployment_branch_policy.custom_branches.map(name =>
+        attrs.deployment_branch_policy.custom_branches.map(rule =>
           this.github.request('POST /repos/:org/:repo/environments/:environment_name/deployment-branch-policies', {
             org: this.repo.owner,
             repo: this.repo.repo,
             environment_name: attrs.name,
-            name
+            name: rule.name,
+            type: rule.type
           })
         )
       )

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@repository-settings/app",
-  "version": "3.0.9",
+  "version": "3.1.0",
   "description": "Pull Requests for GitHub repository settings",
   "repository": "github:repository-settings/app",
   "main": "index.js",
@@ -38,10 +38,10 @@
     "http-status-codes": "2.3.0",
     "jest": "29.7.0",
     "jest-when": "3.6.0",
-    "lockfile-lint": "4.13.2",
-    "ls-engines": "0.9.1",
+    "lockfile-lint": "4.14.0",
+    "ls-engines": "0.9.2",
     "msw": "2.3.1",
-    "nodemon": "3.1.3",
+    "nodemon": "3.1.4",
     "npm-run-all2": "6.2.0",
     "prettier-standard": "16.4.1",
     "publint": "0.2.8",