Skip to content

Commit 8f7b157

Browse files
mtrezzamtrezza
authored
Merge branch 'alpha' into moumouls/fix-gql-include
2 parents eece13b + 75eca2d commit 8f7b157

19 files changed

+732
-148
lines changed

‎.github/workflows/ci.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,18 @@ jobs:
101101
strategy:
102102
matrix:
103103
include:
104+
- name: MongoDB 5.2, ReplicaSet, WiredTiger
105+
MONGODB_VERSION: 5.2.1
106+
MONGODB_TOPOLOGY: replicaset
107+
MONGODB_STORAGE_ENGINE: wiredTiger
108+
NODE_VERSION: 14.18.1
109+
- name: MongoDB 5.1, ReplicaSet, WiredTiger
110+
MONGODB_VERSION: 5.1.1
111+
MONGODB_TOPOLOGY: replicaset
112+
MONGODB_STORAGE_ENGINE: wiredTiger
113+
NODE_VERSION: 14.18.1
104114
- name: MongoDB 5.0, ReplicaSet, WiredTiger
105-
MONGODB_VERSION: 5.0.3
115+
MONGODB_VERSION: 5.0.6
106116
MONGODB_TOPOLOGY: replicaset
107117
MONGODB_STORAGE_ENGINE: wiredTiger
108118
NODE_VERSION: 16.13.0

