Merge pull request #490 from gigabo/cli-commands

Cli commands

README.md

@@ -29,7 +29,7 @@ yo react-server
 # compile and run the new app
 npm run compile
 npm run start
-# go to http://localhost:3010
+# go to http://localhost:3000
 ```
 
 That hooks you up with [`react-server-cli`](packages/react-server-cli), which

docs/testing-ports.md

@@ -4,7 +4,7 @@ simultaneously, so port conflicts will fail the tests.  Make sure
 to update this manifest when adding a test that starts a server.
 
 ## generator-react-server 
-3010, 3011
+3000, 3001
 
 ## react-server-integration-test
-8771, 3001
+8771, 8772

packages/generator-react-server/generators/app/templates/package.json

@@ -4,7 +4,7 @@
   "description": "A react-server instance",
   "main": "HelloWorld.js",
   "scripts": {
-    "start": "react-server --port 3010 --js-port 3011",
+    "start": "react-server start",
     "test": "xo && nsp check && ava test.js"
   },
   "license": "Apache-2.0",

packages/generator-react-server/generators/app/templates/test.js

@@ -23,7 +23,7 @@ function getResponseCode(url) {
 	return new Promise((resolve, reject) => {
 		const req = http.get({
 			hostname: 'localhost',
-			port: 3010,
+			port: 3000,
 			path: url
 		}, res => {
 			resolve(res.statusCode);

packages/react-server-cli/package.json

@@ -26,6 +26,7 @@
     "json-loader": "^0.5.4",
     "less": "^2.7.1",
     "less-loader": "^2.2.3",
+    "lodash": "^4.14.1",
     "mkdirp": "~0.5.1",
     "node-libs-browser": "~0.5.2",
     "null-loader": "~0.1.1",

packages/react-server-cli/src/ConfigurationError.js

@@ -0,0 +1,13 @@
+// Can't use `instanceof` with babel-ified subclasses of builtins.
+//
+//   https://phabricator.babeljs.io/T3083
+//
+// Gotta do this the old-fashioned way. :p
+//
+export default function ConfigurationError(message) {
+	this.name = 'ConfigurationError';
+	this.message = message;
+	this.stack = (new Error()).stack;
+}
+ConfigurationError.prototype = Object.create(Error.prototype);
+ConfigurationError.prototype.constructor = ConfigurationError;

packages/react-server-cli/src/cli.js

@@ -1,5 +1,5 @@
 require("babel-core/register");
 
-const {start, parseCliArgs} = require(".");
+const {run, parseCliArgs} = require(".");
 
-start(parseCliArgs());
+run(parseCliArgs());

packages/react-server-cli/src/commands/add-page.js

@@ -0,0 +1,53 @@
+import _ from "lodash";
+import fs from "fs";
+import {join} from "path";
+import chalk from "chalk";
+import mkdirp from "mkdirp";
+import fileExists from "../fileExists";
+import ConfigurationError from "../ConfigurationError";
+
+const PAGE_SOURCE = _.template(`
+import React from "react";
+
+export default class <%= className %> {
+	handleRoute(next) {
+		// Kick off data requests here.
+		return next();
+	}
+
+	getElements() {
+		return <div>This is <%= className %>.</div>
+	}
+}
+`);
+
+export default function addPage(options){
+	const {routesFile, routesPath, routes} = options;
+
+	const path = options._[3];
+	const className = options._[4];
+
+	if (!path || !className) {
+		throw new ConfigurationError("Usage: react-server add-page <urlPath> <ClassName>");
+	}
+
+	const page = join("pages", className + ".js");
+
+	if (fileExists(page)) {
+		throw new ConfigurationError(`Found a pre-existing ${page}.  Aborting.`);
+	}
+
+	mkdirp("pages");
+
+	console.log(chalk.yellow("Generating " + page));
+
+	fs.writeFileSync(page, PAGE_SOURCE({className}));
+
+	routes.routes[className] = { path, page };
+
+	console.log(chalk.yellow("Updating " + routesFile));
+
+	fs.writeFileSync(routesPath, JSON.stringify(routes, null, "  ") + "\n");
+
+	console.log(chalk.green("All set!"));
+}

packages/react-server-cli/src/commands/compile.js

@@ -0,0 +1,24 @@
+import compileClient from "../compileClient"
+import handleCompilationErrors from "../handleCompilationErrors";
+import setupLogging from "../setupLogging";
+import logProductionWarnings from "../logProductionWarnings";
+import {logging} from "../react-server";
+
+const logger = logging.getLogger(__LOGGER__);
+
+export default function compile(options){
+	setupLogging(options);
+	logProductionWarnings(options);
+
+	const {compiler} = compileClient(options);
+
+	logger.notice("Starting compilation of client JavaScript...");
+	compiler.run((err, stats) => {
+		const error = handleCompilationErrors(err, stats);
+		if (!error) {
+			logger.notice("Successfully compiled client JavaScript.");
+		} else {
+			logger.error(error);
+		}
+	});
+}

packages/react-server-cli/src/commands/init.js

@@ -0,0 +1,72 @@
+import _ from "lodash";
+import fs from "fs";
+import {spawnSync} from "child_process";
+import chalk from "chalk";
+import fileExists from "../fileExists";
+import ConfigurationError from "../ConfigurationError";
+
+const DEPENDENCIES = [
+	"react-server",
+	"babel-preset-react-server",
+
+	// TODO: Modernize our peer deps and remove versions here.
+	"[email protected]",
+	"react@~0.14.2",
+	"react-dom@~0.14.2",
+]
+
+const DEV_DEPENDENCIES = [
+
+	// TODO: These, too.
+	"webpack-dev-server@~1.13.0",
+	"webpack@^1.13.1",
+]
+
+const CONFIG = {
+	"routes.json": {
+		middleware: [],
+		routes: {},
+	},
+	".reactserverrc": {
+		routesFile: "routes.json",
+		port: 3000,
+		env: {
+			production: {
+				port: 80,
+			},
+		},
+	},
+	".babelrc": {
+		presets: ["react-server"],
+	},
+}
+
+export default function init(){
+
+	if (!fileExists("package.json")) {
+		console.log(chalk.yellow("No package.json found.  Running `npm init --yes`"));
+		spawnSync("npm", ["init", "--yes"], {stdio: "inherit"});
+	}
+
+	Object.keys(CONFIG).forEach(fn => {
+		if (fileExists(fn)) {
+			throw new ConfigurationError(`Found a pre-existing ${fn}.  Aborting.`);
+		}
+	});
+
+	console.log(chalk.yellow("Installing dependencies"));
+
+	spawnSync("npm", ["install", "--save", ...DEPENDENCIES], {stdio: "inherit"});
+
+	console.log(chalk.yellow("Installing devDependencies"));
+
+	spawnSync("npm", ["install", "--save-dev", ...DEV_DEPENDENCIES], {stdio: "inherit"});
+
+	_.forEach(CONFIG, (config, fn) => {
+		console.log(chalk.yellow("Generating " + fn));
+
+		fs.writeFileSync(fn, JSON.stringify(config, null, "  ") + "\n");
+	});
+
+	console.log(chalk.green("All set!"));
+}