Merge pull request #3868 from Northeastern-Electric-Racing/esm-switch

Esm switch

Author: chpy04

.github/workflows/run-tests.yml

@@ -37,5 +37,7 @@ jobs:
         run: docker exec finishline psql -U postgres -c "CREATE DATABASE nerpm;"
       - name: Install modules
         run: yarn install && yarn prisma:generate && yarn prisma:migrate:prod
+      - name: Build shared package
+        run: yarn build:shared
       - name: Run tests
         run: yarn test:backend; yarn test:frontend

.github/workflows/tsc-check.yml

@@ -28,5 +28,8 @@ jobs:
       - name: Install dependencies
         run: yarn install && yarn prisma:generate
 
+      - name: Build shared package
+        run: yarn build:shared
+
       - name: Run tsc check
         run: npm run tsc-check # You need to define this script in your package.json

devContainerization/docker-compose.dev.yml

@@ -2,11 +2,12 @@ name: finishline-development
 services:
   database:
     container_name: database-dev
-    image: postgres
+    image: postgres:16
     environment:
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: docker
       POSTGRES_DB: finishline_database
+      PGDATA: /var/lib/postgresql/data
     ports:
       - '5432:5432'
     volumes:

devContainerization/start-containers.js

@@ -1,5 +1,5 @@
-const { exec, spawn } = require('child_process');
-const { promisify } = require('util');
+import { exec, spawn } from 'child_process';
+import { promisify } from 'util';
 
 const execAsync = promisify(exec);
 const COMPOSE_FILE = 'docker-compose.dev.yml';

package.json

@@ -27,7 +27,7 @@
     "prisma:manual": "yarn workspace backend prisma:manual",
     "prisma:studio": "cd src/backend; npx prisma studio",
     "docker:prisma:studio": "cd devContainerization && docker compose -f docker-compose.dev.yml exec -T backend sh -c \"cd /src/backend && npx prisma studio\"",
-    "containerize": "cd containerization; docker compose down && docker compose build && docker compose up -d && sleep 5 && cd ../ && yarn containerize:psql:init && yarn prisma:migrate",
+    "containerize": "cd containerization; docker compose down && docker compose build && docker compose up -d && sleep 5 && cd ../ && yarn containerize:psql:init && docker exec backend sh -c 'cd /base/src/backend && npx prisma migrate deploy'",
     "containerize:psql:init": "docker exec database psql -U postgres -c \"CREATE DATABASE nerpm;\" && yarn database:setup:script",
     "containerize:test:e2e": "yarn containerize && yarn prisma:reset:force && yarn test:e2e",
     "lint": "npx eslint .",

scripts/database-setup.js

@@ -1,31 +1,31 @@
-const fs = require('fs');
+import fs from 'fs';
 
 const filePath = './src/backend/.env';
 const lineToAdd = 'DATABASE_URL="postgresql://postgres:docker@localhost:5432/nerpm?schema=public"';
 
 if (!fs.existsSync(filePath)) {
-    fs.writeFileSync(filePath, lineToAdd, 'utf8');
-    return;
+  fs.writeFileSync(filePath, lineToAdd, 'utf8');
+  return;
 }
 
 fs.readFile(filePath, 'utf8', (err, data) => {
-    if (err) {
-        console.error('Error reading file:', err);
-        return;
-    }
+  if (err) {
+    console.error('Error reading file:', err);
+    return;
+  }
 
-    // Split file contents into lines
-    const lines = data.trim().split('\n');
+  // Split file contents into lines
+  const lines = data.trim().split('\n');
 
-    for (const line of lines) {
-        //db url already exists, no need to add it
-        if (line.startsWith("DATABASE_URL=")) return;
-    }
+  for (const line of lines) {
+    //db url already exists, no need to add it
+    if (line.startsWith('DATABASE_URL=')) return;
+  }
 
-    fs.appendFile(filePath, `\n${lineToAdd}`, 'utf8', (err) => {
-        if (err) {
-            console.error('Error appending line to file:', err);
-            return;
-        }
-    });
+  fs.appendFile(filePath, `\n${lineToAdd}`, 'utf8', (err) => {
+    if (err) {
+      console.error('Error appending line to file:', err);
+      return;
+    }
+  });
 });

scripts/db-pull.js

