chore: upgrade to [email protected]

dimitrisnl · Apr 25, 2024 · 4562131 · 4562131
1 parent 28c5cd0
commit 4562131
Show file tree

Hide file tree

Showing 78 changed files with 1,343 additions and 1,552 deletions.
diff --git a/.storybook/main.js b/.storybook/main.js
@@ -6,7 +6,7 @@ const config = {
     '@storybook/addon-essentials',
     '@storybook/addon-onboarding',
     '@storybook/addon-interactions',
-    '@chromatic-com/storybook'
+    '@chromatic-com/storybook',
   ],
   framework: {
     name: '@storybook/react-vite',

diff --git a/app/core/domain/password.test.ts b/app/core/domain/password.test.ts
@@ -27,8 +27,8 @@ describe('domain/password', () => {
       const password = 'my-password-is-ok';
 
       const result = await Effect.runPromiseExit(
-        Effect.gen(function* (_) {
-          const hash = yield* _(hashPassword(password as Password));
+        Effect.gen(function* () {
+          const hash = yield* hashPassword(password as Password);
           expect(hash).not.toBe(password);
         })
       );
@@ -39,9 +39,9 @@ describe('domain/password', () => {
       const password = 'my-password-is-ok';
 
       const result = await Effect.runPromiseExit(
-        Effect.gen(function* (_) {
-          const hash1 = yield* _(hashPassword(password as Password));
-          const hash2 = yield* _(hashPassword(password as Password));
+        Effect.gen(function* () {
+          const hash1 = yield* hashPassword(password as Password);
+          const hash2 = yield* hashPassword(password as Password);
           expect(hash1).not.toBe(hash2);
         })
       );
@@ -55,15 +55,13 @@ describe('domain/password', () => {
       const password = 'my-password-is-ok';
 
       const result = await Effect.runPromiseExit(
-        Effect.gen(function* (_) {
-          const hash = yield* _(hashPassword(password as Password));
+        Effect.gen(function* () {
+          const hash = yield* hashPassword(password as Password);
 
-          const isValid = yield* _(
-            comparePasswords({
-              plainText: password,
-              hashValue: hash,
-            })
-          );
+          const isValid = yield* comparePasswords({
+            plainText: password,
+            hashValue: hash,
+          });
 
           expect(isValid).toBe(true);
         })
@@ -76,15 +74,13 @@ describe('domain/password', () => {
       const password = 'my-password-is-ok';
 
       const result = await Effect.runPromiseExit(
-        Effect.gen(function* (_) {
-          const hash = yield* _(hashPassword(password as Password));
-
-          const isValid = yield* _(
-            comparePasswords({
-              plainText: 'my-password-is-not-ok',
-              hashValue: hash,
-            })
-          );
+        Effect.gen(function* () {
+          const hash = yield* hashPassword(password as Password);
+
+          const isValid = yield* comparePasswords({
+            plainText: 'my-password-is-not-ok',
+            hashValue: hash,
+          });
 
           expect(isValid).toBe(false);
         })

diff --git a/app/core/jobs/email-queue.server.ts b/app/core/jobs/email-queue.server.ts
@@ -17,7 +17,7 @@ const emailQueue = registerQueue<JobPayload>('email', async (job) => {
 });
 
 export const addEmailJob = (jobName: string, jobPayload: JobPayload) => {
-  return Effect.gen(function* (_) {
-    yield* _(Effect.promise(() => emailQueue.add(jobName, jobPayload)));
+  return Effect.gen(function* () {
+    yield* Effect.promise(() => emailQueue.add(jobName, jobPayload));
   });
 };
diff --git a/app/core/lib/helpers.server.ts b/app/core/lib/helpers.server.ts
@@ -13,25 +13,25 @@ import {parseUserId} from '../domain/user.server';
 type Params = LoaderFunctionArgs['params'];
 
 export function identifyOrgByParams(params: Params) {
-  return Effect.gen(function* (_) {
-    const slug = yield* _(parseOrgSlug(params.slug));
-    const orgId = yield* _(getOrgIdBySlug({db, pool}).execute(slug));
+  return Effect.gen(function* () {
+    const slug = yield* parseOrgSlug(params.slug);
+    const orgId = yield* getOrgIdBySlug({db, pool}).execute(slug);
 
     return orgId;
   });
 }
 
 export function parseFormData(request: Request) {
-  return Effect.gen(function* (_) {
-    const formData = yield* _(Effect.promise(() => request.clone().formData()));
+  return Effect.gen(function* () {
+    const formData = yield* Effect.promise(() => request.clone().formData());
     return Object.fromEntries(formData);
   });
 }
 
 export function authenticateUser(request: Request) {
-  return Effect.gen(function* (_) {
-    const session = yield* _(getSession(request));
-    const userId = yield* _(parseUserId(session.get(USER_SESSION_KEY)));
+  return Effect.gen(function* () {
+    const session = yield* getSession(request);
+    const userId = yield* parseUserId(session.get(USER_SESSION_KEY));
 
     return userId;
   }).pipe(

diff --git a/app/core/lib/session.server.ts b/app/core/lib/session.server.ts
@@ -30,11 +30,11 @@ export function getSession(request: Request) {
 }
 
 export function logout(request: Request) {
-  return Effect.gen(function* (_) {
-    const session = yield* _(getSession(request));
+  return Effect.gen(function* () {
+    const session = yield* getSession(request);
 
-    const cookie: string = yield* _(
-      Effect.promise(() => sessionStorage.destroySession(session))
+    const cookie: string = yield* Effect.promise(() =>
+      sessionStorage.destroySession(session)
     );
 
     return new Redirect({
@@ -59,20 +59,18 @@ export function createUserSession({
   redirectToPath: string;
   request: Request;
 }) {
-  return Effect.gen(function* (_) {
-    yield* _(Effect.log(`Session: Creating user session ${userId}`));
-    const session = yield* _(getSession(request));
+  return Effect.gen(function* () {
+    yield* Effect.log(`Session: Creating user session ${userId}`);
+    const session = yield* getSession(request);
 
     session.set(USER_SESSION_KEY, userId);
 
-    const cookie: string = yield* _(
-      Effect.promise(() =>
-        sessionStorage.commitSession(session, {
-          maxAge: remember
-            ? 60 * 60 * 24 * 7 // 7 days
-            : undefined,
-        })
-      )
+    const cookie: string = yield* Effect.promise(() =>
+      sessionStorage.commitSession(session, {
+        maxAge: remember
+          ? 60 * 60 * 24 * 7 // 7 days
+          : undefined,
+      })
     );
 
     return new Redirect({

diff --git a/app/core/mailer/emails/send-invitation-email.server.tsx b/app/core/mailer/emails/send-invitation-email.server.tsx
@@ -14,7 +14,7 @@ export function sendInvitationEmail({
   orgName: string;
   invitationTokenId: string;
 }) {
-  return Effect.gen(function* (_) {
+  return Effect.gen(function* () {
     const html = `
     You've been invited to join ${orgName}!\n
     Accept your invitation by creating a new account: ${config.DASHBOARD_URL}\n
@@ -27,7 +27,7 @@ export function sendInvitationEmail({
       content: html,
     };
 
-    yield* _(addEmailJob('invitation-email', payload));
+    yield* addEmailJob('invitation-email', payload);
   }).pipe(
     Effect.catchAll((error) =>
       pipe(

diff --git a/app/core/mailer/emails/send-password-reset-email.server.tsx b/app/core/mailer/emails/send-password-reset-email.server.tsx
@@ -12,7 +12,7 @@ export function sendPasswordResetEmail({
   email: string;
   passwordResetTokenId: string;
 }) {
-  return Effect.gen(function* (_) {
+  return Effect.gen(function* () {
     const html = `
     You requested a password reset\n
     Change your password here: ${config.DASHBOARD_URL}/password/reset-password?token=${passwordResetTokenId}
@@ -24,7 +24,7 @@ export function sendPasswordResetEmail({
       content: html,
     };
 
-    yield* _(addEmailJob('password-reset-email', payload));
+    yield* addEmailJob('password-reset-email', payload);
   }).pipe(
     Effect.catchAll((error) =>
       pipe(

diff --git a/app/core/mailer/emails/send-verification-email.server.tsx b/app/core/mailer/emails/send-verification-email.server.tsx
@@ -13,10 +13,8 @@ export function sendVerificationEmail({
   email: string;
   verifyEmailTokenId: string;
 }) {
-  return Effect.gen(function* (_) {
-    yield* _(
-      Effect.log(`Mailer(verification-email): Sending email to ${email}`)
-    );
+  return Effect.gen(function* () {
+    yield* Effect.log(`Mailer(verification-email): Sending email to ${email}`);
 
     const html = `
       Welcome!
@@ -29,8 +27,8 @@ export function sendVerificationEmail({
       content: html,
     };
 
-    yield* _(addEmailJob('password-reset-email', payload));
-    yield* _(Effect.log(`Mailer(verification-email): Sent email to ${email}`));
+    yield* addEmailJob('password-reset-email', payload);
+    yield* Effect.log(`Mailer(verification-email): Sent email to ${email}`);
   }).pipe(
     Effect.catchAll((error) =>
       pipe(