fix: only extend underscore partial files

Author: lukekarrys

lib/util/template.js

@@ -10,14 +10,21 @@ const partialName = (s) => basename(s, extname(s)) // remove extension
   .replace(/^_/, '') // remove leading underscore
   .replace(/-([a-z])/g, (_, g) => g.toUpperCase()) // camelcase
 
-const makePartials = (dir, setDefault) => {
+const makePartials = (dir, isBase) => {
   const partials = fs.readdirSync(dir).reduce((acc, f) => {
     const partial = fs.readFileSync(join(dir, f)).toString()
     const name = partialName(f)
-    acc[name] = partial
-    if (setDefault && f.startsWith('_')) {
+
+    if (isBase) {
+      // in the default dir, everything is a partial
+      // and also gets set with a default prefix for extending
+      acc[name] = partial
       acc[partialName(`default-${name}`)] = partial
+    } else if (f.startsWith('_')) {
+      // otherwise only _ files get set as partials
+      acc[name] = partial
     }
+
     return acc
   }, {})
 

test/apply/index.js

@@ -219,17 +219,25 @@ t.test('content can override partials', async (t) => {
     },
     testdir: {
       content_dir: {
+        'index.js': `module.exports={
+          rootRepo:{
+            add:{'.github/workflows/ci-release.yml': 'ci-release.yml'}
+          }
+        }`,
+        'ci-release.yml': '{{> ciRelease }}\n  job: 1',
         '_step-deps.yml': '- run: INSTALL\n',
         '_step-test.yml': '- run: TEST\n{{> defaultStepTest }}\n',
       },
     },
   })
   await s.apply()
   const ci = await s.readFile(join('.github', 'workflows', 'ci.yml'))
+  const release = await s.readFile(join('.github', 'workflows', 'ci-release.yml'))
   t.ok(ci.includes('- run: INSTALL'))
   t.ok(ci.includes('- run: TEST'))
   t.notOk(ci.includes('npm i --ignore-scripts --no-audit --no-fund'))
   t.ok(ci.includes('npm test --ignore-scripts'))
+  t.ok(release.includes('job: 1'))
 })
 
 t.test('content can extend files', async (t) => {