Skip to content

Commit 081b1b0

Browse files
committed
Merge branch 'master' into snyk-upgrade-0c8b741252bb5a8c27c5f71d1bb0648e
2 parents 16617af + c56d326 commit 081b1b0

File tree

12 files changed

+71
-11879
lines changed

12 files changed

+71
-11879
lines changed

.github/workflows/ci.yml

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,26 @@ jobs:
5252
- name: Install dependencies
5353
run: npm ci
5454
- run: npm run lint
55+
check-circular:
56+
name: Circular Dependencies
57+
timeout-minutes: 5
58+
runs-on: ubuntu-18.04
59+
steps:
60+
- uses: actions/checkout@v2
61+
- name: Use Node.js ${{ matrix.NODE_VERSION }}
62+
uses: actions/setup-node@v1
63+
with:
64+
node-version: ${{ matrix.node-version }}
65+
- name: Cache Node.js modules
66+
uses: actions/cache@v2
67+
with:
68+
path: ~/.npm
69+
key: ${{ runner.os }}-node-${{ matrix.NODE_VERSION }}-${{ hashFiles('**/package-lock.json') }}
70+
restore-keys: |
71+
${{ runner.os }}-node-${{ matrix.NODE_VERSION }}-
72+
- name: Install dependencies
73+
run: npm ci
74+
- run: npm run madge:circular
5575
check-mongo:
5676
strategy:
5777
matrix:
@@ -71,8 +91,8 @@ jobs:
7191
MONGODB_TOPOLOGY: replicaset
7292
MONGODB_STORAGE_ENGINE: wiredTiger
7393
NODE_VERSION: 14.16.0
74-
- name: Mongo 3.6, Standalone, MMAPv1
75-
MONGODB_VERSION: 3.6.23
94+
- name: Mongo 4.0, Standalone, MMAPv1
95+
MONGODB_VERSION: 4.0.23
7696
MONGODB_TOPOLOGY: standalone
7797
MONGODB_STORAGE_ENGINE: mmapv1
7898
NODE_VERSION: 14.16.0

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ ___
9797
- EXPERIMENTAL: Added new page router with placeholder rendering and localization of custom and feature pages such as password reset and email verification (Manuel Trezza) [#6891](https://github.com/parse-community/parse-server/issues/6891)
9898
- 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/issues/7231)
9999
- Remove support for Node 10 which has reached its End-of-Life support date (Manuel Trezza) [#7314](https://github.com/parse-community/parse-server/pull/7314)
100+
- Remove support for MongoDB 3.6 which has reached its End-of-Life support date (Manuel Trezza) [#7315](https://github.com/parse-community/parse-server/pull/7315)
100101
### Other Changes
101102
- 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)
102103
- request.context for afterFind triggers (dblythy) [#7078](https://github.com/parse-community/parse-server/pull/7078)

README.md

Lines changed: 1 addition & 2 deletions
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 3.6,4.0,4.2,4.4" src="https://img.shields.io/badge/mongodb-3.6,_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" src="https://img.shields.io/badge/mongodb-4.0,_4.2,_4.4-green.svg?logo=mongodb&style=flat"></a>
2222
<a href="https://www.postgresql.org"> <img alt="PostgreSQL 10,11,12,13" src="https://img.shields.io/badge/postgresql-10,_11,_12,_13-green.svg?logo=postgresql&style=flat"></a>
2323
</p>
2424

@@ -123,7 +123,6 @@ Parse Server is continuously tested with the most recent releases of MongoDB to
123123

124124
| Version | Latest Patch Version | End-of-Life Date | Compatibility |
125125
|-------------|----------------------|------------------|--------------------|
126-
| MongoDB 3.6 | 3.6.23 | April 2021 | ✅ Fully compatible |
127126
| MongoDB 4.0 | 4.0.23 | January 2022 | ✅ Fully compatible |
128127
| MongoDB 4.2 | 4.2.13 | TBD | ✅ Fully compatible |
129128
| MongoDB 4.4 | 4.4.4 | TBD | ✅ Fully compatible |

0 commit comments

Comments
 (0)