Update the package server's URL structure to mirror cdn.hypothes.is

 - /hypothesis and /hypothesis@X.Y.Z serve the boot script

 - /hypothesis/X.Y.Z/ serves the files for a given version of the
   package

gulpfile.js

@@ -271,7 +271,7 @@ function generateBootScript(manifest) {
   if (process.env.NODE_ENV === 'production') {
     defaultAssetRoot = `https://cdn.hypothes.is/hypothesis/${version}/`;
   } else {
-    defaultAssetRoot = `http://${packageServerHostname()}:3001/hypothesis@${version}/`;
+    defaultAssetRoot = `http://${packageServerHostname()}:3001/hypothesis/${version}/`;
   }
 
   if (isFirstBuild) {

scripts/gulp/serve-package.js

@@ -10,10 +10,8 @@ var { version } = require('../../package.json');
 /**
  * An express server which serves the contents of the package.
  *
- * The server behaves similarly to npm CDNs, such as unpkg.com. The
- * '/hypothesis@VERSION' route returns the contents of the package's entry
- * point. Other routes return the contents of the specified file within the
- * package.
+ * The server mirrors the URL structure of cdn.hypothes.is, an S3-backed domain
+ * which serves the client's assets in production.
  *
  * When developing the client, the Hypothesis service should be configured to
  * use the URL of this service as the client URL, so that the boot script is
@@ -23,23 +21,17 @@ var { version } = require('../../package.json');
 function servePackage(port, hostname) {
   var app = express();
 
-  // Set up redirects which mirror unpkg's behavior
-  app.get('/hypothesis', function (req, res) {
-    res.redirect(302, `/hypothesis@${version}`);
-  });
-
-  app.get('/hypothesis/*', function (req, res) {
-    var path = req.path.replace('/hypothesis/', '');
-    res.redirect(302, `/hypothesis@${version}/${path}`);
-  });
-
-  app.get(`/hypothesis@${version}`, function (req, res) {
+  var serveBootScript = function (req, res) {
     var entryPath = require.resolve('../..');
     var entryScript = readFileSync(entryPath).toString('utf-8');
     res.send(entryScript);
-  });
+  };
 
-  app.use(`/hypothesis@${version}/`, express.static('.'));
+  // Set up URLs which serve the boot script and package content, mirroring
+  // cdn.hypothes.is' structure.
+  app.get('/hypothesis', serveBootScript);
+  app.get(`/hypothesis/${version}`, serveBootScript);
+  app.use(`/hypothesis/${version}/`, express.static('.'));
 
   app.listen(port, function () {
     log(`Package served at http://${hostname}:${port}/hypothesis`);