Merge branch 'alpha' into moumouls/fix-graphql-realy

Author: mtrezza

.babelrc

@@ -7,8 +7,7 @@
         ["@babel/preset-env", {
             "targets": {
                 "node": "12"
-            },
-            "exclude": ["proposal-dynamic-import"]
+            }
         }]
     ],
     "sourceMaps": "inline"

README.md

@@ -489,11 +489,12 @@ You can also find more adapters maintained by the community by searching on [npm
 
 Parse Server allows developers to choose from several options when hosting files:
 
-* `GridFSBucketAdapter`, which is backed by MongoDB;
-* `S3Adapter`, which is backed by [Amazon S3](https://aws.amazon.com/s3/); or
-* `GCSAdapter`, which is backed by [Google Cloud Storage](https://cloud.google.com/storage/)
+* `GridFSBucketAdapter` - which is backed by MongoDB
+* `S3Adapter` - which is backed by [Amazon S3](https://aws.amazon.com/s3/)
+* `GCSAdapter` - which is backed by [Google Cloud Storage](https://cloud.google.com/storage/)
+* `FSAdapter` - local file storage
 
-`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).
+`GridFSBucketAdapter` is used by default and requires no setup, but if you're interested in using Amazon S3, Google Cloud Storage, or local file storage, additional configuration information is available in the [Parse Server guide](http://docs.parseplatform.org/parse-server/guide/#configuring-file-adapters).
 
 ## Idempotency Enforcement
  

changelogs/CHANGELOG_alpha.md

@@ -1,3 +1,17 @@
+# [5.0.0-alpha.7](https://github.com/parse-community/parse-server/compare/5.0.0-alpha.6...5.0.0-alpha.7) (2021-11-12)
+
+
+### Bug Fixes
+
+* node engine range has no upper limit to exclude incompatible node versions ([#7692](https://github.com/parse-community/parse-server/issues/7692)) ([573558d](https://github.com/parse-community/parse-server/commit/573558d3adcbcc6222c92003829867e1a73eef94))
+
+# [5.0.0-alpha.6](https://github.com/parse-community/parse-server/compare/5.0.0-alpha.5...5.0.0-alpha.6) (2021-11-10)
+
+
+### Reverts
+
+* refactor: allow ES import for cloud string if package type is module ([b64640c](https://github.com/parse-community/parse-server/commit/b64640c5705f733798783e68d216e957044ef23c))
+
 # [5.0.0-alpha.5](https://github.com/parse-community/parse-server/compare/5.0.0-alpha.4...5.0.0-alpha.5) (2021-11-01)
 
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "parse-server",
-  "version": "5.0.0-alpha.5",
+  "version": "5.0.0-alpha.7",
   "description": "An express module providing a Parse-compatible API server",
   "main": "lib/index.js",
   "repository": {
@@ -23,7 +23,7 @@
     "@graphql-tools/links": "6.2.5",
     "@graphql-tools/stitch": "6.2.4",
     "@graphql-tools/utils": "6.2.4",
-    "@parse/fs-files-adapter": "1.2.0",
+    "@parse/fs-files-adapter": "1.2.1",
     "@parse/push-adapter": "3.4.1",
     "apollo-server-express": "2.25.2",
     "bcryptjs": "2.4.3",
@@ -32,8 +32,8 @@
     "cors": "2.8.5",
     "deepcopy": "2.1.0",
     "express": "4.17.1",
-    "follow-redirects": "1.14.2",
-    "graphql": "15.6.0",
+    "follow-redirects": "1.14.4",
+    "graphql": "15.7.0",
     "graphql-list-fields": "2.0.2",
     "graphql-relay": "0.7.0",
     "graphql-tag": "2.12.5",
@@ -49,7 +49,7 @@
     "mustache": "4.2.0",
     "parse": "3.3.1",
     "pg-monitor": "1.4.1",
-    "pg-promise": "10.11.0",
+    "pg-promise": "10.11.1",
     "pluralize": "8.0.0",
     "redis": "3.1.2",
     "semver": "7.3.5",
@@ -58,7 +58,7 @@
     "uuid": "8.3.2",
     "winston": "3.3.3",
     "winston-daily-rotate-file": "4.5.5",
-    "ws": "8.2.2"
+    "ws": "8.2.3"
   },
   "devDependencies": {
     "@actions/core": "1.2.6",
@@ -135,7 +135,7 @@
     "madge:circular": "node_modules/.bin/madge ./src --circular"
   },
   "engines": {
-    "node": ">=12.20.0"
+    "node": ">=12.20.0 <16"
   },
   "bin": {
     "parse-server": "bin/parse-server"

package.json

@@ -39,14 +39,6 @@ describe('Cloud Code', () => {
     });
   });
 
-  it('can load cloud code as a module', async () => {
-    process.env.npm_package_type = 'module';
-    await reconfigureServer({ cloud: './spec/cloud/cloudCodeModuleFile.js' });
-    const result = await Parse.Cloud.run('cloudCodeInFile');
-    expect(result).toEqual('It is possible to define cloud code in a file.');
-    delete process.env.npm_package_type;
-  });
-
   it('can create functions', done => {
     Parse.Cloud.define('hello', () => {
       return 'Hello world!';

spec/CloudCode.spec.js

@@ -108,11 +108,7 @@ class ParseServer {
       if (typeof cloud === 'function') {
         cloud(Parse);
       } else if (typeof cloud === 'string') {
-        if (process.env.npm_package_type === 'module') {
-          import(path.resolve(process.cwd(), cloud));
-        } else {
-          require(path.resolve(process.cwd(), cloud));
-        }
+        require(path.resolve(process.cwd(), cloud));
       } else {
         throw "argument 'cloud' must either be a string or a function";
       }