Merge pull request GoogleChrome#257 from keanulee/package-lock

Remove event-stream@3.3.6 from package-lock.json

middleware/src/middleware.ts

@@ -45,11 +45,11 @@ export const botUserAgents = [
  * proxied.
  */
 const staticFileExtensions = [
-  'ai',  'avi',  'css', 'dat',  'dmg', 'doc',     'doc',  'exe', 'flv',
-  'gif', 'ico',  'iso', 'jpeg', 'jpg', 'js',      'less', 'm4a', 'm4v',
-  'mov', 'mp3',  'mp4', 'mpeg', 'mpg', 'pdf',     'png',  'ppt', 'psd',
-  'rar', 'rss',  'svg', 'swf',  'tif', 'torrent', 'ttf',  'txt', 'wav',
-  'wmv', 'woff', 'xls', 'xml',  'zip',
+  'ai', 'avi', 'css', 'dat', 'dmg', 'doc', 'doc', 'exe', 'flv',
+  'gif', 'ico', 'iso', 'jpeg', 'jpg', 'js', 'less', 'm4a', 'm4v',
+  'mov', 'mp3', 'mp4', 'mpeg', 'mpg', 'pdf', 'png', 'ppt', 'psd',
+  'rar', 'rss', 'svg', 'swf', 'tif', 'torrent', 'ttf', 'txt', 'wav',
+  'wmv', 'woff', 'xls', 'xml', 'zip',
 ];
 
 /**
@@ -97,31 +97,31 @@ export function makeMiddleware(options: Options): express.Handler {
     proxyUrl += '/';
   }
   const userAgentPattern =
-      options.userAgentPattern || new RegExp(botUserAgents.join('|'), 'i');
+    options.userAgentPattern || new RegExp(botUserAgents.join('|'), 'i');
   const excludeUrlPattern = options.excludeUrlPattern ||
-      new RegExp(`\\.(${staticFileExtensions.join('|')})$`, 'i');
+    new RegExp(`\\.(${staticFileExtensions.join('|')})$`, 'i');
   const injectShadyDom = !!options.injectShadyDom;
   // The Rendertron service itself has a hard limit of 10 seconds to render, so
   // let's give a little more time than that by default.
   const timeout = options.timeout || 11000;  // Milliseconds.
 
   return function rendertronMiddleware(req, res, next) {
-    let ua = req.headers['user-agent'];
+    const ua = req.headers['user-agent'];
     if (ua === undefined || !userAgentPattern.test(ua) ||
-        excludeUrlPattern.test(req.path)) {
+      excludeUrlPattern.test(req.path)) {
       next();
       return;
     }
     const incomingUrl =
-        req.protocol + '://' + req.get('host') + req.originalUrl;
+      req.protocol + '://' + req.get('host') + req.originalUrl;
     let renderUrl = proxyUrl + encodeURIComponent(incomingUrl);
     if (injectShadyDom) {
       renderUrl += '?wc-inject-shadydom=true';
     }
-    request({url: renderUrl, timeout}, (e) => {
+    request({ url: renderUrl, timeout }, (e) => {
       if (e) {
         console.error(
-            `[rendertron middleware] ${e.code} error fetching ${renderUrl}`);
+          `[rendertron middleware] ${e.code} error fetching ${renderUrl}`);
         next();
       }
     }).pipe(res);