Merge branch 'staging' into release/q1-2024

wireapp · Jan 25, 2024 · e01afa5 · e01afa5
2 parents cd50931 + bf41c6b
commit e01afa5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/server/package.json b/server/package.json
@@ -36,13 +36,16 @@
  "jszip": "3.10.1",
  "nodemon": "2.0.22",
  "opn": "6.0.0",
- "prettier": "3.2.4",
+ "prettier": "2.8.8",
  "request": "2.88.2",
  "rimraf": "5.0.1",
  "typescript": "4.9.5",
  "webpack-dev-middleware": "6.1.1",
  "webpack-hot-middleware": "2.25.3"
  },
+ "engines": {
+ "node": ">= 18.16.0"
+ },
  "name": "wire-web-server",
  "private": true,
  "repository": {

diff --git a/server/yarn.lock b/server/yarn.lock
@@ -5195,12 +5195,12 @@ __metadata:
  languageName: node
  linkType: hard
 
-"prettier@npm:3.2.4":
- version: 3.2.4
- resolution: "prettier@npm:3.2.4"
+"prettier@npm:2.8.8":
+ version: 2.8.8
+ resolution: "prettier@npm:2.8.8"
  bin:
- prettier: bin/prettier.cjs
- checksum: 6ec9385a836e0b9bac549e585101c086d1521c31d7b882d5c8bb7d7646da0693da5f31f4fff6dc080710e5e2d34c85e6fb2f8766876b3645c8be2f33b9c3d1a3
+ prettier: bin-prettier.js
+ checksum: b49e409431bf129dd89238d64299ba80717b57ff5a6d1c1a8b1a28b590d998a34e083fa13573bc732bb8d2305becb4c9a4407f8486c81fa7d55100eb08263cf8
  languageName: node
  linkType: hard
 
@@ -6500,7 +6500,7 @@ __metadata:
  nodemon: 2.0.22
  opn: 6.0.0
  pm2: 5.2.2
- prettier: 3.2.4
+ prettier: 2.8.8
  request: 2.88.2
  rimraf: 5.0.1
  typescript: 4.9.5