fix: Improve PR body fixes for scoped packages (#569)

Escape all scoped package mentions
Escape in group PR bodies too
Remove empty repositoryUrl links

lib/config/templates/default/pr-body.hbs

-This {{#if isGitHub}}Pull{{else}}Merge{{/if}} Request {{#if isRollback}}rolls back{{else}}updates{{/if}} dependency {{#if repositoryUrl}}[{{depName}}]({{repositoryUrl}}){{else}}`depName`{{/if}} from version `{{currentVersion}}` to `{{newVersion}}`{{#if isRollback}}. This is necessary and important because version `{{currentVersion}}` cannot be found in the npm registry - probably because of it being unpublished.{{/if}}
+This {{#if isGitHub}}Pull{{else}}Merge{{/if}} Request {{#if isRollback}}rolls back{{else}}updates{{/if}} dependency {{#if repositoryUrl}}[{{depName}}]({{repositoryUrl}}){{else}}`{{depName}}`{{/if}} from version `{{currentVersion}}` to `{{newVersion}}`{{#if isRollback}}. This is necessary and important because version `{{currentVersion}}` cannot be found in the npm registry - probably because of it being unpublished.{{/if}}
 {{#if releases.length}}
 
 {{#if schedule}}

lib/config/templates/group/pr-body.hbs

@@ -5,7 +5,7 @@ This {{#if isGitHub}}Pull{{else}}Merge{{/if}} Request renovates the package grou
 {{/if}}
 
 {{#each upgrades as |upgrade|}}
--   [{{upgrade.depName}}]({{upgrade.repositoryUrl}}): from `{{upgrade.currentVersion}}` to `{{upgrade.newVersion}}`
+-   {{#if repositoryUrl}}[{{upgrade.depName}}]({{upgrade.repositoryUrl}}){{else}}`{{depName}}`{{/if}}: from `{{upgrade.currentVersion}}` to `{{upgrade.newVersion}}`
 {{/each}}
 
 {{#unless isPin}}

lib/workers/package/index.js

@@ -50,7 +50,10 @@ async function renovatePackage(config) {
   // Flatten the result on top of config, add repositoryUrl
   return results.map(result => {
     const upg = configParser.mergeChildConfig(config, result);
-    upg.repositoryUrl = npmDep ? npmDep.repositoryUrl : '';
+    upg.repositoryUrl =
+      npmDep && npmDep.repositoryUrl && npmDep.repositoryUrl.length
+        ? npmDep.repositoryUrl
+        : null;
     return configParser.filterConfig(upg, 'branch');
   });
 }

lib/workers/pr/index.js

@@ -115,7 +115,7 @@ async function ensurePr(inputConfig, logger, errors, warnings) {
 
   const prTitle = handlebars.compile(config.prTitle)(config);
   let prBodyMarkdown = handlebars.compile(config.prBody)(config);
-  const atUserRe = /@([a-z]+\/[a-z]+)/;
+  const atUserRe = /[^`]@([a-z]+\/[a-z]+)/g;
   prBodyMarkdown = prBodyMarkdown.replace(atUserRe, '@​$1');
   const prBody = converter.makeHtml(prBodyMarkdown);
 

test/workers/package/__snapshots__/index.spec.js.snap

@@ -49,7 +49,7 @@ Array [
 {{/if}}
 
 {{#each upgrades as |upgrade|}}
--   [{{upgrade.depName}}]({{upgrade.repositoryUrl}}): from \`{{upgrade.currentVersion}}\` to \`{{upgrade.newVersion}}\`
+-   {{#if repositoryUrl}}[{{upgrade.depName}}]({{upgrade.repositoryUrl}}){{else}}\`{{depName}}\`{{/if}}: from \`{{upgrade.currentVersion}}\` to \`{{upgrade.newVersion}}\`
 {{/each}}
 
 {{#unless isPin}}
@@ -110,7 +110,7 @@ This {{#if isGitHub}}PR{{else}}MR{{/if}} has been generated by [Renovate Bot](ht
     "labels": Array [],
     "lazyGrouping": true,
     "message": "Failed to look up dependency",
-    "prBody": "This {{#if isGitHub}}Pull{{else}}Merge{{/if}} Request {{#if isRollback}}rolls back{{else}}updates{{/if}} dependency {{#if repositoryUrl}}[{{depName}}]({{repositoryUrl}}){{else}}\`depName\`{{/if}} from version \`{{currentVersion}}\` to \`{{newVersion}}\`{{#if isRollback}}. This is necessary and important because version \`{{currentVersion}}\` cannot be found in the npm registry - probably because of it being unpublished.{{/if}}
+    "prBody": "This {{#if isGitHub}}Pull{{else}}Merge{{/if}} Request {{#if isRollback}}rolls back{{else}}updates{{/if}} dependency {{#if repositoryUrl}}[{{depName}}]({{repositoryUrl}}){{else}}\`{{depName}}\`{{/if}} from version \`{{currentVersion}}\` to \`{{newVersion}}\`{{#if isRollback}}. This is necessary and important because version \`{{currentVersion}}\` cannot be found in the npm registry - probably because of it being unpublished.{{/if}}
 {{#if releases.length}}
 
 {{#if schedule}}
@@ -166,7 +166,7 @@ This {{#if isGitHub}}PR{{else}}MR{{/if}} has been generated by [Renovate Bot](ht
     "rebaseStalePrs": false,
     "recreateClosed": false,
     "repoIsOnboarded": true,
-    "repositoryUrl": "",
+    "repositoryUrl": null,
     "requiredStatusChecks": Array [],
     "reviewers": Array [],
     "schedule": "some schedule",