Skip to content

Commit 8d3f0b6

Browse files
authored
Merge branch 'alpha' into fix-definitions
2 parents 48a45a8 + fc81b41 commit 8d3f0b6

File tree

18 files changed

+153
-56
lines changed

18 files changed

+153
-56
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: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,35 @@
1+
# [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)
2+
3+
4+
### Reverts
5+
6+
* fix: Inaccurate table total row count for PostgreSQL ([6722110](https://github.com/parse-community/parse-server/commit/6722110f203bc5fdcaa68cdf091cf9e7b48d1cff))
7+
8+
# [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)
9+
10+
11+
### Bug Fixes
12+
13+
* 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))
14+
15+
# [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)
16+
17+
18+
### Bug Fixes
19+
20+
* 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))
21+
22+
### Features
23+
24+
* 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))
25+
26+
# [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)
27+
28+
29+
### Bug Fixes
30+
31+
* 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))
32+
133
# [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)
234

335

package-lock.json

Lines changed: 60 additions & 35 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "parse-server",
3-
"version": "6.1.0-alpha.12",
3+
"version": "6.1.0-alpha.16",
44
"description": "An express module providing a Parse-compatible API server",
55
"main": "lib/index.js",
66
"repository": {
@@ -25,10 +25,10 @@
2525
"@graphql-tools/utils": "8.12.0",
2626
"@graphql-yoga/node": "2.6.0",
2727
"@parse/fs-files-adapter": "1.2.2",
28-
"@parse/push-adapter": "4.1.2",
28+
"@parse/push-adapter": "4.1.3",
2929
"bcryptjs": "2.4.3",
3030
"body-parser": "1.20.1",
31-
"commander": "5.1.0",
31+
"commander": "10.0.1",
3232
"cors": "2.8.5",
3333
"deepcopy": "2.1.0",
3434
"express": "4.18.2",
@@ -44,12 +44,12 @@
4444
"jwks-rsa": "2.1.5",
4545
"ldapjs": "2.3.3",
4646
"lodash": "4.17.21",
47-
"lru-cache": "7.12.0",
47+
"lru-cache": "9.1.1",
4848
"mime": "3.0.0",
4949
"mongodb": "4.10.0",
5050
"mustache": "4.2.0",
5151
"parse": "4.0.1",
52-
"path-to-regexp": "0.1.7",
52+
"path-to-regexp": "6.2.1",
5353
"pg-monitor": "2.0.0",
5454
"pg-promise": "11.3.0",
5555
"pluralize": "8.0.0",

spec/CLI.spec.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ describe('commander additions', () => {
7474
done();
7575
});
7676

77-
it('should load properly use args over env', done => {
77+
it('should load properly use args over env', () => {
7878
commander.loadDefinitions(testDefinitions);
7979
commander.parse(['node', './CLI.spec.js', '--arg0', 'arg0Value', '--arg4', ''], {
8080
PROGRAM_ARG_0: 'arg0ENVValue',
@@ -86,7 +86,6 @@ describe('commander additions', () => {
8686
expect(commander.arg1).toEqual('arg1ENVValue');
8787
expect(commander.arg2).toEqual(4);
8888
expect(commander.arg4).toEqual('');
89-
done();
9089
});
9190

9291
it('should fail in action as port is invalid', done => {

spec/CloudCode.spec.js

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1352,6 +1352,27 @@ describe('Cloud Code', () => {
13521352
});
13531353
});
13541354

1355+
it('allow cloud to encode Parse Objects', async () => {
1356+
const user = new Parse.User();
1357+
user.setUsername('username');
1358+
user.setPassword('password');
1359+
user.set('deleted', false);
1360+
await user.signUp();
1361+
Parse.Cloud.define(
1362+
'deleteAccount',
1363+
async req => {
1364+
expect(req.params.object instanceof Parse.Object).toBeTrue();
1365+
req.params.object.set('deleted', true);
1366+
await req.params.object.save(null, { useMasterKey: true });
1367+
return 'Object deleted';
1368+
},
1369+
{
1370+
requireMaster: true,
1371+
}
1372+
);
1373+
await Parse.Cloud.run('deleteAccount', { object: user.toPointer() }, { useMasterKey: true });
1374+
});
1375+
13551376
it('beforeSave should not affect fetched pointers', done => {
13561377
Parse.Cloud.beforeSave('BeforeSaveUnchanged', () => {});
13571378

spec/ParseHooks.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ describe('Hooks', () => {
208208
expect(err).not.toBe(null);
209209
if (err) {
210210
expect(err.code).toBe(143);
211-
expect(err.message).toBe('function name: my_new_function already exits');
211+
expect(err.message).toBe('function name: my_new_function already exists');
212212
}
213213
return Parse.Hooks.removeFunction('my_new_function');
214214
}

spec/SessionTokenCache.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ describe('SessionTokenCache', function () {
4747

4848
sessionTokenCache.getUserId('sessionToken').then(userIdFromCache => {
4949
expect(userIdFromCache).toBe('userId');
50-
expect(sessionTokenCache.cache.length).toBe(1);
50+
expect(sessionTokenCache.cache.size).toBe(1);
5151
done();
5252
});
5353
});

0 commit comments

Comments
 (0)