ENG-785 Use commonjs in whole project (#377)

Author: maparent

apps/roam/scripts/compile.ts

@@ -2,9 +2,18 @@ import esbuild from "esbuild";
 import fs from "fs";
 import path from "path";
 import { z } from "zod";
-// https://linear.app/discourse-graphs/issue/ENG-766/upgrade-all-commonjs-to-esm
-// import { envContents } from "@repo/database/dbDotEnv";
-const { envContents } = require("@repo/database/dbDotEnv");
+let envContents = null;
+
+try {
+  const dbDotEnv = require("@repo/database/dbDotEnv");
+  envContents = dbDotEnv.envContents;
+} catch (error) {
+  if ((error as Error).message.includes("Cannot find module")) {
+    console.error("Build the database module before compiling roam");
+    process.exit(1);
+  }
+  throw error;
+}
 
 // https://github.com/evanw/esbuild/issues/337#issuecomment-954633403
 const importAsGlobals = (

apps/roam/scripts/deploy.ts

@@ -2,9 +2,11 @@ import { put } from "@vercel/blob";
 import fs, { readFileSync } from "fs";
 import { join } from "path";
 import { compile } from "./compile";
+import { config } from "@repo/database/dbDotEnv";
+import { execSync } from "child_process";
 
 if (process.env.NODE_ENV !== "production") {
-  require("dotenv").config();
+  config();
 }
 
 const deploy = async () => {
@@ -38,10 +40,7 @@ const deploy = async () => {
       // 2. GitHub Actions environment variable for pushes/tags
       process.env.GITHUB_REF_NAME ||
       // 3. Local Git branch resolution
-      require("child_process")
-        .execSync("git rev-parse --abbrev-ref HEAD")
-        .toString()
-        .trim() ||
+      execSync("git rev-parse --abbrev-ref HEAD").toString().trim() ||
       // 4. Final fallback
       "main";
 

apps/roam/src/utils/conceptConversion.ts

@@ -3,11 +3,7 @@ import getDiscourseRelations from "./getDiscourseRelations";
 import type { DiscourseRelation } from "./getDiscourseRelations";
 import type { SupabaseContext } from "~/utils/supabaseContext";
 
-// import type { LocalConceptDataInput } from "@repo/database/inputTypes";
-// TODO: Change to apps/roam to ESM and delete below
-// // linear.app/discourse-graphs/issue/ENG-766/upgrade-all-commonjs-to-esm
-// Define the type locally to avoid ESM import issues
-type LocalConceptDataInput = any;
+import type { LocalConceptDataInput } from "@repo/database/inputTypes";
 
 const getNodeExtraData = (
   node_uid: string,

apps/roam/src/utils/hyde.ts

@@ -3,7 +3,7 @@ import { getLoggedInClient } from "./supabaseContext";
 import { Result } from "./types";
 import normalizePageTitle from "roamjs-components/queries/normalizePageTitle";
 import findDiscourseNode from "./findDiscourseNode";
-const { nextApiRoot } = require("@repo/utils/execContext");
+import { nextApiRoot } from "@repo/utils/execContext";
 
 type ApiEmbeddingResponse = {
   data: Array<{
@@ -93,11 +93,11 @@ const generateHypotheticalNode: HypotheticalNodeGenerator = async ({
 }) => {
   const { relationLabel, relatedNodeText, relatedNodeFormat } = relationType;
 
-  const userPromptContent = `Given the source discourse node \`\`\`${node}\`\`\`, 
-and considering the relation \`\`\`${relationLabel}\`\`\` 
-which typically connects to a node of type \`\`\`${relatedNodeText}\`\`\` 
-(formatted like \`\`\`${relatedNodeFormat}\`\`\`), 
-generate a hypothetical related discourse node text that would plausibly fit this relationship. 
+  const userPromptContent = `Given the source discourse node \`\`\`${node}\`\`\`,
+and considering the relation \`\`\`${relationLabel}\`\`\`
+which typically connects to a node of type \`\`\`${relatedNodeText}\`\`\`
+(formatted like \`\`\`${relatedNodeFormat}\`\`\`),
+generate a hypothetical related discourse node text that would plausibly fit this relationship.
 Only return the text of the hypothetical node.`;
   const requestBody = {
     documents: [{ role: "user", content: userPromptContent }],

apps/roam/src/utils/supabaseContext.ts

@@ -6,23 +6,13 @@ import getRoamUrl from "roamjs-components/dom/getRoamUrl";
 import { DISCOURSE_CONFIG_PAGE_TITLE } from "~/utils/renderNodeConfigPage";
 import getBlockProps from "~/utils/getBlockProps";
 import setBlockProps from "~/utils/setBlockProps";
-// https://linear.app/discourse-graphs/issue/ENG-766/upgrade-all-commonjs-to-esm
-// import type { Enums } from "@repo/database/dbTypes";
-// import type { DGSupabaseClient } from "@repo/database/lib/client";
-// import {
-//   fetchOrCreateSpaceDirect,
-//   fetchOrCreatePlatformAccount,
-//   createLoggedInClient,
-// } from "@repo/database/lib/contextFunctions";
-const {
+import type { Enums } from "@repo/database/dbTypes";
+import type { DGSupabaseClient } from "@repo/database/lib/client";
+import {
   fetchOrCreateSpaceDirect,
   fetchOrCreatePlatformAccount,
   createLoggedInClient,
-} = require("@repo/database/lib/contextFunctions");
-// TEMP TODO: Change to apps/roam to ESM
-// https://linear.app/discourse-graphs/issue/ENG-766/upgrade-all-commonjs-to-esm
-type DGSupabaseClient = any; // Supabase client type
-type Enums<T> = T extends "Platform" ? "Roam" | "Obsidian" : never;
+} from "@repo/database/lib/contextFunctions";
 
 declare const crypto: { randomUUID: () => string };
 

apps/roam/src/utils/upsertNodesAsContentWithEmbeddings.ts

@@ -1,8 +1,7 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 import { type RoamDiscourseNodeData } from "./getAllDiscourseNodesSince";
 import { type SupabaseContext } from "./supabaseContext";
-// https://linear.app/discourse-graphs/issue/ENG-766/upgrade-all-commonjs-to-esm
-const { nextApiRoot } = require("@repo/utils/execContext");
+import { nextApiRoot } from "@repo/utils/execContext";
 type LocalContentDataInput = any;
 type DGSupabaseClient = any;
 type Json = any;

apps/roam/tsconfig.json

@@ -1,13 +1,16 @@
 {
   "extends": "@repo/typescript-config/react-library.json",
-  "include": ["src", "src/types.d.ts", "tailwind.config.ts", "tests", "scripts"],
+  "include": [
+    "src",
+    "src/types.d.ts",
+    "tailwind.config.ts",
+    "tests",
+    "scripts"
+  ],
   "compilerOptions": {
     "baseUrl": ".",
     "outDir": "dist",
     "allowJs": false,
-    "esModuleInterop": false,
-    "forceConsistentCasingInFileNames": true,
-    "jsx": "react",
     "noUncheckedIndexedAccess": false
   }
 }

apps/website/next.config.ts

@@ -5,6 +5,5 @@ const nextConfig = {
   serverRuntimeConfig: {
     maxDuration: 300,
   },
-  transpilePackages: ["@repo/database", "@repo/utils", "@repo/ui"],
 };
 export default nextConfig;

package-lock.json

@@ -1,6 +1,6 @@
 {
   "default": {
-    "loader": ["ts-node/esm"],
-    "import": ["features/step-definitions/**/*.ts"]
+    "requireModule": ["ts-node/register"],
+    "require": ["features/step-definitions/**/*.ts"]
   }
 }