@npmcli/template-oss 4.4.0 → 4.4.2

package/lib/content/post-dependabot.yml

@@ -25,10 +25,13 @@ jobs:
         if: contains(steps.metadata.outputs.dependency-names, '{{ __NAME__ }}')
         id: flags
         run: |
-          if [[ "$\{{ steps.metadata.outputs.directory }}" == "/" ]]; then
+          dependabot_dir="$\{{ steps.metadata.outputs.directory }}"
+          if [[ "$dependabot_dir" == "/" ]]; then
             echo "::set-output name=workspace::-iwr"
           else
-            echo "::set-output name=workspace::-w $\{{ steps.metadata.outputs.directory }}"
+            # strip leading slash from directory so it works as a
+            # a path to the workspace flag
+            echo "::set-output name=workspace::-w ${dependabot_dir#/}"
           fi
 
       - name: Apply Changes
@@ -65,7 +68,7 @@ jobs:
       # If the previous step failed, then reset the commit and remove any workflow changes
       # and attempt to commit and push again. This is helpful because we will have a commit
       # with the correct prefix that we can then --amend with @npmcli/stafftools later.
-      - name: Commit and push all changes except workflows
+      - name: Push All Changes Except Workflows
         if: steps.apply.outputs.changes && steps.push-all.outcome == 'failure'
         env:
           GITHUB_TOKEN: $\{{ secrets.GITHUB_TOKEN }}

package/lib/release-please/index.js

@@ -20,9 +20,21 @@ const main = async ({ repo: fullRepo, token, dryRun, branch }) => {
 
   const [owner, repo] = fullRepo.split('/')
   const github = await RP.GitHub.create({ owner, repo, token })
+
+  // This is mostly for testing and debugging. Use environs with the
+  // format `RELEASE_PLEASE_<manfiestOverrideConfigName>` (eg
+  // `RELEASE_PLEASE_lastReleaseSha=<SHA>`) to set one-off config items
+  // for the release please run without needing to commit and push the config.
+  const manifestOverrides = Object.entries(process.env)
+    .filter(([k, v]) => k.startsWith('RELEASE_PLEASE_') && v != null)
+    .map(([k, v]) => [k.replace('RELEASE_PLEASE_', ''), v])
+
   const manifest = await RP.Manifest.fromManifest(
     github,
-    branch ?? github.repository.defaultBranch
+    branch ?? github.repository.defaultBranch,
+    undefined,
+    undefined,
+    Object.fromEntries(manifestOverrides)
   )
 
   const pullRequests = await (dryRun ? manifest.buildPullRequests() : manifest.createPullRequests())

package/lib/util/template.js

@@ -10,14 +10,21 @@ const partialName = (s) => basename(s, extname(s)) // remove extension
   .replace(/^_/, '') // remove leading underscore
   .replace(/-([a-z])/g, (_, g) => g.toUpperCase()) // camelcase
 
-const makePartials = (dir, setDefault) => {
+const makePartials = (dir, isBase) => {
   const partials = fs.readdirSync(dir).reduce((acc, f) => {
     const partial = fs.readFileSync(join(dir, f)).toString()
     const name = partialName(f)
-    acc[name] = partial
-    if (setDefault && f.startsWith('_')) {
+
+    if (isBase) {
+      // in the default dir, everything is a partial
+      // and also gets set with a default prefix for extending
+      acc[name] = partial
       acc[partialName(`default-${name}`)] = partial
+    } else if (f.startsWith('_')) {
+      // otherwise only _ files get set as partials
+      acc[name] = partial
     }
+
     return acc
   }, {})
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@npmcli/template-oss",
-  "version": "4.4.0",
+  "version": "4.4.2",
   "description": "templated files used in npm CLI team oss projects",
   "main": "lib/content/index.js",
   "bin": {
@@ -47,7 +47,7 @@
     "lodash": "^4.17.21",
     "npm-package-arg": "^9.0.1",
     "proc-log": "^2.0.0",
-    "release-please": "npm:@npmcli/release-please@^14.2.4",
+    "release-please": "npm:@npmcli/release-please@^14.2.5",
     "semver": "^7.3.5",
     "yaml": "^2.1.1"
   },