Skip to content

Commit 7da6fbc

Browse files
dblythydblythy
authored
Merge branch 'master' into CloudDashboard
2 parents 35ae973 + 08b2ea4 commit 7da6fbc

File tree

127 files changed

+4664
-4360
lines changed

Some content is hidden

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

127 files changed

+4664
-4360
lines changed

‎.github/ISSUE_TEMPLATE/---1-report-an-issue.md

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@ assignees: ''
88
---
99

1010
### New Issue Checklist
11-
<!-- Please check the following boxes [ ] -> [x] before submitting your issue. Click the "Preview" tab for better readability. Thanks for reporting issues back to Parse Server! -->
11+
<!--
12+
Please check the following boxes [x] before submitting your issue.
13+
Click the "Preview" tab for better readability.
14+
Thanks for contributing to Parse Server!
15+
-->
1216

1317
- [ ] I am not disclosing a [vulnerability](https://github.com/parse-community/parse-server/blob/master/SECURITY.md).
1418
- [ ] I am not just asking a [question](https://github.com/parse-community/.github/blob/master/SUPPORT.md).
@@ -27,6 +31,16 @@ assignees: ''
2731
### Expected Outcome
2832
<!-- What outcome, for example query result, did you expect? -->
2933

34+
### Failing Test Case / Pull Request
35+
<!--
36+
Check one of the following boxes [x] if you added a PR and add the link.
37+
See the contribution guide for how add a test cases:
38+
https://github.com/parse-community/parse-server/blob/master/CONTRIBUTING.md
39+
-->
40+
41+
- [ ] 🤩 I submitted a PR with a fix and a test case.
42+
- [ ] 🧐 I submitted a PR with a failing test case.
43+
3044
### Environment
3145
<!-- Be specific with versions, don't use "latest" or semver ranges like "~x.y.z" or "^x.y.z". -->
3246

‎.github/ISSUE_TEMPLATE/---2-feature-request.md

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,28 @@ assignees: ''
77

88
---
99

10-
**Is your feature request related to a problem? Please describe.**
11-
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
10+
### New Feature / Enhancement Checklist
11+
<!--
12+
Please check the following boxes [x] before submitting your issue.
13+
Click the "Preview" tab for better readability.
14+
Thanks for contributing to Parse Server!
15+
-->
1216

13-
**Describe the solution you'd like**
14-
A clear and concise description of what you want to happen.
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).
1520

16-
**Describe alternatives you've considered**
17-
A clear and concise description of any alternative solutions or features you've considered.
21+
### Current Limitation
22+
<!-- Which current limitation is the feature or enhancement addressing? -->
1823

19-
**Additional context**
20-
Add any other context or screenshots about the feature request here.
24+
### Feature / Enhancement Description
25+
<!-- What is the concept of the functionality and how should it be implemented? -->
26+
27+
### Example Use Case
28+
<!-- What is an example use case in steps (1. / 2. / 3. / etc.) that describes the functionality? -->
29+
30+
### Alternatives / Workarounds
31+
<!-- Which alternatives or workarounds exist currently? -->
32+
33+
### 3rd Party References
34+
<!-- Have you seen a similar functionality provided somewhere else? -->

‎.github/pull_request_template.md

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
### New Pull Request Checklist
2+
<!--
3+
Please check the following boxes [x] before submitting your issue.
4+
Click the "Preview" tab for better readability.
5+
Thanks for contributing to Parse Server!
6+
-->
7+
8+
- [ ] I am not disclosing a [vulnerability](https://github.com/parse-community/parse-server/blob/master/SECURITY.md).
9+
- [ ] I am creating this PR in reference to an [issue](https://github.com/parse-community/parse-server/issues?q=is%3Aissue).
10+
11+
### Issue Description
12+
<!-- Add a brief description of the issue this PR solves. -->
13+
14+
Related issue: FILL_THIS_OUT
15+
16+
### Approach
17+
<!-- Add a description of the approach in this PR. -->
18+
19+
### TODOs before merging
20+
<!--
21+
Add TODOs that need to be completed before merging this PR.
22+
Delete suggested TODOs that do not apply to this PR.
23+
-->
24+
25+
- [ ] Add test cases
26+
- [ ] Add entry to changelog
27+
- [ ] Add changes to documentation (guides, repository pages, in-code descriptions)
28+
- [ ] Add [security check](https://github.com/parse-community/parse-server/blob/master/CONTRIBUTING.md#security-checks)
29+
- [ ] Add new Parse Error codes to Parse JS SDK <!-- no hard-coded error codes in Parse Server -->
30+
- [ ] ...

‎.github/stale.yml

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,19 @@
11
# Number of days of inactivity before an issue becomes stale
2-
daysUntilStale: 45
2+
daysUntilStale: 30
33
# Number of days of inactivity before a stale issue is closed
4-
daysUntilClose: 7
5-
# Issues with these labels will never be considered stale
6-
exemptLabels:
7-
- bug
8-
- enhancement
9-
- feature request
10-
- good first issue
11-
- hacktoberfest
12-
- help wanted
13-
- needs investigation
14-
- needs more info
15-
- question
16-
- pinned
17-
- security
18-
- up-for-grabs
4+
daysUntilClose: 30
5+
# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
6+
onlyLabels:
7+
- ":rocket: feature"
8+
- ":dna: enhancement"
199
# Label to use when marking an issue as stale
20-
staleLabel: stale
10+
staleLabel: up-for-grabs
2111
# Limit to only `issues` not `pulls`
2212
only: issues
2313
# Comment to post when marking an issue as stale. Set to `false` to disable
2414
markComment: >
25-
This issue has been automatically marked as stale because it has not had
15+
This issue has been automatically marked as up-for-grabs because it has not had
2616
recent activity. It will be closed if no further activity occurs. Thank you
2717
for your contributions.
2818
# Comment to post when closing a stale issue. Set to `false` to disable
29-
closeComment: false
19+
closeComment: false

‎.github/workflows/ci.yml

Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
name: ci
2+
on:
3+
push:
4+
branches:
5+
- master
6+
pull_request:
7+
branches:
8+
- '**'
9+
env:
10+
COVERAGE_OPTION: ./node_modules/.bin/nyc
11+
NODE_VERSION: 10
12+
PARSE_SERVER_TEST_TIMEOUT: 20000
13+
jobs:
14+
check-mongo:
15+
strategy:
16+
matrix:
17+
include:
18+
- name: Mongo 4.0.4, ReplicaSet, WiredTiger
19+
MONGODB_VERSION: 4.0.4
20+
MONGODB_TOPOLOGY: replicaset
21+
MONGODB_STORAGE_ENGINE: wiredTiger
22+
NODE_VERSION: 10
23+
- name: Mongo 3.6.21
24+
MONGODB_VERSION: 3.6.21
25+
NODE_VERSION: 10
26+
- name: Redis Cache
27+
PARSE_SERVER_TEST_CACHE: redis
28+
NODE_VERSION: 10
29+
- name: Node 12.12.0
30+
NODE_VERSION: 12.12.0
31+
name: ${{ matrix.name }}
32+
timeout-minutes: 30
33+
runs-on: ubuntu-18.04
34+
services:
35+
redis:
36+
image: redis
37+
ports:
38+
- 6379:6379
39+
env:
40+
MONGODB_VERSION: ${{ matrix.MONGODB_VERSION }}
41+
MONGODB_TOPOLOGY: ${{ matrix.MONGODB_TOPOLOGY }}
42+
MONGODB_STORAGE_ENGINE: ${{ matrix.MONGODB_STORAGE_ENGINE }}
43+
PARSE_SERVER_TEST_CACHE: ${{ matrix.PARSE_SERVER_TEST_CACHE }}
44+
NODE_VERSION: ${{ matrix.NODE_VERSION }}
45+
steps:
46+
- uses: actions/checkout@v2
47+
- name: Use Node.js ${{ matrix.NODE_VERSION }}
48+
uses: actions/setup-node@v1
49+
with:
50+
node-version: ${{ matrix.NODE_VERSION }}
51+
- name: Cache Node.js modules
52+
uses: actions/cache@v2
53+
with:
54+
path: ~/.npm
55+
key: ${{ runner.os }}-node-${{ matrix.NODE_VERSION }}-${{ hashFiles('**/package-lock.json') }}
56+
restore-keys: |
57+
${{ runner.os }}-node-${{ matrix.NODE_VERSION }}-
58+
- name: Install dependencies
59+
run: npm ci
60+
- if: ${{ matrix.name == 'Mongo 3.6.21' }}
61+
run: npm run lint
62+
- run: npm run pretest
63+
- run: npm run coverage
64+
env:
65+
CI: true
66+
- run: bash <(curl -s https://codecov.io/bash)
67+
check-postgres:
68+
name: Postgresql
69+
timeout-minutes: 30
70+
runs-on: ubuntu-18.04
71+
services:
72+
redis:
73+
image: redis
74+
ports:
75+
- 6379:6379
76+
postgres:
77+
image: postgis/postgis:11-3.0
78+
env:
79+
POSTGRES_PASSWORD: postgres
80+
ports:
81+
- 5432:5432
82+
options: >-
83+
--health-cmd pg_isready
84+
--health-interval 10s
85+
--health-timeout 5s
86+
--health-retries 5
87+
env:
88+
PARSE_SERVER_TEST_DB: postgres
89+
POSTGRES_MAJOR_VERSION: 11
90+
PARSE_SERVER_TEST_DATABASE_URI: postgres://postgres:postgres@localhost:5432/parse_server_postgres_adapter_test_database
91+
steps:
92+
- uses: actions/checkout@v2
93+
- name: Use Node.js 10
94+
uses: actions/setup-node@v1
95+
with:
96+
node-version: 10
97+
- name: Cache Node.js modules
98+
uses: actions/cache@v2
99+
with:
100+
path: ~/.npm
101+
key: ${{ runner.os }}-node-${{ matrix.NODE_VERSION }}-${{ hashFiles('**/package-lock.json') }}
102+
restore-keys: |
103+
${{ runner.os }}-node-${{ matrix.NODE_VERSION }}-
104+
- name: Install dependencies
105+
run: npm ci
106+
- run: bash scripts/before_script_postgres.sh
107+
- run: npm run coverage
108+
env:
109+
CI: true
110+
- run: bash <(curl -s https://codecov.io/bash)

‎.github/workflows/release.yml

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
name: release
2+
on:
3+
release:
4+
types: [published]
5+
jobs:
6+
publish-npm:
7+
runs-on: ubuntu-18.04
8+
steps:
9+
- uses: actions/checkout@v2
10+
- uses: actions/setup-node@v1
11+
with:
12+
node-version: '10.14'
13+
registry-url: https://registry.npmjs.org/
14+
- name: Cache Node.js modules
15+
uses: actions/cache@v2
16+
with:
17+
path: ~/.npm
18+
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
19+
restore-keys: |
20+
${{ runner.os }}-node-
21+
- run: npm ci
22+
- run: npm publish
23+
env:
24+
NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
25+
publish-docs:
26+
runs-on: ubuntu-18.04
27+
timeout-minutes: 30
28+
steps:
29+
- uses: actions/checkout@v2
30+
- name: Use Node.js
31+
uses: actions/setup-node@v1
32+
with:
33+
node-version: '10.14'
34+
- name: Cache Node.js modules
35+
uses: actions/cache@v2
36+
with:
37+
path: ~/.npm
38+
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
39+
restore-keys: |
40+
${{ runner.os }}-node-
41+
- name: Get Tag
42+
uses: actions/github-script@v3
43+
id: tag
44+
with:
45+
github-token: ${{secrets.GITHUB_TOKEN}}
46+
result-encoding: string
47+
script: |
48+
const ref = process.env.GITHUB_REF
49+
if(!ref.startsWith('refs/tags/'))
50+
return ''
51+
return ref.replace(/^refs\/tags\//, '')
52+
- name: Generate Docs
53+
run: |
54+
echo $SOURCE_TAG
55+
npm ci
56+
./release_docs.sh
57+
env:
58+
SOURCE_TAG: ${{ steps.tag.outputs.result }}
59+
- name: Deploy
60+
uses: peaceiris/[email protected]
61+
with:
62+
github_token: ${{ secrets.GITHUB_TOKEN }}
63+
publish_dir: ./docs

‎.travis.yml

Lines changed: 0 additions & 80 deletions
This file was deleted.

0 commit comments

Comments
 (0)