Skip to content

Commit f587b66

Browse files
mtrezzamtrezza
committed
Merge branch 'master' into snyk-upgrade-2f531ba6e390dc58939e5c240e3fad17
2 parents 5baaa79 + 9923cd3 commit f587b66

File tree

7 files changed

+41
-35
lines changed

7 files changed

+41
-35
lines changed

‎.github/workflows/ci.yml

+21-16
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
branches:
88
- '**'
99
env:
10-
NODE_VERSION: 14.17.2
10+
NODE_VERSION: 14.17.3
1111
PARSE_SERVER_TEST_TIMEOUT: 20000
1212
jobs:
1313
check-ci:
@@ -93,39 +93,44 @@ jobs:
9393
strategy:
9494
matrix:
9595
include:
96+
- name: MongoDB 5.0, ReplicaSet, WiredTiger
97+
MONGODB_VERSION: 5.0.1
98+
MONGODB_TOPOLOGY: replicaset
99+
MONGODB_STORAGE_ENGINE: wiredTiger
100+
NODE_VERSION: 14.17.3
96101
- name: MongoDB 4.4, ReplicaSet, WiredTiger
97-
MONGODB_VERSION: 4.4.6
102+
MONGODB_VERSION: 4.4.7
98103
MONGODB_TOPOLOGY: replicaset
99104
MONGODB_STORAGE_ENGINE: wiredTiger
100-
NODE_VERSION: 14.17.2
105+
NODE_VERSION: 14.17.3
101106
- name: MongoDB 4.2, ReplicaSet, WiredTiger
102-
MONGODB_VERSION: 4.2.14
107+
MONGODB_VERSION: 4.2.15
103108
MONGODB_TOPOLOGY: replicaset
104109
MONGODB_STORAGE_ENGINE: wiredTiger
105-
NODE_VERSION: 14.17.2
110+
NODE_VERSION: 14.17.3
106111
- name: MongoDB 4.0, ReplicaSet, WiredTiger
107112
MONGODB_VERSION: 4.0.25
108113
MONGODB_TOPOLOGY: replicaset
109114
MONGODB_STORAGE_ENGINE: wiredTiger
110-
NODE_VERSION: 14.17.2
115+
NODE_VERSION: 14.17.3
111116
- name: MongoDB 4.0, Standalone, MMAPv1
112117
MONGODB_VERSION: 4.0.25
113118
MONGODB_TOPOLOGY: standalone
114119
MONGODB_STORAGE_ENGINE: mmapv1
115-
NODE_VERSION: 14.17.2
120+
NODE_VERSION: 14.17.3
116121
- name: Redis Cache
117122
PARSE_SERVER_TEST_CACHE: redis
118-
MONGODB_VERSION: 4.4.6
123+
MONGODB_VERSION: 4.4.7
119124
MONGODB_TOPOLOGY: standalone
120125
MONGODB_STORAGE_ENGINE: wiredTiger
121-
NODE_VERSION: 14.17.2
126+
NODE_VERSION: 14.17.3
122127
- name: Node 12
123-
MONGODB_VERSION: 4.4.6
128+
MONGODB_VERSION: 4.4.7
124129
MONGODB_TOPOLOGY: standalone
125130
MONGODB_STORAGE_ENGINE: wiredTiger
126-
NODE_VERSION: 12.22.2
131+
NODE_VERSION: 12.22.3
127132
- name: Node 15
128-
MONGODB_VERSION: 4.4.6
133+
MONGODB_VERSION: 4.4.7
129134
MONGODB_TOPOLOGY: standalone
130135
MONGODB_STORAGE_ENGINE: wiredTiger
131136
NODE_VERSION: 15.14.0
@@ -170,16 +175,16 @@ jobs:
170175
include:
171176
- name: PostgreSQL 11, PostGIS 3.0
172177
POSTGRES_IMAGE: postgis/postgis:11-3.0
173-
NODE_VERSION: 14.17.2
178+
NODE_VERSION: 14.17.3
174179
- name: PostgreSQL 11, PostGIS 3.1
175180
POSTGRES_IMAGE: postgis/postgis:11-3.1
176-
NODE_VERSION: 14.17.2
181+
NODE_VERSION: 14.17.3
177182
- name: PostgreSQL 12, PostGIS 3.1
178183
POSTGRES_IMAGE: postgis/postgis:12-3.1
179-
NODE_VERSION: 14.17.2
184+
NODE_VERSION: 14.17.3
180185
- name: PostgreSQL 13, PostGIS 3.1
181186
POSTGRES_IMAGE: postgis/postgis:13-3.1
182-
NODE_VERSION: 14.17.2
187+
NODE_VERSION: 14.17.3
183188
fail-fast: false
184189
name: ${{ matrix.name }}
185190
timeout-minutes: 15

