Skip to content

Commit 0a32279

Browse files
cbaker6cbaker6
authored
Merge branch 'alpha' into slimImage
2 parents b873d9d + 76c7a6f commit 0a32279

16 files changed

+750
-68
lines changed

‎.github/workflows/ci.yml

+18-14
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
pull_request:
66
branches: [ release*, alpha, beta ]
77
env:
8-
NODE_VERSION: 18.12.1
8+
NODE_VERSION: 19.3.0
99
PARSE_SERVER_TEST_TIMEOUT: 20000
1010
jobs:
1111
check-code-analysis:
@@ -145,24 +145,24 @@ jobs:
145145
- name: MongoDB 4.2, ReplicaSet
146146
MONGODB_VERSION: 4.2.19
147147
MONGODB_TOPOLOGY: replicaset
148-
NODE_VERSION: 18.12.1
148+
NODE_VERSION: 19.3.0
149149
- name: MongoDB 4.4, ReplicaSet
150150
MONGODB_VERSION: 4.4.13
151151
MONGODB_TOPOLOGY: replicaset
152-
NODE_VERSION: 18.12.1
152+
NODE_VERSION: 19.3.0
153153
- name: MongoDB 5, ReplicaSet
154154
MONGODB_VERSION: 5.3.2
155155
MONGODB_TOPOLOGY: replicaset
156-
NODE_VERSION: 18.12.1
156+
NODE_VERSION: 19.3.0
157157
- name: MongoDB 6, ReplicaSet
158158
MONGODB_VERSION: 6.0.2
159159
MONGODB_TOPOLOGY: replicaset
160-
NODE_VERSION: 18.12.1
160+
NODE_VERSION: 19.3.0
161161
- name: Redis Cache
162162
PARSE_SERVER_TEST_CACHE: redis
163163
MONGODB_VERSION: 4.4.13
164164
MONGODB_TOPOLOGY: standalone
165-
NODE_VERSION: 18.12.1
165+
NODE_VERSION: 19.3.0
166166
- name: Node 14
167167
MONGODB_VERSION: 4.4.13
168168
MONGODB_TOPOLOGY: standalone
@@ -171,6 +171,10 @@ jobs:
171171
MONGODB_VERSION: 4.4.13
172172
MONGODB_TOPOLOGY: standalone
173173
NODE_VERSION: 16.18.1
174+
- name: Node 18
175+
MONGODB_VERSION: 4.4.13
176+
MONGODB_TOPOLOGY: standalone
177+
NODE_VERSION: 18.12.1
174178
fail-fast: false
175179
name: ${{ matrix.name }}
176180
timeout-minutes: 15
@@ -214,28 +218,28 @@ jobs:
214218
include:
215219
- name: PostgreSQL 11, PostGIS 3.0
216220
POSTGRES_IMAGE: postgis/postgis:11-3.0
217-
NODE_VERSION: 18.12.1
221+
NODE_VERSION: 19.3.0
218222
- name: PostgreSQL 11, PostGIS 3.1
219223
POSTGRES_IMAGE: postgis/postgis:11-3.1
220-
NODE_VERSION: 18.12.1
224+
NODE_VERSION: 19.3.0
221225
- name: PostgreSQL 11, PostGIS 3.2
222226
POSTGRES_IMAGE: postgis/postgis:11-3.2
223-
NODE_VERSION: 18.12.1
227+
NODE_VERSION: 19.3.0
224228
- name: PostgreSQL 11, PostGIS 3.3
225229
POSTGRES_IMAGE: postgis/postgis:11-3.3
226-
NODE_VERSION: 18.12.1
230+
NODE_VERSION: 19.3.0
227231
- name: PostgreSQL 12, PostGIS 3.3
228232
POSTGRES_IMAGE: postgis/postgis:12-3.3
229-
NODE_VERSION: 18.12.1
233+
NODE_VERSION: 19.3.0
230234
- name: PostgreSQL 13, PostGIS 3.3
231235
POSTGRES_IMAGE: postgis/postgis:13-3.3
232-
NODE_VERSION: 18.12.1
236+
NODE_VERSION: 19.3.0
233237
- name: PostgreSQL 14, PostGIS 3.3
234238
POSTGRES_IMAGE: postgis/postgis:14-3.3
235-
NODE_VERSION: 18.12.1
239+
NODE_VERSION: 19.3.0
236240
- name: PostgreSQL 15, PostGIS 3.3
237241
POSTGRES_IMAGE: postgis/postgis:15-3.3
238-
NODE_VERSION: 18.12.1
242+
NODE_VERSION: 19.3.0
239243
fail-fast: false
240244
name: ${{ matrix.name }}
241245
timeout-minutes: 15

