@npmcli/template-oss 4.4.3 → 4.4.5

package/lib/config.js

@@ -1,5 +1,6 @@
 const { relative, dirname, join, extname, posix, win32 } = require('path')
 const { defaults, pick, omit, uniq } = require('lodash')
+const semver = require('semver')
 const parseCIVersions = require('./util/parse-ci-versions.js')
 const getGitUrl = require('./util/get-git-url.js')
 const gitignore = require('./util/gitignore.js')
@@ -222,9 +223,22 @@ const getFullConfig = async ({
       versions = defaultVersions.ciVersions.slice(-1)
     }
 
-    const parsed = parseCIVersions(versions)
-    derived.ciVersions = parsed.targets
-    derived.engines = pkgConfig.engines || parsed.engines
+    const { targets, engines } = parseCIVersions(versions)
+
+    // get just a list of the target versions (not ranges)
+    // these are used for the node version when doing engines checks
+    // since we want to test in the lowest version of each major
+    let targetVersions = targets.filter(t => semver.valid(t))
+    // if the versions are all ranges then convert them to the lower bound of each range
+    if (!targetVersions.length) {
+      targetVersions = targets.filter(t => semver.validRange(t)).map(t => {
+        return new semver.Range(t).set[0][0].semver.version
+      })
+    }
+
+    derived.ciVersions = targets
+    derived.baseCiVersions = targetVersions
+    derived.engines = pkgConfig.engines || engines
   }
 
   const gitUrl = await getGitUrl(root)

package/lib/content/ci.yml

@@ -10,7 +10,7 @@ jobs:
       jobDepFlags="--engines-strict"
       macCI=false
       windowsCI=false
-      ciVersions=(reject ciVersions '\.x$')
+      ciVersions=baseCiVersions
     }}
 
   lint:

package/lib/content/post-dependabot.yml

@@ -11,7 +11,7 @@ jobs:
     {{> job
       jobName="template-oss"
       jobIf="github.actor == 'dependabot[bot]'"
-      jobCheckout=(obj ref="${{ github.event.pull_request.head.ref }}")
+      jobCheckout=(obj ref="${{ github.ref_name }}")
     }}
       - name: Fetch Dependabot Metadata
         id: metadata

package/lib/util/template.js

@@ -35,7 +35,6 @@ const setupHandlebars = (baseDir, ...otherDirs) => {
   Handlebars.registerHelper('obj', ({ hash }) => Object.fromEntries(safeValues(hash)))
   Handlebars.registerHelper('join', (arr, sep) => arr.join(typeof sep === 'string' ? sep : ', '))
   Handlebars.registerHelper('pluck', (arr, key) => arr.map(a => a[key]))
-  Handlebars.registerHelper('reject', (arr, re) => arr.filter(a => !new RegExp(re).test(a)))
   Handlebars.registerHelper('quote', (arr) => arr.map(a => `'${a}'`))
   Handlebars.registerHelper('last', (arr) => arr[arr.length - 1])
   Handlebars.registerHelper('json', (c) => JSON.stringify(c))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@npmcli/template-oss",
-  "version": "4.4.3",
+  "version": "4.4.5",
   "description": "templated files used in npm CLI team oss projects",
   "main": "lib/content/index.js",
   "bin": {