Merge branch 'master' into cleanup-code

Author: dblythy

.babelrc

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

CHANGELOG.md

@@ -151,6 +151,7 @@ ___
 - Refactor: uniform issue templates across repos (Manuel Trezza) [#7528](https://github.com/parse-community/parse-server/pull/7528)
 - ci: bump ci environment (Manuel Trezza) [#7539](https://github.com/parse-community/parse-server/pull/7539)
 - CI now pushes docker images to Docker Hub (Corey Baker) [#7548](https://github.com/parse-community/parse-server/pull/7548)
+- Allow cloud string for ES modules (Daniel Blyth) [#7560](https://github.com/parse-community/parse-server/pull/7560)
 - docs: Introduce deprecation ID for reference in comments and online search (Manuel Trezza) [#7562](https://github.com/parse-community/parse-server/pull/7562)
 - refactor: simplify Cloud Code tests and FunctionsRouter (Daniel Blyth) [#7564](https://github.com/parse-community/parse-server/pull/7564)
 

spec/CloudCode.spec.js

@@ -38,6 +38,13 @@ describe('Cloud Code', () => {
   it('can create functions', async () => {
     Parse.Cloud.define('hello', () => 'Hello world!');
     await expectAsync(Parse.Cloud.run('hello')).toBeResolvedTo('Hello world!');
+
+  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('show warning on duplicate cloud functions', () => {

spec/cloud/cloudCodeModuleFile.js

@@ -0,0 +1,3 @@
+Parse.Cloud.define('cloudCodeInFile', () => {
+  return 'It is possible to define cloud code in a file.';
+});

src/ParseServer.js

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