@npmcli/template-oss 3.2.1 → 3.2.2

package/lib/config.js

@@ -112,6 +112,7 @@ const getConfig = async ({
     pkgName: pkg.name,
     pkgNameFs: pkg.name.replace(/\//g, '-').replace(/@/g, ''),
     pkgRelPath: pkgRelPath,
+    pkgPrivate: !!pkg.private,
     // booleans to control application of updates
     isForce,
     isDogFood,

package/lib/content/index.js

@@ -38,7 +38,10 @@ const rootModule = {
 // Changes for each workspace but applied to the root of the repo
 const workspaceRepo = {
   add: {
-    '.github/workflows/release-please-{{pkgNameFs}}.yml': 'release-please.yml',
+    '.github/workflows/release-please-{{pkgNameFs}}.yml': {
+      file: 'release-please.yml',
+      filter: (o) => !o.pkg.private,
+    },
     '.github/workflows/ci-{{pkgNameFs}}.yml': 'ci.yml',
   },
 }

package/lib/content/pkg.json

@@ -7,8 +7,12 @@
     "template-oss-apply": "template-oss-apply --force",
     "lintfix": "npm run lint -- --fix",
     "preversion": "npm test",
+    {{#if pkgPrivate}}
+    "postversion": "git push origin --follow-tags",
+    {{else}}
     "postversion": "npm publish",
     "prepublishOnly": "git push origin --follow-tags",
+    {{/if}}
     "snap": "tap",
     "test": "tap",
     "posttest": "npm run lint",

package/lib/content/post-dependabot.yml

@@ -31,3 +31,4 @@ jobs:
           git add .
           git commit -am "chore: postinstall for dependabot template-oss PR"
           git push
+          npm run lint

package/lib/content/release-please.yml

@@ -21,7 +21,7 @@ jobs:
           release-type: node
           {{#if pkgRelPath}}
           monorepo-tags: true
-          paths: {{pkgRelPath}}
+          path: {{pkgRelPath}}
           {{/if}}
           changelog-types: >
             [

package/lib/util/files.js

@@ -9,13 +9,24 @@ const fullTarget = (dir, file, options) => join(dir, template(file, options))
 
 // given an obj of files, return the full target/source paths and associated parser
 const getParsers = (dir, files, options) => Object.entries(files).map(([t, s]) => {
-  let { file, parser: fileParser } = typeof s === 'string' ? { file: s } : s
-  const target = fullTarget(dir, t, options)
+  let {
+    file,
+    parser: fileParser,
+    filter,
+  } = typeof s === 'string' ? { file: s } : s
+
   file = join(options.config.sourceDir, file)
+  const target = fullTarget(dir, t, options)
+
+  if (typeof filter === 'function' && !filter(options)) {
+    return null
+  }
+
   if (fileParser) {
     // allow files to extend base parsers or create new ones
     return new (fileParser(Parser.Parsers))(target, file, options)
   }
+
   return new (Parser(file))(target, file, options)
 })
 
@@ -32,7 +43,9 @@ const rmEach = async (dir, files, options, fn) => {
 const parseEach = async (dir, files, options, fn) => {
   const res = []
   for (const parser of getParsers(dir, files, options)) {
-    res.push(await fn(parser))
+    if (parser) {
+      res.push(await fn(parser))
+    }
   }
   return res.filter(Boolean)
 }

package/lib/util/parser.js

@@ -249,7 +249,7 @@ class PackageJson extends JsonMerge {
         return unset(pkg.content, keys)
       }
     })
-    pkg.save()
+    await pkg.save()
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@npmcli/template-oss",
-  "version": "3.2.1",
+  "version": "3.2.2",
   "description": "templated files used in npm CLI team oss projects",
   "main": "lib/content/index.js",
   "bin": {
@@ -44,7 +44,7 @@
     "npm-package-arg": "^9.0.1",
     "proc-log": "^2.0.0",
     "semver": "^7.3.5",
-    "yaml": "^2.0.0-10"
+    "yaml": "^2.0.0-11"
   },
   "files": [
     "bin/",