@npmcli/template-oss 3.3.2 → 3.4.0

package/lib/config.js

@@ -1,4 +1,4 @@
-const { relative, dirname, posix, win32 } = require('path')
+const { relative, dirname, join, posix, win32 } = require('path')
 const log = require('proc-log')
 const { uniq, defaults } = require('lodash')
 const parseCIVersions = require('./util/parse-ci-versions.js')
@@ -50,13 +50,14 @@ const getConfig = async ({
     workspaceRepo,
     workspaceModule,
     version,
-    ...pkgContent
+    ...pkgConfig // this includes config merged in from root
   },
 }) => {
   const isRoot = root === path
   const isLatest = version === LATEST_VERSION
   const isDogFood = pkg.name === NAME
   const isForce = process.argv.includes('--force')
+  const rawPkgConfig = getPkgConfig(pkg)
 
   // this is written to ci yml files so it needs to always use posix
   const pkgRelPath = makePosix(relative(root, path))
@@ -128,12 +129,25 @@ const getConfig = async ({
 
   // merge the rest of base and pkg content to make the
   // full content object
-  const content = { ...baseContent, ...pkgContent }
+  const content = { ...baseContent, ...pkgConfig }
 
   // set some defaults on content that can be overwritten unlike
   // derived values which are calculated from other config
   const contentDefaults = {}
 
+  if (content.npmBin && content.npmBin !== baseContent.npmBin) {
+    // make it relative to each workspace if they did not set the config themselves
+    if (!rawPkgConfig.npmBin) {
+      content.npmBin = makePosix(join(relative(path, root), content.npmBin))
+    }
+    // a bit of a hack but allow custom node paths or no node path at all
+    // checks if the first thing has node somewhere in it and if it doesnt
+    // puts a system node in front of the script
+    const execPaths = content.npmBin.split(' ')[0].split(posix.sep)
+    if (execPaths.every(p => p !== 'node')) {
+      content.npmBin = `node ${content.npmBin}`
+    }
+  }
   if (Array.isArray(content.ciVersions)) {
     const parsed = parseCIVersions(content.ciVersions)
     contentDefaults.engines = parsed.engines

package/lib/content/gitignore

@@ -12,6 +12,9 @@
 !/README*
 !/LICENSE*
 !/CHANGELOG*
+{{#if lockfile}}
+package-lock.json
+{{/if}}
 {{#each ignorePaths}}
 {{.}}
 {{/each}}

package/lib/content/index.js

@@ -13,7 +13,10 @@ const rootRepo = {
     '.github/workflows/codeql-analysis.yml': 'codeql-analysis.yml',
     '.github/workflows/post-dependabot.yml': 'post-dependabot.yml',
     '.github/workflows/pull-request.yml': 'pull-request.yml',
-    '.github/workflows/release-please.yml': 'release-please.yml',
+    '.github/workflows/release-please.yml': {
+      file: 'release-please.yml',
+      filter: (o) => !o.pkg.private,
+    },
   },
 }
 
@@ -70,6 +73,7 @@ module.exports = {
   distPaths: ['bin/', 'lib/'],
   ciVersions: ['12.13.0', '12.x', '14.15.0', '14.x', '16.0.0', '16.x'],
   lockfile: false,
+  npmBin: 'npm',
   unwantedPackages: [
     'eslint',
     'eslint-plugin-node',

package/lib/content/pkg.json

@@ -5,17 +5,17 @@
     "lint": "eslint \"**/*.js\"",
     "postlint": "template-oss-check",
     "template-oss-apply": "template-oss-apply --force",
-    "lintfix": "npm run lint -- --fix",
-    "preversion": "npm test",
+    "lintfix": "{{npmBin}} run lint -- --fix",
+    "preversion": "{{npmBin}} test",
     {{#if pkgPrivate}}
     "postversion": "git push origin --follow-tags",
     {{else}}
-    "postversion": "npm publish",
+    "postversion": "{{npmBin}} publish",
     "prepublishOnly": "git push origin --follow-tags",
     {{/if}}
     "snap": "tap",
     "test": "tap",
-    "posttest": "npm run lint",
+    "posttest": "{{npmBin}} run lint",
     "template-copy": {{{del}}},
     "lint:fix": {{{del}}}
   },

package/lib/content/setup-git.yml

@@ -7,5 +7,5 @@
 {{/if}}
 - name: Setup git user
   run: |
-    git config --global user.email "ops+npm-cli@npmjs.com"
-    git config --global user.name "npm cli ops bot"
+    git config --global user.email "npm team"
+    git config --global user.name "ops+robot@npmjs.com"

package/package.json

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