further simplify server and do not proxy from s3

Author: skshetry

.env.example

@@ -3,7 +3,7 @@
 require('dotenv').config()
 const path = require('path')
 
-const redirectsMiddleware = require('./src/server/middleware/redirects')
+const redirectsMiddleware = require('./server/redirect')
 
 const title = 'Data Version Control · DVC'
 const description =

gatsby-config.js

@@ -1,4 +1,4 @@
 {
-  "watch": ["src/server"],
-  "exec": "node src/server/index.js"
+  "watch": ["server"],
+  "exec": "node server/index.js"
 }

lychee.toml

@@ -9,7 +9,7 @@
     "dev": "gatsby develop",
     "clean": "gatsby clean",
     "build": "gatsby build",
-    "start": "node ./src/server/index.js",
+    "start": "node ./server/index.js",
     "start-dev": "nodemon",
     "heroku-postbuild": "./scripts/heroku-deploy.sh",
     "test": "jest",
@@ -43,14 +43,12 @@
   ],
   "dependencies": {
     "@dvcorg/gatsby-theme": "workspace:^",
-    "@hapi/wreck": "18.1.0",
     "@radix-ui/react-dialog": "1.1.15",
     "@radix-ui/react-label": "2.1.7",
     "@reach/router": "1.3.4",
     "@reach/tooltip": "0.18.0",
     "@sentry/node": "10.17.0",
     "algoliasearch": "4.25.2",
-    "clsx": "2.1.1",
     "compression": "1.8.1",
     "dotenv": "17.2.3",
     "express": "5.1.0",
@@ -70,7 +68,6 @@
     "http-proxy-middleware": "3.0.5",
     "isomorphic-fetch": "3.0.0",
     "lucide-react": "0.545.0",
-    "mime-types": "3.0.1",
     "nanoid": "5.1.6",
     "permissions-policy": "0.6.0",
     "promise-polyfill": "8.3.0",
@@ -90,7 +87,6 @@
   },
   "devDependencies": {
     "@aws-sdk/client-cloudfront": "3.901.0",
-    "@aws-sdk/client-s3": "3.901.0",
     "@babel/core": "7.28.4",
     "@eslint/eslintrc": "3.3.1",
     "@eslint/js": "9.37.0",
@@ -128,7 +124,6 @@
     "prettier": "3.6.2",
     "remark": "15.0.1",
     "remark-html": "16.0.1",
-    "s3-sync-client": "4.3.1",
     "stylelint": "16.25.0",
     "stylelint-config-standard": "38.0.0",
     "ts-jest": "29.4.4",

nodemon.json

@@ -8,7 +8,5 @@ ln -s $NEWPWD $OLDPWD
 cd $NEWPWD
 yarn build
 rm -rf static .cache
-./scripts/deploy-with-s3.js
 # Copy the 404 HTML file from public into the root dir for Heroku
-cp public/404.html 404.html
 ./scripts/clear-cloudfront-cache.js

package.json

@@ -1,41 +1,31 @@
 /*
- * Production server. Proxies to S3 depending on HEROKU_APP_NAME (see
- * scripts/deploy-with-s3.js)
+ * Production server.
  *
  * NOTE: This file doesn't go through babel or webpack. Make sure the syntax and
  * sources this file requires are compatible with the current node version you
  * are running.
  *
  * Required environment variables:
  *
- *  - S3_BUCKET: name of the bucket
- *  - AWS_REGION: region of the bucket
- *  - AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY: IAM token to access bucket
  *  - HEROKU_APP_NAME: If this is a PR, an ID of the PR. Don't add this for
  *    production.
  */
-
 require('./instrument')
+require('dotenv').config()
 
 const Sentry = require('@sentry/node')
 const compression = require('compression')
 const express = require('express')
 const helmet = require('helmet')
 const { createProxyMiddleware } = require('http-proxy-middleware')
 const permissionsPolicy = require('permissions-policy')
+const serveHandler = require('serve-handler')
 
-require('dotenv').config()
-
-// eslint-disable-next-line import-x/order
-const { s3Url } = require('./config')
+const redirectsMiddleware = require('./redirect')
 
 const port = process.env.PORT || 3000
 const app = express()
 
-const redirectsMiddleware = require('./middleware/redirects')
-const serveMiddleware = require('./middleware/serve')
-const { isProduction } = require('./utils')
-
 app.use(compression())
 app.use(redirectsMiddleware)
 app.use(
@@ -93,6 +83,15 @@ app.use(
   })
 )
 app.use(helmet(helmetOptions))
+
+const serveMiddleware = async (req, res) => {
+  await serveHandler(req, res, {
+    public: 'public',
+    cleanUrls: true,
+    trailingSlash: false,
+    directoryListing: false
+  })
+}
 app.use(serveMiddleware)
 Sentry.setupExpressErrorHandler(app)
 
@@ -117,10 +116,5 @@ app.use((req, res, _next) => {
 })
 app.listen(port, () => {
   console.log(`Listening on http://localhost:${port}/`)
-
-  if (isProduction) {
-    console.log(`Proxying to ${s3Url}`)
-  } else {
-    console.log('Serving static files from local')
-  }
+  console.log('Serving static files from local')
 })

scripts/deploy-with-s3.js

@@ -1,6 +1,8 @@
 const Sentry = require('@sentry/node')
 
-const { parseBoolean } = require('./utils')
+const parseBoolean = str => {
+  return ['True', 'true', '1', true].includes(str)
+}
 
 Sentry.init({
   dsn: process.env.SENTRY_DSN,