Merge pull request #18 from groupon/dbushong/feature/master/pr-tmpl-from-root

Find PR templates in root dir

Author: aotarola

lib/commands/pr.js

@@ -42,6 +42,7 @@ const {
   remoteFromLocal,
   cmdLine,
   UIError,
+  repoRootDir,
 } = require('../common');
 
 /**
@@ -75,14 +76,16 @@ function forkPrefix(git) {
   });
 }
 
-function prTemplateBodySuffix() {
+/** @param {import('simple-git/promise').SimpleGit} git */
+async function prTemplateBodySuffix(git) {
+  const repoDir = await repoRootDir(git);
   // See: https://docs.github.com/en/free-pro-team@latest/github/building-a-strong-community/creating-a-pull-request-template-for-your-repository
   for (const subDir of ['', '.github', 'docs']) {
     for (const file of [
       'PULL_REQUEST_TEMPLATE.md',
       'pull_request_template.md',
     ]) {
-      const pathToPrTemplate = path.resolve(subDir, file);
+      const pathToPrTemplate = path.resolve(repoDir, subDir, file);
       if (fs.existsSync(pathToPrTemplate)) {
         return `${fs.readFileSync(pathToPrTemplate)}\n`;
       }
@@ -139,7 +142,7 @@ async function prAction({ deps: { git, log }, opts }) {
   }
 
   body += '\n';
-  if (!opts.ignorePrTemplate) body += prTemplateBodySuffix();
+  if (!opts.ignorePrTemplate) body += await prTemplateBodySuffix(git);
   body += `\n\n\n---\n_This PR was started by: ${cmdLine(true)}_`;
 
   const prURL = await ghURL(git, `/compare/${parent}...${remoteBranch}`, {

lib/common.js

@@ -232,6 +232,14 @@ async function ghURL(git, path, query = {}) {
 }
 exports.ghURL = ghURL;
 
+/**
+ * @param {SimpleGit} git
+ */
+function repoRootDir(git) {
+  return git.revparse(['--show-toplevel']);
+}
+exports.repoRootDir = repoRootDir;
+
 /**
  * @param {SimpleGit} git
  * @param {boolean} [forceFork]