From 0437d6aada195a27e6a21a8ba3857854ba82319a Mon Sep 17 00:00:00 2001
From: Shreeyash Shrestha <shresthashree0807@gmail.com>
Date: Tue, 19 Nov 2024 14:43:23 +0545
Subject: [PATCH] Add ts files in "generated" on knip

---
 .../{workflows => }/pull_request_template.md  |  0
 Dockerfile                                    |  4 +--
 docker-compose-with-backend.yml               |  2 +-
 env.sample                                    |  5 ++++
 env.ts                                        | 22 +++++++++------
 index.html                                    |  3 +--
 knip.json                                     | 16 -----------
 knip.jsonc                                    | 18 +++++++++++++
 package.json                                  | 27 +++++++------------
 pnpm-lock.yaml                                |  6 ++---
 src/App/index.tsx                             | 16 ++++++-----
 type.template.tsx                             | 16 -----------
 12 files changed, 62 insertions(+), 73 deletions(-)
 rename .github/{workflows => }/pull_request_template.md (100%)
 create mode 100644 env.sample
 delete mode 100644 knip.json
 create mode 100644 knip.jsonc
 delete mode 100644 type.template.tsx

diff --git a/.github/workflows/pull_request_template.md b/.github/pull_request_template.md
similarity index 100%
rename from .github/workflows/pull_request_template.md
rename to .github/pull_request_template.md
diff --git a/Dockerfile b/Dockerfile
index 5b63b5cb..da63263c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,9 +2,7 @@ FROM node:18-bullseye
 
 RUN apt-get update -y \
     && apt-get install -y --no-install-recommends \