‎CONTRIBUTING.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
- [Merging](#merging)
2525
- [Breaking Change](#breaking-change-1)
2626
- [Reverting](#reverting)
27+
- [Releasing](#releasing)
28+
- [General Considerations](#general-considerations)
2729
- [Major Release / Long-Term-Support](#major-release--long-term-support)
2830
- [Versioning](#versioning)
2931
- [Code of Conduct](#code-of-conduct)
@@ -379,6 +381,12 @@ If the commit reverts a previous commit, use the prefix `revert:`, followed by t
379381
This reverts commit 1234567890abcdef.
380382
```
381383
384+
## Releasing
385+
386+
### General Considerations
387+
388+
- The `package-lock.json` file has to be deleted and recreated by npm from scratch in regular intervals using the `npm i` command. It is not enough to only update the file via automated security pull requests (e.g. dependabot, snyk), that can create inconsistencies between sub-devependencies of a dependency and increase the chances of vulnerabilities. The file should be recreated once every release cycle which is usually monthly.
389+
382390
### Major Release / Long-Term-Support
383391
384392
Long-Term-Support (LTS) is provided for the previous Parse Server major version. For example, Parse Server 4.x will receive security updates until Parse Server 5.x is superseded by Parse Server 6.x and becomes the new LTS version. While the current major version is published on branch `release`, a LTS version is published on branch `release-#.x.x`, for example `release-4.x.x` for the Parse Server 4.x LTS branch.

‎README.md

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ Before you start make sure you have installed:
112112
#### Node.js
113113
Parse Server is continuously tested with the most recent releases of Node.js to ensure compatibility. We follow the [Node.js Long Term Support plan](https://github.com/nodejs/Release) and only test against versions that are officially supported and have not reached their end-of-life date.
114114

115-
| Version | Latest Version | End-of-Life | Compatible |
116-
|------------|----------------|-------------|---------------|
115+
| Version | Latest Version | End-of-Life | Compatible |
116+
|------------|----------------|-------------|--------------|
117117
| Node.js 12 | 12.22.7 | April 2022 | ✅ Yes |
118118
| Node.js 14 | 14.18.1 | April 2023 | ✅ Yes |
119119
| Node.js 16 | 16.13.0 | April 2024 | ✅ Yes |
@@ -122,22 +122,24 @@ Parse Server is continuously tested with the most recent releases of Node.js to
122122
#### MongoDB
123123
Parse Server is continuously tested with the most recent releases of MongoDB to ensure compatibility. We follow the [MongoDB support schedule](https://www.mongodb.com/support-policy) and only test against versions that are officially supported and have not reached their end-of-life date.
124124

125-
| Version | Latest Version | End-of-Life | Compatible |
126-
|-------------|----------------|--------------|------------|
127-
| MongoDB 4.0 | 4.0.27 | April 2022 | ✅ Yes |
128-
| MongoDB 4.2 | 4.2.17 | TBD | ✅ Yes |
129-
| MongoDB 4.4 | 4.4.10 | TBD | ✅ Yes |
130-
| MongoDB 5.0 | 5.0.3 | January 2024 | ✅ Yes |
131-
125+
| Version | Latest Version | End-of-Life | Compatible |
126+
|-------------|----------------|-------------|------------|
127+
| MongoDB 4.0 | 4.0.27 | April 2022 | ✅ Yes |
128+
| MongoDB 4.2 | 4.2.17 | TBD | ✅ Yes |
129+
| MongoDB 4.4 | 4.4.10 | TBD | ✅ Yes |
130+
| MongoDB 5.0 | 5.0.6 | TBD | ✅ Yes |
131+
| MongoDB 5.1 | 5.1.1 | TBD | ✅ Yes |
132+
| MongoDB 5.2 | 5.2.1 | TBD | ✅ Yes |
133+
132134
#### PostgreSQL
133135
Parse Server is continuously tested with the most recent releases of PostgreSQL and PostGIS to ensure compatibility, using [PostGIS docker images](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&ordering=last_updated). We follow the [PostgreSQL support schedule](https://www.postgresql.org/support/versioning) and [PostGIS support schedule](https://www.postgis.net/eol_policy/) and only test against versions that are officially supported and have not reached their end-of-life date. Due to the extensive PostgreSQL support duration of 5 years, Parse Server drops support if a version is older than 3.5 years and a newer version has been available for at least 2.5 years.
134136

135137
| Version | PostGIS Version | End-of-Life | Parse Server Support End | Compatible |
136138
|-------------|-----------------|---------------|--------------------------|------------|
137-
| Postgres 11 | 3.0, 3.1, 3.2 | November 2023 | April 2022 | ✅ Yes |
138-
| Postgres 12 | 3.2 | November 2024 | April 2023 | ✅ Yes |
139-
| Postgres 13 | 3.2 | November 2025 | April 2024 | ✅ Yes |
140-
| Postgres 14 | 3.2 | November 2026 | April 2025 | ✅ Yes |
139+
| Postgres 11 | 3.0, 3.1, 3.2 | November 2023 | April 2022 | ✅ Yes |
140+
| Postgres 12 | 3.2 | November 2024 | April 2023 | ✅ Yes |
141+
| Postgres 13 | 3.2 | November 2025 | April 2024 | ✅ Yes |
142+
| Postgres 14 | 3.2 | November 2026 | April 2025 | ✅ Yes |
141143

142144
### Locally
143145
```bash

‎changelogs/CHANGELOG_alpha.md

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,59 @@
1+
# [5.3.0-alpha.3](https://github.com/parse-community/parse-server/compare/5.3.0-alpha.2...5.3.0-alpha.3) (2022-03-27)
2+
3+
4+
### Features
5+
6+
* add MongoDB 5.2 support ([#7894](https://github.com/parse-community/parse-server/issues/7894)) ([6b4b358](https://github.com/parse-community/parse-server/commit/6b4b358f0842ae920e45652f5e8b2afebc6caf3a))
7+
8+
# [5.3.0-alpha.2](https://github.com/parse-community/parse-server/compare/5.3.0-alpha.1...5.3.0-alpha.2) (2022-03-27)
9+
10+
11+
### Bug Fixes
12+
13+
* security upgrade parse push adapter from 4.1.0 to 4.1.2 ([#7893](https://github.com/parse-community/parse-server/issues/7893)) ([ef56e98](https://github.com/parse-community/parse-server/commit/ef56e98ef65041b4d3b7b82cce3473269c27f6fd))
14+
15+
# [5.3.0-alpha.1](https://github.com/parse-community/parse-server/compare/5.2.1-alpha.2...5.3.0-alpha.1) (2022-03-27)
16+
17+
18+
### Features
19+
20+
* add MongoDB 5.1 compatibility ([#7682](https://github.com/parse-community/parse-server/issues/7682)) ([90155cf](https://github.com/parse-community/parse-server/commit/90155cf1680e5e0499b0000e071c6cb0ce3aef96))
21+
22+
## [5.2.1-alpha.2](https://github.com/parse-community/parse-server/compare/5.2.1-alpha.1...5.2.1-alpha.2) (2022-03-26)
23+
24+
25+
### Performance Improvements
26+
27+
* reduce database operations when using the constant parameter in Cloud Function validation ([#7892](https://github.com/parse-community/parse-server/issues/7892)) ([48bd512](https://github.com/parse-community/parse-server/commit/48bd512eeb47666967dff8c5e723ddc5b7801daa))
28+
29+
## [5.2.1-alpha.1](https://github.com/parse-community/parse-server/compare/5.2.0...5.2.1-alpha.1) (2022-03-26)
30+
31+
32+
### Bug Fixes
33+
34+
* return correct response when revert is used in beforeSave ([#7839](https://github.com/parse-community/parse-server/issues/7839)) ([f63fb2b](https://github.com/parse-community/parse-server/commit/f63fb2b338c908f0e7a648d338c26b9daa50c8f2))
35+
36+
# [5.2.0-alpha.3](https://github.com/parse-community/parse-server/compare/5.2.0-alpha.2...5.2.0-alpha.3) (2022-03-24)
37+
38+
39+
### Bug Fixes
40+
41+
* security bump minimist from 1.2.5 to 1.2.6 ([#7884](https://github.com/parse-community/parse-server/issues/7884)) ([c5cf282](https://github.com/parse-community/parse-server/commit/c5cf282d11ffdc023764f8e7539a2bd6bc246fe1))
42+
43+
# [5.2.0-alpha.2](https://github.com/parse-community/parse-server/compare/5.2.0-alpha.1...5.2.0-alpha.2) (2022-03-24)
44+
45+
46+
### Bug Fixes
47+
48+
* sensitive keyword detection may produce false positives ([#7881](https://github.com/parse-community/parse-server/issues/7881)) ([0d6f9e9](https://github.com/parse-community/parse-server/commit/0d6f9e951d9e186e95e96d8869066ce7022bad02))
49+
50+
# [5.2.0-alpha.1](https://github.com/parse-community/parse-server/compare/5.1.1...5.2.0-alpha.1) (2022-03-23)
51+
52+
53+
### Features
54+
55+
* improved LiveQuery error logging with additional information ([#7837](https://github.com/parse-community/parse-server/issues/7837)) ([443a509](https://github.com/parse-community/parse-server/commit/443a5099059538d379fe491793a5871fcbb4f377))
56+
157
# [5.0.0-alpha.29](https://github.com/parse-community/parse-server/compare/5.0.0-alpha.28...5.0.0-alpha.29) (2022-03-12)
258

359

‎changelogs/CHANGELOG_beta.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
# [5.2.0-beta.2](https://github.com/parse-community/parse-server/compare/5.2.0-beta.1...5.2.0-beta.2) (2022-03-24)
2+
3+
4+
### Bug Fixes
5+
6+
* security bump minimist from 1.2.5 to 1.2.6 ([#7884](https://github.com/parse-community/parse-server/issues/7884)) ([c5cf282](https://github.com/parse-community/parse-server/commit/c5cf282d11ffdc023764f8e7539a2bd6bc246fe1))
7+
* sensitive keyword detection may produce false positives ([#7881](https://github.com/parse-community/parse-server/issues/7881)) ([0d6f9e9](https://github.com/parse-community/parse-server/commit/0d6f9e951d9e186e95e96d8869066ce7022bad02))
8+
9+
# [5.2.0-beta.1](https://github.com/parse-community/parse-server/compare/5.1.1...5.2.0-beta.1) (2022-03-23)
10+
11+
12+
### Features
13+
14+
* improved LiveQuery error logging with additional information ([#7837](https://github.com/parse-community/parse-server/issues/7837)) ([443a509](https://github.com/parse-community/parse-server/commit/443a5099059538d379fe491793a5871fcbb4f377))
15+
116
# [5.0.0-beta.10](https://github.com/parse-community/parse-server/compare/5.0.0-beta.9...5.0.0-beta.10) (2022-03-15)
217

318

‎changelogs/CHANGELOG_release.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
# [5.2.0](https://github.com/parse-community/parse-server/compare/5.1.1...5.2.0) (2022-03-24)
2+
3+
4+
### Bug Fixes
5+
6+
* security bump minimist from 1.2.5 to 1.2.6 ([#7884](https://github.com/parse-community/parse-server/issues/7884)) ([c5cf282](https://github.com/parse-community/parse-server/commit/c5cf282d11ffdc023764f8e7539a2bd6bc246fe1))
7+
* sensitive keyword detection may produce false positives ([#7881](https://github.com/parse-community/parse-server/issues/7881)) ([0d6f9e9](https://github.com/parse-community/parse-server/commit/0d6f9e951d9e186e95e96d8869066ce7022bad02))
8+
9+
### Features
10+
11+
* improved LiveQuery error logging with additional information ([#7837](https://github.com/parse-community/parse-server/issues/7837)) ([443a509](https://github.com/parse-community/parse-server/commit/443a5099059538d379fe491793a5871fcbb4f377))
12+
113
## [5.1.1](https://github.com/parse-community/parse-server/compare/5.1.0...5.1.1) (2022-03-18)
214

315

‎ci/nodeEngineCheck.js

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -75,17 +75,21 @@ class NodeEngineCheck {
7575

7676
// For each file
7777
for (const file of files) {
78-
7978
// Get node version
8079
const contentString = await fs.readFile(file, 'utf-8');
81-
const contentJson = JSON.parse(contentString);
82-
const version = ((contentJson || {}).engines || {}).node;
83-
84-
// Add response
85-
response.push({
86-
file: file,
87-
nodeVersion: version
88-
});
80+
try {
81+
const contentJson = JSON.parse(contentString);
82+
const version = ((contentJson || {}).engines || {}).node;
83+
84+
// Add response
85+
response.push({
86+
file: file,
87+
nodeVersion: version
88+
});
89+
} catch(e) {
90+
console.log(`Ignoring file because it is not valid JSON: ${file}`);
91+
core.warning(`Ignoring file because it is not valid JSON: ${file}`);
92+
}
8993
}
9094

9195
// If results should be cleaned by removing undefined node versions

‎package-lock.json

Lines changed: 48 additions & 44 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)