@npmcli/template-oss 4.5.0 → 4.5.1

package/lib/config.js

@@ -99,6 +99,10 @@ const getFullConfig = async ({
   pkgConfig: _pkgConfig,
 }) => {
   const isRoot = root === path
+  const isWorkspace = !isRoot
+  const isMono = !!workspaces.length
+  const isRootMono = isRoot && isMono
+
   const isLatest = _pkgConfig.version === LATEST_VERSION
   const isDogFood = pkgJson.name === NAME
   const isForce = process.argv.includes('--force')
@@ -154,14 +158,14 @@ const getFullConfig = async ({
   // all derived keys
   const derived = {
     isRoot,
-    isWorkspace: !isRoot,
+    isWorkspace,
     // Some files are written to the base of a repo but will
     // include configuration for all packages within a monorepo
     // For these cases it is helpful to know if we are in a
     // monorepo since template-oss might be used only for
     // workspaces and not the root or vice versa.
-    isRootMono: isRoot && !!workspaces.length,
-    isMono: !!workspaces.length,
+    isRootMono,
+    isMono,
     // repo
     repoDir: root,
     repoFiles,
@@ -177,8 +181,8 @@ const getFullConfig = async ({
     pkgPath,
     pkgDir: posixDir(pkgPath),
     pkgGlob: posixGlob(pkgPath),
-    pkgFlags: isRoot ? '-iwr' : `-w ${pkgJson.name}`,
-    allFlags: `${workspaces.length ? '-ws -iwr' : ''} --if-present`.trim(),
+    pkgFlags: isWorkspace ? `-w ${pkgJson.name}` : '',
+    allFlags: isMono ? '-ws -iwr --if-present' : '',
     workspacePaths,
     workspaceGlobs: workspacePaths.map(posixGlob),
     // booleans to control application of updates

package/lib/content/_step-lint.yml

@@ -1,4 +1,4 @@
 - name: Lint
-  run: {{ rootNpmPath }} run lint --ignore-scripts
+  run: {{ rootNpmPath }} run lint --ignore-scripts {{~#if jobRunFlags}} {{ jobRunFlags }}{{/if}}
 - name: Post Lint
-  run: {{ rootNpmPath }} run postlint --ignore-scripts
+  run: {{ rootNpmPath }} run postlint --ignore-scripts {{~#if jobRunFlags}} {{ jobRunFlags }}{{/if}}

package/lib/content/release.yml

@@ -78,7 +78,7 @@ jobs:
           GITHUB_TOKEN: $\{{ secrets.GITHUB_TOKEN }}
         run: |
           {{ rootNpmPath }} exec --offline -- template-oss-release-manager
-          {{ rootNpmPath }} run rp-pull-request --ignore-scripts {{ allFlags }}
+          {{ rootNpmPath }} run rp-pull-request --ignore-scripts {{~#if allFlags}} {{ allFlags }}{{else}} --if-present{{/if}}
       - name: Commit
         id: commit
         env:

package/package.json

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