Skip to content

Commit

Permalink
feat: pnpm udpdate (#412)
Browse files Browse the repository at this point in the history
  • Loading branch information
wielopolski authored Feb 7, 2025
1 parent f57c0fa commit be2e102
Show file tree
Hide file tree
Showing 10 changed files with 52 additions and 36 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
- name: Setup pnpm
uses: pnpm/action-setup@v4
with:
version: 10.2.0
version: 10.2.1

- name: Setup Node.js
uses: actions/setup-node@v4
Expand Down
3 changes: 2 additions & 1 deletion apps/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,12 @@
"@nestjs/websockets": "10.4.4",
"@repo/email-templates": "workspace:*",
"@sinclair/typebox": "0.32.34",
"@types/bcryptjs": "^2.4.6",
"@types/multer": "1.4.12",
"add": "2.0.6",
"adm-zip": "0.5.16",
"axios": "1.7.2",
"bcrypt": "5.1.1",
"bcryptjs": "^2.4.3",
"cache-manager": "6.2.0",
"cookie": "0.6.0",
"cookie-parser": "1.4.6",
Expand Down
2 changes: 1 addition & 1 deletion apps/api/src/auth/__tests__/auth.service.spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ConflictException, NotFoundException, UnauthorizedException } from "@nestjs/common";
import { JwtService } from "@nestjs/jwt";
import * as bcrypt from "bcrypt";
import * as bcrypt from "bcryptjs";
import { eq } from "drizzle-orm";
import { omit } from "lodash";
import { nanoid } from "nanoid";
Expand Down
2 changes: 1 addition & 1 deletion apps/api/src/auth/auth.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
PasswordRecoveryEmail,
WelcomeEmail,
} from "@repo/email-templates";
import * as bcrypt from "bcrypt";
import * as bcrypt from "bcryptjs";
import { and, eq, isNull, lte, sql } from "drizzle-orm";
import { nanoid } from "nanoid";

Expand Down
2 changes: 1 addition & 1 deletion apps/api/src/common/helpers/hashPassword.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as bcrypt from "bcrypt";
import * as bcrypt from "bcryptjs";

export default function hashPassword(password: string): Promise<string> {
return bcrypt.hash(password, 10);
Expand Down
5 changes: 5 additions & 0 deletions apps/api/src/courses/course.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,11 @@ export class CourseService {
}

async getCourse(id: UUIDType, userId: UUIDType): Promise<CommonShowCourse> {
//TODO: to remove
const testDeployment = "test";

testDeployment;

const [course] = await this.db
.select({
id: courses.id,
Expand Down
2 changes: 1 addition & 1 deletion apps/api/src/user/user.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
UnauthorizedException,
} from "@nestjs/common";
import { CreatePasswordEmail } from "@repo/email-templates";
import * as bcrypt from "bcrypt";
import * as bcrypt from "bcryptjs";
import { and, count, eq, ilike, inArray, or, sql } from "drizzle-orm";
import { nanoid } from "nanoid";

Expand Down
1 change: 0 additions & 1 deletion apps/web/app/modules/Courses/Courses.page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ export default function CoursesPage() {
category: state.category,
sort: state.sort,
});
console.log({ userAvailableCourses });

const { data: categories, isLoading: isCategoriesLoading } = useCategoriesSuspense();

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"prettier-plugin-tailwindcss": "0.6.9",
"turbo": "^2.2.3"
},
"packageManager": "[email protected].0",
"packageManager": "[email protected].1",
"engines": {
"node": ">=20"
}
Expand Down
67 changes: 39 additions & 28 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit be2e102

Please sign in to comment.