Skip to content

Commit e08347c

Browse files
authored
Merge branch 'alpha' into session_logout
2 parents 1029d8b + fd108bf commit e08347c

File tree

138 files changed

+35420
-10087
lines changed

Some content is hidden

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

138 files changed

+35420
-10087
lines changed

.eslintrc.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22
"root": true,
33
"extends": [
44
"eslint:recommended",
5-
"plugin:jsdoc/recommended"
5+
"plugin:jsdoc/recommended",
6+
"plugin:flowtype/recommended"
67
],
78
"env": {
89
"node": true,
910
"es6": true
1011
},
11-
"parser": "babel-eslint",
12+
"parser": "@babel/eslint-parser",
1213
"globals": {
1314
"wx": true
1415
},
@@ -18,7 +19,8 @@
1819
],
1920
"parserOptions": {
2021
"ecmaVersion": 6,
21-
"sourceType": "module"
22+
"sourceType": "module",
23+
"requireConfigFile": false
2224
},
2325
"rules": {
2426
"indent": ["error", 2],
@@ -34,6 +36,7 @@
3436
"no-console": 0,
3537
"no-prototype-builtins": "off",
3638
"require-atomic-updates": "off",
39+
"flowtype/no-types-missing-file-annotation": 0,
3740
"jsdoc/require-jsdoc": 0,
3841
"jsdoc/require-returns-description": 0,
3942
"jsdoc/require-param-description": 0,

.github/dependabot.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ updates:
1414
prefix: "refactor"
1515
# Define dependencies to update
1616
allow:
17+
# Allow updates on every commit of parse-server
1718
- dependency-name: "parse-server"
18-
# Allow both direct and indirect updates for all packages
19-
- dependency-type: "all"
19+
# Allow direct updates for all packages
20+
- dependency-type: "direct"

.github/pull_request_template.md

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,19 @@
1-
### New Pull Request Checklist
2-
<!--
3-
Check every following box [x] before submitting your PR.
4-
Click the "Preview" tab for better readability.
5-
Thanks for contributing to Parse Platform!
6-
-->
1+
## Pull Request
72

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-SDK-JS/issues?q=is%3Aissue).
3+
- Report security issues [confidentially](https://github.com/parse-community/Parse-SDK-JS/security/policy).
4+
- Any contribution is under this [license](https://github.com/parse-community/Parse-SDK-JS/blob/alpha/LICENSE).
5+
- Link this pull request to an [issue](https://github.com/parse-community/Parse-SDK-JS/issues?q=is%3Aissue).
106

11-
### Issue Description
12-
<!-- Add a brief description of the issue this PR solves. -->
7+
## Issue
8+
<!-- Add the link to the issue that this PR closes. -->
139

1410
Closes: FILL_THIS_OUT
1511

16-
### Approach
17-
<!-- Add a description of the approach in this PR. -->
12+
## Approach
13+
<!-- Describe the changes in this PR. -->
1814

19-
### TODOs before merging
20-
<!--
21-
Add TODOs that need to be completed before merging this PR.
22-
Delete TODOs that do not apply to this PR.
23-
-->
15+
## Tasks
16+
<!-- Delete tasks that don't apply. -->
2417

2518
- [ ] Add tests
26-
- [ ] Add changes to documentation (guides, repository pages, in-code descriptions)
19+
- [ ] Add changes to documentation (guides, repository pages, code comments)

.github/workflows/ci.yml

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ jobs:
99
check-lock-file-version:
1010
name: NPM Lock File Version
1111
timeout-minutes: 5
12-
runs-on: ubuntu-18.04
12+
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v2
14+
- uses: actions/checkout@v3
1515
- name: Check NPM lock file version
1616
uses: mansona/npm-lockfile-version@v1
1717
with:
18-
version: 1
18+
version: 2
1919
build:
2020
runs-on: ubuntu-latest
2121
timeout-minutes: 30
@@ -37,24 +37,22 @@ jobs:
3737
- name: Fix git protocol for Node 14
3838
if: ${{ startsWith(matrix.NODE_VERSION, '14.') }}
3939
run: sudo git config --system url."https://github".insteadOf "ssh://git@github"
40-
- uses: actions/checkout@v2
40+
- uses: actions/checkout@v3
4141
- name: Use Node.js
42-
uses: actions/setup-node@v1
42+
uses: actions/setup-node@v3
4343
with:
4444
node-version: ${{ matrix.NODE_VERSION }}
4545
- name: Cache Node.js modules
46-
uses: actions/cache@v2
46+
uses: actions/cache@v3
4747
with:
4848
path: ~/.npm
49-
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
49+
key: ${{ runner.os }}-node-${{ matrix.NODE_VERSION }}-${{ hashFiles('**/package-lock.json') }}
5050
restore-keys: |
51-
${{ runner.os }}-node-
51+
${{ runner.os }}-node-${{ matrix.NODE_VERSION }}-
5252
- run: npm ci
53-
- run: npm install -g mongodb-runner
54-
- run: mongodb-runner start
5553
- run: npm run lint
5654
- run: npm test -- --maxWorkers=4
57-
- run: npm run integration
55+
- run: npm run test:mongodb
5856
env:
5957
CI: true
6058
- run: bash <(curl -s https://codecov.io/bash)

.github/workflows/release-automated-scheduler.yml

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

.github/workflows/release-automated.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
persist-credentials: false
1818
- uses: actions/setup-node@v2
1919
with:
20-
node-version: 16
20+
node-version: 18
2121
registry-url: https://registry.npmjs.org/
2222
- name: Cache Node.js modules
2323
uses: actions/cache@v2
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: release-manual-docs
2+
on:
3+
workflow_dispatch:
4+
inputs:
5+
tag:
6+
default: ''
7+
description: 'Version tag:'
8+
jobs:
9+
docs-publish:
10+
if: github.event.inputs.tag != ''
11+
runs-on: ubuntu-18.04
12+
timeout-minutes: 15
13+
steps:
14+
- uses: actions/checkout@v3
15+
with:
16+
ref: ${{ github.event.inputs.tag }}
17+
- name: Use Node.js
18+
uses: actions/setup-node@v1
19+
with:
20+
node-version: 16
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-
28+
- name: Generate Docs
29+
run: |
30+
npm ci
31+
npm run release_docs
32+
env:
33+
SOURCE_TAG: ${{ github.event.inputs.tag }}
34+
- name: Deploy
35+
uses: peaceiris/[email protected]
36+
with:
37+
github_token: ${{ secrets.GITHUB_TOKEN }}
38+
publish_dir: ./docs

CONTRIBUTING.md

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -106,15 +106,11 @@ Parse Community has a [responsible Vulnerability Disclosure Program](https://git
106106

107107
This project adheres to the [Contributor Covenant Code of Conduct](https://github.com/parse-community/parse-server/blob/master/CODE_OF_CONDUCT.md). By participating, you are expected to honor this code.
108108

109-
## License
110-
111-
By contributing to the Parse JavaScript SDK, you agree that your contributions will be licensed under its license.
112-
113-
[google-group]: https://groups.google.com/forum/#!forum/parse-developers
114-
[stack-overflow]: http://stackoverflow.com/tags/parse-server
115-
[bug-reports]: https://github.com/parse-community/parse-server/issues
116-
[rest-api]: https://docs.parseplatform.org/rest/guide
117-
[parse-api-console]: http://blog.parseplatform.org/announcements/introducing-the-parse-api-console/
118-
[stacktrace-or-gtfo]: http://i.imgur.com/jacoj.jpg
119-
[tests-dir]: /src/__tests__
120-
[integration-test-dir]: /integration/test
109+
[google-group]: https://groups.google.com/forum/#!forum/parse-developers
110+
[stack-overflow]: http://stackoverflow.com/tags/parse-server
111+
[bug-reports]: https://github.com/parse-community/parse-server/issues
112+
[rest-api]: https://docs.parseplatform.org/rest/guide
113+
[parse-api-console]: http://blog.parseplatform.org/announcements/introducing-the-parse-api-console/
114+
[stacktrace-or-gtfo]: http://i.imgur.com/jacoj.jpg
115+
[tests-dir]: /src/__tests__
116+
[integration-test-dir]: /integration/test

0 commit comments

Comments
 (0)