Merge branch 'next' into rest-next

src/core/build/createWebpackConfig.ts

@@ -1,6 +1,6 @@
 import CaseSensitivePathsPlugin from "case-sensitive-paths-webpack-plugin";
-import ExtractTextPlugin from "extract-text-webpack-plugin";
 import HtmlWebpackPlugin, { Options } from "html-webpack-plugin";
+import MiniCssExtractPlugin from "mini-css-extract-plugin";
 import path from "path";
 import InterpolateHtmlPlugin from "react-dev-utils/InterpolateHtmlPlugin";
 import WatchMissingNodeModulesPlugin from "react-dev-utils/WatchMissingNodeModulesPlugin";
@@ -8,6 +8,7 @@ import TsconfigPathsPlugin from "tsconfig-paths-webpack-plugin";
 import UglifyJsPlugin from "uglifyjs-webpack-plugin";
 import webpack, { Configuration } from "webpack";
 import ManifestPlugin from "webpack-manifest-plugin";
+
 import paths from "./paths";
 
 interface CreateWebpackConfig {
@@ -59,27 +60,6 @@ export default function createWebpackConfig({
     },
   };
 
-  const cssLoaders = [
-    {
-      loader: require.resolve("css-loader"),
-      options: {
-        modules: true,
-        importLoaders: 1,
-        localIdentName: "[name]-[local]-[hash:base64:5]",
-        minimize: isProduction,
-        sourceMap: isProduction && !disableSourcemaps,
-      },
-    },
-    {
-      loader: require.resolve("postcss-loader"),
-      options: {
-        config: {
-          path: paths.appPostCssConfig,
-        },
-      },
-    },
-  ];
-
   const localesOptions = {
     pathToLocales: paths.appLocales,
 
@@ -127,13 +107,9 @@ export default function createWebpackConfig({
           },
           sourceMap: !disableSourcemaps,
         }),
-        // Note: this won't work without ExtractTextPlugin.extract(..) in `loaders`.
-        new ExtractTextPlugin({
-          // We use [md5:contenthash:hex:20] instead of [contenthash:8]
-          // because of this bug https://github.com/webpack-contrib/extract-text-webpack-plugin/issues/763.
-          // TODO: Repalce with mini-css-extract-plugin once it supports HMR.
-          // https://github.com/webpack-contrib/mini-css-extract-plugin
-          filename: "assets/css/[name].[md5:contenthash:hex:20].css",
+        new MiniCssExtractPlugin({
+          filename: "assets/css/[name].[hash].css",
+          chunkFilename: "assets/css/[id].[hash].css",
         }),
       ]
     : [
@@ -316,19 +292,27 @@ export default function createWebpackConfig({
             // in development "style" loader enables hot editing of CSS.
             {
               test: /\.css$/,
-              loader:
-                (isProduction &&
-                  ExtractTextPlugin.extract({
-                    fallback: styleLoader,
-                    use: cssLoaders,
-                  })) ||
-                undefined,
-              use:
-                (!isProduction && [
-                  require.resolve("style-loader"),
-                  ...cssLoaders,
-                ]) ||
-                undefined,
+              use: [
+                isProduction ? MiniCssExtractPlugin.loader : styleLoader,
+                {
+                  loader: require.resolve("css-loader"),
+                  options: {
+                    modules: true,
+                    importLoaders: 1,
+                    localIdentName: "[name]-[local]-[hash:base64:5]",
+                    minimize: isProduction,
+                    sourceMap: isProduction && !disableSourcemaps,
+                  },
+                },
+                {
+                  loader: require.resolve("postcss-loader"),
+                  options: {
+                    config: {
+                      path: paths.appPostCssConfig,
+                    },
+                  },
+                },
+              ],
             },
             // "file" loader makes sure those assets get served by WebpackDevServer.
             // When you `import` an asset, you get its (virtual) filename.

src/core/server/app/handlers/auth/local.ts

@@ -14,7 +14,6 @@ export interface SignupBody {
   username: string;
   password: string;
   email: string;
-  displayName?: string;
 }
 
 const SignupBodySchema = Joi.object().keys({

src/core/server/app/handlers/embed/stream.ts

@@ -0,0 +1,5 @@
+import { RequestHandler } from "express";
+
+export const streamHandler: RequestHandler = (req, res) => {
+  res.render("stream");
+};

src/core/server/app/index.ts

@@ -1,7 +1,10 @@
+import cons from "consolidate";
 import { Express } from "express";
 import http from "http";
 import { Redis } from "ioredis";
 import { Db } from "mongodb";
+import nunjucks from "nunjucks";
+import path from "path";
 
 import { Config } from "talk-common/config";
 import { notFoundMiddleware } from "talk-server/app/middleware/notFound";
@@ -29,6 +32,9 @@ export interface AppOptions {
  * createApp will create a Talk Express app that can be used to handle requests.
  */
 export async function createApp(options: AppOptions): Promise<Express> {
+  // Configure the application.
+  configureApplication(options);
+
   // Pull the parent out of the options.
   const { parent } = options;
 
@@ -46,7 +52,7 @@ export async function createApp(options: AppOptions): Promise<Express> {
   );
 
   // Static Files
-  parent.use(serveStatic);
+  parent.use("/assets", serveStatic);
 
   // Error Handling
   parent.use(notFoundMiddleware);
@@ -70,6 +76,38 @@ export const listenAndServe = (
     const httpServer = app.listen(port, () => resolve(httpServer));
   });
 
+function configureApplication(options: AppOptions) {
+  const { parent } = options;
+
+  // Trust the first proxy in front of us, this will enable us to trust the fact
+  // that SSL was terminated correctly.
+  parent.set("trust proxy", 1);
+
+  // Setup the view config.
+  setupViews(options);
+}
+
+function setupViews(options: AppOptions) {
+  const { parent } = options;
+
+  // configure the default views directory.
+  const views = path.join(__dirname, "..", "..", "..", "static");
+  parent.set("views", views);
+
+  // Reconfigure nunjucks.
+  (cons.requires as any).nunjucks = nunjucks.configure(views, {
+    // In development, we should enable file watch mode.
+    watch: options.config.get("env") === "development",
+  });
+
+  // assign the nunjucks engine to .njk and .html files.
+  parent.engine("njk", cons.nunjucks);
+  parent.engine("html", cons.nunjucks);
+
+  // set .html as the default extension.
+  parent.set("view engine", "html");
+}
+
 /**
  * attachSubscriptionHandlers attaches all the handlers to the http.Server to
  * handle websocket traffic by upgrading their http connections to websocket.

src/core/server/app/middleware/notFound.ts

@@ -1,5 +1,6 @@
 import { RequestHandler } from "express";
 
 export const notFoundMiddleware: RequestHandler = (req, res, next) => {
+  // FIXME: (wyattjoh) send an error that won't log as crazily as this one does.
   next(new Error("not found"));
 };

src/core/server/app/middleware/serveStatic.ts

@@ -1,4 +1,8 @@
 import serveStatic from "express-static-gzip";
 import path from "path";
 
-export default serveStatic(path.join(__dirname, "..", "..", "dist"), {});
+const staticPath = path.resolve(
+  path.join(__dirname, "..", "..", "..", "..", "static", "assets")
+);
+
+export default serveStatic(staticPath, { index: false });

src/core/server/app/middleware/tenant.ts

@@ -28,6 +28,9 @@ export default (options: MiddlewareOptions) => async (
     // Attach the tenant to the request.
     req.tenant = tenant;
 
+    // Attach the tenant to the view locals.
+    res.locals.tenant = tenant;
+
     next();
   } catch (err) {
     next(err);

src/core/server/app/router.ts

@@ -2,6 +2,7 @@ import express from "express";
 import passport from "passport";
 
 import { signupHandler } from "talk-server/app/handlers/auth/local";
+import { streamHandler } from "talk-server/app/handlers/embed/stream";
 import { apiErrorHandler } from "talk-server/app/middleware/error";
 import { errorLogger } from "talk-server/app/middleware/logging";
 import { wrapAuthn } from "talk-server/app/middleware/passport";
@@ -134,5 +135,8 @@ export async function createRouter(app: AppOptions, options: RouterOptions) {
     );
   }
 
+  // Handle the stream handler.
+  router.get("/embed/stream", streamHandler);
+
   return router;
 }