Skip to content

Commit aa8f938

Browse files
authored
Merge pull request #101 from teacoder-team/dev
Dev
2 parents 7789559 + 1b9a576 commit aa8f938

4 files changed

Lines changed: 33 additions & 42 deletions

File tree

.vscode/settings.json

Lines changed: 12 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,18 @@
11
{
22
"editor.formatOnSave": true,
3-
"editor.formatOnPaste": false,
4-
"editor.formatOnType": false,
5-
6-
"editor.tabSize": 4,
7-
"editor.insertSpaces": false,
8-
"editor.detectIndentation": false,
9-
10-
"files.eol": "\n",
11-
"files.insertFinalNewline": true,
12-
"files.trimFinalNewlines": true,
13-
"files.trimTrailingWhitespace": true,
14-
3+
"editor.formatOnPaste": true,
154
"editor.defaultFormatter": "esbenp.prettier-vscode",
16-
"prettier.requireConfig": true,
17-
18-
"typescript.updateImportsOnFileMove.enabled": "always",
19-
"javascript.updateImportsOnFileMove.enabled": "always",
20-
21-
"files.exclude": {
22-
"**/dist": true,
23-
"**/coverage": true
5+
"files.associations": {
6+
"*.ts": "typescript",
7+
"*.tsx": "typescriptreact"
248
},
25-
26-
"search.exclude": {
27-
"**/dist": true,
28-
"**/node_modules": true
9+
"prettier.requireConfig": true,
10+
"prettier.useEditorConfig": true,
11+
"tailwindCSS.includeLanguages": {
12+
"typescript": "javascript",
13+
"typescriptreact": "javascriptreact"
2914
},
30-
31-
"postman.settings.dotenv-detection-notification-visibility": false,
32-
"editor.minimap.enabled": false,
33-
34-
"npm.packageManager": "yarn"
15+
"terminal.integrated.defaultProfile.linux": "bash",
16+
"terminal.integrated.defaultProfile.osx": "zsh",
17+
"terminal.integrated.defaultProfile.windows": "PowerShell"
3518
}

Dockerfile

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ FROM base AS builder
66

77
WORKDIR /app
88

9+
ENV YARN_NODE_LINKER=node-modules
10+
911
COPY package.json yarn.lock ./
1012
RUN yarn install --immutable
1113

@@ -18,9 +20,15 @@ FROM base AS runner
1820

1921
WORKDIR /app
2022

23+
ENV NODE_ENV=production
24+
ENV YARN_NODE_LINKER=node-modules
25+
26+
COPY package.json yarn.lock ./
27+
28+
RUN chown -R node:node /app
29+
2130
USER node
2231

23-
COPY --chown=node:node package.json yarn.lock ./
2432
RUN yarn install --immutable
2533

2634
COPY --chown=node:node --from=builder /app/dist ./dist

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
"@nestjs/schedule": "^6.0.0",
4242
"@nestjs/swagger": "^8.0.7",
4343
"@nestjs/throttler": "^6.4.0",
44-
"@prisma/adapter-pg": "^7.7.0",
45-
"@prisma/client": "^7.7.0",
44+
"@prisma/adapter-pg": "^7.2.0",
45+
"@prisma/client": "^7.2.0",
4646
"@react-email/components": "0.0.33",
4747
"@simplewebauthn/server": "^13.1.2",
4848
"@teacoder/sentinel": "^1.0.4",
@@ -75,7 +75,7 @@
7575
"nodemailer": "^8.0.5",
7676
"otpauth": "^9.5.0",
7777
"preview-email": "^3.1.3",
78-
"prisma": "^7.7.0",
78+
"prisma": "^7.2.0",
7979
"pug": "^3.0.3",
8080
"qrcode": "^1.5.4",
8181
"react": "19.2.5",

yarn.lock

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1103,9 +1103,9 @@ __metadata:
11031103
linkType: hard
11041104

11051105
"@colordx/core@npm:^5.0.3":
1106-
version: 5.0.3
1107-
resolution: "@colordx/core@npm:5.0.3"
1108-
checksum: 10c0/b938d1384acfaa31e6101a54192bb7e05703b940fc24139e38761df6e5498c63bb0bf252fa09afb9a147413c162a75097c685327199c75f1531b535ffb0f8cb6
1106+
version: 5.1.0
1107+
resolution: "@colordx/core@npm:5.1.0"
1108+
checksum: 10c0/3fb058cde3f157d547d58017193a6fffc81b6359428720ed53310f2b1c3a13fabbf0903fd15b3bf9bb4b0bda86324320fa75773b88d8df4a86b6120ec759153a
11091109
languageName: node
11101110
linkType: hard
11111111

@@ -3465,7 +3465,7 @@ __metadata:
34653465
languageName: node
34663466
linkType: hard
34673467

3468-
"@prisma/adapter-pg@npm:^7.7.0":
3468+
"@prisma/adapter-pg@npm:^7.2.0":
34693469
version: 7.7.0
34703470
resolution: "@prisma/adapter-pg@npm:7.7.0"
34713471
dependencies:
@@ -3484,7 +3484,7 @@ __metadata:
34843484
languageName: node
34853485
linkType: hard
34863486

3487-
"@prisma/client@npm:^7.7.0":
3487+
"@prisma/client@npm:^7.2.0":
34883488
version: 7.7.0
34893489
resolution: "@prisma/client@npm:7.7.0"
34903490
dependencies:
@@ -6478,8 +6478,8 @@ __metadata:
64786478
"@nestjs/swagger": "npm:^8.0.7"
64796479
"@nestjs/testing": "npm:^11.1.19"
64806480
"@nestjs/throttler": "npm:^6.4.0"
6481-
"@prisma/adapter-pg": "npm:^7.7.0"
6482-
"@prisma/client": "npm:^7.7.0"
6481+
"@prisma/adapter-pg": "npm:^7.2.0"
6482+
"@prisma/client": "npm:^7.2.0"
64836483
"@react-email/components": "npm:0.0.33"
64846484
"@simplewebauthn/server": "npm:^13.1.2"
64856485
"@swc/cli": "npm:^0.8.1"
@@ -6534,7 +6534,7 @@ __metadata:
65346534
otpauth: "npm:^9.5.0"
65356535
prettier: "npm:^3.8.3"
65366536
preview-email: "npm:^3.1.3"
6537-
prisma: "npm:^7.7.0"
6537+
prisma: "npm:^7.2.0"
65386538
pug: "npm:^3.0.3"
65396539
qrcode: "npm:^1.5.4"
65406540
react: "npm:19.2.5"
@@ -13778,7 +13778,7 @@ __metadata:
1377813778
languageName: node
1377913779
linkType: hard
1378013780

13781-
"prisma@npm:^7.7.0":
13781+
"prisma@npm:^7.2.0":
1378213782
version: 7.7.0
1378313783
resolution: "prisma@npm:7.7.0"
1378413784
dependencies:

0 commit comments

Comments
 (0)