Merge pull request #1 from parse-community/master

 fix(package): update pg-promise to version 5.8.1 (parse-community#3883)

.babelrc

@@ -1,9 +1,13 @@
 {
  "plugins": [
- "transform-flow-strip-types"
+ "transform-flow-strip-types",
+ "transform-object-rest-spread"
  ],
  "presets": [
- "es2015",
- "stage-0"
+ ["env", {
+ "targets": {
+ "node": "6.11.4"
+ }
+ }]
  ]
 }

.eslintignore

@@ -1,2 +1,3 @@
-lib/*
-coverage/*
+lib
+coverage
+

.eslintrc.json

@@ -21,6 +21,7 @@
  "space-in-parens": ["error", "never"],
  "no-multiple-empty-lines": 1,
  "prefer-const": "error",
- "space-infix-ops": "error"
+ "space-infix-ops": "error",
+ "no-useless-escape": "off"
  }
 }

.flowconfig

@@ -7,3 +7,4 @@
 [libs]
 
 [options]
+suppress_comment= \\(.\\|\n\\)*\\@flow-disable-next

.gitattributes

@@ -0,0 +1,15 @@
+* text=auto eol=lf
+
+*.js text
+*.html text
+*.less text
+*.json text
+*.css text
+*.xml text
+*.md text
+*.txt text
+*.yml text
+*.sql text
+*.sh text
+
+*.png binary

.github/ISSUE_TEMPLATE.md

@@ -1,50 +1,30 @@
-Please read the following instructions carefully.
+We use GitHub Issues for bugs.
 
-Check out https://github.com/ParsePlatform/parse-server/issues/1271 for an ideal bug report. 
-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!
+If you have a non-bug question, ask on Stack Overflow or Server Fault: 
+- https://stackoverflow.com/questions/tagged/parse.com 
+- https://serverfault.com/tags/parse
 
-Many members of the community use Stack Overflow and Server Fault to ask questions. 
-Read through the existing questions or ask your own!
-- Stack Overflow: http://stackoverflow.com/questions/tagged/parse.com 
-- Server Fault: https://serverfault.com/tags/parse
+If you have a vulnerability disclosure, please follow our policy available here https://github.com/parse-community/parse-server/blob/master/SECURITY.md
 
-For database migration help, please file a bug report at https://parse.com/help#report
+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 
 
-Make sure these boxes are checked before submitting your issue -- thanks for reporting issues back to Parse Server!
-
-- [ ] You've met the prerequisites: https://github.com/ParsePlatform/parse-server/wiki/Parse-Server-Guide#prerequisites.
-
-- [ ] You're running the latest version of Parse Server: https://github.com/ParsePlatform/parse-server/releases
-
-- [ ] 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.
-
-- [ ] You have filled out every section below. Issues without sufficient information are more likely to be closed.
-
---
+--- Please use this template. If you don't use this template, your issue may be closed without comment. ---
 
 ### Issue Description
 
-[DELETE EVERYTHING ABOVE THIS LINE BEFORE SUBMITTING YOUR ISSUE]
-
 Describe your issue in as much detail as possible.
 
-[FILL THIS OUT]
-
 ### Steps to reproduce
 
 Please include a detailed list of steps that reproduce the issue. Include curl commands when applicable.
 
-1. [FILL THIS OUT]
-2. [FILL THIS OUT]
-3. [FILL THIS OUT]
-
 #### Expected Results
 
-[FILL THIS OUT]
+What you expected to happen.
 
 #### Actual Outcome
 
-[FILL THIS OUT]
+What is happening instead.
 
 ### Environment Setup
 
@@ -62,6 +42,4 @@ Please include a detailed list of steps that reproduce the issue. Include curl c
 
 ### Logs/Trace
 
-You can turn on additional logging by configuring VERBOSE=1 in your environment.
-
-[FILL THIS OUT]
+Include all relevant logs. You can turn on additional logging by configuring VERBOSE=1 in your environment.

.gitignore

@@ -13,6 +13,7 @@ lib-cov
 
 # Coverage directory used by tools like istanbul
 coverage
+.nyc_output
 
 # Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
 .grunt

.nycrc

@@ -0,0 +1,11 @@
+{
+ "reporter": [
+ "lcov",
+ "text-summary"
+ ],
+ "exclude": [
+ "**/spec/**",
+ "lib/"
+ ]
+}
+

.travis.yml

@@ -1,71 +1,75 @@
 language: node_js
 dist: trusty
-node_js:
-- '4.5'
-- '6.1'
 services:
+ - mongodb
  - postgresql
  - redis-server
  - docker
 addons:
  postgresql: '9.5'
  apt_packages:
  - postgresql-9.5-postgis-2.3
-before_script:
- - ls -al "$HOME/.mongodb/versions"
- - psql -c 'create database parse_server_postgres_adapter_test_database;' -U postgres
- - psql -c 'CREATE EXTENSION postgis;' -U postgres -d parse_server_postgres_adapter_test_database
- - psql -c 'CREATE EXTENSION postgis_topology;' -U postgres -d parse_server_postgres_adapter_test_database
-env:
- global:
- - COVERAGE_OPTION='./node_modules/.bin/istanbul cover'
- matrix:
- - MONGODB_VERSION=3.0.8
- - MONGODB_VERSION=3.2.6
- - PARSE_SERVER_TEST_DB=postgres
- - PARSE_SERVER_TEST_CACHE=redis
-matrix:
- fast_finish: true
- allow_failures: 
- - env: PARSE_SERVER_TEST_DB=postgres
 branches:
  only:
  - master
  - /^[0-9]+.[0-9]+.[0-9]+(-.*)?$/
+ - 3.x
+ - /^greenkeeper/.*$/
 cache:
  directories:
  - node_modules
  - "$HOME/.mongodb/versions"
+
+# Test stage
+stage: test
+env:
+ global:
+ - COVERAGE_OPTION='./node_modules/.bin/nyc'
+ - NODE_VERSION=6.11.4
+ matrix:
+ - MONGODB_VERSION=3.2.13
+ - MONGODB_VERSION=3.4.4
+ - PARSE_SERVER_TEST_DB=postgres
+ - PARSE_SERVER_TEST_CACHE=redis
+ - NODE_VERSION=8.7
+before_install:
+- nvm install $NODE_VERSION
+- nvm use $NODE_VERSION
+before_script:
+- node -e 'require("./lib/index.js")'
+- psql -c 'create database parse_server_postgres_adapter_test_database;' -U postgres
+- psql -c 'CREATE EXTENSION postgis;' -U postgres -d parse_server_postgres_adapter_test_database
+- psql -c 'CREATE EXTENSION postgis_topology;' -U postgres -d parse_server_postgres_adapter_test_database
+- silent=1 mongodb-runner --start
+script:
+- npm run coverage
 after_script:
 - bash <(curl -s https://codecov.io/bash)
-after_failure:
- - (cd resources; python travis_after_all.py)
-after_success:
- - (cd resources; python travis_after_all.py)
- - export $(cat resources/.to_export_back)
 
-deploy:
- - provider: npm
- skip_cleanup: true
- email:
- 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=
- api_key:
- 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=
- on:
- tags: true
- all_branches: true
- condition: "$BUILD_LEADER$BUILD_AGGREGATE_STATUS = YESothers_succeeded"
- repo: ParsePlatform/parse-server
- - provider: script
- skip_cleanup: true
- script: ./resources/npm-git.sh
- on:
- branch: master
- condition: "$BUILD_LEADER$BUILD_AGGREGATE_STATUS = YESothers_succeeded"
- - provider: script
- skip_cleanup: true
- script: ./resources/docker-hub.sh
- on:
- tags: true
- all_branches: true
- condition: "$BUILD_LEADER$BUILD_AGGREGATE_STATUS = YESothers_succeeded"
+jobs:
+ include:
+ # release on github latest branch
+ - stage: release
+ node_js: '6.11.4'
+ env: 
+ before_script: skip
+ after_script: skip
+ script: skip
+ deploy:
+ - provider: script
+ skip_cleanup: true
+ script: ./resources/npm-git.sh
+ on:
+ branch:
+ - master
+ - 3.x
+ - provider: npm
+ skip_cleanup: true
+ email:
+ secure: "YweTGc22uqFWpzbfiUa5ptBLRAy6tt6d9TZLwEkPtmnsWzN9dguGyKWmXiw0qL+848FWQ5PWzUgBn5XdigV9tF3rJY6RGs8i38WulNjwSoGuRZa3AChsQHAb1KenANcJybzhnwgEj9gRsrGZPEsyI2whfake/xLDtG91kHjpJANsd4gseOh6fdS4FIYCbyXvSbC7S0yZzIJkgSkMqJO7RJ8r0HYQ7srYIw31dM3ZXSmUYu+GaMDUUu3RLAGYoKaROxhDRnzkjdeLLiwZH8hQ/6CaqwqX54iJ6OS+MOQU3fi5ZXalA7RZvtC4RmrcCkaTf3i0f+5xejYIFgzXdYGMVm8DUc82tDw1s4b6Pb19bgi1xXOQ0IKzRmZuGxnvkRN61dnYdnpnnNuG97HXgVjiOigZXVLZkWazUdnf9zXqmkC+KxPfa4Ldqg0TMjQ9J14n6TXxRti8Tt0xMa1Uzho7VdsxdJy35Bghy398O6X8VdX6parfzEkX7c/JzcA3TIMJ9+S1dy3J4Tb2URB5367W6h7cDeXtGmwLTFu75Q1CNqRJkUGbSrX2NyMqG5tc8oaTM+OWvLxcbKPRy9T6qN7x2JmCHHaapf8/8VR9wCy2PwE5j+KWhmctEHqqOgrtG5gsjC0eCPJsposxZWyM7M6aUpXe3w+olBfKq9apUGStUSU="
+ api_key:
+ secure: "QprkaqQ+WCvZQR4qIEs5iS6peMCbRd8Hgt0s6HfdmhavNXwDFY8Bkdf6zJwWHLiqs4pyClXDZ2f6QiOs7y9IvJZ+wOIbsf4N5V6s06zOxJ0NAOwhe0mgWS3Us0zgXIfmW4BpmGnU4ql/qGL+9vNfyQJ7wxEJxVK7hiYh9Epu49E2jmefDqTX+SNSrDCg4HkRcxerxYGnAJDCP50QaNlyLSciODD6wHaddrSYkdvmISLMnLHug61OkE4OBIOWXfYV+e31kDj+zgczAfVQgekDKtaimCQclHFrmaEPl0KIm6wsDQAw5HWkepA/WZfv4SbCrDaKJDZw+LBI7dR0ezmiOH/zmWWrRW7D4wjkDGiumWjA8etuf8I4GRyC/d1RS+hnlvPr0Bu+WljuVxLoK3nhZOdiK5t4QlVDoGankkRjLylwFQgo8tzu5N0dc26z3ClowTwcKsjStmFr53gjCD7l3qoFjyPot1JlW3LPhG9Nch7rK33/7ONqVai3zxb1xB9ynd8TSzKi4/66LeYEDcGVM5A9Vmkp+egCnOhkOAXdI8O4jid98NANir+U4xmUYZ2PAMNmSeHlpSpwH2pC1/BHpDKA9RZEuEdr3sgmtuXXwwOCp+xvuVwxZZ6+gVEjG4nGTqSNxUIq1fzjGih8ElJtbM1Uhh2dVE9uxW7EC/oCuuk="
+ on:
+ tags: true
+ all_branches: true
+ repo: parse-community/parse-server