Skip to content

Commit 4f4b747

Browse files
authored
Merge branch 'alpha' into rate-limit-zone
2 parents 483e240 + e2a7218 commit 4f4b747

31 files changed

+617
-339
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ on:
55
pull_request:
66
branches:
77
- '**'
8+
paths-ignore:
9+
- '**/**.md'
810
env:
911
NODE_VERSION: 19.3.0
1012
PARSE_SERVER_TEST_TIMEOUT: 20000

CONTRIBUTING.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
- [Review Feedback](#review-feedback)
1212
- [Merge Readiness](#merge-readiness)
1313
- [Review Validity](#review-validity)
14+
- [Code Ownership](#code-ownership)
1415
- [Environment Setup](#environment-setup)
1516
- [Recommended Tools](#recommended-tools)
1617
- [Setting up your local machine](#setting-up-your-local-machine)
@@ -34,6 +35,8 @@
3435
- [Breaking Change](#breaking-change-1)
3536
- [Reverting](#reverting)
3637
- [Security Vulnerability](#security-vulnerability)
38+
- [Local Testing](#local-testing)
39+
- [Merging](#merging-1)
3740
- [Releasing](#releasing)
3841
- [General Considerations](#general-considerations)
3942
- [Major Release / Long-Term-Support](#major-release--long-term-support)
@@ -143,6 +146,12 @@ It's contrary to an open, collaborative environment to expect others to be invol
143146
144147
Your arguments must focus on the issue, not on your assumption of someone else's personal experience. We will take immediate and appropriate action in case of personal attacks, regardless of your previous contributions. Personal attacks are not permissible. If you became a victim of personal attacks, you can privately [report](https://docs.github.com/en/communities/maintaining-your-safety-on-github/reporting-abuse-or-spam) the GitHub comment to the Parse Platform PMC.
145148

149+
### Code Ownership
150+
151+
> *Can I open a new pull request based on another author's pull request?*
152+
153+
If your pull request contains work from someone else then you are required to get their permission to use their work in your pull request. Please make sure to observe the [license](LICENSE) for more details. In addition, as an appreciative gesture you should clearly mention that your pull request is based on another pull request with a link in the top-most comment of your pull request. To avoid this issue we encourage contributors to collaborate on a single pull request to preserve the commit history and clearly identify each author's contribution. To do so, you can review the other author's pull request and submit your code suggestions, or ask the original author to grant you write access to their repository to also be able to make commits directly to their pull request.
154+
146155
## Environment Setup
147156

148157
### Recommended Tools

changelogs/CHANGELOG_alpha.md

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,56 @@
1+
# [6.1.0-alpha.19](https://github.com/parse-community/parse-server/compare/6.1.0-alpha.18...6.1.0-alpha.19) (2023-06-08)
2+
3+
4+
### Bug Fixes
5+
6+
* LiveQuery server is not shut down properly when `handleShutdown` is called ([#8491](https://github.com/parse-community/parse-server/issues/8491)) ([967700b](https://github.com/parse-community/parse-server/commit/967700bdbc94c74f75ba84d2b3f4b9f3fd2dca0b))
7+
8+
# [6.1.0-alpha.18](https://github.com/parse-community/parse-server/compare/6.1.0-alpha.17...6.1.0-alpha.18) (2023-06-08)
9+
10+
11+
### Features
12+
13+
* Add support for `$eq` query constraint in LiveQuery ([#8614](https://github.com/parse-community/parse-server/issues/8614)) ([656d673](https://github.com/parse-community/parse-server/commit/656d673cf5dea354e4f2b3d4dc2b29a41d311b3e))
14+
15+
# [6.1.0-alpha.17](https://github.com/parse-community/parse-server/compare/6.1.0-alpha.16...6.1.0-alpha.17) (2023-06-07)
16+
17+
18+
### Features
19+
20+
* Add new Parse Server option `preventSignupWithUnverifiedEmail` to prevent returning a user without session token on sign-up with unverified email address ([#8451](https://github.com/parse-community/parse-server/issues/8451)) ([82da308](https://github.com/parse-community/parse-server/commit/82da30842a55980aa90cb7680fbf6db37ee16dab))
21+
22+
# [6.1.0-alpha.16](https://github.com/parse-community/parse-server/compare/6.1.0-alpha.15...6.1.0-alpha.16) (2023-05-28)
23+
24+
25+
### Reverts
26+
27+
* fix: Inaccurate table total row count for PostgreSQL ([6722110](https://github.com/parse-community/parse-server/commit/6722110f203bc5fdcaa68cdf091cf9e7b48d1cff))
28+
29+
# [6.1.0-alpha.15](https://github.com/parse-community/parse-server/compare/6.1.0-alpha.14...6.1.0-alpha.15) (2023-05-28)
30+
31+
32+
### Bug Fixes
33+
34+
* Inaccurate table total row count for PostgreSQL ([#8511](https://github.com/parse-community/parse-server/issues/8511)) ([0823a02](https://github.com/parse-community/parse-server/commit/0823a02fbf80bc88dc403bc47e9f5c6597ea78b4))
35+
36+
# [6.1.0-alpha.14](https://github.com/parse-community/parse-server/compare/6.1.0-alpha.13...6.1.0-alpha.14) (2023-05-27)
37+
38+
39+
### Bug Fixes
40+
41+
* Unnecessary log entries by `extendSessionOnUse` ([#8562](https://github.com/parse-community/parse-server/issues/8562)) ([fd6a007](https://github.com/parse-community/parse-server/commit/fd6a0077f2e5cf83d65e52172ae5a950ab0f1eae))
42+
43+
### Features
44+
45+
* Allow `Parse.Object` pointers in Cloud Code arguments ([#8490](https://github.com/parse-community/parse-server/issues/8490)) ([28aeda3](https://github.com/parse-community/parse-server/commit/28aeda3f160efcbbcf85a85484a8d26567fa9761))
46+
47+
# [6.1.0-alpha.13](https://github.com/parse-community/parse-server/compare/6.1.0-alpha.12...6.1.0-alpha.13) (2023-05-25)
48+
49+
50+
### Bug Fixes
51+
52+
* Rate limit feature is incompatible with Node 14 ([#8578](https://github.com/parse-community/parse-server/issues/8578)) ([f911f2c](https://github.com/parse-community/parse-server/commit/f911f2cd3a8c45cd326272dcd681532764a3761e))
53+
154
# [6.1.0-alpha.12](https://github.com/parse-community/parse-server/compare/6.1.0-alpha.11...6.1.0-alpha.12) (2023-05-19)
255

356

ci/definitionsCheck.js

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,14 @@
11
const fs = require('fs').promises;
22
const { exec } = require('child_process');
33
const core = require('@actions/core');
4-
const { nextTick } = require('process');
5-
const { AbortController } = require("node-abort-controller");
4+
const util = require('util');
65
(async () => {
76
const [currentDefinitions, currentDocs] = await Promise.all([
87
fs.readFile('./src/Options/Definitions.js', 'utf8'),
98
fs.readFile('./src/Options/docs.js', 'utf8'),
109
]);
11-
exec('npm run definitions');
12-
const ac = new AbortController();
13-
const { signal } = ac;
14-
const watcher = fs.watch('./src/Options/docs.js', {signal});
15-
let i = 0;
16-
// eslint-disable-next-line
17-
for await (const _ of watcher) {
18-
i++;
19-
if (i === 3) {
20-
ac.abort();
21-
break;
22-
}
23-
}
24-
await new Promise(resolve => nextTick(resolve));
10+
const execute = util.promisify(exec);
11+
await execute('npm run definitions');
2512
const [newDefinitions, newDocs] = await Promise.all([
2613
fs.readFile('./src/Options/Definitions.js', 'utf8'),
2714
fs.readFile('./src/Options/docs.js', 'utf8'),

0 commit comments

Comments
 (0)