Revert D2531438

andreicoman11 · facebook-github-bot-3 · commit 96dda4bf5f91 · 2015-10-12T08:36:27.000-07:00
Differential Revision: D2531532

fb-gh-sync-id: c86bbcde3254df78f3dca88285ef1cd5a3563123
diff --git a/private-cli/src/bundle/bundle.js b/private-cli/src/bundle/bundle.js
@@ -9,7 +9,7 @@
 'use strict';
 
 const log = require('../util/log').out('bundle');
-const parseBundleCommandLine = require('./parseBundleCommandLine');
+const parseCommandLine = require('../../../packager/parseCommandLine');
 const processBundle = require('./processBundle');
 const Promise = require('promise');
 const ReactPackager = require('../../../packager/react-packager');
@@ -25,7 +25,36 @@ function bundle(argv, config) {
 }
 
 function _bundle(argv, config, resolve, reject) {
-  const args = parseBundleCommandLine(argv);
+  const args = parseCommandLine([
+    {
+      command: 'entry-file',
+      description: 'Path to the root JS file, either absolute or relative to JS root',
+      type: 'string',
+      required: true,
+    }, {
+      command: 'platform',
+      description: 'Either "ios" or "android"',
+      type: 'string',
+      required: true,
+    }, {
+      command: 'dev',
+      description: 'If false, warnings are disabled and the bundle is minified',
+      default: true,
+    }, {
+      command: 'bundle-output',
+      description: 'File name where to store the resulting bundle, ex. /tmp/groups.bundle',
+      type: 'string',
+      required: true,
+    }, {
+      command: 'sourcemap-output',
+      description: 'File name where to store the sourcemap file for resulting bundle, ex. /tmp/groups.map',
+      type: 'string',
+    }, {
+      command: 'assets-dest',
+      description: 'Directory name where to store assets referenced in the bundle',
+      type: 'string',
+    }
+  ], argv);
 
   // This is used by a bazillion of npm modules we don't control so we don't
   // have other choice than defining it as an env variable here.
diff --git a/private-cli/src/bundle/parseBundleCommandLine.js b/private-cli/src/bundle/parseBundleCommandLine.js
diff --git a/private-cli/src/cli.js b/private-cli/src/cli.js
@@ -29,16 +29,16 @@ const hiddenCommands = {
  */
 function run(command, commandArgs) {
   if (!command) {
-    return Promise.reject(helpMessage());
+    throw new Error(helpMessage());
   }
   commandArgs = commandArgs || [];
 
   const commandToExec = documentedCommands[command] || hiddenCommands[command];
   if (!commandToExec) {
-    return Promise.reject(helpMessage(command));
+    throw new Error(helpMessage(command));
   }
 
-  return commandToExec(commandArgs, Config.get());
+  commandToExec(commandArgs, Config.get()).done();
 }
 
 function helpMessage(command) {
@@ -61,7 +61,4 @@ function help() {
   return Promise.resolve();
 }
 
-module.exports = {
-  run: run,
-  commands: documentedCommands,
-};
+module.exports.run = run;

Original file line number	Diff line number	Diff line change
`@@ -29,16 +29,16 @@ const hiddenCommands = {`
`29`	`29`	`*/`
`30`	`30`	`function run(command, commandArgs) {`
`31`	`31`	`if (!command) {`
`32`		`- return Promise.reject(helpMessage());`
	`32`	`+ throw new Error(helpMessage());`
`33`	`33`	`}`
`34`	`34`	`commandArgs = commandArgs \|\| [];`
`35`	`35`
`36`	`36`	`const commandToExec = documentedCommands[command] \|\| hiddenCommands[command];`
`37`	`37`	`if (!commandToExec) {`
`38`		`- return Promise.reject(helpMessage(command));`
	`38`	`+ throw new Error(helpMessage(command));`
`39`	`39`	`}`
`40`	`40`
`41`		`- return commandToExec(commandArgs, Config.get());`
	`41`	`+ commandToExec(commandArgs, Config.get()).done();`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`function helpMessage(command) {`
`@@ -61,7 +61,4 @@ function help() {`
`61`	`61`	`return Promise.resolve();`
`62`	`62`	`}`
`63`	`63`
`64`		`-module.exports = {`
`65`		`- run: run,`
`66`		`- commands: documentedCommands,`
`67`		`-};`
	`64`	`+module.exports.run = run;`