Skip to content

Commit

Permalink
Merge branch 'develop' into renovate/husky-9.x
Browse files Browse the repository at this point in the history
  • Loading branch information
nichenqin authored Jan 29, 2024
2 parents 41408f1 + 26dd49d commit a169e27
Show file tree
Hide file tree
Showing 8 changed files with 251 additions and 257 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:

- uses: pnpm/[email protected]
with:
version: 8.12.1
version: 8.15.0

- name: Install dependencies
run: pnpm install
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/draft-new-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v2
with:
version: 8.12.1
version: 8.15.0

- name: changelogen
run: |
Expand Down
2 changes: 1 addition & 1 deletion .gitpod.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ RUN bash -c 'VERSION="20.6.1" \
&& source $HOME/.nvm/nvm.sh && nvm install $VERSION \
&& nvm use $VERSION && nvm alias default $VERSION'

RUN npm install -g pnpm@8.12.1
RUN npm install -g pnpm@8.15.0

RUN echo "nvm use default &>/dev/null" >> ~/.bashrc.d/51-nvm-fix
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN tar -C /usr/local/bin -xzf /tmp/litestream.tar.gz
# installer
FROM node:20.6.1 AS installer

RUN npm install -g pnpm@8.12.1
RUN npm install -g pnpm@8.15.0

WORKDIR /undb

Expand Down
6 changes: 3 additions & 3 deletions apps/backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
"@nestjs/swagger": "^7.1.17",
"@nestjs/terminus": "^10.2.0",
"@opentelemetry/auto-instrumentations-node": "^0.40.2",
"@opentelemetry/exporter-trace-otlp-http": "^0.47.0",
"@opentelemetry/exporter-trace-otlp-http": "^0.48.0",
"@opentelemetry/resources": "^1.19.0",
"@opentelemetry/sdk-node": "^0.47.0",
"@opentelemetry/sdk-node": "^0.48.0",
"@opentelemetry/semantic-conventions": "^1.19.0",
"@temporalio/activity": "^1.8.6",
"@temporalio/client": "^1.8.6",
Expand Down Expand Up @@ -112,7 +112,7 @@
"esm": "^3.2.25",
"express": "^4.18.2",
"nodemon": "^3.0.2",
"npm-run-all": "^4.1.5",
"npm-run-all2": "^6.0.0",
"openapi3-ts": "^4.1.2",
"supertest": "^6.3.3",
"ts-loader": "^9.5.1",
Expand Down
4 changes: 2 additions & 2 deletions apps/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"js-cookie": "^3.0.5",
"keycode": "^2.2.1",
"lodash-es": "^4.17.21",
"lucide-svelte": "^0.314.0",
"lucide-svelte": "^0.316.0",
"nprogress": "^0.2.0",
"papaparse": "^5.4.1",
"plausible-tracker": "^0.3.8",
Expand All @@ -73,7 +73,7 @@
"svelte-check": "^3.6.2",
"svelte-copy": "^1.4.1",
"svelte-dnd-action": "^0.9.35",
"svelte-gantt": "4.2.2",
"svelte-gantt": "4.2.4",
"svelte-grid": "^5.1.2",
"svelte-i18next": "^2.2.2",
"svelte-jsoneditor": "^0.21.0",
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
"zx": "^7.2.3"
},
"engines": {
"pnpm": ">=8.12.1",
"pnpm": ">=8.15.0",
"node": ">=20.0.0"
},
"lint-staged": {
"*.{ts,tsx,md}": "prettier --write"
},
"packageManager": "pnpm@8.12.1",
"packageManager": "pnpm@8.15.0",
"private": true,
"scripts": {
"bootstrap": "pnpm install && pnpm run build",
Expand Down Expand Up @@ -59,4 +59,4 @@
"better-sqlite3": "^9.2.2",
"husky": "^9.0.0"
}
}
}
Loading

0 comments on commit a169e27

Please sign in to comment.