Skip to content

Commit 01b1488

Browse files
authored
Merge pull request #24 from back4app/back4app2.7.4
Back4app2.7.4
2 parents 127629d + a420fd7 commit 01b1488

File tree

397 files changed

+51994
-11764
lines changed

Some content is hidden

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

397 files changed

+51994
-11764
lines changed

.babelrc

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
{
22
"plugins": [
3-
"transform-flow-strip-types"
3+
"transform-flow-strip-types",
4+
"transform-object-rest-spread"
45
],
56
"presets": [
6-
"es2015",
7-
"stage-0"
7+
["env", {
8+
"targets": {
9+
"node": "6.11.4"
10+
}
11+
}]
812
]
913
}

.eslintignore

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
lib/*
2-
coverage/*
1+
lib
2+
coverage
3+

.eslintrc.json

+8-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,13 @@
1515
},
1616
"rules": {
1717
"indent": ["error", 2],
18-
"linebreak-style": ["error", "unix"]
18+
"linebreak-style": ["error", "unix"],
19+
"no-trailing-spaces": 2,
20+
"eol-last": 2,
21+
"space-in-parens": ["error", "never"],
22+
"no-multiple-empty-lines": 1,
23+
"prefer-const": "error",
24+
"space-infix-ops": "error",
25+
"no-useless-escape": "off"
1926
}
2027
}

.flowconfig

+1
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@
77
[libs]
88

99
[options]
10+
suppress_comment= \\(.\\|\n\\)*\\@flow-disable-next

.gitattributes

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
* text=auto eol=lf
2+
3+
*.js text
4+
*.html text
5+
*.less text
6+
*.json text
7+
*.css text
8+
*.xml text
9+
*.md text
10+
*.txt text
11+
*.yml text
12+
*.sql text
13+
*.sh text
14+
15+
*.png binary

.github/ISSUE_TEMPLATE.md

+10-32
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,30 @@
1-
Please read the following instructions carefully.
1+
We use GitHub Issues for bugs.
22

3-
Check out https://github.com/ParsePlatform/parse-server/issues/1271 for an ideal bug report.
4-
The closer your issue report is to that one, the more likely we are to be able to help, and the more likely we will be to fix the issue quickly!
3+
If you have a non-bug question, ask on Stack Overflow or Server Fault:
4+
- https://stackoverflow.com/questions/tagged/parse.com
5+
- https://serverfault.com/tags/parse
56

6-
Many members of the community use Stack Overflow and Server Fault to ask questions.
7-
Read through the existing questions or ask your own!
8-
- Stack Overflow: http://stackoverflow.com/questions/tagged/parse.com
9-
- Server Fault: https://serverfault.com/tags/parse
7+
If you have a vulnerability disclosure, please follow our policy available here https://github.com/parse-community/parse-server/blob/master/SECURITY.md
108

11-
For database migration help, please file a bug report at https://parse.com/help#report
9+
You may also search through existing issues before opening a new one: https://github.com/parse-community/parse-server/issues?utf8=%E2%9C%93&q=is%3Aissue
1210

13-
Make sure these boxes are checked before submitting your issue -- thanks for reporting issues back to Parse Server!
14-
15-
- [ ] You've met the prerequisites: https://github.com/ParsePlatform/parse-server/wiki/Parse-Server-Guide#prerequisites.
16-
17-
- [ ] You're running the latest version of Parse Server: https://github.com/ParsePlatform/parse-server/releases
18-
19-
- [ ] You've searched through existing issues: https://github.com/ParsePlatform/Parse-Server/issues?utf8=%E2%9C%93&q=is%3Aissue Chances are that your issue has been reported or resolved before.
20-
21-
- [ ] You have filled out every section below. Issues without sufficient information are more likely to be closed.
22-
23-
--
11+
--- Please use this template. If you don't use this template, your issue may be closed without comment. ---
2412

2513
### Issue Description
2614

27-
[DELETE EVERYTHING ABOVE THIS LINE BEFORE SUBMITTING YOUR ISSUE]
28-
2915
Describe your issue in as much detail as possible.
3016

31-
[FILL THIS OUT]
32-
3317
### Steps to reproduce
3418

3519
Please include a detailed list of steps that reproduce the issue. Include curl commands when applicable.
3620

37-
1. [FILL THIS OUT]
38-
2. [FILL THIS OUT]
39-
3. [FILL THIS OUT]
40-
4121
#### Expected Results
4222

43-
[FILL THIS OUT]
23+
What you expected to happen.
4424

4525
#### Actual Outcome
4626

47-
[FILL THIS OUT]
27+
What is happening instead.
4828

4929
### Environment Setup
5030

@@ -62,6 +42,4 @@ Please include a detailed list of steps that reproduce the issue. Include curl c
6242

6343
### Logs/Trace
6444

65-
You can turn on additional logging by configuring VERBOSE=1 in your environment.
66-
67-
[FILL THIS OUT]
45+
Include all relevant logs. You can turn on additional logging by configuring VERBOSE=1 in your environment.

.gitignore

+3-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ lib-cov
1313

1414
# Coverage directory used by tools like istanbul
1515
coverage
16+
.nyc_output
1617

1718
# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
1819
.grunt
@@ -40,10 +41,11 @@ node_modules
4041
.vscode
4142

4243
# Babel.js
43-
lib/
44+
#lib/
4445

4546
# cache folder
4647
.cache
48+
.eslintcache
4749

4850
# Mac DS_Store files
4951
.DS_Store

.istanbul.yml

-2
This file was deleted.

.nycrc

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"reporter": [
3+
"lcov",
4+
"text-summary"
5+
],
6+
"exclude": [
7+
"**/spec/**",
8+
"lib/"
9+
]
10+
}
11+

.travis.yml

+56-51
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,75 @@
11
language: node_js
22
dist: trusty
3-
sudo: required
4-
node_js:
5-
- '4.5'
6-
- '6.1'
73
services:
4+
- mongodb
85
- postgresql
96
- redis-server
107
- docker
118
addons:
129
postgresql: '9.5'
13-
before_script:
14-
- ls -al "$HOME/.mongodb/versions"
15-
- psql -c 'create database parse_server_postgres_adapter_test_database;' -U postgres
16-
- psql -c 'CREATE EXTENSION postgis;' -U postgres -d parse_server_postgres_adapter_test_database
17-
- psql -c 'CREATE EXTENSION postgis_topology;' -U postgres -d parse_server_postgres_adapter_test_database
18-
- npm run lint
19-
env:
20-
global:
21-
- COVERAGE_OPTION='./node_modules/.bin/istanbul cover'
22-
matrix:
23-
- MONGODB_VERSION=3.0.8
24-
- MONGODB_VERSION=3.2.6
25-
- PARSE_SERVER_TEST_DB=postgres
26-
- PARSE_SERVER_TEST_CACHE=redis
27-
matrix:
28-
fast_finish: true
29-
allow_failures:
30-
- env: PARSE_SERVER_TEST_DB=postgres
10+
apt_packages:
11+
- postgresql-9.5-postgis-2.3
3112
branches:
3213
only:
3314
- master
3415
- /^[0-9]+.[0-9]+.[0-9]+(-.*)?$/
16+
- 3.x
17+
- /^greenkeeper/.*$/
3518
cache:
3619
directories:
3720
- node_modules
3821
- "$HOME/.mongodb/versions"
22+
23+
# Test stage
24+
stage: test
25+
env:
26+
global:
27+
- COVERAGE_OPTION='./node_modules/.bin/nyc'
28+
- NODE_VERSION=6.11.4
29+
matrix:
30+
- MONGODB_VERSION=3.2.13
31+
- MONGODB_VERSION=3.4.4
32+
- PARSE_SERVER_TEST_DB=postgres
33+
- PARSE_SERVER_TEST_CACHE=redis
34+
- NODE_VERSION=8.7
35+
before_install:
36+
- nvm install $NODE_VERSION
37+
- nvm use $NODE_VERSION
38+
before_script:
39+
- node -e 'require("./lib/index.js")'
40+
- psql -c 'create database parse_server_postgres_adapter_test_database;' -U postgres
41+
- psql -c 'CREATE EXTENSION postgis;' -U postgres -d parse_server_postgres_adapter_test_database
42+
- psql -c 'CREATE EXTENSION postgis_topology;' -U postgres -d parse_server_postgres_adapter_test_database
43+
- silent=1 mongodb-runner --start
44+
script:
45+
- npm run coverage
3946
after_script:
4047
- bash <(curl -s https://codecov.io/bash)
41-
after_failure:
42-
- (cd resources; python travis_after_all.py)
43-
after_success:
44-
- (cd resources; python travis_after_all.py)
45-
- export $(cat resources/.to_export_back)
4648

47-
deploy:
48-
- provider: script
49-
skip_cleanup: true
50-
script: ./resources/npm-git.sh
51-
on:
52-
branch: master
53-
condition: "$BUILD_LEADER$BUILD_AGGREGATE_STATUS = YESothers_succeeded"
54-
- provider: script
55-
skip_cleanup: true
56-
script: ./resources/docker-hub.sh
57-
on:
58-
tags: true
59-
all_branches: true
60-
condition: "$BUILD_LEADER$BUILD_AGGREGATE_STATUS = YESothers_succeeded"
61-
- provider: npm
62-
email:
63-
secure: T3LwSJFcu632SDfCoavcKL39NktWLEOOFzonAjeHAglmMyDp9hvU8xHwQ4JJy2CRA03c+ezAe2gH3Va+jfxvh1JtFUan+p88vaCHHKuNwPSp4WZBPt1ZTDmG+ACG6j+ZWHK+eP7hLvtlCi/M9/v4/bVojpm7v01LLiM+MRhnE9E7eLemQC4zb6RVtf2oGQ3mX51kMeya218kEm5bsQPpRJElI9jwletFa8qYK5AFgaCHpll059RRHQTTE9MTNcN58P/Kf6Qb3KGpKNoaHTXoOD4U6LcXLWvdHONVB6AzGefxg2b/dvtaO4nd5lDooMBR3u9kWpopXkyAuf+fO/8je9JTxO6CDUtDjHRcR2mCEXWX6rculIAbNXOv1ccRYCTQ8aFtYnFlMSb1+QIAdyT6HHmeT5ktk3+XJRuEv0PJJvqHTo+j7tPngjiv5sPNutgGFlOFO90omTbzEkIT/D/LsgXbWm2QKYWejbLiuSINg+FiFiZN90doCf4aCpm2y1Q/9GzvK+eXcpqzPCGxOykE7EuPZK3+S/ZU2oaWL2uSpbKPtC0qxebrneR307aVEa7C85HCkTMMBzE4tjUr8h5HhLqtWvqmDcnBo3PfQhf9cEO6jQLd3qhEVJmcwKz/yOCfgPXlCbRqiKk7j94perpNCIalXtMI9ySYjJNjHsB4600=
64-
api_key:
65-
secure: WLjhHVAdUkDy6UdNWveTpZqphw9olN0alCpyPpU0cJjlN/hk7YxPP+YHOSVnMZaRZoHM0LL11jPKLf970nymBfvJHDWxKk71c/5xyTX8pBtSxmGmGy23a5g2VrHVMd2JxsI7NEAH500tlFz+01t4E3Steo0NpAkHR3Q51kj01gQy8IumsksfhRc9uvjZ7zjm99Yk4L+cxyei79v4esfpx7Bgm0HTfAAAG/19F+r0hvvFiV517SREDU/YtcX/rIjVepEy1uiLKEohnmYtVIRSA3Hjh6VlHVhdj2WDd/dYrxi/Ioysq2zOM9pZVLamO9asB1e6JrTEipWE9jSZXxsbnfFzuNLxcOjKv1wd3OzQKF/7pGKGiWRTv5Xm19D/FrXoE/ULs6bHcC/Ke8Gs2RxPlOCdvAFehCkyf5P4HOPCQdR7o8Yiuvt+5JWKBflElNbSd4nWgwUOo3Yv8vC4Vj53fwmM+Uqfu3IgYFWktYxCm4RWIKMfB/gtmjcF6QYFfjvEMwAvRfBV81kuynCsnubXWzQeBE/b3JOhBfpGciKCjKfy+tS6bZfFjCtQV98hMMiCPre8Y7PahHDYc65wU9Ake+ZE+dDaSbeV3DZ5JeifLJHzKW2J2dWeRANkOaiSwO9VBC9/rht5ulK5qQ1pB2+sKDToAaiKy6RMlB/HgIoYqsU=
66-
on:
67-
tags: true
68-
all_branches: true
69-
condition: "$MONGODB_VERSION = '3.0.8'"
70-
repo: ParsePlatform/parse-server
49+
jobs:
50+
include:
51+
# release on github latest branch
52+
- stage: release
53+
node_js: '6.11.4'
54+
env:
55+
before_script: skip
56+
after_script: skip
57+
script: skip
58+
deploy:
59+
- provider: script
60+
skip_cleanup: true
61+
script: ./resources/npm-git.sh
62+
on:
63+
branch:
64+
- master
65+
- 3.x
66+
- provider: npm
67+
skip_cleanup: true
68+
email:
69+
secure: "YweTGc22uqFWpzbfiUa5ptBLRAy6tt6d9TZLwEkPtmnsWzN9dguGyKWmXiw0qL+848FWQ5PWzUgBn5XdigV9tF3rJY6RGs8i38WulNjwSoGuRZa3AChsQHAb1KenANcJybzhnwgEj9gRsrGZPEsyI2whfake/xLDtG91kHjpJANsd4gseOh6fdS4FIYCbyXvSbC7S0yZzIJkgSkMqJO7RJ8r0HYQ7srYIw31dM3ZXSmUYu+GaMDUUu3RLAGYoKaROxhDRnzkjdeLLiwZH8hQ/6CaqwqX54iJ6OS+MOQU3fi5ZXalA7RZvtC4RmrcCkaTf3i0f+5xejYIFgzXdYGMVm8DUc82tDw1s4b6Pb19bgi1xXOQ0IKzRmZuGxnvkRN61dnYdnpnnNuG97HXgVjiOigZXVLZkWazUdnf9zXqmkC+KxPfa4Ldqg0TMjQ9J14n6TXxRti8Tt0xMa1Uzho7VdsxdJy35Bghy398O6X8VdX6parfzEkX7c/JzcA3TIMJ9+S1dy3J4Tb2URB5367W6h7cDeXtGmwLTFu75Q1CNqRJkUGbSrX2NyMqG5tc8oaTM+OWvLxcbKPRy9T6qN7x2JmCHHaapf8/8VR9wCy2PwE5j+KWhmctEHqqOgrtG5gsjC0eCPJsposxZWyM7M6aUpXe3w+olBfKq9apUGStUSU="
70+
api_key:
71+
secure: "QprkaqQ+WCvZQR4qIEs5iS6peMCbRd8Hgt0s6HfdmhavNXwDFY8Bkdf6zJwWHLiqs4pyClXDZ2f6QiOs7y9IvJZ+wOIbsf4N5V6s06zOxJ0NAOwhe0mgWS3Us0zgXIfmW4BpmGnU4ql/qGL+9vNfyQJ7wxEJxVK7hiYh9Epu49E2jmefDqTX+SNSrDCg4HkRcxerxYGnAJDCP50QaNlyLSciODD6wHaddrSYkdvmISLMnLHug61OkE4OBIOWXfYV+e31kDj+zgczAfVQgekDKtaimCQclHFrmaEPl0KIm6wsDQAw5HWkepA/WZfv4SbCrDaKJDZw+LBI7dR0ezmiOH/zmWWrRW7D4wjkDGiumWjA8etuf8I4GRyC/d1RS+hnlvPr0Bu+WljuVxLoK3nhZOdiK5t4QlVDoGankkRjLylwFQgo8tzu5N0dc26z3ClowTwcKsjStmFr53gjCD7l3qoFjyPot1JlW3LPhG9Nch7rK33/7ONqVai3zxb1xB9ynd8TSzKi4/66LeYEDcGVM5A9Vmkp+egCnOhkOAXdI8O4jid98NANir+U4xmUYZ2PAMNmSeHlpSpwH2pC1/BHpDKA9RZEuEdr3sgmtuXXwwOCp+xvuVwxZZ6+gVEjG4nGTqSNxUIq1fzjGih8ElJtbM1Uhh2dVE9uxW7EC/oCuuk="
72+
on:
73+
tags: true
74+
all_branches: true
75+
repo: parse-community/parse-server

0 commit comments

Comments
 (0)