From eb0e65af21fc0be206f4e749a829bc0cece48b52 Mon Sep 17 00:00:00 2001
From: Nirmalya Ghosh <nirmalya.email@gmail.com>
Date: Thu, 2 Apr 2020 22:33:35 +0530
Subject: [PATCH] feat: Removes custom server from frontend package

---
 packages/frontend/package.json         |  5 +----
 packages/frontend/server.ts            | 26 --------------------------
 packages/frontend/tsconfig.server.json |  3 +--
 yarn.lock                              | 15 ---------------
 4 files changed, 2 insertions(+), 47 deletions(-)
 delete mode 100644 packages/frontend/server.ts

diff --git a/packages/frontend/package.json b/packages/frontend/package.json
index 6c4797fa..273cc47f 100644
--- a/packages/frontend/package.json
+++ b/packages/frontend/package.json
@@ -4,7 +4,7 @@
   "author": "nirmalya.email@gmail.com",
   "license": "MIT",
   "scripts": {
-    "start": "ts-node --project tsconfig.server.json server.ts",
+    "start": "next",
     "build:analyze": "ANALYZE=true next build && tsc --project tsconfig.server.json",
     "build": "next build",
     "start:prod": "NODE_ENV=production node dist/server.js",
@@ -24,7 +24,6 @@
     "apollo-utilities": "^1.3.3",
     "dotenv-webpack": "^1.7.0",
     "emotion-theming": "^10.0.27",
-    "express": "^4.17.1",
     "graphql": "^14.6.0",
     "graphql-tag": "^2.10.3",
     "isomorphic-unfetch": "^3.0.0",
@@ -39,7 +38,6 @@
     "use-http": "^0.4.4"
   },
   "devDependencies": {
-    "@types/express": "^4.17.4",
     "@types/lodash": "^4.14.149",
     "@types/next": "^9.0.0",
     "@types/node": "^13.9.8",
@@ -49,7 +47,6 @@
     "husky": "^4.2.3",
     "lint-staged": "^10.1.1",
     "prettier": "^2.0.2",
-    "ts-node": "^8.8.1",
     "tslint": "^6.1.1",
     "tslint-react": "^4.2.0",
     "typescript": "^3.8.3",
diff --git a/packages/frontend/server.ts b/packages/frontend/server.ts
deleted file mode 100644
index a4f59a2b..00000000
--- a/packages/frontend/server.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import next from 'next'
-import express from 'express'
-import { parse } from 'url'
-
-const dev = process.env.NODE_ENV !== 'production'
-const app = next({ dev })
-const handle = app.getRequestHandler()
-
-app
-  .prepare()
-  .then(() => {
-    const server = express()
-    server.get('*', (req: any, res: any) => {
-      const parsedUrl = parse(req.url, true)
-
-      handle(req, res, parsedUrl)
-    })
-
-    server.listen(process.env.PORT || 3000, () => {
-      console.log('⚡️ Ready on http://localhost:3000')
-    })
-  })
-  .catch(ex => {
-    console.error(ex.stack)
-    process.exit(1)
-  })
diff --git a/packages/frontend/tsconfig.server.json b/packages/frontend/tsconfig.server.json
index 45dd337b..54d28eba 100644
--- a/packages/frontend/tsconfig.server.json
+++ b/packages/frontend/tsconfig.server.json
@@ -6,6 +6,5 @@
     "target": "es2017",
     "isolatedModules": false,
     "noEmit": false
-  },
-  "include": ["server.ts"]
+  }
 }
diff --git a/yarn.lock b/yarn.lock
index f3d6ff81..53b56007 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2195,16 +2195,6 @@
     "@types/express-serve-static-core" "*"
     "@types/serve-static" "*"
 
-"@types/express@^4.17.4":
-  version "4.17.4"
-  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.4.tgz#e78bf09f3f530889575f4da8a94cd45384520aac"
-  integrity sha512-DO1L53rGqIDUEvOjJKmbMEQ5Z+BM2cIEPy/eV3En+s166Gz+FeuzRerxcab757u/U4v4XF4RYrZPmqKa+aY/2w==
-  dependencies:
-    "@types/body-parser" "*"
-    "@types/express-serve-static-core" "*"
-    "@types/qs" "*"
-    "@types/serve-static" "*"
-
 "@types/glob@^7.1.1":
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz#aa59a1c6e3fbc421e07ccd31a944c30eba521575"
@@ -2296,11 +2286,6 @@
   resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7"
   integrity sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==
 
-"@types/qs@*":
-  version "6.9.1"
-  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.1.tgz#937fab3194766256ee09fcd40b781740758617e7"
-  integrity sha512-lhbQXx9HKZAPgBkISrBcmAcMpZsmpe/Cd/hY7LGZS5OfkySUBItnPZHgQPssWYUET8elF+yCFBbP1Q0RZPTdaw==
-
 "@types/range-parser@*":
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.3.tgz#7ee330ba7caafb98090bece86a5ee44115904c2c"