revert

Author: dblythy

spec/CloudCode.spec.js

@@ -47,14 +47,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 load cloud code as a function', async () => {
     await reconfigureServer({
       cloud: () => {

src/cli/parse-server.js

@@ -39,6 +39,21 @@ runner({
       console.error('');
       process.exit(1);
     }
+    if (options['liveQuery.classNames']) {
+      options.liveQuery = options.liveQuery || {};
+      options.liveQuery.classNames = options['liveQuery.classNames'];
+      delete options['liveQuery.classNames'];
+    }
+    if (options['liveQuery.redisURL']) {
+      options.liveQuery = options.liveQuery || {};
+      options.liveQuery.redisURL = options['liveQuery.redisURL'];
+      delete options['liveQuery.redisURL'];
+    }
+    if (options['liveQuery.redisOptions']) {
+      options.liveQuery = options.liveQuery || {};
+      options.liveQuery.redisOptions = options['liveQuery.redisOptions'];
+      delete options['liveQuery.redisOptions'];
+    }
     if (options.cluster) {
       const numCPUs = typeof options.cluster === 'number' ? options.cluster : os.cpus().length;
       if (cluster.isMaster) {