Skip to content

Commit 0462693

Browse files
mtrezzamtrezza
authored
Merge branch 'alpha' into realDBAdapterLoader
2 parents 4923443 + 2420024 commit 0462693

15 files changed

+289
-58
lines changed

Diff for: ‎.github/workflows/ci.yml

+13-5
Original file line numberDiff line numberDiff line change
@@ -162,16 +162,16 @@ jobs:
162162
MONGODB_TOPOLOGY: replset
163163
NODE_VERSION: 20.12.0
164164
- name: MongoDB 7, ReplicaSet
165-
MONGODB_VERSION: 7.0.7
165+
MONGODB_VERSION: 7.0.8
166166
MONGODB_TOPOLOGY: replset
167167
NODE_VERSION: 20.12.0
168168
- name: Redis Cache
169169
PARSE_SERVER_TEST_CACHE: redis
170-
MONGODB_VERSION: 7.0.7
170+
MONGODB_VERSION: 7.0.8
171171
MONGODB_TOPOLOGY: standalone
172172
NODE_VERSION: 20.12.0
173173
- name: Node 18
174-
MONGODB_VERSION: 7.0.7
174+
MONGODB_VERSION: 7.0.8
175175
MONGODB_TOPOLOGY: standalone
176176
NODE_VERSION: 18.20.0
177177
fail-fast: false
@@ -210,7 +210,11 @@ jobs:
210210
- run: npm run coverage
211211
env:
212212
CI: true
213-
- run: bash <(curl -s https://codecov.io/bash)
213+
- name: Upload code coverage
214+
uses: codecov/codecov-action@v4
215+
with:
216+
fail_ci_if_error: true
217+
token: ${{ secrets.CODECOV_TOKEN }}
214218
check-postgres:
215219
strategy:
216220
matrix:
@@ -281,7 +285,11 @@ jobs:
281285
- run: npm run coverage
282286
env:
283287
CI: true
284-
- run: bash <(curl -s https://codecov.io/bash)
288+
- name: Upload code coverage
289+
uses: codecov/codecov-action@v4
290+
with:
291+
fail_ci_if_error: true
292+
token: ${{ secrets.CODECOV_TOKEN }}
285293
concurrency:
286294
group: ${{ github.workflow }}-${{ github.ref }}
287295
cancel-in-progress: true

Diff for: ‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ Parse Server is continuously tested with the most recent releases of MongoDB to
142142
| MongoDB 4.4 | 4.4.29 | February 2024 | ✅ Yes |
143143
| MongoDB 5 | 5.0.26 | October 2024 | ✅ Yes |
144144
| MongoDB 6 | 6.0.14 | July 2025 | ✅ Yes |
145-
| MongoDB 7 | 7.0.7 | TDB | ✅ Yes |
145+
| MongoDB 7 | 7.0.8 | TDB | ✅ Yes |
146146

147147
#### PostgreSQL
148148

Diff for: ‎changelogs/CHANGELOG_alpha.md

+14
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
# [7.1.0-alpha.6](https://github.com/parse-community/parse-server/compare/7.1.0-alpha.5...7.1.0-alpha.6) (2024-04-14)
2+
3+
4+
### Bug Fixes
5+
6+
* `Parse.Cloud.startJob` and `Parse.Push.send` not returning status ID when setting Parse Server option `directAccess: true` ([#8766](https://github.com/parse-community/parse-server/issues/8766)) ([5b0efb2](https://github.com/parse-community/parse-server/commit/5b0efb22efe94c47f243cf8b1e6407ed5c5a67d3))
7+
8+
# [7.1.0-alpha.5](https://github.com/parse-community/parse-server/compare/7.1.0-alpha.4...7.1.0-alpha.5) (2024-04-07)
9+
10+
11+
### Features
12+
13+
* Prevent Parse Server start in case of unknown option in server configuration ([#8987](https://github.com/parse-community/parse-server/issues/8987)) ([8758e6a](https://github.com/parse-community/parse-server/commit/8758e6abb9dbb68757bddcbd332ad25100c24a0e))
14+
115
# [7.1.0-alpha.4](https://github.com/parse-community/parse-server/compare/7.1.0-alpha.3...7.1.0-alpha.4) (2024-03-31)
216

317

Diff for: ‎jsdoc-conf.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"template": "./node_modules/clean-jsdoc-theme",
3030
"theme_opts": {
3131
"default_theme": "dark",
32-
"title": "<img src='../.github/parse-server-logo.png' class='logo'/>",
32+
"title": "<img src='https://raw.githubusercontent.com/parse-community/parse-server/alpha/.github/parse-server-logo.png' class='logo'/>",
3333
"create_style": "header, .sidebar-section-title, .sidebar-title { color: #139cee !important } .logo { margin-left : 40px; margin-right: 40px }"
3434
}
3535
},

Diff for: ‎package-lock.json

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

Diff for: ‎package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "parse-server",
3-
"version": "7.1.0-alpha.4",
3+
"version": "7.1.0-alpha.6",
44
"description": "An express module providing a Parse-compatible API server",
55
"main": "lib/index.js",
66
"repository": {
@@ -24,7 +24,7 @@
2424
"@graphql-tools/merge": "9.0.3",
2525
"@graphql-tools/schema": "10.0.3",
2626
"@graphql-tools/utils": "8.12.0",
27-
"@parse/fs-files-adapter": "2.0.1",
27+
"@parse/fs-files-adapter": "3.0.0",
2828
"@parse/push-adapter": "6.0.0",
2929
"bcryptjs": "2.4.3",
3030
"body-parser": "1.20.2",
@@ -36,7 +36,7 @@
3636
"follow-redirects": "1.15.6",
3737
"graphql": "16.8.1",
3838
"graphql-list-fields": "2.0.4",
39-
"graphql-relay": "0.10.0",
39+
"graphql-relay": "0.10.1",
4040
"graphql-tag": "2.12.6",
4141
"graphql-upload": "15.0.2",
4242
"intersect": "1.0.1",
@@ -66,7 +66,7 @@
6666
},
6767
"devDependencies": {
6868
"@actions/core": "1.10.1",
69-
"@apollo/client": "3.9.5",
69+
"@apollo/client": "3.9.11",
7070
"@babel/cli": "7.23.9",
7171
"@babel/core": "7.24.3",
7272
"@babel/plugin-proposal-object-rest-spread": "7.10.0",

Diff for: ‎release_docs.sh

+16-9
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,17 @@
11
#!/bin/sh -e
22
set -x
3+
# GITHUB_ACTIONS=true SOURCE_TAG=test ./release_docs.sh
4+
35
if [ "${GITHUB_ACTIONS}" = "" ];
46
then
57
echo "Cannot release docs without GITHUB_ACTIONS set"
68
exit 0;
79
fi
10+
if [ "${SOURCE_TAG}" = "" ];
11+
then
12+
echo "Cannot release docs without SOURCE_TAG set"
13+
exit 0;
14+
fi
815
REPO="https://github.com/parse-community/parse-server"
916

1017
rm -rf docs
@@ -13,20 +20,20 @@ cd docs
1320
git pull origin gh-pages
1421
cd ..
1522

16-
DEST="master"
23+
RELEASE="release"
24+
VERSION="${SOURCE_TAG}"
1725

18-
if [ "${SOURCE_TAG}" != "" ];
19-
then
20-
DEST="${SOURCE_TAG}"
21-
# change the default page to the latest
22-
echo "<meta http-equiv='refresh' content='0; url=/parse-server/api/${DEST}'>" > "docs/api/index.html"
23-
fi
26+
# change the default page to the latest
27+
echo "<meta http-equiv='refresh' content='0; url=/parse-server/api/${VERSION}'>" > "docs/api/index.html"
2428

2529
npm run definitions
2630
npm run docs
2731

28-
mkdir -p "docs/api/${DEST}"
29-
cp -R out/* "docs/api/${DEST}"
32+
mkdir -p "docs/api/${RELEASE}"
33+
cp -R out/* "docs/api/${RELEASE}"
34+
35+
mkdir -p "docs/api/${VERSION}"
36+
cp -R out/* "docs/api/${VERSION}"
3037

3138
# Copy other resources
3239
RESOURCE_DIR=".github"

Diff for: ‎resources/buildConfigDefinitions.js

+17
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,23 @@ function inject(t, list) {
254254
if (action) {
255255
props.push(t.objectProperty(t.stringLiteral('action'), action));
256256
}
257+
258+
if (t.isGenericTypeAnnotation(elt)) {
259+
if (elt.typeAnnotation.id.name in nestedOptionEnvPrefix) {
260+
props.push(
261+
t.objectProperty(t.stringLiteral('type'), t.stringLiteral(elt.typeAnnotation.id.name))
262+
);
263+
}
264+
} else if (t.isArrayTypeAnnotation(elt)) {
265+
const elementType = elt.typeAnnotation.elementType;
266+
if (t.isGenericTypeAnnotation(elementType)) {
267+
if (elementType.id.name in nestedOptionEnvPrefix) {
268+
props.push(
269+
t.objectProperty(t.stringLiteral('type'), t.stringLiteral(elementType.id.name + '[]'))
270+
);
271+
}
272+
}
273+
}
257274
if (elt.defaultValue) {
258275
let parsedValue = parseDefaultValue(elt, elt.defaultValue, t);
259276
if (!parsedValue) {

0 commit comments

Comments
 (0)