mirror of
https://github.com/zebrajr/react.git
synced 2026-01-15 12:15:22 +00:00
Move npm-react-core to npm-react, fix tasks accordingly
This commit is contained in:
14
Gruntfile.js
14
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);
|
||||
|
||||
|
||||
@@ -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/';
|
||||
|
||||
@@ -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": [
|
||||
{
|
||||
Reference in New Issue
Block a user