Move release url get/set to github client

release-it · Dec 19, 2018 · 50087b9 · 50087b9
1 parent 7f68a3a
commit 50087b9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/lib/github-client.js b/lib/github-client.js
@@ -91,6 +91,7 @@ const release = ({ version, tagName, repo, changelog = '', github }) => {
             response.data.name
           }")`
         );
+        config.setOption('githubReleaseUrl', response.data.html_url);
         return response.data;
       } catch (err) {
         const msg = parseErrorMessage(err);
@@ -171,7 +172,15 @@ const uploadAssets = ({ release, repo, github }) => {
   });
 };
 
+const getReleaseUrlFallback = () => {
+  const tag = format(config.getOption('git.tagName'));
+  return format(`https://\${repo.host}/\${repo.repository}/releases/tag/${tag}`);
+};
+
+const getReleaseUrl = () => config.getOption('githubReleaseUrl') || getReleaseUrlFallback();
+
 module.exports = {
   release,
-  uploadAssets
+  uploadAssets,
+  getReleaseUrl
 };
diff --git a/lib/tasks.js b/lib/tasks.js
@@ -25,11 +25,6 @@ const {
   InvalidVersionError
 } = require('./errors');
 
-const getGithubHtmlUrl = releaseInfo => {
-  // releaseInfo is no initialized during a dry-run, so we need a fallback
-  return releaseInfo && releaseInfo.html_url ? releaseInfo.html_url : config.options.repo.remote;
-}
-
 const validateRepoState = async options => {
   const { github, git, dist } = options;
   const { requireCleanWorkingDir, requireUpstream } = git;
@@ -181,14 +176,12 @@ module.exports = async options => {
     const uploadAssets = release => githubClient.uploadAssets({ release, repo, github });
     const otpPrompt = task => prompt(true, 'src', 'otp', task);
     const publish = () => npmPublish(npm, options.name, isInteractive && otpPrompt);
-    let githubHtmlUrl = null;
 
     if (!isInteractive) {
       await spinner(git.commit, commit, 'Git commit');
       await spinner(git.tag, tag, 'Git tag');
       await spinner(git.push, push, 'Git push');
       const releaseInfo = await spinner(github.release, release, 'GitHub release');
-      githubHtmlUrl = getGithubHtmlUrl(releaseInfo);
       await spinner(github.assets && releaseInfo, () => uploadAssets(releaseInfo), 'GitHub upload assets');
       if (!npm.private) {
         await spinner(npm.publish, publish, 'npm publish');
@@ -199,7 +192,6 @@ module.exports = async options => {
       await prompt(git.push, 'src', 'push', push);
       await prompt(github.release, 'src', 'release', async () => {
         const releaseInfo = await release();
-        githubHtmlUrl = getGithubHtmlUrl(releaseInfo);
         return github.assets && releaseInfo && (await uploadAssets(releaseInfo));
       });
       if (!npm.private) {
@@ -253,7 +245,6 @@ module.exports = async options => {
         await spinner(shouldTag, tag, 'Git tag');
         await spinner(git.push, push, 'Git push');
         const releaseInfo = await spinner(github.release, release, 'GitHub release');
-        githubHtmlUrl = getGithubHtmlUrl(releaseInfo);
         await spinner(github.assets && releaseInfo, () => uploadAssets(releaseInfo), 'GitHub upload assets');
         await spinner(npm.publish, publish, 'npm publish');
       } else {
@@ -263,7 +254,6 @@ module.exports = async options => {
         await prompt(git.push, 'dist', 'push', push);
         await prompt(github.release, 'dist', 'release', async () => {
           const releaseInfo = await release();
-          githubHtmlUrl = getGithubHtmlUrl(releaseInfo);
           return github.assets && releaseInfo && (await uploadAssets(releaseInfo));
         });
         await prompt(npm.publish, 'dist', 'publish', publish);
@@ -276,7 +266,7 @@ module.exports = async options => {
     }
 
     if (github.release) {
-      log(`🔗 ${githubHtmlUrl}`);
+      log(`🔗 ${githubClient.getReleaseUrl()}`);
     }
     if (npm.publish) {
       log(`🔗 ${getPackageUrl()}`);