@@ -1,5 +1,5 @@
-const { execSync } = require('child_process');
-const readline = require('readline');
+import { execSync } from 'child_process';
+import readline from 'readline';
 
 function promptUser(question) {
   const rl = readline.createInterface({
@@ -19,7 +19,7 @@ async function main() {
   console.log('🚀 Database Migration Script\n');
 
   try {
-    const targetUrl = "postgresql://postgres:docker@localhost:5432/nerpm"
+    const targetUrl = 'postgresql://postgres:docker@localhost:5432/nerpm';
 
     console.log(`📍 Target database: ${targetUrl.replace(/\/\/[^@]*@/, '//***:***@')}`);
 
@@ -41,7 +41,7 @@ async function main() {
 
     // First, clear the target database completely
     const clearCommand = `psql "${targetUrl}" -c "DROP SCHEMA public CASCADE; CREATE SCHEMA public;"`;
-    console.log(targetUrl)
+    console.log(targetUrl);
 
     try {
       execSync(clearCommand, { stdio: 'inherit' });
@@ -57,11 +57,10 @@ async function main() {
     execSync(dumpCommand, { stdio: 'inherit' });
 
     console.log('✅ Migration complete!');
-
   } catch (error) {
     console.error('❌ Error:', error.message);
     process.exit(1);
   }
 }
 
-main();
+main();

scripts/test-setup.js

@@ -1,25 +1,25 @@
-const fs = require('fs');
+import fs from 'fs';
 
 const filePath = './src/backend/.env';
 const lineToAdd = 'DATABASE_URL="postgresql://postgres:docker@localhost:5433/nerpm?schema=public"';
 
 fs.readFile(filePath, 'utf8', (err, data) => {
-    if (err) {
-        console.error('Error reading file:', err);
-        return;
-    }
+  if (err) {
+    console.error('Error reading file:', err);
+    return;
+  }
 
-    // Split file contents into lines
-    const lines = data.trim().split('\n');
+  // Split file contents into lines
+  const lines = data.trim().split('\n');
 
-    // Check if the last line matches the lineToAdd
-    if (lines[lines.length - 1] !== lineToAdd) {
-        // Append the line if it's not already the last line
-        fs.appendFile(filePath, `\n${lineToAdd}`, 'utf8', (err) => {
-            if (err) {
-                console.error('Error appending line to file:', err);
-                return;
-            }
-        });
-    }
-});
+  // Check if the last line matches the lineToAdd
+  if (lines[lines.length - 1] !== lineToAdd) {
+    // Append the line if it's not already the last line
+    fs.appendFile(filePath, `\n${lineToAdd}`, 'utf8', (err) => {
+      if (err) {
+        console.error('Error appending line to file:', err);
+        return;
+      }
+    });
+  }
+});

scripts/test-teardown.js

@@ -1,28 +1,28 @@
-const fs = require('fs');
+import fs from 'fs';
 
 const filePath = './src/backend/.env';
 const lineToMatch = 'DATABASE_URL="postgresql://postgres:docker@localhost:5433/nerpm?schema=public"';
 
 fs.readFile(filePath, 'utf8', (err, data) => {
-    if (err) {
-        console.error('Error reading file:', err);
-        return;
-    }
+  if (err) {
+    console.error('Error reading file:', err);
+    return;
+  }
 
-    // Split file contents into lines
-    const lines = data.trim().split('\n');
+  // Split file contents into lines
+  const lines = data.trim().split('\n');
 
-    // Check if the last line matches the lineToMatch
-    if (lines[lines.length - 1] === lineToMatch) {
-        // Remove the last line
-        lines.pop();
+  // Check if the last line matches the lineToMatch
+  if (lines[lines.length - 1] === lineToMatch) {
+    // Remove the last line
+    lines.pop();
 
-        // Write modified contents back to the file
-        fs.writeFile(filePath, lines.join('\n'), 'utf8', (err) => {
-            if (err) {
-                console.error('Error writing file:', err);
-                return;
-            }
-        });
-    } 
-});
+    // Write modified contents back to the file
+    fs.writeFile(filePath, lines.join('\n'), 'utf8', (err) => {
+      if (err) {
+        console.error('Error writing file:', err);
+        return;
+      }
+    });
+  }
+});

src/backend/Dockerfile

@@ -14,7 +14,7 @@ RUN yarn install --prod;
 RUN echo DATABASE_URL=\"postgresql://postgres:docker@database:5432/nerpm?schema=public\" > ./src/backend/.env
 RUN echo NODE_ENV=development >> ./src/backend/.env
 
-RUN yarn prisma:generate && yarn build:backend && yarn build:shared
+RUN yarn prisma:generate && yarn build:shared && yarn build:backend
 
 EXPOSE 3001
 CMD [ "yarn", "backend" ]