Revert "Fix CUSTOM_LEMMY_SERVERS when installed (aeharding#127)" (aeh…

…arding#133)

This reverts commit 8bde519.

.eslintrc

@@ -60,8 +60,7 @@
     {
       "files": ["src/**"],
       "globals": {
-        "APP_VERSION": true,
-        "CUSTOM_LEMMY_SERVERS": true
+        "APP_VERSION": true
       }
     }
   ]

src/helpers/lemmy.ts

@@ -1,8 +1,8 @@
 import { Comment, CommentView, Community } from "lemmy-js-client";
 
 export const LEMMY_SERVERS =
-  typeof CUSTOM_LEMMY_SERVERS !== "undefined"
-    ? (CUSTOM_LEMMY_SERVERS as string).split(",")
+  "CUSTOM_LEMMY_SERVERS" in window
+    ? (window.CUSTOM_LEMMY_SERVERS as string[])
     : ["lemmy.world", "lemmy.ml", "beehaw.org", "sh.itjust.works"];
 
 export interface LemmyJWT {

src/vite-env.d.ts

@@ -3,4 +3,3 @@
 /// <reference types="vite-plugin-pwa/react" />
 
 declare const APP_VERSION: string;
-declare const CUSTOM_LEMMY_SERVERS: string;

vite.config.ts

@@ -3,48 +3,42 @@ import { defineConfig } from "vitest/config";
 import { VitePWA } from "vite-plugin-pwa";
 import svgr from "vite-plugin-svgr";
 import legacy from "@vitejs/plugin-legacy";
-import { loadEnv } from "vite";
 
 // https://vitejs.dev/config/
-export default ({ mode }) => {
-  process.env = { ...process.env, ...loadEnv(mode, process.cwd(), "") };
-
-  return defineConfig({
-    plugins: [
-      react({
-        jsxImportSource: "@emotion/react",
-        babel: {
-          plugins: ["@emotion/babel-plugin"],
-        },
-      }),
-      svgr(),
-      VitePWA({ registerType: "prompt" }),
-      legacy({
-        modernPolyfills: ["es.array.at"],
-      }),
-    ],
-    // TODO: Outdated clients trying to access stale codesplit js chucks
-    // break. This breaks iOS transitions.
-    // Put everything into one chunk for now.
-    build: {
-      rollupOptions: {
-        output: {
-          manualChunks: () => "index.js",
-        },
+export default defineConfig({
+  plugins: [
+    react({
+      jsxImportSource: "@emotion/react",
+      babel: {
+        plugins: ["@emotion/babel-plugin"],
+      },
+    }),
+    svgr(),
+    VitePWA({ registerType: "prompt" }),
+    legacy({
+      modernPolyfills: ["es.array.at"],
+    }),
+  ],
+  // TODO: Outdated clients trying to access stale codesplit js chucks
+  // break. This breaks iOS transitions.
+  // Put everything into one chunk for now.
+  build: {
+    rollupOptions: {
+      output: {
+        manualChunks: () => "index.js",
       },
     },
-    define: {
-      // eslint-disable-next-line no-undef
-      APP_VERSION: JSON.stringify(process.env.npm_package_version),
-      CUSTOM_LEMMY_SERVERS: JSON.stringify(process.env.CUSTOM_LEMMY_SERVERS),
-    },
-    test: {
-      globals: true,
-      environment: "jsdom",
-      setupFiles: "./src/setupTests.ts",
-    },
-    optimizeDeps: {
-      exclude: ["mdast-util-gfm-autolink-literal-lemmy"],
-    },
-  });
-};
+  },
+  define: {
+    // eslint-disable-next-line no-undef
+    APP_VERSION: JSON.stringify(process.env.npm_package_version),
+  },
+  test: {
+    globals: true,
+    environment: "jsdom",
+    setupFiles: "./src/setupTests.ts",
+  },
+  optimizeDeps: {
+    exclude: ["mdast-util-gfm-autolink-literal-lemmy"],
+  },
+});