Skip to content

Commit 038f67c

Browse files
authored
Merge branch 'alpha' into master
2 parents 969e43b + 350b59a commit 038f67c

File tree

4 files changed

+132
-17
lines changed

4 files changed

+132
-17
lines changed

changelogs/CHANGELOG_alpha.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
# [5.0.0-alpha.20](https://github.com/parse-community/parse-server/compare/5.0.0-alpha.19...5.0.0-alpha.20) (2022-01-22)
2+
3+
4+
### Bug Fixes
5+
6+
* bump node-fetch from 2.6.1 to 3.1.1 ([#7782](https://github.com/parse-community/parse-server/issues/7782)) ([9082351](https://github.com/parse-community/parse-server/commit/90823514113a1a085ebc818f7109b3fd7591346f))
7+
8+
# [5.0.0-alpha.19](https://github.com/parse-community/parse-server/compare/5.0.0-alpha.18...5.0.0-alpha.19) (2022-01-22)
9+
10+
11+
### Bug Fixes
12+
13+
* bump nanoid from 3.1.25 to 3.2.0 ([#7781](https://github.com/parse-community/parse-server/issues/7781)) ([f5f63bf](https://github.com/parse-community/parse-server/commit/f5f63bfc64d3481ed944ceb5e9f50b33dccd1ce9))
14+
115
# [5.0.0-alpha.18](https://github.com/parse-community/parse-server/compare/5.0.0-alpha.17...5.0.0-alpha.18) (2022-01-13)
216

317

package-lock.json

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

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "parse-server",
3-
"version": "5.0.0-alpha.18",
3+
"version": "5.0.0-alpha.20",
44
"description": "An express module providing a Parse-compatible API server",
55
"main": "lib/index.js",
66
"repository": {
@@ -97,7 +97,7 @@
9797
"mock-mail-adapter": "file:spec/dependencies/mock-mail-adapter",
9898
"mongodb-runner": "4.8.1",
9999
"mongodb-version-list": "1.0.0",
100-
"node-fetch": "2.6.1",
100+
"node-fetch": "3.1.1",
101101
"nyc": "15.1.0",
102102
"prettier": "2.0.5",
103103
"semantic-release": "17.4.6",

spec/ParseGraphQLServer.spec.js

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const http = require('http');
22
const express = require('express');
33
const req = require('../lib/request');
4-
const fetch = require('node-fetch');
4+
const fetch = (...args) => import('node-fetch').then(({ default: fetch }) => fetch(...args));
55
const FormData = require('form-data');
66
const ws = require('ws');
77
require('./helper');
@@ -2600,18 +2600,22 @@ describe('ParseGraphQLServer', () => {
26002600
// "SecondaryObject:bBRgmzIRRM" < "SecondaryObject:nTMcuVbATY" true
26012601
// base64("SecondaryObject:bBRgmzIRRM"") < base64(""SecondaryObject:nTMcuVbATY"") false
26022602
// "U2Vjb25kYXJ5T2JqZWN0OmJCUmdteklSUk0=" < "U2Vjb25kYXJ5T2JqZWN0Om5UTWN1VmJBVFk=" false
2603-
const originalIds = [getSecondaryObjectsResult.data.secondaryObject2.objectId,
2604-
getSecondaryObjectsResult.data.secondaryObject4.objectId];
2603+
const originalIds = [
2604+
getSecondaryObjectsResult.data.secondaryObject2.objectId,
2605+
getSecondaryObjectsResult.data.secondaryObject4.objectId,
2606+
];
26052607
expect(
26062608
findSecondaryObjectsResult.data.secondaryObjects.edges[0].node.objectId
2607-
).not.toBe(
2608-
findSecondaryObjectsResult.data.secondaryObjects.edges[1].node.objectId
2609-
);
2609+
).not.toBe(findSecondaryObjectsResult.data.secondaryObjects.edges[1].node.objectId);
26102610
expect(
2611-
originalIds.includes(findSecondaryObjectsResult.data.secondaryObjects.edges[0].node.objectId)
2611+
originalIds.includes(
2612+
findSecondaryObjectsResult.data.secondaryObjects.edges[0].node.objectId
2613+
)
26122614
).toBeTrue();
26132615
expect(
2614-
originalIds.includes(findSecondaryObjectsResult.data.secondaryObjects.edges[1].node.objectId)
2616+
originalIds.includes(
2617+
findSecondaryObjectsResult.data.secondaryObjects.edges[1].node.objectId
2618+
)
26152619
).toBeTrue();
26162620

26172621
const createPrimaryObjectResult = await apolloClient.mutate({

0 commit comments

Comments
 (0)