fix(RNPM): fix rnpm-plugin-windows to work with react-native-cli

README.md

@@ -28,10 +28,9 @@ See the official [React Native website](https://facebook.github.io/react-native/
 ## Getting Started
 
 - Follow the [Getting Started guide](http://facebook.github.io/react-native/docs/getting-started.html) to install React Native and its dependencies.
-- Change your working directory to the project directory you specified in the `react native init` command from the [Getting Started guide](http://facebook.github.io/react-native/docs/getting-started.html) (i.e., `cd AwesomeProject`).
-- Install [rnpm](https://github.com/rnpm/rnpm) via NPM, globally (i.e., `npm install -g rnpm`).
+- Change your working directory to the project directory you specified in the `react-native init` command from the [Getting Started guide](http://facebook.github.io/react-native/docs/getting-started.html) (e.g., `cd AwesomeProject`).
 - Install [rnpm-plugin-windows](https://www.npmjs.com/package/rnpm-plugin-windows) from NPM (i.e., `npm install --save-dev rnpm-plugin-windows`).
-- Initialize Windows project with `rnpm windows` command in the project directory.
+- Initialize Windows project with `react-native windows` command in the project directory.
 - Learn more about various [tools for debugging React Native](http://facebook.github.io/react-native/docs/debugging.html).
 
 ### Requirements
@@ -84,12 +83,12 @@ The GitHub issues are intended for bug reports and feature requests. For help an
 
 ## FAQs
 
-1. Running `rnpm windows` fails with `No compatible version found: [email protected].*`
+1. Running `react-native windows` fails with `No compatible version found: [email protected].*`
 
 We try to keep up-to-date with the latest version of `react-native`, but sometimes we fall a bit behind. The default behavior of the Windows init RNPM plugin is to try and install the version of `react-native-windows` that matches the version of `react-native` that you're using (from the `package.json` file of your project).  Often times, an older version of `react-native-windows` will work just fine with a later version of `react-native`, so a good first attempt is to try and select the latest (or release candidate) version of `react-native-windows` using the `--windowsVersion` flag.  E.g.,
 
 ```
-rnpm windows --windowsVersion 0.x.0-rc.0
+react-native windows --windowsVersion 0.x.0-rc.0
 ```
 
 Where `x` is the version of `react-native` you have installed.

local-cli/generator-windows/index.js

@@ -109,7 +109,6 @@ module.exports = yeoman.Base.extend({
   end: function() {
     const projectPath = path.resolve(this.destinationRoot(), 'windows', this.name);
     this.log(chalk.white.bold('To run your app on UWP:'));
-    this.log(chalk.white(`   Open ${projectPath}.sln in Visual Studio`));
-    this.log(chalk.white('   Deploy the application and run on the specified destination'));
+    this.log(chalk.white('   react-native run-windows'));
   }
 });

local-cli/generator-windows/templates/src/project.json

@@ -1,7 +1,7 @@
 {
   "dependencies": {
-    "Facebook.CSSLayout": "2.0.0-pre",
-    "Microsoft.NETCore.UniversalWindowsPlatform": "5.0.0"
+    "Facebook.CSSLayout": "2.0.1-pre",
+    "Microsoft.NETCore.UniversalWindowsPlatform": "5.2.2"
   },
   "frameworks": {
     "uap10.0": {}

local-cli/rnpm/windows/README.md

@@ -4,17 +4,17 @@ To bootstrap the creation of Windows projects for React Native, we've published
 
 ## Project Initialization
 
-To start, make sure you have RNPM installed globally.
+To start, make sure you have the react-native CLI installed globally.
 
 ```
-npm install -g rnpm
+npm install -g react-native-cli
 ```
 
-Once RNPM is installed, install the Windows plugin for RNPM and initialize your project.
+Once the CLI is installed, install rnpm-plugin-windows and initialize your project.
 
 ```
 npm install --save-dev rnpm-plugin-windows
-rnpm windows
+react-native windows
 ```
 
 The `windows` command will do the following:
@@ -25,16 +25,24 @@ The `windows` command will do the following:
 ### Usage
 
 ```
-rnpm windows [name] [--namespace <namespace>] [--windowsVersion <version>]
+react-native windows [name] [--namespace <namespace>] [--windowsVersion <version>]
 ```
 
-The RNPM `windows` command takes an optional command line argument.
+The `windows` command takes an optional command line argument.
 - `name` - The name of the project, which will be used for both file names and the name of the component that is registered in the React Native [AppRegistry](https://facebook.github.io/react-native/docs/appregistry.html). Default value is the name given in the root-level `package.json`.
 
-The RNPM `windows` command accepts two optional flags.
+The `windows` command accepts two optional flags.
 - `--namepace` - The namespace that will be used in the generated native C# code. Default value is `name`.
 - `--windowsVersion` - The version of `react-native-windows` that will be used. Default value is matches the major and minor version of `react-native` if installed, otherwise the latest version.
 
+### React Native 0.27.* -> 0.30.*
+
+For versions of react-native prior to 0.31.0, you'll need to use the [rnpm](http://github.com/rnpm/rnpm) global CLI to run the `windows` command. Since the RNPM plugin syntax for the react-native CLI is not backward compatibile with rnpm, you'll need to use an older version of `rnpm-plugin-windows`:
+
+```
+npm install --save-dev [email protected].*
+```
+
 ## Running React Windows Applications
 
 Coming soon.

local-cli/rnpm/windows/index.js

@@ -1,12 +1,12 @@
-module.exports = [{
+module.exports = {
   func: require('./src/windows'),
   description: 'Generate React Native Windows template project',
   name: 'windows [name]',
   options: [{
-    flags: '--windowsVersion <version>',
+    command: '--windowsVersion [version]',
     description: 'The version of react-native-windows to use.'
   }, {
-    flags: '--namespace <namespace>',
+    command: '--namespace [namespace]',
     description: 'The native project namespace.'
   }]
-}];
+};

local-cli/rnpm/windows/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rnpm-plugin-windows",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "description": "rnpm plugin that generates a Windows template project",
   "main": "index.js",
   "scripts": {
@@ -20,6 +20,9 @@
     "node": ">= 4.0.0"
   },
   "license": "MIT",
+  "peerDependencies": {
+    "react-native": ">=0.31.0"
+  },
   "dependencies": {
     "semver": "^5.0.3",
     "chalk": "^1.1.3"

local-cli/runWindows/runWindows.js

@@ -27,10 +27,9 @@ function runWindows(config, args, options) {
 
   // Get build/deploy options
   const buildType = options.release ? 'Release' : 'Debug';
-  const buildArch = options.arch ? options.arch : 'x86';
 
   try {
-    build.buildSolution(slnFile, buildType, buildArch);
+    build.buildSolution(slnFile, buildType, options.arch);
   } catch (e) {
     console.error(chalk.red(`Build failed with message ${e}. Check your build configuration.`));
     return;
@@ -76,26 +75,26 @@ module.exports = {
   description: 'builds your app and starts it on a connected Windows desktop, emulator or device',
   func: runWindows,
   options: [{
-    flags: '--release',
+    command: '--release',
     description: 'Specifies a release build',
   }, {
-    flags: '--root [string]',
+    command: '--root [string]',
     description: 'Override the root directory for the windows build which contains the windows folder.',
   }, {
-    flags: '--arch [string]',
+    command: '--arch [string]',
     description: 'The build architecture (ARM, x86, x64)',
     default: 'x86',
   }, {
-    flags: '--emulator',
+    command: '--emulator',
     description: 'Deploys the app to an emulator',
   }, {
-    flags: '--device',
+    command: '--device',
     description: 'Deploys the app to a connected device',
   }, {
-    flags: '--target [string]',
+    command: '--target [string]',
     description: 'Deploys the app to the specified GUID for a device.',
   }, {
-    flags: '--proxy',
+    command: '--proxy',
     description: 'Deploys the app in remote debugging mode.',
   }]
 };

local-cli/runWindows/utils/deploy.js

@@ -12,8 +12,7 @@ const WinAppDeployTool = require('./winappdeploytool');
 
 function getAppPackage(options) {
   const configuration = options.release ? 'Release' : 'Debug';
-  const arch = options.arch ? options.arch : 'x86';
-  return glob.sync(path.join(options.root, `windows/*/AppPackages/*_${arch}_${configuration}_*`))[0];
+  return glob.sync(path.join(options.root, `windows/*/AppPackages/*_${options.arch}_${configuration}_*`))[0];
 }
 
 function getWindowsStoreAppUtils(options) {