‎CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ ___
102102
- EXPERIMENTAL: Added custom routes to easily customize flows for password reset, email verification or build entirely new flows (Manuel Trezza) [#7231](https://github.com/parse-community/parse-server/pull/7231)
103103
- Added Deprecation Policy to govern the introduction of breaking changes in a phased pattern that is more predictable for developers (Manuel Trezza) [#7199](https://github.com/parse-community/parse-server/pull/7199)
104104
- Add REST API endpoint `/loginAs` to create session of any user with master key; allows to impersonate another user. (GormanFletcher) [#7406](https://github.com/parse-community/parse-server/pull/7406)
105+
- Add official support for MongoDB 5.0 (Manuel Trezza) [#7469](https://github.com/parse-community/parse-server/pull/7469)
105106

106107
### Other Changes
107108
- Fix error when a not yet inserted job is updated (Antonio Davi Macedo Coelho de Castro) [#7196](https://github.com/parse-community/parse-server/pull/7196)

‎README.md

+7-6
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<a href="https://community.parseplatform.org/"><img alt="Join the conversation" src="https://img.shields.io/discourse/https/community.parseplatform.org/topics.svg"></a>
1919
<a href="https://snyk.io/test/github/parse-community/parse-server"><img alt="Snyk badge" src="https://snyk.io/test/github/parse-community/parse-server/badge.svg"></a>
2020
<a href="https://nodejs.org/"><img alt="Node.js 12,14,15" src="https://img.shields.io/badge/nodejs-12,_14,_15-green.svg?logo=node.js&style=flat"></a>
21-
<a href="https://www.mongodb.com/"><img alt="MongoDB 4.0,4.2,4.4" src="https://img.shields.io/badge/mongodb-4.0,_4.2,_4.4-green.svg?logo=mongodb&style=flat"></a>
21+
<a href="https://www.mongodb.com/"><img alt="MongoDB 4.0,4.2,4.4,5.0" src="https://img.shields.io/badge/mongodb-4.0,_4.2,_4.4,_5.0-green.svg?logo=mongodb&style=flat"></a>
2222
<a href="https://www.postgresql.org"> <img alt="PostgreSQL 11,12,13" src="https://img.shields.io/badge/postgresql-11,_12,_13-green.svg?logo=postgresql&style=flat"></a>
2323
</p>
2424

@@ -114,18 +114,19 @@ Parse Server is continuously tested with the most recent releases of Node.js to
114114

115115
| Version | Latest Version | End-of-Life Date | Compatibility |
116116
|------------|----------------|------------------|--------------------|
117-
| Node.js 12 | 12.22.2 | April 2022 | ✅ Fully compatible |
118-
| Node.js 14 | 14.17.2 | April 2023 | ✅ Fully compatible |
117+
| Node.js 12 | 12.22.3 | April 2022 | ✅ Fully compatible |
118+
| Node.js 14 | 14.17.3 | April 2023 | ✅ Fully compatible |
119119
| Node.js 15 | 15.14.0 | June 2021 | ✅ Fully compatible |
120120

121121
#### MongoDB
122122
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.
123123

124124
| Version | Latest Version | End-of-Life Date | Compatibility |
125125
|-------------|----------------|------------------|--------------------|
126-
| MongoDB 4.0 | 4.0.25 | January 2022 | ✅ Fully compatible |
127-
| MongoDB 4.2 | 4.2.14 | TBD | ✅ Fully compatible |
128-
| MongoDB 4.4 | 4.4.6 | TBD | ✅ Fully compatible |
126+
| MongoDB 4.0 | 4.0.25 | April 2022 | ✅ Fully compatible |
127+
| MongoDB 4.2 | 4.2.15 | TBD | ✅ Fully compatible |
128+
| MongoDB 4.4 | 4.4.7 | TBD | ✅ Fully compatible |
129+
| MongoDB 5.0 | 5.0.1 | January 2024 | ✅ Fully compatible |
129130

130131
#### PostgreSQL
131132
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.

‎package-lock.json

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"follow-redirects": "1.14.1",
3636
"graphql": "15.5.0",
3737
"graphql-list-fields": "2.0.2",
38-
"graphql-relay": "0.7.0",
38+
"graphql-relay": "0.8.0",
3939
"graphql-tag": "2.12.5",
4040
"graphql-upload": "11.0.0",
4141
"intersect": "1.0.1",
@@ -112,14 +112,14 @@
112112
"test:mongodb:testonly": "cross-env MONGODB_VERSION=${MONGODB_VERSION:=$npm_config_dbversion} MONGODB_TOPOLOGY=${MONGODB_TOPOLOGY:=standalone} MONGODB_STORAGE_ENGINE=${MONGODB_STORAGE_ENGINE:=wiredTiger} TESTING=1 jasmine",
113113
"test:mongodb": "npm run test:mongodb:runnerstart --dbversion=$npm_config_dbversion && npm run test:mongodb:testonly --dbversion=$npm_config_dbversion",
114114
"test:mongodb:4.0.25": "npm run test:mongodb --dbversion=4.0.25",
115-
"test:mongodb:4.2.14": "npm run test:mongodb --dbversion=4.2.14",
116-
"test:mongodb:4.4.6": "npm run test:mongodb --dbversion=4.4.6",
115+
"test:mongodb:4.2.15": "npm run test:mongodb --dbversion=4.2.15",
116+
"test:mongodb:4.4.7": "npm run test:mongodb --dbversion=4.4.7",
117117
"posttest:mongodb": "mongodb-runner stop",
118-
"pretest": "cross-env MONGODB_VERSION=${MONGODB_VERSION:=4.4.6} MONGODB_TOPOLOGY=${MONGODB_TOPOLOGY:=standalone} MONGODB_STORAGE_ENGINE=${MONGODB_STORAGE_ENGINE:=wiredTiger} mongodb-runner start",
119-
"testonly": "cross-env MONGODB_VERSION=${MONGODB_VERSION:=4.4.6} MONGODB_TOPOLOGY=${MONGODB_TOPOLOGY:=standalone} MONGODB_STORAGE_ENGINE=${MONGODB_STORAGE_ENGINE:=wiredTiger} TESTING=1 jasmine",
118+
"pretest": "cross-env MONGODB_VERSION=${MONGODB_VERSION:=4.4.7} MONGODB_TOPOLOGY=${MONGODB_TOPOLOGY:=standalone} MONGODB_STORAGE_ENGINE=${MONGODB_STORAGE_ENGINE:=wiredTiger} mongodb-runner start",
119+
"testonly": "cross-env MONGODB_VERSION=${MONGODB_VERSION:=4.4.7} MONGODB_TOPOLOGY=${MONGODB_TOPOLOGY:=standalone} MONGODB_STORAGE_ENGINE=${MONGODB_STORAGE_ENGINE:=wiredTiger} TESTING=1 jasmine",
120120
"test": "npm run testonly",
121-
"posttest": "cross-env MONGODB_VERSION=${MONGODB_VERSION:=4.4.6} MONGODB_TOPOLOGY=${MONGODB_TOPOLOGY:=standalone} MONGODB_STORAGE_ENGINE=${MONGODB_STORAGE_ENGINE:=wiredTiger} mongodb-runner stop",
122-
"coverage": "cross-env MONGODB_VERSION=${MONGODB_VERSION:=4.4.6} MONGODB_TOPOLOGY=${MONGODB_TOPOLOGY:=standalone} MONGODB_STORAGE_ENGINE=${MONGODB_STORAGE_ENGINE:=wiredTiger} TESTING=1 nyc jasmine",
121+
"posttest": "cross-env MONGODB_VERSION=${MONGODB_VERSION:=4.4.7} MONGODB_TOPOLOGY=${MONGODB_TOPOLOGY:=standalone} MONGODB_STORAGE_ENGINE=${MONGODB_STORAGE_ENGINE:=wiredTiger} mongodb-runner stop",
122+
"coverage": "cross-env MONGODB_VERSION=${MONGODB_VERSION:=4.4.7} MONGODB_TOPOLOGY=${MONGODB_TOPOLOGY:=standalone} MONGODB_STORAGE_ENGINE=${MONGODB_STORAGE_ENGINE:=wiredTiger} TESTING=1 nyc jasmine",
123123
"start": "node ./bin/parse-server",
124124
"prettier": "prettier --write '{src,spec}/{**/*,*}.js'",
125125
"prepare": "npm run build",

‎resources/ci/ciCheck.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ async function checkMongoDbVersions() {
3838
'~4.3.0', // Development release according to MongoDB support
3939
'~4.7.0', // Development release according to MongoDB support
4040

41-
'4.4.5', // Temporarily disabled because not yet available for download via mongodb-runner
42-
'4.0.24', // Temporarily disabled because not yet available for download via mongodb-runner
41+
'4.0.26', // Temporarily disabled because not yet available for download via mongodb-runner
4342
],
4443
}).check();
4544
}

‎spec/OAuth1.spec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ describe('OAuth', function () {
9797
consumer_key: 'invalid_consumer_key',
9898
consumer_secret: 'invalid_consumer_secret',
9999
};
100-
const path = '/1.1/account/settings.json';
100+
const path = '/1.1/favorites/list.json';
101101
const params = { lang: 'en' };
102102
const oauthClient = new OAuth(options);
103103
oauthClient.get(path, params).then(function (data) {

0 commit comments

Comments
 (0)