@samitouri / QOS-React-2 / commits / ce0f244c54

Move npm-react-core to npm-react, fix tasks accordingly

Paul O’Shannessy committed Dec 6, 2013 at 12:11 UTC ce0f244c543424192c67607d7900e98189e4b4bb
7 files changed +10 -10
Gruntfile.js
+7 -7
@@ -9,7 +9,7 @@ var webdriverJasmineTasks = require('./grunt/tasks/webdriver-jasmine');
9 var sauceTunnelTask = require('./grunt/tasks/sauce-tunnel');
10 var npmTask = require('./grunt/tasks/npm');
11 var releaseTasks = require('./grunt/tasks/release');
12 -var reactCoreTasks = require('./grunt/tasks/react-core');
12 +var npmReactTasks = require('./grunt/tasks/npm-react');
13
14 module.exports = function(grunt) {
15
@@ -52,7 +52,7 @@ module.exports = function(grunt) {
52
53 grunt.registerMultiTask('npm', npmTask);
54
55 - grunt.registerTask('react-core:release', reactCoreTasks.buildRelease);
55 + grunt.registerTask('npm-react:release', npmReactTasks.buildRelease);
56
57 // Check that the version we're exporting is the same one we expect in the
58 // package. This is not an ideal way to do this, but makes sure that we keep
@@ -62,7 +62,7 @@ module.exports = function(grunt) {
62 var reactVersion = reactVersionExp.exec(
63 grunt.file.read('./build/modules/React.js')
64 )[1];
65 - var reactCoreVersion = grunt.file.readJSON('./npm-react-core/package.json').version;
65 + var npmReactVersion = grunt.file.readJSON('./npm-react/package.json').version;
66 var reactToolsVersion = grunt.config.data.pkg.version;
67
68 if (reactVersion !== reactToolsVersion) {
@@ -73,11 +73,11 @@ module.exports = function(grunt) {
73 );
74 return false;
75 }
76 - if (reactCoreVersion !== reactToolsVersion) {
76 + if (npmReactVersion !== reactToolsVersion) {
77 grunt.log.error(
78 - 'react-core version does not match react-tools veersion. Expected %s, saw %s',
78 + 'npm-react version does not match react-tools veersion. Expected %s, saw %s',
79 reactToolsVersion,
80 - reactCoreVersion
80 + npmReactVersion
81 );
82 return false;
83 }
@@ -98,7 +98,7 @@ module.exports = function(grunt) {
98 'version-check',
99 'populist:test'
100 ]);
101 - grunt.registerTask('build:react-core', ['version-check', 'jsx:release', 'react-core:release']);
101 + grunt.registerTask('build:npm-react', ['version-check', 'jsx:release', 'react-core:release']);
102
103 grunt.registerTask('webdriver-phantomjs', webdriverPhantomJSTask);
104
grunt/tasks/npm-react.js renamed
+2 -2
@@ -2,8 +2,8 @@
2
3 var grunt = require('grunt');
4
5 -var src = 'npm-react-core/';
6 -var dest = 'build/react-core/';
5 +var src = 'npm-react/';
6 +var dest = 'build/npm-react/';
7 var modSrc = 'build/modules/';
8 var lib = dest + 'lib/';
9
npm-react/README.md renamed
npm-react/ReactJSErrors.js renamed
npm-react/addons.js renamed
npm-react/package.json renamed
+1 -1
@@ -4,7 +4,7 @@
4 "keywords": [
5 "react"
6 ],
7 - "homepage": "https://github.com/facebook/react/tree/master/npm-react-core",
7 + "homepage": "https://github.com/facebook/react/tree/master/npm-react",
8 "bugs": "https://github.com/facebook/react/issues?labels=react-core",
9 "licenses": [
10 {
npm-react/react.js renamed