Skip to content

Commit f2a858d

Browse files
ddrechseddrechse
committed
Merge branch 'realDBAdapterLoader' of github.com:ddrechse/parse-server into realDBAdapterLoader
2 parents 426510c + 0462693 commit f2a858d

File tree

83 files changed

+10323
-9555
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+10323
-9555
lines changed

Diff for: ‎.eslintrc.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
"prefer-const": "error",
2525
"space-infix-ops": "error",
2626
"no-useless-escape": "off",
27-
"require-atomic-updates": "off"
27+
"require-atomic-updates": "off",
28+
"object-curly-spacing": ["error", "always"]
2829
},
2930
"globals": {
3031
"Parse": true

Diff for: ‎.github/ISSUE_TEMPLATE/---1-report-an-issue.md

+4-9
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,10 @@ assignees: ''
88
---
99

1010
### New Issue Checklist
11-
<!--
12-
Check every following box [x] before submitting your issue.
13-
Click the "Preview" tab for better readability.
14-
Thanks for contributing to Parse Platform!
15-
-->
1611

17-
- [ ] I am not disclosing a [vulnerability](https://github.com/parse-community/parse-server/blob/master/SECURITY.md).
18-
- [ ] I am not just asking a [question](https://github.com/parse-community/.github/blob/master/SUPPORT.md).
19-
- [ ] I have searched through [existing issues](https://github.com/parse-community/parse-server/issues?q=is%3Aissue).
20-
- [ ] I can reproduce the issue with the [latest version of Parse Server](https://github.com/parse-community/parse-server/releases). <!-- We don't investigate issues for outdated releases. -->
12+
- Report security issues [confidentially](https://github.com/parse-community/parse-server/security/policy).
13+
- Any contribution is under this [license](https://github.com/parse-community/parse-server/blob/alpha/LICENSE).
14+
- Before posting search [existing issues](https://github.com/parse-community/parse-server/issues?q=is%3Aissue).
2115

2216
### Issue Description
2317
<!-- What is the specific issue with Parse Server? -->
@@ -30,6 +24,7 @@ assignees: ''
3024

3125
### Expected Outcome
3226
<!-- What outcome, for example query result, did you expect? -->
27+
3328
### Environment
3429
<!-- Be specific with versions, don't use "latest" or semver ranges like "~x.y.z" or "^x.y.z". -->
3530

Diff for: ‎.github/ISSUE_TEMPLATE/---2-feature-request.md

+4-9
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,10 @@ assignees: ''
88
---
99

1010
### New Feature / Enhancement Checklist
11-
<!--
12-
Check every following box [x] before submitting your issue.
13-
Click the "Preview" tab for better readability.
14-
Thanks for contributing to Parse Platform!
15-
-->
16-
17-
- [ ] I am not disclosing a [vulnerability](https://github.com/parse-community/parse-server/blob/master/SECURITY.md).
18-
- [ ] I am not just asking a [question](https://github.com/parse-community/.github/blob/master/SUPPORT.md).
19-
- [ ] I have searched through [existing issues](https://github.com/parse-community/parse-server/issues?q=is%3Aissue).
11+
12+
- Report security issues [confidentially](https://github.com/parse-community/parse-server/security/policy).
13+
- Any contribution is under this [license](https://github.com/parse-community/parse-server/blob/alpha/LICENSE).
14+
- Before posting search [existing issues](https://github.com/parse-community/parse-server/issues?q=is%3Aissue).
2015

2116
### Current Limitation
2217
<!-- Which current limitation is the feature or enhancement addressing? -->

Diff for: ‎.github/dependabot.yml

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Dependabot dependency updates
2+
# Docs: https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
3+
4+
version: 2
5+
updates:
6+
- package-ecosystem: "npm"
7+
# Location of package-lock.json
8+
directory: "/"
9+
# Check daily for updates
10+
schedule:
11+
interval: "daily"
12+
commit-message:
13+
# Set commit message prefix
14+
prefix: "refactor"

Diff for: ‎.github/workflows/ci-automated-check-environment.yml

+4-10
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,12 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Checkout default branch
16-
uses: actions/checkout@v2
16+
uses: actions/checkout@v4
1717
- name: Setup Node
1818
uses: actions/setup-node@v2
1919
with:
20-
node-version: 14
21-
- name: Cache Node.js modules
22-
uses: actions/cache@v2
23-
with:
24-
path: ~/.npm
25-
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
26-
restore-keys: |
27-
${{ runner.os }}-node-
20+
node-version: 20
21+
cache: 'npm'
2822
- name: Install dependencies
2923
run: npm ci
3024
- name: CI Environments Check
@@ -36,7 +30,7 @@ jobs:
3630
runs-on: ubuntu-latest
3731
steps:
3832
- name: Checkout default branch
39-
uses: actions/checkout@v2
33+
uses: actions/checkout@v4
4034
- name: Compose branch name for PR
4135
id: branch
4236
run: echo "::set-output name=name::ci-bump-environment"

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

+69-75
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
paths-ignore:
99
- '**/**.md'
1010
env:
11-
NODE_VERSION: 19.3.0
11+
NODE_VERSION: 20.12.0
1212
PARSE_SERVER_TEST_TIMEOUT: 20000
1313
jobs:
1414
check-code-analysis:
@@ -24,7 +24,7 @@ jobs:
2424
language: ['javascript']
2525
steps:
2626
- name: Checkout repository
27-
uses: actions/checkout@v3
27+
uses: actions/checkout@v4
2828
- name: Initialize CodeQL
2929
uses: github/codeql-action/init@v2
3030
with:
@@ -37,13 +37,13 @@ jobs:
3737
timeout-minutes: 15
3838
runs-on: ubuntu-latest
3939
steps:
40-
- uses: actions/checkout@v2
40+
- uses: actions/checkout@v4
4141
- name: Use Node.js ${{ matrix.NODE_VERSION }}
42-
uses: actions/setup-node@v2
42+
uses: actions/setup-node@v4
4343
with:
4444
node-version: ${{ matrix.node-version }}
4545
- name: Cache Node.js modules
46-
uses: actions/cache@v2
46+
uses: actions/cache@v4
4747
with:
4848
path: ~/.npm
4949
key: ${{ runner.os }}-node-${{ matrix.NODE_VERSION }}-${{ hashFiles('**/package-lock.json') }}
@@ -58,13 +58,13 @@ jobs:
5858
timeout-minutes: 15
5959
runs-on: ubuntu-latest
6060
steps:
61-
- uses: actions/checkout@v2
61+
- uses: actions/checkout@v4
6262
- name: Use Node.js ${{ matrix.NODE_VERSION }}
63-
uses: actions/setup-node@v2
63+
uses: actions/setup-node@v4
6464
with:
6565
node-version: ${{ matrix.node-version }}
6666
- name: Cache Node.js modules
67-
uses: actions/cache@v2
67+
uses: actions/cache@v4
6868
with:
6969
path: ~/.npm
7070
key: ${{ runner.os }}-node-${{ matrix.NODE_VERSION }}-${{ hashFiles('**/package-lock.json') }}
@@ -78,13 +78,13 @@ jobs:
7878
timeout-minutes: 5
7979
runs-on: ubuntu-latest
8080
steps:
81-
- uses: actions/checkout@v2
81+
- uses: actions/checkout@v4
8282
- name: Use Node.js ${{ matrix.NODE_VERSION }}
83-
uses: actions/setup-node@v2
83+
uses: actions/setup-node@v4
8484
with:
8585
node-version: ${{ matrix.node-version }}
8686
- name: Cache Node.js modules
87-
uses: actions/cache@v2
87+
uses: actions/cache@v4
8888
with:
8989
path: ~/.npm
9090
key: ${{ runner.os }}-node-${{ matrix.NODE_VERSION }}-${{ hashFiles('**/package-lock.json') }}
@@ -99,13 +99,13 @@ jobs:
9999
timeout-minutes: 5
100100
runs-on: ubuntu-latest
101101
steps:
102-
- uses: actions/checkout@v2
102+
- uses: actions/checkout@v4
103103
- name: Use Node.js ${{ matrix.NODE_VERSION }}
104-
uses: actions/setup-node@v2
104+
uses: actions/setup-node@v4
105105
with:
106106
node-version: ${{ matrix.node-version }}
107107
- name: Cache Node.js modules
108-
uses: actions/cache@v2
108+
uses: actions/cache@v4
109109
with:
110110
path: ~/.npm
111111
key: ${{ runner.os }}-node-${{ matrix.NODE_VERSION }}-${{ hashFiles('**/package-lock.json') }}
@@ -120,23 +120,23 @@ jobs:
120120
runs-on: ubuntu-latest
121121
steps:
122122
- name: Checkout repository
123-
uses: actions/checkout@v2
123+
uses: actions/checkout@v4
124124
- name: Set up QEMU
125125
id: qemu
126-
uses: docker/setup-qemu-action@v1
126+
uses: docker/setup-qemu-action@v2
127127
- name: Set up Docker Buildx
128-
uses: docker/setup-buildx-action@v1
128+
uses: docker/setup-buildx-action@v2
129129
- name: Build docker image
130-
uses: docker/build-push-action@v2
130+
uses: docker/build-push-action@v3
131131
with:
132132
context: .
133-
platforms: linux/amd64
133+
platforms: linux/amd64, linux/arm64/v8
134134
check-lock-file-version:
135135
name: NPM Lock File Version
136136
timeout-minutes: 5
137137
runs-on: ubuntu-latest
138138
steps:
139-
- uses: actions/checkout@v2
139+
- uses: actions/checkout@v4
140140
- name: Check NPM lock file version
141141
uses: mansona/npm-lockfile-version@v1
142142
with:
@@ -146,42 +146,34 @@ jobs:
146146
matrix:
147147
include:
148148
- name: MongoDB 4.2, ReplicaSet
149-
MONGODB_VERSION: 4.2.19
149+
MONGODB_VERSION: 4.2.25
150150
MONGODB_TOPOLOGY: replset
151-
NODE_VERSION: 19.3.0
151+
NODE_VERSION: 20.12.0
152152
- name: MongoDB 4.4, ReplicaSet
153-
MONGODB_VERSION: 4.4.13
153+
MONGODB_VERSION: 4.4.29
154154
MONGODB_TOPOLOGY: replset
155-
NODE_VERSION: 19.3.0
155+
NODE_VERSION: 20.12.0
156156
- name: MongoDB 5, ReplicaSet
157-
MONGODB_VERSION: 5.3.2
157+
MONGODB_VERSION: 5.0.26
158158
MONGODB_TOPOLOGY: replset
159-
NODE_VERSION: 19.3.0
159+
NODE_VERSION: 20.12.0
160160
- name: MongoDB 6, ReplicaSet
161-
MONGODB_VERSION: 6.0.2
161+
MONGODB_VERSION: 6.0.14
162162
MONGODB_TOPOLOGY: replset
163-
NODE_VERSION: 19.3.0
163+
NODE_VERSION: 20.12.0
164164
- name: MongoDB 7, ReplicaSet
165-
MONGODB_VERSION: 7.0.1
165+
MONGODB_VERSION: 7.0.8
166166
MONGODB_TOPOLOGY: replset
167-
NODE_VERSION: 19.3.0
167+
NODE_VERSION: 20.12.0
168168
- name: Redis Cache
169169
PARSE_SERVER_TEST_CACHE: redis
170-
MONGODB_VERSION: 4.4.13
170+
MONGODB_VERSION: 7.0.8
171171
MONGODB_TOPOLOGY: standalone
172-
NODE_VERSION: 19.3.0
173-
- name: Node 14
174-
MONGODB_VERSION: 4.4.13
175-
MONGODB_TOPOLOGY: standalone
176-
NODE_VERSION: 14.21.1
177-
- name: Node 16
178-
MONGODB_VERSION: 4.4.13
179-
MONGODB_TOPOLOGY: standalone
180-
NODE_VERSION: 16.18.1
172+
NODE_VERSION: 20.12.0
181173
- name: Node 18
182-
MONGODB_VERSION: 4.4.13
174+
MONGODB_VERSION: 7.0.8
183175
MONGODB_TOPOLOGY: standalone
184-
NODE_VERSION: 18.12.1
176+
NODE_VERSION: 18.20.0
185177
fail-fast: false
186178
name: ${{ matrix.name }}
187179
timeout-minutes: 15
@@ -200,16 +192,13 @@ jobs:
200192
steps:
201193
- name: Fix usage of insecure GitHub protocol
202194
run: sudo git config --system url."https://github".insteadOf "git://github"
203-
- name: Fix git protocol for Node 14
204-
if: ${{ startsWith(matrix.NODE_VERSION, '14.') }}
205-
run: sudo git config --system url."https://github".insteadOf "ssh://git@github"
206-
- uses: actions/checkout@v2
195+
- uses: actions/checkout@v4
207196
- name: Use Node.js ${{ matrix.NODE_VERSION }}
208-
uses: actions/setup-node@v2
197+
uses: actions/setup-node@v4
209198
with:
210199
node-version: ${{ matrix.NODE_VERSION }}
211200
- name: Cache Node.js modules
212-
uses: actions/cache@v2
201+
uses: actions/cache@v4
213202
with:
214203
path: ~/.npm
215204
key: ${{ runner.os }}-node-${{ matrix.NODE_VERSION }}-${{ hashFiles('**/package-lock.json') }}
@@ -221,35 +210,36 @@ jobs:
221210
- run: npm run coverage
222211
env:
223212
CI: true
224-
- 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 }}
225218
check-postgres:
226219
strategy:
227220
matrix:
228221
include:
229-
- name: PostgreSQL 11, PostGIS 3.0
230-
POSTGRES_IMAGE: postgis/postgis:11-3.0
231-
NODE_VERSION: 19.3.0
232-
- name: PostgreSQL 11, PostGIS 3.1
233-
POSTGRES_IMAGE: postgis/postgis:11-3.1
234-
NODE_VERSION: 19.3.0
235-
- name: PostgreSQL 11, PostGIS 3.2
236-
POSTGRES_IMAGE: postgis/postgis:11-3.2
237-
NODE_VERSION: 19.3.0
238-
- name: PostgreSQL 11, PostGIS 3.3
239-
POSTGRES_IMAGE: postgis/postgis:11-3.3
240-
NODE_VERSION: 19.3.0
241-
- name: PostgreSQL 12, PostGIS 3.3
242-
POSTGRES_IMAGE: postgis/postgis:12-3.3
243-
NODE_VERSION: 19.3.0
222+
- name: PostgreSQL 13, PostGIS 3.1
223+
POSTGRES_IMAGE: postgis/postgis:13-3.1
224+
NODE_VERSION: 20.12.0
225+
- name: PostgreSQL 13, PostGIS 3.2
226+
POSTGRES_IMAGE: postgis/postgis:13-3.2
227+
NODE_VERSION: 20.12.0
244228
- name: PostgreSQL 13, PostGIS 3.3
245229
POSTGRES_IMAGE: postgis/postgis:13-3.3
246-
NODE_VERSION: 19.3.0
247-
- name: PostgreSQL 14, PostGIS 3.3
248-
POSTGRES_IMAGE: postgis/postgis:14-3.3
249-
NODE_VERSION: 19.3.0
250-
- name: PostgreSQL 15, PostGIS 3.3
251-
POSTGRES_IMAGE: postgis/postgis:15-3.3
252-
NODE_VERSION: 19.3.0
230+
NODE_VERSION: 20.12.0
231+
- name: PostgreSQL 13, PostGIS 3.4
232+
POSTGRES_IMAGE: postgis/postgis:13-3.4
233+
NODE_VERSION: 20.12.0
234+
- name: PostgreSQL 14, PostGIS 3.4
235+
POSTGRES_IMAGE: postgis/postgis:14-3.4
236+
NODE_VERSION: 20.12.0
237+
- name: PostgreSQL 15, PostGIS 3.4
238+
POSTGRES_IMAGE: postgis/postgis:15-3.4
239+
NODE_VERSION: 20.12.0
240+
- name: PostgreSQL 16, PostGIS 3.4
241+
POSTGRES_IMAGE: postgis/postgis:15-3.4
242+
NODE_VERSION: 20.12.0
253243
fail-fast: false
254244
name: ${{ matrix.name }}
255245
timeout-minutes: 15
@@ -275,13 +265,13 @@ jobs:
275265
PARSE_SERVER_TEST_DATABASE_URI: postgres://postgres:postgres@localhost:5432/parse_server_postgres_adapter_test_database
276266
NODE_VERSION: ${{ matrix.NODE_VERSION }}
277267
steps:
278-
- uses: actions/checkout@v2
268+
- uses: actions/checkout@v4
279269
- name: Use Node.js ${{ matrix.NODE_VERSION }}
280-
uses: actions/setup-node@v2
270+
uses: actions/setup-node@v4
281271
with:
282272
node-version: ${{ matrix.NODE_VERSION }}
283273
- name: Cache Node.js modules
284-
uses: actions/cache@v2
274+
uses: actions/cache@v4
285275
with:
286276
path: ~/.npm
287277
key: ${{ runner.os }}-node-${{ matrix.NODE_VERSION }}-${{ hashFiles('**/package-lock.json') }}
@@ -295,7 +285,11 @@ jobs:
295285
- run: npm run coverage
296286
env:
297287
CI: true
298-
- 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 }}
299293
concurrency:
300294
group: ${{ github.workflow }}-${{ github.ref }}
301295
cancel-in-progress: true

0 commit comments

Comments
 (0)