From 1133567955b12cbd64a207a1698e61490132bac3 Mon Sep 17 00:00:00 2001 From: Chance Strickland Date: Fri, 18 Mar 2022 10:38:18 -0700 Subject: [PATCH] chore: use get-port in gists app --- fixtures/gists-app/package.json | 1 + fixtures/gists-app/server.js | 115 +++++++++++++++++--------------- 2 files changed, 61 insertions(+), 55 deletions(-) diff --git a/fixtures/gists-app/package.json b/fixtures/gists-app/package.json index 5396235fd12..f4eb2fcf183 100644 --- a/fixtures/gists-app/package.json +++ b/fixtures/gists-app/package.json @@ -29,6 +29,7 @@ "autoprefixer": "^10.2.4", "cssnano": "^4.1.10", "fs-extra": "^10.0.0", + "get-port": "^5.1.1", "pm2": "^4.5.1", "postcss": "^8.2.6", "postcss-cli": "^8.3.1", diff --git a/fixtures/gists-app/server.js b/fixtures/gists-app/server.js index f6a778345a4..bd0e782ba78 100644 --- a/fixtures/gists-app/server.js +++ b/fixtures/gists-app/server.js @@ -2,69 +2,74 @@ const express = require("express"); const morgan = require("morgan"); const compression = require("compression"); const { createRequestHandler } = require("@remix-run/express"); +const getPort = require("get-port"); -const port = process.env.PORT || 3000; - -if (process.env.NODE_ENV === "test") { - class MockConsole { - assert() {} - clear() {} - count() {} - countReset() {} - debug() {} - dir() {} - dirxml() {} - error() {} - group() {} - groupCollapsed() {} - groupEnd() {} - info() {} - log() {} - table() {} - time() {} - timeEnd() {} - timeLog() {} - timeStamp() {} - trace() {} - warn() {} +getPort({ port: process.env.PORT || 3000 }).then((port) => { + if (process.env.NODE_ENV === "test") { + class MockConsole { + assert() {} + clear() {} + count() {} + countReset() {} + debug() {} + dir() {} + dirxml() {} + error() {} + group() {} + groupCollapsed() {} + groupEnd() {} + info() {} + log() {} + table() {} + time() {} + timeEnd() {} + timeLog() {} + timeStamp() {} + trace() {} + warn() {} + } + global.console = new MockConsole(); } - global.console = new MockConsole(); -} -let app = express(); + let app = express(); -app.use(compression()); + app.use(compression()); -app.use( - express.static("public", { - // maxAge: process.env.NODE_ENV === "production" ? "1y" : undefined - maxAge: "1y", - }) -); + app.use( + express.static("public", { + // maxAge: process.env.NODE_ENV === "production" ? "1y" : undefined + maxAge: "1y", + }) + ); -app.get("/fails.css", (req, res) => { - res.status(500).send("Boom! No CSS here!"); -}); + app.get("/fails.css", (req, res) => { + res.status(500).send("Boom! No CSS here!"); + }); -// server-side redirect -app.get("/user-gists/:username", (req, res) => { - res.redirect(301, `/gists/${req.params.username}`); -}); + // server-side redirect + app.get("/user-gists/:username", (req, res) => { + res.redirect(301, `/gists/${req.params.username}`); + }); -if (process.env.NODE_ENV !== "production" && process.env.NODE_ENV !== "test") { - app.use(morgan("dev")); -} + if ( + process.env.NODE_ENV !== "production" && + process.env.NODE_ENV !== "test" + ) { + app.use(morgan("dev")); + } -app.all( - "*", - createRequestHandler({ - build: require("@remix-run/dev/server-build"), - getLoadContext() { - return { userId: 4 }; - }, - }) -); + app.all( + "*", + createRequestHandler({ + build: require("@remix-run/dev/server-build"), + getLoadContext() { + return { userId: 4 }; + }, + }) + ); -app.listen(port, () => { - console.log(`Gists app running on port ${port}`); + app.listen(port, () => { + console.log(`Gists app running on port ${port}`); + console.log(`http://localhost:${port}`); + }); });