-        git bash g++ make iproute2 \
-    && rm -rf /var/lib/apt/lists/*
-
+        git bash g++ make \
 RUN npm install -g pnpm
 
 WORKDIR /code
diff --git a/docker-compose-with-backend.yml b/docker-compose-with-backend.yml
index 492af476..d936724f 100644
--- a/docker-compose-with-backend.yml
+++ b/docker-compose-with-backend.yml
@@ -7,7 +7,7 @@ services:
     environment:
       APP_TITLE: ${APP_TITLE:-CMS}
       APP_GRAPHQL_ENDPOINT: ${APP_GRAPHQL_ENDPOINT:-http://localhost:8001/graphql/}
-      APP_GRAPHQL_CODEGEN_ENDPOINT: ${APP_GRAPHQL_CODEGEN_ENDPOINT:-http://web:8001/graphql/}
+      APP_GRAPHQL_CODEGEN_ENDPOINT: ${APP_GRAPHQL_CODEGEN_ENDPOINT:-./backend/schema.graphql}
     volumes:
       - ../:/code
     ports:
diff --git a/env.sample b/env.sample
new file mode 100644
index 00000000..a7a91f47
--- /dev/null
+++ b/env.sample
@@ -0,0 +1,5 @@
+COMPOSE_FILE=
+
+APP_TITLE=
+APP_GRAPHQL_CODEGEN_ENDPOINT=
+APP_GRAPHQL_ENDPOINT=
diff --git a/env.ts b/env.ts
index 3a233f53..535eb732 100644
--- a/env.ts
+++ b/env.ts
@@ -1,9 +1,15 @@
-import {
-    defineConfig,
-    Schema,
-} from '@julr/vite-plugin-validate-env';
+import { Schema } from '@julr/vite-plugin-validate-env';
 
-export default defineConfig({
-    COMPOSE_FILE: Schema.string.optional(),
-    APP_TITLE: Schema.string.optional(),
-});
+const envConfig = {
+    validator: 'builtin',
+    debug: true,
+    schema: {
+        // NOTE: We need to replace with URL
+        APP_GRAPHQL_ENDPOINT: Schema.string(),
+
+        // NOTE: It is not used for now
+        APP_TITLE: Schema.string.optional(),
+    },
+};
+
+export default envConfig;
diff --git a/index.html b/index.html
index 5d8267dd..d2d5a3cd 100644
--- a/index.html
+++ b/index.html
@@ -21,8 +21,7 @@
         <title>
             %APP_TITLE%
         </title>
-        <link href="https://fonts.googleapis.com/css2?family=Manrope:wght@200..800&display=swap" rel="stylesheet">
-        <link href="https://fonts.googleapis.com/css2?family=Assistant:wght@200..800&display=swap" rel="stylesheet">
+        <link href="https://fonts.googleapis.com/css2?family=Assistant:wght@300;400;600;700&family=Manrope:wght@300;400;600;700&display=swap" rel="stylesheet">
         <style>
             html, body {
                 margin: 0;
diff --git a/knip.json b/knip.json
deleted file mode 100644
index 208c1997..00000000
--- a/knip.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "$schema": "https://unpkg.com/knip@5/schema.json",
-    "ignoreBinaries": ["awk", "ip"],
-    "entry": [
-        "src/**/*.test.ts",
-        "src/**/*.test.tsx",
-        "src/index.tsx!"
-    ],
-    "project": [
-        "src/**/*.d.ts",
-        "src/**/*.test.ts",
-        "src/**/*.test.tsx",
-        "src/**/*.tsx!",
-        "src/**/*.ts!"
-    ]
-}
diff --git a/knip.jsonc b/knip.jsonc
new file mode 100644
index 00000000..2a7bd5c1
--- /dev/null
+++ b/knip.jsonc
@@ -0,0 +1,18 @@
+{
+    "$schema": "https://unpkg.com/knip@5/schema.json",
+    /* NOTE: It is ignored because some of the files and types inside the generated will not be used but needed. */
+    "ignore": ["generated/**/*.ts"],
+    "entry": [
+        "src/index.tsx!",
+        "src/**/*.test.ts",
+        "src/**/*.test.tsx"
+    ],
+    "project": [
+        "src/**/*.tsx!",
+        "src/**/*.ts!",
+        "src/**/*.d.ts",
+        "src/**/*.test.ts",
+        "src/**/*.test.tsx",
+        "generated/**/*.ts"
+    ]
+}
diff --git a/package.json b/package.json
index 922920ab..c044abc3 100644
--- a/package.json
+++ b/package.json
@@ -4,35 +4,29 @@
     "version": "0.0.0",
     "type": "module",
     "scripts": {
+        "generate:type": "graphql-codegen --require dotenv/config --config codegen.ts",
+        "prestart": "pnpm generate:type",
         "start": "vite",
-        "dev": "vite",
-        "preview": "vite preview",
-        "test": "vitest",
-        "coverage": "vitest run --coverage",
-        "prestart": "pnpm initialize",
-        "get-hostname": "ip route | awk '/default/ { print $3 }'",
-        "replace-localhost": "awk \"{sub(/localhost/, \\\"$(pnpm -s get-hostname)\\\")}1\"",
-        "generate:type": "APP_GRAPHQL_CODEGEN_ENDPOINT=$(echo $APP_GRAPHQL_CODEGEN_ENDPOINT | pnpm -s replace-localhost) graphql-codegen --require dotenv/config --config codegen.ts",
-        "initialize": "pnpm generate:type",
-        "prebuild": "pnpm initialize",
+        "prebuild": "pnpm generate:type",
         "build": "vite build",
-        "pretypecheck": "pnpm initialize",
+        "pretypecheck": "pnpm generate:type",
         "typecheck": "tsc",
-        "prelint:js": "pnpm initialize",
+        "prelint:unused": "pnpm generate:type",
+        "lint:unused": "knip --no-gitignore --tags=-knipignore",
+        "prelint:js": "pnpm generate:type",
         "lint:js": "eslint src",
-        "prelint:css": "pnpm initialize",
         "lint:css": "stylelint \"./src/**/*.css\"",
-        "prelint": "pnpm initialize",
         "lint": "pnpm lint:js && pnpm lint:css",
         "lint:fix": "pnpm lint:js --fix && pnpm lint:css --fix",
-        "prelint:unused": "pnpm initialize",
-        "lint:unused": "knip --tags=-knipignore",
+        "test": "vitest",
+        "test:coverage": "vitest run --coverage",
         "postinstall": "patch-package"
     },
     "dependencies": {
         "@apollo/client": "^3.11.8",
         "@togglecorp/fujs": "^2.0.0",
         "@julr/vite-plugin-validate-env": "^1.1.1",
+        "@graphql-typed-document-node/core": "^3.2.0",
         "graphql": "^16.9.0",
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
@@ -41,7 +35,6 @@
     "devDependencies": {
         "@graphql-codegen/cli": "^5.0.2",
         "@graphql-codegen/client-preset": "^4.3.3",
-        "@graphql-typed-document-node/core": "^3.2.0",
         "@types/node": "^20.1.3",
         "@types/react": "^18.0.28",
         "@types/react-dom": "^18.0.11",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 135726bc..96ce0149 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -11,6 +11,9 @@ importers:
       '@apollo/client':
         specifier: ^3.11.8
         version: 3.11.8(@types/react@18.0.28)(graphql-ws@5.16.0(graphql@16.9.0))(graphql@16.9.0)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@graphql-typed-document-node/core':
+        specifier: ^3.2.0
+        version: 3.2.0(graphql@16.9.0)
       '@julr/vite-plugin-validate-env':
         specifier: ^1.1.1
         version: 1.1.1(vite@5.1.5(@types/node@20.1.3))(zod@3.23.8)
@@ -36,9 +39,6 @@ importers:
       '@graphql-codegen/client-preset':
         specifier: ^4.3.3
         version: 4.4.0(graphql@16.9.0)
-      '@graphql-typed-document-node/core':
-        specifier: ^3.2.0
-        version: 3.2.0(graphql@16.9.0)
       '@types/node':
         specifier: ^20.1.3
         version: 20.1.3
diff --git a/src/App/index.tsx b/src/App/index.tsx
index ccf2f820..f41ca3f1 100644
--- a/src/App/index.tsx
+++ b/src/App/index.tsx
@@ -27,13 +27,12 @@ import { unwrappedRoutes } from './routes';
 const ME_QUERY = gql`
     query Me {
         public {
-            id
             me {
-                displayName
-                email
-                firstName
                 id
+                firstName
                 lastName
+                email
+                displayName
             }
         }
     }
@@ -52,10 +51,9 @@ function App() {
     );
 
     useEffect(() => {
-        if (loading) {
-            return;
+        if (!loading) {
+            setUserAuth(meResult?.public.me ?? undefined);
         }
-        setUserAuth(meResult?.public.me ?? undefined);
     }, [meResult, loading]);
 
     const removeUserAuth = useCallback(
@@ -74,6 +72,10 @@ function App() {
         [userAuth, removeUserAuth],
     );
 
+    if (loading) {
+        return null;
+    }
+
     return (
         <UserContext.Provider value={userContextValue}>
             <RouterProvider router={router} />
diff --git a/type.template.tsx b/type.template.tsx
deleted file mode 100644
index a4450ea4..00000000
--- a/type.template.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
-   Both lint and build steps fail if `generated/type.tsx` is missing
-   We generally genereate this file using graphql-codegen but graphql-codegen
-   cannot always be used.
-   In such cases, just copy this mock type.tsx to ensure that lint and build
-   steps pass.
-  NOTE: typecheck step still fails.
-*/
-
-export type Query = {
-  __typename?: 'Query';
-};
-
-export type Mutation = {
-  __typename?: 'Mutation';
-};