[3.0] Changes WebApp to use Express under the hood

docs/history.md

@@ -69,7 +69,11 @@
 
 * `webapp`:
   - `WebAppInternals.getBoilerplate` is now async.
-
+  - Changed engine from connect to express and changed api naming to match express. See below: 
+  - `WebApp.connectHandlers.use(middleware)` is now `WebApp.expressHandlers.use(middleware)`
+  - `WebApp.rawConnectHandlers.use(middleware)` is now `WebApp.rawExpressHandlers.use(middleware)`
+  - `WebApp.connectApp` is now `WebApp.expressApp`
+
 ####  Internal API changes
 
 

docs/source/packages/webapp.md

@@ -13,20 +13,20 @@ This package also allows you to add handlers for HTTP requests.
 This lets other services access your app's data through an HTTP API, allowing
 it to easily interoperate with tools and frameworks that don't yet support DDP.
 
-`webapp` exposes the [connect](https://github.com/senchalabs/connect) API for
-handling requests through `WebApp.connectHandlers`.
+`webapp` exposes the [express](https://github.com/expressjs/express) API for
+handling requests through `WebApp.expressHandlers`.
 Here's an example that will let you handle a specific URL:
 
 ```js
 // Listen to incoming HTTP requests (can only be used on the server).
-WebApp.connectHandlers.use('/hello', (req, res, next) => {
+WebApp.expressHandlers.use('/hello', (req, res, next) => {
   res.writeHead(200);
   res.end(`Hello world from: ${Meteor.release}`);
 });
 ```
 
-{% apibox "WebApp.connectHandlers" %}
-{% apibox "connectHandlersCallback(req, res, next)" %}
+{% apibox "WebApp.expressHandlers" %}
+{% apibox "expressHandlersCallback(req, res, next)" %}
 
 ### Serving a Static Landing Page
 
@@ -62,14 +62,14 @@ Here's a sample _index.html_ you might use to get started:
 </html>
 ```
 
-Then using the connectHandlers method described above serve up your static HTML on app-root/ page load as shown below.
+Then using the expressHandlers method described above serve up your static HTML on app-root/ page load as shown below.
 
 ```
 /* global WebApp Assets */
 import crypto from 'crypto'
 import connectRoute from 'connect-route'
 
-WebApp.connectHandlers.use(connectRoute(function (router) {
+WebApp.expressHandlers.use(connectRoute(function (router) {
     router.get('/', function (req, res, next) {
         const buf = Assets.getText('index.html')
 

guide/source/deployment.md

@@ -99,7 +99,7 @@ If you are hosting a webfont as part of your application and serving it via a CD
 ```js
 import { WebApp } from 'meteor/webapp';
 
-WebApp.rawConnectHandlers.use(function(req, res, next) {
+WebApp.rawExpressHandlers.use(function(req, res, next) {
   if (req._parsedUrl.pathname.match(/\.(ttf|ttc|otf|eot|woff|woff2|font\.css|css)$/)) {
     res.setHeader('Access-Control-Allow-Origin', /* your hostname, or just '*' */);
   }

guide/source/security.md

@@ -480,7 +480,7 @@ By default, Helmet can be used to set various HTTP headers (see link above). The
 import helmet from "helmet";
 
 // Within server side Meter.startup()
-WebApp.connectHandlers.use(helmet())
+WebApp.expressHandlers.use(helmet())
 ```
 
 At a minimum, Meteor recommends users to set the following headers. Note that code examples shown below are specific to Helmet.
@@ -500,7 +500,7 @@ By default, Meteor recommends unsafe inline scripts and styles are allowed, sinc
 import helmet from "helmet";
 
 // Within server side Meter.startup()
-WebApp.connectHandlers.use(
+WebApp.expressHandlers.use(
   helmet.contentSecurityPolicy({
     directives: {
       defaultSrc: ["'self'"],
@@ -679,7 +679,7 @@ With Helmet, Frameguard sets the X-Frame-Options header.
 import helmet from "helmet";
 
 // Within server side Meter.startup()
-WebApp.connectHandlers.use(helmet.frameguard());  // defaults to sameorigin
+WebApp.expressHandlers.use(helmet.frameguard());  // defaults to sameorigin
 ```
 For more detail please read the following guide: [Frameguard](https://helmetjs.github.io/docs/frameguard/).
 

packages/appcache/appcache-server.js

@@ -63,7 +63,7 @@ WebApp.addHtmlAttributeHook(request =>
     { manifest: "/app.manifest" }
 );
 
-WebApp.connectHandlers.use((req, res, next) => {
+WebApp.expressHandlers.use((req, res, next) => {
   if (req.url !== '/app.manifest') {
     return next();
   }

packages/browser-policy-common/browser-policy-common.js

@@ -10,7 +10,7 @@ BrowserPolicy._setRunningTest = function () {
   inTest = true;
 };
 
-WebApp.connectHandlers.use(function (req, res, next) {
+WebApp.expressHandlers.use(function (req, res, next) {
   // Never set headers inside tests because they could break other tests.
   if (BrowserPolicy._runningTest())
     return next();
@@ -28,13 +28,13 @@ WebApp.connectHandlers.use(function (req, res, next) {
   next();
 });
 
-// We use `rawConnectHandlers` to set X-Content-Type-Options on all
+// We use `rawExpressHandlers` to set X-Content-Type-Options on all
 // requests, including static files.
-// XXX We should probably use `rawConnectHandlers` for X-Frame-Options
+// XXX We should probably use `rawExpressHandlers` for X-Frame-Options
 // and Content-Security-Policy too, but let's make sure that doesn't
 // break anything first (e.g. the OAuth popup flow won't work well with
 // a CSP that disallows inline scripts).
-WebApp.rawConnectHandlers.use(function (req, res, next) {
+WebApp.rawExpressHandlers.use(function (req, res, next) {
   if (BrowserPolicy._runningTest())
     return next();
 

packages/deprecated/http/test_responder.js

@@ -76,7 +76,7 @@ var respond = function(req, res) {
 };
 
 var run_responder = function() {
-  WebApp.connectHandlers.stack.unshift(
+  WebApp.expressHandlers.stack.unshift(
     { route: TEST_RESPONDER_ROUTE, handle: respond });
 };
 

packages/deprecated/spiderable/spiderable_server.js

@@ -58,7 +58,7 @@ Spiderable._urlForPhantom = function (siteAbsoluteUrl, requestUrl) {
 
 var PHANTOM_SCRIPT = Assets.getText("phantom_script.js");
 
-WebApp.connectHandlers.use(function (req, res, next) {
+WebApp.expressHandlers.use(function (req, res, next) {
   // _escaped_fragment_ comes from Google's AJAX crawling spec:
   // https://developers.google.com/webmasters/ajax-crawling/docs/specification
   if (/\?.*_escaped_fragment_=/.test(req.url) ||

packages/oauth/oauth_server.js

@@ -205,9 +205,9 @@ const middleware = async (req, res, next) => {
 };
 
 // Listen to incoming OAuth http requests
-WebApp.connectHandlers.use('/_oauth', bodyParser.json());
-WebApp.connectHandlers.use('/_oauth', bodyParser.urlencoded({ extended: false }));
-WebApp.connectHandlers.use(middleware);
+WebApp.expressHandlers.use('/_oauth', bodyParser.json());
+WebApp.expressHandlers.use('/_oauth', bodyParser.urlencoded({ extended: false }));
+WebApp.expressHandlers.use(middleware);
 
 OAuthTest.middleware = middleware;