‎README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,8 @@ Parse Server is continuously tested with the most recent releases of Node.js to
132132
|------------|----------------|-------------|------------|
133133
| Node.js 14 | 14.19.1 | April 2023 | ✅ Yes |
134134
| Node.js 16 | 16.14.2 | April 2024 | ✅ Yes |
135-
| Node.js 18 | 18.1.0 | April 2025 | ✅ Yes |
135+
| Node.js 18 | 18.12.1 | April 2025 | ✅ Yes |
136+
| Node.js 19 | 19.3.0 | June 2023 | ✅ Yes |
136137

137138
#### MongoDB
138139

‎changelogs/CHANGELOG_alpha.md

+14
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
# [6.0.0-alpha.21](https://github.com/parse-community/parse-server/compare/6.0.0-alpha.20...6.0.0-alpha.21) (2023-01-06)
2+
3+
4+
### Features
5+
6+
* Add request rate limiter based on IP address ([#8174](https://github.com/parse-community/parse-server/issues/8174)) ([6c79f6a](https://github.com/parse-community/parse-server/commit/6c79f6a69e25e47846e3b0685d6bdfd6b91086b1))
7+
8+
# [6.0.0-alpha.20](https://github.com/parse-community/parse-server/compare/6.0.0-alpha.19...6.0.0-alpha.20) (2023-01-06)
9+
10+
11+
### Features
12+
13+
* Add Node 19 support ([#8363](https://github.com/parse-community/parse-server/issues/8363)) ([a4990dc](https://github.com/parse-community/parse-server/commit/a4990dcd29abcb4442f3c424aff482a0a116160f))
14+
115
# [6.0.0-alpha.19](https://github.com/parse-community/parse-server/compare/6.0.0-alpha.18...6.0.0-alpha.19) (2023-01-05)
216

317

‎package-lock.json

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

‎package.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "parse-server",
3-
"version": "6.0.0-alpha.19",
3+
"version": "6.0.0-alpha.21",
44
"description": "An express module providing a Parse-compatible API server",
55
"main": "lib/index.js",
66
"repository": {
@@ -32,6 +32,7 @@
3232
"cors": "2.8.5",
3333
"deepcopy": "2.1.0",
3434
"express": "4.18.2",
35+
"express-rate-limit": "6.6.0",
3536
"follow-redirects": "1.15.2",
3637
"graphql": "16.6.0",
3738
"graphql-list-fields": "2.0.2",
@@ -48,6 +49,7 @@
4849
"mongodb": "4.10.0",
4950
"mustache": "4.2.0",
5051
"parse": "3.4.2",
52+
"path-to-regexp": "0.1.7",
5153
"pg-monitor": "1.5.0",
5254
"pg-promise": "10.12.1",
5355
"pluralize": "8.0.0",
@@ -97,8 +99,8 @@
9799
"mock-mail-adapter": "file:spec/dependencies/mock-mail-adapter",
98100
"mongodb-runner": "4.8.1",
99101
"mongodb-version-list": "1.0.0",
100-
"node-fetch": "3.2.10",
101102
"node-abort-controller": "3.0.1",
103+
"node-fetch": "3.2.10",
102104
"nyc": "15.1.0",
103105
"prettier": "2.0.5",
104106
"semantic-release": "17.4.6",

‎resources/buildConfigDefinitions.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ const nestedOptionEnvPrefix = {
4444
SecurityOptions: 'PARSE_SERVER_SECURITY_',
4545
SchemaOptions: 'PARSE_SERVER_SCHEMA_',
4646
LogLevels: 'PARSE_SERVER_LOG_LEVELS_',
47+
RateLimitOptions: 'PARSE_SERVER_RATE_LIMIT_',
4748
};
4849

4950
function last(array) {
@@ -111,7 +112,9 @@ function processProperty(property, iface) {
111112
}
112113
let defaultValue;
113114
if (defaultLine) {
114-
defaultValue = defaultLine.split(' ')[1];
115+
const defaultArray = defaultLine.split(' ');
116+
defaultArray.shift();
117+
defaultValue = defaultArray.join(' ');
115118
}
116119
let type = property.value.type;
117120
let isRequired = true;

0 commit comments

Comments
 (0)