From ce0f244c543424192c67607d7900e98189e4b4bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20O=E2=80=99Shannessy?= <paul@oshannessy.com>
Date: Fri, 6 Dec 2013 12:11:40 -0800
Subject: [PATCH] Move npm-react-core to npm-react, fix tasks accordingly

---
 Gruntfile.js                                   | 14 +++++++-------
 grunt/tasks/{react-core.js => npm-react.js}    |  4 ++--
 {npm-react-core => npm-react}/README.md        |  0
 {npm-react-core => npm-react}/ReactJSErrors.js |  0
 {npm-react-core => npm-react}/addons.js        |  0
 {npm-react-core => npm-react}/package.json     |  2 +-
 {npm-react-core => npm-react}/react.js         |  0
 7 files changed, 10 insertions(+), 10 deletions(-)
 rename grunt/tasks/{react-core.js => npm-react.js} (95%)
 rename {npm-react-core => npm-react}/README.md (100%)
 rename {npm-react-core => npm-react}/ReactJSErrors.js (100%)
 rename {npm-react-core => npm-react}/addons.js (100%)
 rename {npm-react-core => npm-react}/package.json (98%)
 rename {npm-react-core => npm-react}/react.js (100%)

diff --git a/Gruntfile.js b/Gruntfile.js
index 87208c011c..823e5f172a 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -9,7 +9,7 @@ var webdriverJasmineTasks = require('./grunt/tasks/webdriver-jasmine');
 var sauceTunnelTask = require('./grunt/tasks/sauce-tunnel');
 var npmTask = require('./grunt/tasks/npm');
 var releaseTasks = require('./grunt/tasks/release');
-var reactCoreTasks = require('./grunt/tasks/react-core');
+var npmReactTasks = require('./grunt/tasks/npm-react');
 
 module.exports = function(grunt) {
 
@@ -52,7 +52,7 @@ module.exports = function(grunt) {
 
   grunt.registerMultiTask('npm', npmTask);
 
-  grunt.registerTask('react-core:release', reactCoreTasks.buildRelease);
+  grunt.registerTask('npm-react:release', npmReactTasks.buildRelease);
 
   // Check that the version we're exporting is the same one we expect in the
   // package. This is not an ideal way to do this, but makes sure that we keep
@@ -62,7 +62,7 @@ module.exports = function(grunt) {
     var reactVersion = reactVersionExp.exec(
       grunt.file.read('./build/modules/React.js')
     )[1];
-    var reactCoreVersion = grunt.file.readJSON('./npm-react-core/package.json').version;
+    var npmReactVersion = grunt.file.readJSON('./npm-react/package.json').version;
     var reactToolsVersion = grunt.config.data.pkg.version;
 
     if (reactVersion !== reactToolsVersion) {
@@ -73,11 +73,11 @@ module.exports = function(grunt) {
       );
       return false;
     }
-    if (reactCoreVersion !== reactToolsVersion) {
+    if (npmReactVersion !== reactToolsVersion) {
       grunt.log.error(
-        'react-core version does not match react-tools veersion. Expected %s, saw %s',
+        'npm-react version does not match react-tools veersion. Expected %s, saw %s',
         reactToolsVersion,
-        reactCoreVersion
+        npmReactVersion
       );
       return false;
     }
@@ -98,7 +98,7 @@ module.exports = function(grunt) {
     'version-check',
     'populist:test'
   ]);
-  grunt.registerTask('build:react-core', ['version-check', 'jsx:release', 'react-core:release']);
+  grunt.registerTask('build:npm-react', ['version-check', 'jsx:release', 'react-core:release']);
 
   grunt.registerTask('webdriver-phantomjs', webdriverPhantomJSTask);
 
diff --git a/grunt/tasks/react-core.js b/grunt/tasks/npm-react.js
similarity index 95%
rename from grunt/tasks/react-core.js
rename to grunt/tasks/npm-react.js
index e9abe3b269..683820cf47 100644
--- a/grunt/tasks/react-core.js
+++ b/grunt/tasks/npm-react.js
@@ -2,8 +2,8 @@
 
 var grunt = require('grunt');
 
-var src = 'npm-react-core/';
-var dest = 'build/react-core/';
+var src = 'npm-react/';
+var dest = 'build/npm-react/';
 var modSrc = 'build/modules/';
 var lib = dest + 'lib/';
 
diff --git a/npm-react-core/README.md b/npm-react/README.md
similarity index 100%
rename from npm-react-core/README.md
rename to npm-react/README.md
diff --git a/npm-react-core/ReactJSErrors.js b/npm-react/ReactJSErrors.js
similarity index 100%
rename from npm-react-core/ReactJSErrors.js
rename to npm-react/ReactJSErrors.js
diff --git a/npm-react-core/addons.js b/npm-react/addons.js
similarity index 100%
rename from npm-react-core/addons.js
rename to npm-react/addons.js
diff --git a/npm-react-core/package.json b/npm-react/package.json
similarity index 98%
rename from npm-react-core/package.json
rename to npm-react/package.json
index b37973dcda..412ce34f0d 100644
--- a/npm-react-core/package.json
+++ b/npm-react/package.json
@@ -4,7 +4,7 @@
   "keywords": [
     "react"
   ],
-  "homepage": "https://github.com/facebook/react/tree/master/npm-react-core",
+  "homepage": "https://github.com/facebook/react/tree/master/npm-react",
   "bugs": "https://github.com/facebook/react/issues?labels=react-core",
   "licenses": [
     {
diff --git a/npm-react-core/react.js b/npm-react/react.js
similarity index 100%
rename from npm-react-core/react.js
rename to npm-react/react.js