Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Multiple addons packages #4185

Merged
merged 2 commits into from
Jul 2, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,10 @@ module.exports = function(grunt) {
var npmReactDOMTasks = require('./grunt/tasks/npm-react-dom');
grunt.registerTask('npm-react-dom:pack', npmReactDOMTasks.packRelease);

var npmReactAddonsTasks = require('./grunt/tasks/npm-react-addons');
grunt.registerTask('npm-react-addons:release', npmReactAddonsTasks.buildReleases);
grunt.registerTask('npm-react-addons:pack', npmReactAddonsTasks.packReleases);

var gemReactSourceTasks = require('./grunt/tasks/gem-react-source');
grunt.registerTask('gem-react-source:release', gemReactSourceTasks.buildRelease);
grunt.registerTask('gem-react-source:pack', gemReactSourceTasks.packRelease);
Expand Down Expand Up @@ -228,6 +232,8 @@ module.exports = function(grunt) {
'npm-react-tools:release',
'npm-react-tools:pack',
'npm-react-dom:pack',
'npm-react-addons:release',
'npm-react-addons:pack',
'compare_size',
]);

Expand Down
114 changes: 114 additions & 0 deletions grunt/tasks/npm-react-addons.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
'use strict';

var assign = require('object-assign');
var fs = require('fs');
var grunt = require('grunt');
var path = require('path');

var addons = {
CSSTransitionGroup: {
module: 'ReactCSSTransitionGroup',
name: 'css-transition-group',
},
LinkedStateMixin: {
module: 'LinkedStateMixin',
name: 'linked-state-mixin',
},
PureRenderMixin: {
module: 'ReactComponentWithPureRenderMixin',
name: 'pure-render-mixin',
},
TransitionGroup: {
module: 'ReactTransitionGroup',
name: 'transition-group',
},
batchedUpdates: {
module: 'ReactUpdates',
method: 'batchedUpdates',
name: 'batched-updates',
},
cloneWithProps: {
module: 'cloneWithProps',
name: 'clone-with-props',
},
createFragment: {
module: 'ReactFragment',
method: 'create',
name: 'create-fragment',
},
shallowCompare: {
module: 'shallowCompare',
name: 'shallow-compare',
},
updates: {
module: 'updates',
name: 'updates',
},
};

function generateSource(info) {
var pieces = [
"module.exports = require('react/lib/",
info.module,
"')",
];
if (info.method) {
pieces.push('.', info.method);
}
pieces.push(';');
return pieces.join('');
}

function buildReleases() {
var pkgTemplate = grunt.file.readJSON('./packages/react-addons/package.json');
// var done = this.async();
Object.keys(addons).map(function(k) {
var info = addons[k];
var pkgName = 'react-addons-' + info.name;
var destDir = 'build/packages/' + pkgName;

var pkgData = assign({}, pkgTemplate);
pkgData.name = pkgName;

grunt.file.mkdir(destDir);
fs.writeFileSync(path.join(destDir, 'index.js'), generateSource(info));
fs.writeFileSync(path.join(destDir, 'package.json'), JSON.stringify(pkgData, null, 2));

// TODO: Make a readme. Consider using a template and sticking it in the original source directory. Also, maybe a license, patents file.
});
// done();
}

function packReleases() {
var done = this.async();
var count = 0;

var addonKeys = Object.keys(addons);

addonKeys.forEach(function(k) {
var info = addons[k];
var pkgName = 'react-addons-' + info.name;
var pkgDir = 'build/packages/' + pkgName;

var spawnCmd = {
cmd: 'npm',
args: ['pack', pkgDir],
};
grunt.util.spawn(spawnCmd, function() {
var buildSrc = pkgName + '-' + grunt.config.data.pkg.version + '.tgz';
var buildDest = 'build/packages/' + pkgName + '.tgz';
fs.rename(buildSrc, buildDest, maybeDone);
});
});

function maybeDone() {
if (++count === addonKeys.length) {
done();
}
}
}

module.exports = {
buildReleases: buildReleases,
packReleases: packReleases,
};
4 changes: 4 additions & 0 deletions grunt/tasks/version-check.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,15 @@ var reactVersionExp = /\bReact\.version\s*=\s*['"]([^'"]+)['"];/;
module.exports = function() {
var pkgVersion = grunt.config.data.pkg.version;

var addonsData = grunt.file.readJSON('./packages/react-addons/package.json');
var versions = {
'packages/react/package.json':
grunt.file.readJSON('./packages/react/package.json').version,
'packages/react-dom/package.json':
grunt.file.readJSON('./packages/react-dom/package.json').version,
'packages/react-addons/package.json (version)': addonsData.version,
// Get the "version" without the range bit
'packages/react-addons/package.json (react dependency)': addonsData.peerDependencies.react.slice(1),
'src/React.js': reactVersionExp.exec(grunt.file.read('./src/React.js'))[1],
};

Expand Down
9 changes: 9 additions & 0 deletions packages/react-addons/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"name": "react-addons",
"version": "0.14.0-alpha3",
"main": "index.js",
"license": "BSD-3-Clause",
"peerDependencies": {
"react": "^0.14.0-alpha3"
}
}
2 changes: 0 additions & 2 deletions src/addons/ReactWithAddons.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ var ReactTransitionGroup = require('ReactTransitionGroup');
var ReactUpdates = require('ReactUpdates');

var cloneWithProps = require('cloneWithProps');
var renderSubtreeIntoContainer = require('renderSubtreeIntoContainer');
var shallowCompare = require('shallowCompare');
var update = require('update');

Expand All @@ -41,7 +40,6 @@ React.addons = {
batchedUpdates: ReactUpdates.batchedUpdates,
cloneWithProps: cloneWithProps,
createFragment: ReactFragment.create,
renderSubtreeIntoContainer: renderSubtreeIntoContainer,
shallowCompare: shallowCompare,
update: update,
};
Expand Down
2 changes: 2 additions & 0 deletions src/renderers/dom/ReactDOMClient.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ var ReactPerf = require('ReactPerf');
var ReactReconciler = require('ReactReconciler');

var findDOMNode = require('findDOMNode');
var renderSubtreeIntoContainer = require('renderSubtreeIntoContainer');
var warning = require('warning');

ReactDefaultInjection.inject();
Expand All @@ -34,6 +35,7 @@ var React = {
findDOMNode: findDOMNode,
render: render,
unmountComponentAtNode: ReactMount.unmountComponentAtNode,
_renderSubtreeIntoContainer: renderSubtreeIntoContainer,
};

// Inject the runtime into a devtools global hook regardless of browser.
Expand Down