Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Nx and Dependencies #168

Merged
merged 5 commits into from
May 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions .github/workflows/audit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,9 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Set up pnpm
uses: pnpm/action-setup@v3
with:
version: latest
# https://github.com/actions/setup-node/issues/480#issuecomment-1915448139
- name: Enable Corepack
run: corepack enable
- name: Set up Node.js LTS
uses: actions/setup-node@v4
with:
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,9 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Set up pnpm
uses: pnpm/action-setup@v3
with:
version: latest
# https://github.com/actions/setup-node/issues/480#issuecomment-1915448139
- name: Enable Corepack
run: corepack enable
- name: Set up Node.js LTS
uses: actions/setup-node@v4
with:
Expand Down
8 changes: 3 additions & 5 deletions apps/backend/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
FROM node:lts-slim as builder
RUN npm install -g pnpm
WORKDIR /app
COPY package.json pnpm-lock.yaml ./
RUN pnpm install --frozen-lockfile
RUN corepack pnpm install --frozen-lockfile
COPY . .
RUN pnpm run build:backend
RUN corepack pnpm run build:backend

FROM node:lts-slim
RUN npm install -g pnpm
WORKDIR /app
COPY --from=builder /app/dist/apps/backend/ ./
ENV NODE_ENV=production
RUN pnpm install # --frozen-lockfile
RUN corepack pnpm install # --frozen-lockfile
EXPOSE 3000
CMD node main.js
2 changes: 1 addition & 1 deletion apps/backend/src/poll/poll/poll.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ export class PollService implements OnModuleInit {
}

