Use node env instead of version for environment specific logic

diff --git a/Dockerfile b/Dockerfile
index 3d6d6212d8dc4401373873cf3d9bb67cf5cfbecb..0a23ea897b00c8fb118cac744d12f5d39ad1d971 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,6 +7,7 @@ WORKDIR /usr/src/app
 ENV npm_config_target_arch=x64\r
 ENV npm_config_target_platform=linux\r
 ENV npm_config_target_libc=musl\r
+ENV NODE_ENV=production\r
 \r
 # Cache deps\r
 COPY package.json yarn.lock ./\r

diff --git a/dev.dockerfile b/dev.dockerfile
index 0e925c0a90dfca99dceb40c7186bc82e79fb757d..0faa3ad3dbf84c228914031e2869d4397bd094d3 100644 (file)
--- a/dev.dockerfile
+++ b/dev.dockerfile
@@ -6,6 +6,7 @@ WORKDIR /usr/src/app
 ENV npm_config_target_arch=x64\r
 ENV npm_config_target_platform=linux\r
 ENV npm_config_target_libc=musl\r
+ENV NODE_ENV=development\r
 \r
 # Cache deps\r
 COPY package.json yarn.lock ./\r

diff --git a/src/server/index.tsx b/src/server/index.tsx
index dab5341c9c9bbc350e04db9f5138e512f08bca3c..e406e6fe8c58d12c127a9039a23ffddc469d932d 100644 (file)
--- a/src/server/index.tsx
+++ b/src/server/index.tsx
@@ -26,7 +26,8 @@ import {
   initializeSite,
   isAuthPath,
 } from "../shared/utils";
-import { VERSION } from "../shared/version";
+
+const { NODE_ENV } = process.env as Record<string, string>;
 
 const server = express();
 const [hostname, port] = process.env["LEMMY_UI_HOST"]
@@ -161,6 +162,7 @@ server.get("/*", async (req, res) => {
     }
 
     let routeData = await Promise.all(promises);
+    // let routeData = [{ error: "I am an error, hear me roar!" } as any];
 
     // Redirect to the 404 if there's an API error
     if (routeData[0] && routeData[0].error) {
@@ -173,7 +175,7 @@ server.get("/*", async (req, res) => {
 
         // Exact error should only be seen in a development environment. Users
         // in production will get a more generic message.
-        if (VERSION === "dev") {
+        if (NODE_ENV === "development") {
           errorPageData.error = error;
         }
 
@@ -188,6 +190,8 @@ server.get("/*", async (req, res) => {
       }
     }
 
+    console.log(routeData);
+
     const isoData: IsoData = {
       path,
       site_res: site,
@@ -287,7 +291,7 @@ server.get("/*", async (req, res) => {
   } catch (err) {
     console.error(err);
     res.statusCode = 500;
-    return res.send(VERSION === "dev" ? err.message : "Server error");
+    return res.send(NODE_ENV === "development" ? err.message : "Server error");
   }
 });
 

diff --git a/src/shared/components/app/error-page.tsx b/src/shared/components/app/error-page.tsx
index 3b1628b786b7e3edef56257cefdc2a568c04943e..5c08dd524442df1c57f2cb9e98c394ebb527c6a2 100644 (file)
--- a/src/shared/components/app/error-page.tsx
+++ b/src/shared/components/app/error-page.tsx
@@ -13,11 +13,11 @@ export class ErrorPage extends Component<any, any> {
     const errorPageData = this.getErrorPageData();
 
     return (
-      <div className="container-lg">
+      <div className="container-lg text-center">
         <h1>{errorPageData ? "Error!" : "Page Not Found"}</h1>
         <p>
           {errorPageData
-            ? "There was an error on the server. Try refreshing your browser of coming back at a later time"
+            ? 'There was an error on the server. Try refreshing your browser. If that doesn\'t work, come back at a later time. If the problem persists, <a href="https://github.com/LemmyNet/lemmy/issues">consider opening an issue.</a>'
             : "The page you are looking for does not exist"}
         </p>
         {!errorPageData && (
@@ -38,7 +38,9 @@ export class ErrorPage extends Component<any, any> {
               </ul>
             </div>
           )}
-        {errorPageData?.error && <code>{errorPageData.error.message}</code>}
+        {errorPageData?.error && (
+          <code className="text-start">{errorPageData.error}</code>
+        )}
       </div>
     );
   }

diff --git a/src/shared/utils.ts b/src/shared/utils.ts
index 627caa265ec13f84889e88d9f27171263afcfe42..70faddfae317f585294361b8d5f8e435fc250484 100644 (file)
--- a/src/shared/utils.ts
+++ b/src/shared/utils.ts
@@ -107,7 +107,7 @@ export type ThemeColor =
 
 export interface ErrorPageData {
   type: "error";
-  error?: Error;
+  error?: string;
   adminMatrixIds?: string[];
 }
 

diff --git a/src/shared/version.ts b/src/shared/version.ts
index 149d272b7a178e5ac8b6facd95eabc13369704c7..c1dba35e9450d7f01548ef3221a15a3b2efde74b 100644 (file)
--- a/src/shared/version.ts
+++ b/src/shared/version.ts
@@ -1 +1 @@
-export const VERSION = "unknown version" as string;
+export const VERSION = "unknown version";