catch esm error

Author: dblythy

spec/CloudCode.spec.js

@@ -45,15 +45,6 @@ describe('Cloud Code', () => {
     );
   });
 
-  it('can use import for cloud files', async () => {
-    await reconfigureServer({
-      cloud: './spec/cloud/cloudCodeRelativeFile.js',
-      module: true,
-    });
-    const result = await Parse.Cloud.run('cloudCodeInFile', {});
-    expect(result).toBe('It is possible to define cloud code in a file.');
-  });
-
   it('can create functions', done => {
     Parse.Cloud.define('hello', () => {
       return 'Hello world!';

src/Options/Definitions.js

@@ -260,11 +260,6 @@ module.exports.ParseServerOptions = {
     env: 'PARSE_SERVER_MIDDLEWARE',
     help: 'middleware for express server, can be string or function',
   },
-  module: {
-    env: 'PARSE_SERVER_MODULE',
-    help: 'Whether cloud should load using `import` instead of `require`.',
-    action: parsers.booleanParser,
-  },
   mountGraphQL: {
     env: 'PARSE_SERVER_MOUNT_GRAPHQL',
     help: 'Mounts the GraphQL endpoint',

src/Options/docs.js

@@ -49,7 +49,6 @@
  * @property {Number|String} maxLogFiles Maximum number of logs to keep. If not set, no logs will be removed. This can be a number of files or number of days. If using days, add 'd' as the suffix. (default: null)
  * @property {String} maxUploadSize Max file size for uploads, defaults to 20mb
  * @property {Union} middleware middleware for express server, can be string or function
- * @property {Boolean} module Whether cloud should load using `import` instead of `require`.
  * @property {Boolean} mountGraphQL Mounts the GraphQL endpoint
  * @property {String} mountPath Mount path for the server, defaults to /parse
  * @property {Boolean} mountPlayground Mounts the GraphQL Playground - never use this option in production

src/Options/index.js

@@ -70,8 +70,6 @@ export interface ParseServerOptions {
   databaseAdapter: ?Adapter<StorageAdapter>;
   /* Full path to your cloud code main.js */
   cloud: ?string;
-  /* Whether cloud should load using `import` instead of `require`. */
-  module: ?boolean;
   /* A collection prefix for the classes
   :DEFAULT: '' */
   collectionPrefix: ?string;

src/ParseServer.js

@@ -103,10 +103,14 @@ class ParseServer {
       if (typeof cloud === 'function') {
         cloud(Parse);
       } else if (typeof cloud === 'string') {
-        if (this.config.module) {
-          import(path.resolve(process.cwd(), cloud));
-        } else {
+        try {
           require(path.resolve(process.cwd(), cloud));
+        } catch (e) {
+          if (e.code === 'ERR_REQUIRE_ESM') {
+            import(path.resolve(process.cwd(), cloud));
+          } else {
+            throw e;
+          }
         }
       } else {
         throw "argument 'cloud' must either be a string or a function";