Skip to content

Commit de188d3

Browse files
Merge branch 'origin/master'
2 parents 07c2f7b + c016cf7 commit de188d3

18 files changed

+737
-503
lines changed

.travis.yml

Lines changed: 33 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,25 @@
11
language: node_js
22
dist: trusty
33
services:
4-
- mongodb
5-
- postgresql
6-
- redis-server
7-
- docker
4+
- mongodb
5+
- postgresql
6+
- redis-server
7+
- docker
88
addons:
99
postgresql: '9.5'
1010
apt:
1111
packages:
12-
- postgresql-9.5-postgis-2.3
12+
- postgresql-9.5-postgis-2.3
1313
branches:
1414
only:
1515
- master
16-
- /^[0-9]+.[0-9]+.[0-9]+(-.*)?$/
16+
- "/^[0-9]+.[0-9]+.[0-9]+(-.*)?$/"
1717
- 3.x
18-
- /^greenkeeper/.*$/
18+
- "/^greenkeeper/.*$/"
1919
cache:
2020
directories:
2121
- "$HOME/.npm"
2222
- "$HOME/.mongodb/versions"
23-
24-
# Test stage
2523
stage: test
2624
env:
2725
global:
@@ -34,7 +32,7 @@ env:
3432
- NODE_VERSION=11.4.0
3533
matrix:
3634
allow_failures:
37-
- env: NODE_VERSION=11.4.0
35+
- env: NODE_VERSION=11.4.0
3836
before_install:
3937
- nvm install $NODE_VERSION
4038
- nvm use $NODE_VERSION
@@ -52,31 +50,30 @@ script:
5250
after_script:
5351
- greenkeeper-lockfile-upload
5452
- bash <(curl -s https://codecov.io/bash)
55-
5653
jobs:
5754
include:
58-
# release on npm on tags
59-
- stage: release
60-
node_js: '8.10'
61-
env:
62-
before_script: skip
63-
after_script: skip
64-
script:
65-
- ./release_docs.sh
66-
deploy:
67-
- provider: pages
68-
skip_cleanup: true
69-
github_token: $GITHUB_TOKEN # Set in travis-ci.org dashboard
70-
local_dir: docs/
71-
on:
72-
all_branches: true
73-
- provider: npm
74-
skip_cleanup: true
75-
email:
76-
secure: $NPM_EMAIL
77-
api_key:
78-
secure: $NPM_TOKEN
79-
on:
80-
tags: true
81-
all_branches: true
82-
repo: parse-community/parse-server
55+
- stage: release
56+
node_js: '10'
57+
env:
58+
before_script: skip
59+
after_script: skip
60+
script:
61+
- "./release_docs.sh"
62+
deploy:
63+
- provider: pages
64+
skip_cleanup: true
65+
github_token:
66+
secure: VHNpkz4+Q0ZxoO7RPP8RlZWuH/jEpLO1A0a1wRpVvP05iMUimqlHRDg3SS491CBTa6VupDlg2kbgcwX8AtZENf9GZWHr4RpOdk8Q9FIcR//9peyXpFbqkMBybJyvxABaNuLDMpGkAkKofmxTwMoMoQ/bdyhVrnEklXlyiRuwnDSjcR70Ti9OFOkYValvgb6Qa4HEX0qs4rRGak+FgNrZzX1cZc7LTOYyiuXwdTvt/UqH5mDW+mXFNScwUZnWTyS+kB+tDJYe/wtKeuFv6J+wHI9TkVHmDsZK6TwnnEEmh+D38cBqlU90ZUKXZYOd4v9E0TFlM4kNxBNmp5N/jYUPThJ+Gc56HULMwqQmdwb+HFa/ZdQImM0Q/ibGgYZtxHxXH9j4K3mOLTpcOOqYGQcw3DBkQGMQM2/rY1b4LUlCqhngs6stEGFkkGCORAV5NE4EMIv0B9/BhfBN4v8nZPm9xin/mqyecaxUxwOGOvJZs1hRO20OEJE30Tk6H6dmkRen8Q2u5Uy6gYH2RU/6lumNTlY223nQ1JvtexKDa6fVWzRKYZ3KfbJ5umoA48i6p1ll9xvAoACy9CUnIdz3WWro86NBA/AK3efRKi0hjA+InjQZ1T8IkqlWN4Habr54E5Vzyz7VQ7/541JN1HvVsTctsnMOErXCBv54wU4Anw2r8lU=
67+
local_dir: docs/
68+
on:
69+
all_branches: true
70+
- provider: npm
71+
api_key:
72+
secure: Yrng6jsnMAtzrrln9DwRuY4xpcxl/WYS/1A5fckyQF6DsLmNlvqVtu3MWF+zdJgANF63G3jIee11tNBpYRecHl8FjPGwO0kc1vEgvIRVnveyR0bwIIDH6s/mR9dg4rZikflwG4XExsLyaQd7ko8aTIOIayfxJiv/u0yqwuBuBW2bFrL/41b1cKGK5+Iq2a+PdFENUPenKXISkACGaMnQF4Y/KVF98UwCiGLf957yFWc2sD6TFbjNDbAENSccvg1J3fBb+djbtzKzldl29ntp2mKVGSVASiKCRa6hSfgQulHiidFqFIKgpYJ1uATRr3UFr/NRVt1WbrgLnzY74OCX7y02c/xiYQMMEPRl/P8hHJu+KjQ3PBWsBvmsRN0QMUJv3PEjUPE3AY8sw49NoxiJZzJr7574vUBuM/dk0byYI6K/gwmUrPIhQjljzZqinS8JJJ4FjGjCdzXRhT5Q+PZvt5bF1rMOZXayNJZa+cICtmiJoU3vO2Yf6TXC3wY1veKvmcs24nws5lp4keJePTKAi1Ig7VoSxwAlgs3EGANIh7oBKx9zWnXQYMdmxbYsvLXAWcnnM+PcSCvooLmXWso3BQBeRuUUSS2oLaBpsFMsiniLNbA1cW4fwMkgUGz4oEDRi8wTD89E/1J2oNxzqtWRPawcVKpMpnBbDJHrWJPEHMw=
73+
email:
74+
secure: lomzDl71N995SzRczm7VE9OZE+PzMo4X8t3zU97agu/FMH5Qcj8BLwE+uVDTnA9Vblyj62ZsFKsNjP2Qp53Vcd+jHM4EJNWNRZYpEMIRO3LngX43r83qoFEHUvPu9s1oaa04a6FojcsJx0wl6B6Ke2AX74MXnJDLb9iZBy1mkpLUMVccVhSfhdoIzhkq3dhUw+6d8C024tNMHcgDW3VnRAsWFtiL7dCMpjLOdI+UxlkeGkQkxXXuRsZ0ZdjoSoM8NSkiYMc8x6EnekyRDoHTujX3OFxuU6+GAjrUmVzNmJWrBIqHVb0DXBQxjEaG3d/cNu5UsQyZYq5sxRRH0BaLs7F4oIQg95etasEtTtUkmsZ3pshVlsweiLU366UdbfuAf5hrJjqLrU12BKZyLjaAwyeKz031r8dA4sJtGIp5uVdXobQQTH6r958A88byJ20uaYSqhqjhZo3hkWXIQP0WQN2Ej/g57HbVNLB/nPKkMILfk/tpp7nBDLT0QrjbZxeo1dwCHqsBEV6z7ZyWyFf4xwpDsir4txL4t8ElzeGdlACjCqAJvIh5w9YzfrwijtoVMvvP6pWvn/iI640d4rsdIDe8egxgqZ1R/TMd/tdHYX+eI+ZfFmCVGj36/uXwdG7KIoIZVjRQ2tvWr9ZuydEPWPSRVGT4ycFeu6wbm3elM3I=
75+
skip_cleanup: true
76+
on:
77+
tags: true
78+
all_branches: true
79+
repo: parse-community/parse-server

CONTRIBUTING.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,8 @@ Once you have babel running in watch mode, you can start making changes to parse
4848
### Please Do's
4949

5050
* Begin by reading the [Development Guide](http://docs.parseplatform.org/parse-server/guide/#development-guide) to learn how to get started running the parse-server.
51-
* Take testing seriously! Aim to increase the test coverage with every pull request. To obtain the test coverage of the project, run:
52-
* **Windows**: `npm run coverage:win`
53-
* **Unix**: `npm run coverage`
54-
* Run the tests for the file you are working on with the following command:
55-
* **Windows**: `npm run test:win spec/MyFile.spec.js`
56-
* **Unix**: `npm test spec/MyFile.spec.js`
51+
* Take testing seriously! Aim to increase the test coverage with every pull request. To obtain the test coverage of the project, run: `npm run coverage`
52+
* Run the tests for the file you are working on with the following command: `npm test spec/MyFile.spec.js`
5753
* Run the tests for the whole project to make sure the code passes all tests. This can be done by running the test command for a single file but removing the test file argument. The results can be seen at *<PROJECT_ROOT>/coverage/lcov-report/index.html*.
5854
* Lint your code by running `npm run lint` to make sure the code is not going to be rejected by the CI.
5955
* **Do not** publish the *lib* folder.

Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ VOLUME /parse-server/cloud /parse-server/config
1616
WORKDIR /parse-server
1717

1818
COPY package*.json ./
19+
COPY postinstall.js ./
20+
1921
RUN npm ci --production
2022

2123
COPY bin bin

package-lock.json

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

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@
3333
"lodash": "4.17.11",
3434
"lru-cache": "5.1.1",
3535
"mime": "2.4.3",
36-
"mongodb": "3.2.6",
36+
"mongodb": "3.2.7",
3737
"parse": "2.4.0",
3838
"pg-promise": "8.7.2",
3939
"redis": "2.8.0",
40-
"semver": "6.1.0",
40+
"semver": "6.1.1",
4141
"tv4": "1.3.0",
4242
"uuid": "3.3.2",
4343
"winston": "3.2.1",
@@ -57,17 +57,17 @@
5757
"deep-diff": "1.0.2",
5858
"eslint": "5.16.0",
5959
"eslint-plugin-flowtype": "3.9.1",
60-
"flow-bin": "0.98.1",
60+
"flow-bin": "0.100.0",
6161
"gaze": "1.1.3",
62-
"husky": "2.3.0",
62+
"husky": "2.4.0",
6363
"jasmine": "3.4.0",
6464
"jasmine-spec-reporter": "4.2.1",
6565
"jsdoc": "3.6.2",
6666
"jsdoc-babel": "0.5.0",
67-
"lint-staged": "8.1.7",
67+
"lint-staged": "8.2.0",
6868
"mongodb-runner": "4.3.2",
6969
"nyc": "14.1.1",
70-
"prettier": "1.17.1",
70+
"prettier": "1.18.0",
7171
"supports-color": "6.0.0"
7272
},
7373
"scripts": {

0 commit comments

Comments
 (0)