@npmcli/template-oss 2.8.1 → 2.9.2

package/lib/content/post-dependabot.yml

@@ -3,6 +3,10 @@
 name: "Post Dependabot Actions"
 on: pull_request
 
+# https://docs.github.com/en/rest/overview/permissions-required-for-github-apps
+permissions:
+  contents: write
+
 jobs:
   Install:
     runs-on: ubuntu-latest

package/lib/content/release-please-workspace.yml

@@ -0,0 +1,29 @@
+# This file is automatically added by @npmcli/template-oss. Do not edit.
+
+name: Node Workspace Release Please %%pkgname%%
+
+on:
+  push:
+    paths:
+      - %%pkgpath%%/**
+    branches:
+      - release-next
+      - latest
+
+jobs:
+  release-please:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: google-github-actions/release-please-action@v2
+        id: release
+        with:
+          release-type: node
+          monorepo-tags: true
+          path: %%pkgpath%%
+          # If you change changelog-types be sure to also update commitlintrc.js
+          changelog-types: >
+            [{"type":"feat","section":"Features","hidden":false},
+            {"type":"fix","section":"Bug Fixes","hidden":false},
+            {"type":"docs","section":"Documentation","hidden":false},
+            {"type":"deps","section":"Dependencies","hidden":false},
+            {"type":"chore","hidden":true}]

package/lib/content/release-please.yml

@@ -14,7 +14,6 @@ jobs:
       - uses: google-github-actions/release-please-action@v2
         id: release
         with:
-          package-name: conventional-test
           release-type: node
           # If you change changelog-types be sure to also update commitlintrc.js
           changelog-types: >

package/lib/postinstall/copy-content.js

@@ -27,9 +27,13 @@ const repoFiles = {
   '.github/workflows/release-please.yml': './release-please.yml',
 }
 
-// currently no workspace moduleFiles
-// const workspaceContent = {}
-// const workspaceRootContent = {}
+// currently no workspace module files
+// const workspaceModuleFiles = {}
+
+const workspaceRepoFiles = {
+  '.github/workflows/release-please-%%pkgfsname%%.yml': './release-please-workspace.yml',
+  '.github/workflows/ci-%%pkgfsname%%.yml': './ci-workspace.yml',
+}
 
 const filesToDelete = [
   // remove any eslint config files that aren't local to the project
@@ -43,10 +47,25 @@ const defaultConfig = {
   windowsCI: true,
 }
 
-const copyFiles = async (targetDir, files) => {
+const findReplace = (str, replace = {}) => {
+  for (const [f, r] of Object.entries(replace)) {
+    str = str.replace(new RegExp(f, 'g'), r)
+  }
+  return str
+}
+
+const copyFile = async (source, target, replacements) => {
+  if (replacements) {
+    const content = await fs.readFile(source, { encoding: 'utf-8' })
+    return fs.writeFile(target, findReplace(content, replacements), { owner: 'inherit' })
+  }
+  return fs.copyFile(source, target, { owner: 'inherit' })
+}
+
+const copyFiles = async (targetDir, files, replacements) => {
   for (let [target, source] of Object.entries(files)) {
+    target = findReplace(join(targetDir, target), replacements)
     source = join(contentDir, source)
-    target = join(targetDir, target)
     // if the target is a subdirectory of the path, mkdirp it first
     if (dirname(target) !== targetDir) {
       await fs.mkdir(dirname(target), {
@@ -55,7 +74,7 @@ const copyFiles = async (targetDir, files) => {
         force: true,
       })
     }
-    await fs.copyFile(source, target, { owner: 'inherit' })
+    await copyFile(source, target, replacements)
   }
 }
 
@@ -94,34 +113,20 @@ const copyContent = async (path, rootPath, config) => {
 
   // only workspace now
 
-  // TODO: await copyFiles(path, workspaceFiles)
+  // TODO: await copyFiles(path, workspaceModuleFiles)
   // if we ever have workspace specific files
 
+  // transform and copy all workspace repo files
   if (config.applyWorkspaceRepoFiles) {
-    // copy and edit workspace repo file (ci github action)
     const workspacePkg = (await PackageJson.load(path)).content
-    const workspaceName = workspacePkg.name
-    let workspaceFile = `ci-${workspaceName.replace(/\//g, '-')}.yml`
-    workspaceFile = workspaceFile.replace(/@/g, '')
-    const workflowPath = join(rootPath, '.github', 'workflows')
-    await fs.mkdir(workflowPath, {
-      owner: 'inherit',
-      recursive: true,
-      force: true,
+    await copyFiles(rootPath, workspaceRepoFiles, {
+      '%%pkgname%%': workspacePkg.name,
+      '%%pkgfsname%%': workspacePkg.name.replace(/\//g, '-').replace(/@/g, ''),
+      '%%pkgpath%%': path.substring(rootPath.length + 1),
     })
-
-    let workflowData = await fs.readFile(
-      join(contentDir, './ci-workspace.yml'),
-      { encoding: 'utf-8' }
-    )
-
-    const relPath = path.substring(rootPath.length + 1)
-    workflowData = workflowData.replace(/%%pkgpath%%/g, relPath)
-    workflowData = workflowData.replace(/%%pkgname%%/g, workspaceName)
-
-    await fs.writeFile(join(workflowPath, workspaceFile), workflowData)
   }
 }
+
 copyContent.moduleFiles = moduleFiles
 copyContent.repoFiles = repoFiles
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@npmcli/template-oss",
-  "version": "2.8.1",
+  "version": "2.9.2",
   "description": "templated files used in npm CLI team oss projects",
   "main": "lib/index.js",
   "bin": {
@@ -31,7 +31,7 @@
   "author": "GitHub Inc.",
   "license": "ISC",
   "dependencies": {
-    "@npmcli/fs": "^1.1.1",
+    "@npmcli/fs": "^2.0.1",
     "@npmcli/map-workspaces": "^2.0.1",
     "@npmcli/package-json": "^1.0.1",
     "json-parse-even-better-errors": "^2.3.1",
@@ -45,7 +45,7 @@
     "@npmcli/eslint-config": "*",
     "@npmcli/promise-spawn": "^2.0.0",
     "@npmcli/template-oss": "file:./",
-    "eslint": "^8.9.0",
+    "eslint": "^8.10.0",
     "eslint-plugin-node": "^11.1.0",
     "tap": "*"
   },