Convert vpre routes to include_prereleases param in [bower chocolatey clojars packagist powershellgallery pub resharper] (#4436)

* Convert vpre routes to include_prereleases param
* add .expectRedirect() helper
* test redirects on SVG endpoint

services/pub/pub.service.js

@@ -2,7 +2,7 @@
 
 const Joi = require('@hapi/joi')
 const { latest, renderVersionBadge } = require('../version')
-const { BaseJsonService } = require('..')
+const { BaseJsonService, redirector } = require('..')
 
 const schema = Joi.object({
   versions: Joi.array()
@@ -10,31 +10,35 @@ const schema = Joi.object({
     .required(),
 }).required()
 
-module.exports = class PubVersion extends BaseJsonService {
+const queryParamSchema = Joi.object({
+  include_prereleases: Joi.equal(''),
+}).required()
+
+class PubVersion extends BaseJsonService {
   static get category() {
     return 'version'
   }
 
   static get route() {
     return {
-      base: 'pub',
-      pattern: ':variant(v|vpre)/:packageName',
+      base: 'pub/v',
+      pattern: ':packageName',
+      queryParamSchema,
     }
   }
 
   static get examples() {
     return [
       {
-        title: 'Pub',
-        pattern: 'v/:packageName',
+        title: 'Pub Version',
         namedParams: { packageName: 'box2d' },
         staticPreview: renderVersionBadge({ version: 'v0.4.0' }),
         keywords: ['dart', 'dartlang'],
       },
       {
-        title: 'Pub',
-        pattern: 'vpre/:packageName',
+        title: 'Pub Version (including pre-releases)',
         namedParams: { packageName: 'box2d' },
+        queryParams: { include_prereleases: null },
         staticPreview: renderVersionBadge({ version: 'v0.4.0' }),
         keywords: ['dart', 'dartlang'],
       },
@@ -52,11 +56,26 @@ module.exports = class PubVersion extends BaseJsonService {
     })
   }
 
-  async handle({ variant, packageName }) {
+  async handle({ packageName }, queryParams) {
     const data = await this.fetch({ packageName })
-    const includePre = variant === 'vpre'
+    const includePre = queryParams.include_prereleases !== undefined
     const versions = data.versions
     const version = latest(versions, { pre: includePre })
     return renderVersionBadge({ version })
   }
 }
+
+const PubVersionRedirector = redirector({
+  category: 'version',
+  route: {
+    base: 'pub/vpre',
+    pattern: ':packageName',
+  },
+  transformPath: ({ packageName }) => `/pub/v/${packageName}`,
+  transformQueryParams: params => ({
+    include_prereleases: null,
+  }),
+  dateAdded: new Date('2019-12-15'),
+})
+
+module.exports = { PubVersion, PubVersionRedirector }

services/pub/pub.tester.js

@@ -1,7 +1,12 @@
 'use strict'
 
 const { isVPlusTripleDottedVersion } = require('../test-validators')
-const t = (module.exports = require('../tester').createServiceTester())
+const { ServiceTester } = require('../tester')
+const t = (module.exports = new ServiceTester({
+  id: 'PubVersion',
+  title: 'Pub Version',
+  pathPrefix: '/pub',
+}))
 
 t.create('package version')
   .get('/v/box2d.json')
@@ -11,7 +16,7 @@ t.create('package version')
   })
 
 t.create('package pre-release version')
-  .get('/vpre/box2d.json')
+  .get('/v/box2d.json?include_prereleases')
   .expectBadge({
     label: 'pub',
     message: isVPlusTripleDottedVersion,
@@ -23,3 +28,7 @@ t.create('package not found')
     label: 'pub',
     message: 'not found',
   })
+
+t.create('package version (legacy redirect: vpre)')
+  .get('/vpre/box2d.svg', { followRedirect: false })
+  .expectRedirect('/pub/v/box2d.svg?include_prereleases')