@npmcli/template-oss 4.24.3 → 4.25.0

package/lib/config.js

@@ -160,8 +160,8 @@ const getFullConfig = async ({
     pkgPath,
     pkgDir: posixDir(pkgPath),
     pkgGlob: posixGlob(pkgPath),
-    pkgFlags: isWorkspace ? `-w ${pkg.pkgJson.name}` : '',
-    allFlags: isMono ? '-ws -iwr --if-present' : '',
+    pkgFlags: isWorkspace ? `--workspace ${pkg.pkgJson.name}` : '',
+    allFlags: isMono ? '--workspaces --include-workspace-root --if-present' : '',
     workspacePaths,
     workspaceGlobs: workspacePaths.map(posixGlob),
     // type

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/content/post-dependabot-yml.hbs

@@ -31,7 +31,7 @@ jobs:
           else
             # strip leading slash from directory so it works as a
             # a path to the workspace flag
-            echo "workspace=-w ${dependabot_dir#/}" >> $GITHUB_OUTPUT
+            echo "workspace=--workspace ${dependabot_dir#/}" >> $GITHUB_OUTPUT
           fi
 
       - name: Apply Changes

package/lib/content/release-integration-yml.hbs

@@ -17,11 +17,13 @@ on:
     secrets:
       PUBLISH_TOKEN:
         required: true
-    {{/if}} 
+    {{/if}}
 
 permissions:
   contents: read
+  {{#if publish}}
   id-token: write
+  {{/if}}
 
 jobs:
   publish:

package/lib/release/release-manager.js

@@ -68,7 +68,7 @@ class ReleaseManager {
       .replace(/<X\.Y\.Z>/g, release.version)
       .replace(/<GITHUB-RELEASE-LINK>/g, release.url)
       .replace(/<PUBLISH-FLAGS>/g, release.flags)
-      .replace(/^(\s*\S.*)(-w <WS-PKG-N>)$/gm, workspaces.map(w => `$1${w.flags}`).join('\n'))
+      .replace(/^(\s*\S.*)(--workspace <WS-PKG-N>)$/gm, workspaces.map(w => `$1${w.flags}`).join('\n'))
       .trim()
 
     return `### Release Checklist for ${release.tag}\n\n${checklist}`
@@ -150,7 +150,9 @@ class ReleaseManager {
       version: rawVersion,
       major: version.major,
       url: `https://github.com/${pullRequest.base.repo.full_name}/releases/tag/${tag}`,
-      flags: [workspaces[name] ? `-w ${workspaces[name]}` : null, `--tag=${publishTag}`].filter(Boolean).join(' '),
+      flags: [workspaces[name] ? `--workspace ${workspaces[name]}` : null, `--tag=${publishTag}`]
+        .filter(Boolean)
+        .join(' '),
     }
   }
 
@@ -221,7 +223,7 @@ class ReleaseManager {
       1. Publish workspaces
   
           ${block('sh')}
-          npm publish -w <WS-PKG-N>
+          npm publish --workspace <WS-PKG-N>
           ${block()}
   
       1. Publish
@@ -261,7 +263,7 @@ class ReleaseManager {
           Release Please will run on the just pushed release commit and create GitHub releases and tags for each package.
   
           ${block('sh')}
-          gh run watch ${R} $(gh run list ${R} -w release -b <BASE-BRANCH> -L 1 --json databaseId -q ".[0].databaseId")
+          gh run watch ${R} $(gh run list ${R} --workspace release -b <BASE-BRANCH> -L 1 --json databaseId -q ".[0].databaseId")
           ${block()}
     `
     /* eslint-enable max-len */

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.3",
+  "version": "4.25.0",
   "description": "templated files used in npm CLI team oss projects",
   "main": "lib/content/index.js",
   "bin": {
@@ -20,8 +20,8 @@
     "postinstall": "template-oss-apply",
     "eslint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\"",
     "prettier": "prettier \"**/*.{js,cjs,ts,mjs,jsx,tsx,json}\"",
-    "test-all": "npm run test -ws -iwr --if-present",
-    "lint-all": "npm run lint -ws -iwr --if-present"
+    "test-all": "npm run test --workspaces --include-workspace-root --if-present",
+    "lint-all": "npm run lint --workspaces --include-workspace-root --if-present"
   },
   "repository": {
     "type": "git",