Skip to content

Commit 990a3f8

Browse files
authored
Merge branch 'master' into greenkeeper/flow-bin-0.80.0
2 parents 8fdd51c + cfa22d0 commit 990a3f8

File tree

248 files changed

+44607
-32152
lines changed

Some content is hidden

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

248 files changed

+44607
-32152
lines changed

.babelrc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"plugins": [
3-
"transform-flow-strip-types",
4-
"transform-object-rest-spread"
3+
"@babel/plugin-transform-flow-strip-types",
4+
"@babel/plugin-proposal-object-rest-spread"
55
],
66
"presets": [
7-
["env", {
7+
["@babel/preset-env", {
88
"targets": {
99
"node": "8"
1010
}

.eslintrc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"sourceType": "module"
1515
},
1616
"rules": {
17-
"indent": ["error", 2],
17+
"indent": ["error", 2, { "SwitchCase": 1 }],
1818
"linebreak-style": ["error", "unix"],
1919
"no-trailing-spaces": 2,
2020
"eol-last": 2,

.prettierrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
semi: true
2+
trailingComma: "es5"
3+
singleQuote: true

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ before_script:
4848
- silent=1 mongodb-runner --start
4949
- greenkeeper-lockfile-update
5050
script:
51+
- npm run lint
5152
- npm run coverage
5253
after_script:
5354
- greenkeeper-lockfile-upload

3.0.0.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ In order to leverage those new nodejs features, you'll need to run at least node
1313
```js
1414
// before
1515
Parse.Cloud.beforeSave('MyClassName', function(request, response) {
16-
if (!passesValidation(req.object)) {
16+
if (!passesValidation(request.object)) {
1717
response.error('Ooops something went wrong');
1818
} else {
1919
response.success();
@@ -22,7 +22,7 @@ Parse.Cloud.beforeSave('MyClassName', function(request, response) {
2222

2323
// after
2424
Parse.Cloud.beforeSave('MyClassName', (request) => {
25-
if (!passesValidation(req.object)) {
25+
if (!passesValidation(request.object)) {
2626
throw 'Ooops something went wrong';
2727
}
2828
});

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -375,11 +375,11 @@ You can also find more adapters maintained by the community by searching on [npm
375375

376376
Parse Server allows developers to choose from several options when hosting files:
377377

378-
* `GridStoreAdapter`, which is backed by MongoDB;
378+
* `GridFSBucketAdapter`, which is backed by MongoDB;
379379
* `S3Adapter`, which is backed by [Amazon S3](https://aws.amazon.com/s3/); or
380380
* `GCSAdapter`, which is backed by [Google Cloud Storage](https://cloud.google.com/storage/)
381381

382-
`GridStoreAdapter` is used by default and requires no setup, but if you're interested in using S3 or Google Cloud Storage, additional configuration information is available in the [Parse Server guide](http://docs.parseplatform.org/parse-server/guide/#configuring-file-adapters).
382+
`GridFSBucketAdapter` is used by default and requires no setup, but if you're interested in using S3 or Google Cloud Storage, additional configuration information is available in the [Parse Server guide](http://docs.parseplatform.org/parse-server/guide/#configuring-file-adapters).
383383

384384
# Upgrading to 3.0.0
385385

jsdoc-conf.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"plugins": ["node_modules/jsdoc-babel", "plugins/markdown"],
33
"babel": {
4-
"plugins": ["transform-flow-strip-types"]
4+
"plugins": ["@babel/plugin-transform-flow-strip-types"]
55
},
66
"source": {
77
"include": ["./README.md", "./src/cloud-code", "./src/Options/docs.js", "./src/ParseServer.js", "./src/Adapters"],

0 commit comments

Comments
 (0)