diff --git a/Dockerfile b/Dockerfile index d9d90e32..1b718691 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ RUN --mount=type=cache,id=pnpm-store,target=/root/.local/share/pnpm-store \ FROM fetcher as builder # specify the app in apps/ we want to build -ARG APP_NAME=@ufabcnext/core +ARG APP_NAME=@next/core ENV APP_NAME=${APP_NAME} diff --git a/apps/core/src/hooks/authenticate.ts b/apps/core/src/hooks/authenticate.ts index e044b12d..665213dd 100644 --- a/apps/core/src/hooks/authenticate.ts +++ b/apps/core/src/hooks/authenticate.ts @@ -1,5 +1,5 @@ import { UserModel } from '@next/models'; -import { logger } from '@ufabcnext/common'; +import { logger } from '@next/common'; import type { onRequestAsyncHookHandler } from 'fastify'; import type { JwtHeader, SignPayloadType } from '@fastify/jwt'; diff --git a/apps/core/src/modules/nextSummary/handlers/nextSummaryQuery.ts b/apps/core/src/modules/nextSummary/handlers/nextSummaryQuery.ts index c609404f..f4ee19e4 100644 --- a/apps/core/src/modules/nextSummary/handlers/nextSummaryQuery.ts +++ b/apps/core/src/modules/nextSummary/handlers/nextSummaryQuery.ts @@ -5,7 +5,7 @@ import { StudentModel, UserModel, } from '@next/models'; -import { logger } from '@ufabcnext/common'; +import { logger } from '@next/common'; import type { PipelineStage } from 'mongoose'; type DisciplinaStats = { diff --git a/apps/core/src/modules/user/handlers/completeUser.ts b/apps/core/src/modules/user/handlers/completeUser.ts index 99744e6a..8ab5de81 100644 --- a/apps/core/src/modules/user/handlers/completeUser.ts +++ b/apps/core/src/modules/user/handlers/completeUser.ts @@ -1,4 +1,4 @@ -import { logger } from '@ufabcnext/common'; +import { logger } from '@next/common'; import { UfabcUser } from '../sign-up-schema.js'; import type { FastifyReply, FastifyRequest } from 'fastify'; diff --git a/apps/core/src/modules/user/handlers/confirmUser.ts b/apps/core/src/modules/user/handlers/confirmUser.ts index 7a970bf5..475df6c5 100644 --- a/apps/core/src/modules/user/handlers/confirmUser.ts +++ b/apps/core/src/modules/user/handlers/confirmUser.ts @@ -1,4 +1,4 @@ -import { logger } from '@ufabcnext/common'; +import { logger } from '@next/common'; import { UserModel } from '@next/models'; import { Config } from '@/config/config.js'; import { ParsedUserToken } from '../sign-up-schema.js'; diff --git a/apps/core/src/plugins/oauth2/utils/get-oauth-info.ts b/apps/core/src/plugins/oauth2/utils/get-oauth-info.ts index ec51378b..f0aaba28 100644 --- a/apps/core/src/plugins/oauth2/utils/get-oauth-info.ts +++ b/apps/core/src/plugins/oauth2/utils/get-oauth-info.ts @@ -1,4 +1,4 @@ -import { logger } from '@ufabcnext/common'; +import { logger } from '@next/common'; import { ofetch } from 'ofetch'; import type { Token } from '@fastify/oauth2'; import type { GoogleUser, NextOAuth2User } from '@next/types'; diff --git a/apps/core/src/server.ts b/apps/core/src/server.ts index 36f323ed..8d119342 100644 --- a/apps/core/src/server.ts +++ b/apps/core/src/server.ts @@ -1,5 +1,5 @@ import gracefullyShutdown from 'close-with-grace'; -import { logger } from '@ufabcnext/common'; +import { logger } from '@next/common'; import { Config } from './config/config.js'; import { buildApp } from './app.js'; import type { FastifyServerOptions } from 'fastify'; diff --git a/apps/core/tsconfig.json b/apps/core/tsconfig.json index 8320c742..9f3bc2d0 100644 --- a/apps/core/tsconfig.json +++ b/apps/core/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": ["@ufabcnext/tsconfig/fastify.json"], + "extends": ["@next/tsconfig/fastify.json"], "compilerOptions": { "module": "NodeNext", "paths": { diff --git a/apps/models/src/schema/Disciplina.ts b/apps/models/src/schema/Disciplina.ts index ca334bdb..6fd3b35b 100644 --- a/apps/models/src/schema/Disciplina.ts +++ b/apps/models/src/schema/Disciplina.ts @@ -5,7 +5,7 @@ import { type UpdateQuery, model, } from 'mongoose'; -import { findQuarter } from '@ufabcnext/common'; +import { findQuarter } from '@next/common'; const disciplinaSchema = new Schema( { diff --git a/apps/models/src/schema/Student.ts b/apps/models/src/schema/Student.ts index a575f353..78f4f645 100644 --- a/apps/models/src/schema/Student.ts +++ b/apps/models/src/schema/Student.ts @@ -4,7 +4,7 @@ import { type UpdateQuery, model, } from 'mongoose'; -import { findQuarter } from '@ufabcnext/common'; +import { findQuarter } from '@next/common'; const studentSchema = new Schema( { diff --git a/apps/models/tsconfig.json b/apps/models/tsconfig.json index 2b15787c..ecbebd78 100644 --- a/apps/models/tsconfig.json +++ b/apps/models/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "@ufabcnext/tsconfig/fastify.json", + "extends": "@next/tsconfig/fastify.json", "include": [ "src/schema/**.ts", "src/index.ts", diff --git a/apps/queue/src/config/config.ts b/apps/queue/src/config/config.ts index 8c75dd17..d61f092f 100644 --- a/apps/queue/src/config/config.ts +++ b/apps/queue/src/config/config.ts @@ -1,4 +1,4 @@ -import { logger } from '@ufabcnext/common'; +import { logger } from '@next/common'; import { config as dotEnvConfig } from 'dotenv'; import { z } from 'zod'; diff --git a/apps/queue/src/integration/ses.ts b/apps/queue/src/integration/ses.ts index faaf2498..df4e276c 100644 --- a/apps/queue/src/integration/ses.ts +++ b/apps/queue/src/integration/ses.ts @@ -3,7 +3,7 @@ import { SendTemplatedEmailCommand, type SendTemplatedEmailCommandInput, } from '@aws-sdk/client-ses'; -import { logger } from '@ufabcnext/common'; +import { logger } from '@next/common'; import { Config } from '../config/config.js'; type Email = { diff --git a/apps/queue/src/jobs/confirmationEmail/email.ts b/apps/queue/src/jobs/confirmationEmail/email.ts index d57f1906..b1448b72 100644 --- a/apps/queue/src/jobs/confirmationEmail/email.ts +++ b/apps/queue/src/jobs/confirmationEmail/email.ts @@ -1,4 +1,4 @@ -import { logger } from '@ufabcnext/common'; +import { logger } from '@next/common'; import { MAILER_CONFIG, WEB_URL, WEB_URL_LOCAL } from '@next/constants'; import { createToken } from '../../helpers/create-token.js'; import { Config } from '../../config/config.js'; diff --git a/apps/queue/tsconfig.json b/apps/queue/tsconfig.json index 8ce6375b..55884e93 100644 --- a/apps/queue/tsconfig.json +++ b/apps/queue/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": ["@ufabcnext/tsconfig/fastify.json"], + "extends": ["@next/tsconfig/fastify.json"], "compilerOptions": { "paths": { "@/*": ["./src/*"] diff --git a/packages/common/tsconfig.json b/packages/common/tsconfig.json index 83deca6d..6e312bf3 100644 --- a/packages/common/tsconfig.json +++ b/packages/common/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "@ufabcnext/tsconfig/base.json", + "extends": "@next/tsconfig/base.json", "compilerOptions": { "resolveJsonModule": true, "declaration": true, diff --git a/packages/constants/tsconfig.json b/packages/constants/tsconfig.json index 83deca6d..6e312bf3 100644 --- a/packages/constants/tsconfig.json +++ b/packages/constants/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "@ufabcnext/tsconfig/base.json", + "extends": "@next/tsconfig/base.json", "compilerOptions": { "resolveJsonModule": true, "declaration": true, diff --git a/packages/types/tsconfig.json b/packages/types/tsconfig.json index de3215c3..d0f787a8 100644 --- a/packages/types/tsconfig.json +++ b/packages/types/tsconfig.json @@ -1,4 +1,4 @@ { - "extends": "@ufabcnext/tsconfig/base.json", + "extends": "@next/tsconfig/base.json", "include": ["**/*.ts"] }