@npmcli/template-oss 4.24.4 → 4.25.1

package/lib/content/dependabot-yml.hbs

@@ -5,7 +5,7 @@ updates:
   - package-ecosystem: npm
     directory: /
     schedule:
-      interval: daily
+      interval: {{ interval }}
     target-branch: "{{ branch }}"
     allow:
       - dependency-type: direct

package/lib/content/index.js

@@ -187,6 +187,7 @@ module.exports = {
   esm: false,
   updateNpm: true,
   dependabot: 'increase-if-necessary',
+  dependabotInterval: 'daily',
   unwantedPackages: [
     'eslint',
     'eslint-plugin-node',

package/lib/release/release-manager.js

@@ -1,15 +1,14 @@
-const { Octokit } = require('@octokit/rest')
 const core = require('@actions/core')
 const { join } = require('path')
 const semver = require('semver')
 const assert = require('assert')
 const dedent = require('dedent')
 const mapWorkspaces = require('@npmcli/map-workspaces')
-const { request: fetch } = require('undici')
 const { getPublishTag, block, noop } = require('./util')
 
 class ReleaseManager {
   #octokit
+  #token
   #owner
   #repo
   #cwd
@@ -28,7 +27,7 @@ class ReleaseManager {
     assert(pr, 'pr is required')
     assert(defaultTag, 'defaultTag is required')
 
-    this.#octokit = new Octokit({ auth: token })
+    this.#token = token
     this.#owner = repo.split('/')[0]
     this.#repo = repo.split('/')[1]
     this.#cwd = cwd
@@ -43,9 +42,15 @@ class ReleaseManager {
 
   static async run(options) {
     const manager = new ReleaseManager(options)
+    await manager.#init()
     return manager.run()
   }
 
+  async #init() {
+    const { Octokit } = await import('@octokit/rest')
+    this.#octokit = new Octokit({ auth: this.#token })
+  }
+
   async run() {
     const { data: pullRequest } = await this.#octokit.rest.pulls.get({
       owner: this.#owner,
@@ -168,15 +173,15 @@ class ReleaseManager {
       // up because that means something is very wrong. This is a rare edge
       // case that isn't worth testing.
 
-      if (r.statusCode === 200) {
+      if (r.status === 200) {
         this.#info('Found release process from wiki')
-        return r.body.text()
-      } else if (r.statusCode === 404) {
+        return r.text()
+      } else if (r.status === 404) {
         this.#info('No release process found in wiki, falling back to default process')
         return this.#getReleaseSteps()
         /* c8 ignore next 3 */
       } else {
-        throw new Error(`Release process fetch failed with status: ${r.statusCode}`)
+        throw new Error(`Release process fetch failed with status: ${r.status}`)
       }
     })
 

package/lib/util/dependabot.js

@@ -4,8 +4,8 @@ const { minimatch } = require('minimatch')
 const parseDependabotConfig = v => (typeof v === 'string' ? { strategy: v } : (v ?? {}))
 
 module.exports = (config, defaultConfig, branches) => {
-  const { dependabot } = config
-  const { dependabot: defaultDependabot } = defaultConfig
+  const { dependabot, dependabotInterval } = config
+  const { dependabot: defaultDependabot, dependabotInterval: defaultInterval } = defaultConfig
 
   if (!dependabot) {
     return false
@@ -15,8 +15,13 @@ module.exports = (config, defaultConfig, branches) => {
     .filter(b => dependabot[b] !== false)
     .map(branch => {
       const isReleaseBranch = minimatch(branch, config.releaseBranch)
+
+      // Determine the interval to use: branch-specific > package-specific > default
+      const interval = parseDependabotConfig(dependabot[branch]).interval || dependabotInterval || defaultInterval
+
       return {
         branch,
+        interval,
         allowNames: isReleaseBranch ? [NAME] : [],
         labels: isReleaseBranch ? ['Backport', branch] : [],
         ...parseDependabotConfig(defaultDependabot),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@npmcli/template-oss",
-  "version": "4.24.4",
+  "version": "4.25.1",
   "description": "templated files used in npm CLI team oss projects",
   "main": "lib/content/index.js",
   "bin": {
@@ -38,28 +38,27 @@
     "@commitlint/cli": "^19.0.3",
     "@commitlint/config-conventional": "^19.2.2",
     "@isaacs/string-locale-compare": "^1.1.0",
-    "@npmcli/arborist": "^7.2.1",
-    "@npmcli/git": "^6.0.0",
-    "@npmcli/map-workspaces": "^4.0.0",
-    "@npmcli/package-json": "^6.0.0",
-    "@octokit/rest": "^19.0.4",
+    "@npmcli/arborist": "^9.1.2",
+    "@npmcli/git": "^7.0.0",
+    "@npmcli/map-workspaces": "^5.0.0",
+    "@npmcli/package-json": "^7.0.0",
+    "@octokit/rest": "^22.0.0",
     "dedent": "^1.5.1",
-    "diff": "^7.0.0",
-    "glob": "^10.1.0",
+    "diff": "^8.0.2",
+    "glob": "^11.0.3",
     "handlebars": "^4.7.7",
-    "hosted-git-info": "^8.0.0",
+    "hosted-git-info": "^9.0.0",
     "ini": "^5.0.0",
     "json-parse-even-better-errors": "^4.0.0",
     "just-deep-map-values": "^1.1.1",
     "just-diff": "^6.0.0",
     "just-omit": "^2.2.0",
     "lodash": "^4.17.21",
-    "minimatch": "^9.0.2",
-    "npm-package-arg": "^12.0.0",
+    "minimatch": "^10.0.3",
+    "npm-package-arg": "^13.0.0",
     "proc-log": "^5.0.0",
-    "release-please": "16.15.0",
+    "release-please": "^17.1.1",
     "semver": "^7.3.5",
-    "undici": "^6.7.0",
     "yaml": "^2.1.1"
   },
   "files": [
@@ -71,15 +70,12 @@
     "@npmcli/eslint-config": "^5.0.0",
     "@npmcli/template-oss": "file:./",
     "eslint-config-prettier": "^9.1.0",
-    "nock": "^13.3.8",
+    "nock": "^14.0.6",
     "prettier": "^3.2.5",
     "tap": "^21.0.1"
   },
   "tap": {
     "timeout": 600,
-    "node-arg": [
-      "--no-experimental-fetch"
-    ],
     "exclude": [
       "workspace/test-workspace/**"
     ],