private async sendAdminInfo(poll: Poll & Document, participant: Participant & Document) {
const events = await this.getEvents(poll._id.toString());
const events = await this.getEvents(poll._id);
const participation = Array(events.length).fill({});

for (let i = 0; i < events.length; i++) {
Expand Down
5 changes: 2 additions & 3 deletions apps/frontend/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
FROM node:lts-slim as builder
WORKDIR /app
RUN npm install -g pnpm
COPY package.json pnpm-lock.yaml ./
RUN pnpm install
RUN corepack pnpm install --frozen-lockfile
COPY . .
RUN pnpm run build:frontend
RUN corepack pnpm run build:frontend

FROM node:lts-slim
WORKDIR /app
Expand Down
86 changes: 43 additions & 43 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,40 +13,41 @@
"lint:backend": "nx lint backend"
},
"private": true,
"packageManager": "pnpm@8.15.8",
"devDependencies": {
"@angular-devkit/build-angular": "~17.3.5",
"@angular-devkit/core": "~17.3.5",
"@angular-devkit/schematics": "~17.3.5",
"@angular-devkit/build-angular": "~17.3.7",
"@angular-devkit/core": "~17.3.7",
"@angular-devkit/schematics": "~17.3.7",
"@angular-eslint/eslint-plugin": "~17.3.0",
"@angular-eslint/eslint-plugin-template": "~17.3.0",
"@angular-eslint/template-parser": "~17.3.0",
"@angular/cli": "~17.3.5",
"@angular/compiler-cli": "~17.3.5",
"@angular/language-service": "~17.3.5",
"@angular/cli": "~17.3.7",
"@angular/compiler-cli": "~17.3.9",
"@angular/language-service": "~17.3.9",
"@nestjs/schematics": "10.1.1",
"@nestjs/testing": "10.3.7",
"@nx/angular": "18.3.3",
"@nx/cypress": "18.3.3",
"@nx/eslint": "18.3.3",
"@nx/eslint-plugin": "18.3.3",
"@nx/jest": "18.3.3",
"@nx/js": "18.3.3",
"@nx/nest": "18.3.3",
"@nx/node": "18.3.3",
"@nx/web": "18.3.3",
"@nx/webpack": "18.3.3",
"@nx/workspace": "18.3.3",
"@nx/angular": "19.0.4",
"@nx/cypress": "19.0.4",
"@nx/eslint": "19.0.4",
"@nx/eslint-plugin": "19.0.4",
"@nx/jest": "19.0.4",
"@nx/js": "19.0.4",
"@nx/nest": "19.0.4",
"@nx/node": "19.0.4",
"@nx/web": "19.0.4",
"@nx/webpack": "19.0.4",
"@nx/workspace": "19.0.4",
"@schematics/angular": "17.3.2",
"@types/express": "^4.17.21",
"@types/file-saver": "^2.0.7",
"@types/jest": "^29.5.12",
"@types/markdown-it": "^13.0.7",
"@types/markdown-it": "^14.1.1",
"@types/node": "20.11.13",
"@types/uuid": "^9.0.8",
"@typescript-eslint/eslint-plugin": "6.20.0",
"@typescript-eslint/parser": "6.20.0",
"browser-sync": "^3.0.2",
"cypress": "^13.8.0",
"cypress": "^13.9.0",
"eslint": "8.57.0",
"eslint-config-prettier": "9.1.0",
"eslint-import-resolver-alias": "^1.1.2",
Expand All @@ -56,36 +57,36 @@
"jest-environment-jsdom": "^29.7.0",
"jest-environment-node": "^29.7.0",
"jest-preset-angular": "14.0.3",
"mongodb-memory-server": "^9.1.8",
"nx": "18.3.3",
"mongodb-memory-server": "^9.2.0",
"nx": "19.0.4",
"prettier": "^3.2.5",
"ts-jest": "29.1.2",
"ts-node": "10.9.2",
"typescript": "5.4.3"
},
"dependencies": {
"@angular/animations": "~17.3.5",
"@angular/common": "~17.3.5",
"@angular/compiler": "~17.3.5",
"@angular/core": "~17.3.5",
"@angular/forms": "~17.3.5",
"@angular/localize": "~17.3.5",
"@angular/platform-browser": "~17.3.5",
"@angular/platform-browser-dynamic": "~17.3.5",
"@angular/platform-server": "~17.3.5",
"@angular/pwa": "~17.3.5",
"@angular/router": "~17.3.5",
"@angular/service-worker": "~17.3.5",
"@angular/ssr": "~17.3.5",
"@angular/animations": "~17.3.9",
"@angular/common": "~17.3.9",
"@angular/compiler": "~17.3.9",
"@angular/core": "~17.3.9",
"@angular/forms": "~17.3.9",
"@angular/localize": "~17.3.9",
"@angular/platform-browser": "~17.3.9",
"@angular/platform-browser-dynamic": "~17.3.9",
"@angular/platform-server": "~17.3.9",
"@angular/pwa": "~17.3.7",
"@angular/router": "~17.3.9",
"@angular/service-worker": "~17.3.9",
"@angular/ssr": "~17.3.7",
"@mean-stream/nestx": "^0.11.4",
"@mean-stream/ngbx": "^0.13.0",
"@nestjs-modules/mailer": "^1.11.2",
"@nestjs/common": "10.3.7",
"@nestjs-modules/mailer": "^2.0.2",
"@nestjs/common": "^10.3.8",
"@nestjs/config": "^3.2.2",
"@nestjs/core": "10.3.7",
"@nestjs/core": "^10.3.8",
"@nestjs/mongoose": "^10.0.6",
"@nestjs/platform-express": "10.3.7",
"@nestjs/swagger": "7.3.1",
"@nestjs/platform-express": "^10.3.8",
"@nestjs/swagger": "^7.3.1",
"@ng-bootstrap/ng-bootstrap": "^16.0.0",
"angular-calendar": "^0.31.1",
"angularx-flatpickr": "^7.3.0",
Expand All @@ -101,9 +102,9 @@
"file-saver": "^2.0.5",
"flatpickr": "^4.6.13",
"handlebars": "^4.7.8",
"ical-generator": "^6.0.1",
"ical-generator": "^7.1.0",
"markdown-it": "^14.1.0",
"mongoose": "^8.3.2",
"mongoose": "^8.4.0",
"ngx-cookie-service-ssr": "^17.1.0",
"ngx-countup": "^13.1.0",
"reflect-metadata": "^0.1.14",
Expand All @@ -113,6 +114,5 @@
"web-push": "^3.6.7",
"zone.js": "0.14.3"
},
"resolutions": {
}
"resolutions": {}
}
Loading
Loading