mirror of
https://github.com/facebook/react.git
synced 2026-11-18 20:15:56 +00:00
Merge pull request #2349 from zpao/update-deps
Update npm dependencies, fix browserify task
This commit is contained in:
commit
58165dfbcd
4 files changed
+49
-48
No files matched your search
+21
-11
@@ -8,7 +8,7 @@ var es3ify = require('es3ify');
|
||||
var grunt = require('grunt');
|
||||
var UglifyJS = require('uglify-js');
|
||||
var uglifyify = require('uglifyify');
|
||||
var _ = require('lodash');
|
||||
var derequire = require('derequire');
|
||||
|
||||
var SIMPLE_TEMPLATE =
|
||||
'/**\n\
|
||||
@@ -58,15 +58,19 @@ var basic = {
|
||||
debug: false,
|
||||
standalone: 'React',
|
||||
transforms: [envify({NODE_ENV: 'development'})],
|
||||
after: [es3ify.transform, simpleBannerify]
|
||||
after: [es3ify.transform, derequire, simpleBannerify]
|
||||
};
|
||||
|
||||
var min = _.merge({}, basic, {
|
||||
var min = {
|
||||
entries: [
|
||||
'./build/modules/React.js'
|
||||
],
|
||||
outfile: './build/react.min.js',
|
||||
debug: false,
|
||||
standalone: 'React',
|
||||
transforms: [envify({NODE_ENV: 'production'}), uglifyify],
|
||||
after: [minify, bannerify]
|
||||
});
|
||||
after: [es3ify.transform, derequire, minify, bannerify]
|
||||
};
|
||||
|
||||
var transformer = {
|
||||
entries:[
|
||||
@@ -75,7 +79,8 @@ var transformer = {
|
||||
outfile: './build/JSXTransformer.js',
|
||||
debug: false,
|
||||
standalone: 'JSXTransformer',
|
||||
after: [es3ify.transform, simpleBannerify]
|
||||
transforms: [],
|
||||
after: [es3ify.transform, derequire, simpleBannerify]
|
||||
};
|
||||
|
||||
var addons = {
|
||||
@@ -85,17 +90,22 @@ var addons = {
|
||||
outfile: './build/react-with-addons.js',
|
||||
debug: false,
|
||||
standalone: 'React',
|
||||
transforms: [envify({NODE_ENV: 'development'})],
|
||||
packageName: 'React (with addons)',
|
||||
after: [es3ify.transform, simpleBannerify]
|
||||
transforms: [envify({NODE_ENV: 'development'})],
|
||||
after: [es3ify.transform, derequire, simpleBannerify]
|
||||
};
|
||||
|
||||
var addonsMin = _.merge({}, addons, {
|
||||
var addonsMin = {
|
||||
entries: [
|
||||
'./build/modules/ReactWithAddons.js'
|
||||
],
|
||||
outfile: './build/react-with-addons.min.js',
|
||||
debug: false,
|
||||
standalone: 'React',
|
||||
packageName: 'React (with addons)',
|
||||
transforms: [envify({NODE_ENV: 'production'}), uglifyify],
|
||||
after: [minify, bannerify]
|
||||
});
|
||||
after: [es3ify.transform, derequire, minify, bannerify]
|
||||
};
|
||||
|
||||
var withCodeCoverageLogging = {
|
||||
entries: [
|
||||
|
||||
@@ -14,50 +14,33 @@ module.exports = function() {
|
||||
// grunt.config.requires('entries');
|
||||
config.transforms = config.transforms || [];
|
||||
config.after = config.after || [];
|
||||
if (typeof config.after === 'function') {
|
||||
config.after = [config.after];
|
||||
}
|
||||
|
||||
// create the bundle we'll work with
|
||||
var entries = grunt.file.expand(config.entries);
|
||||
var bundle = browserify(entries);
|
||||
|
||||
// Make sure the things that need to be exposed are.
|
||||
var requires = config.requires || {};
|
||||
if (requires instanceof Array) {
|
||||
grunt.file.expand({
|
||||
nonull: true, // Keep IDs that don't expand to anything.
|
||||
cwd: "src"
|
||||
}, requires).forEach(function(name) {
|
||||
bundle.require("./build/modules/" + name, {
|
||||
expose: name.replace(/\.js$/i, "")
|
||||
});
|
||||
});
|
||||
} else if (typeof requires === "object") {
|
||||
Object.keys(requires).forEach(function(name) {
|
||||
bundle.require(requires[name], { expose: name });
|
||||
});
|
||||
}
|
||||
|
||||
// Extract other options
|
||||
var options = {
|
||||
entries: entries,
|
||||
debug: config.debug, // sourcemaps
|
||||
standalone: config.standalone // global
|
||||
};
|
||||
|
||||
// TODO: make sure this works, test with this too
|
||||
var bundle = browserify(options);
|
||||
|
||||
config.transforms.forEach(function(transform) {
|
||||
bundle.transform({}, transform);
|
||||
});
|
||||
|
||||
// Actually bundle it up
|
||||
var _this = this;
|
||||
bundle.bundle(options, function(err, src) {
|
||||
bundle.bundle(function(err, buf) {
|
||||
if (err) {
|
||||
grunt.log.error(err);
|
||||
done();
|
||||
return done();
|
||||
}
|
||||
|
||||
var src = buf.toString();
|
||||
|
||||
config.after.forEach(function(fn) {
|
||||
src = fn.call(_this, src);
|
||||
});
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
"node": ">=0.10.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"envify": "^2.0.0"
|
||||
"envify": "^3.0.0"
|
||||
},
|
||||
"browserify": {
|
||||
"transform": ["envify"]
|
||||
|
||||
+20
-12
@@ -28,35 +28,34 @@
|
||||
"dependencies": {
|
||||
"commoner": "^0.10.0",
|
||||
"esprima-fb": "^6001.1.0-dev-harmony-fb",
|
||||
"jstransform": "^6.2.0"
|
||||
"jstransform": "^6.3.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"benchmark": "~1.0.0",
|
||||
"browserify": "^4.1.10",
|
||||
"browserify": "^6.1.0",
|
||||
"coverify": "~1.0.4",
|
||||
"envify": "^2.0.0",
|
||||
"derequire": "^1.2.0",
|
||||
"envify": "^3.0.0",
|
||||
"es3ify": "~0.1.2",
|
||||
"es5-shim": "^4.0.0",
|
||||
"grunt": "~0.4.2",
|
||||
"grunt-cli": "~0.1.9",
|
||||
"grunt-compare-size": "~0.4.0",
|
||||
"grunt-contrib-clean": "~0.5.0",
|
||||
"grunt-contrib-compress": "^0.9.1",
|
||||
"grunt-contrib-clean": "^0.6.0",
|
||||
"grunt-contrib-compress": "^0.12.0",
|
||||
"grunt-contrib-connect": "~0.6.0",
|
||||
"grunt-contrib-copy": "~0.5.0",
|
||||
"grunt-contrib-copy": "^0.6.0",
|
||||
"grunt-contrib-jshint": "^0.10.0",
|
||||
"gzip-js": "~0.3.2",
|
||||
"jasmine-tapreporter": "~0.2.2",
|
||||
"jest-cli": "~0.1.5",
|
||||
"lodash": "~2.4.1",
|
||||
"microtime": "^0.6.0",
|
||||
"optimist": "~0.6.0",
|
||||
"phantomjs": "~1.9",
|
||||
"platform": "^1.1.0",
|
||||
"populist": "~0.1.6",
|
||||
"recast": "^0.6.10",
|
||||
"recast": "^0.7.2",
|
||||
"sauce-tunnel": "~1.1.0",
|
||||
"semver": "^2.3.0",
|
||||
"tmp": "~0.0.18",
|
||||
"uglify-js": "~2.4.0",
|
||||
"uglifyify": "^2.4.0",
|
||||
@@ -77,8 +76,17 @@
|
||||
"rootDir": "",
|
||||
"scriptPreprocessor": "jest/preprocessor.js",
|
||||
"setupEnvScriptFile": "jest/environment.js",
|
||||
"modulePathIgnorePatterns": ["/build/", "/node_modules/", "/.module-cache/"],
|
||||
"testPathIgnorePatterns": ["/build/", "/node_modules/"],
|
||||
"unmockedModulePathPatterns": [""]
|
||||
"modulePathIgnorePatterns": [
|
||||
"/build/",
|
||||
"/node_modules/",
|
||||
"/.module-cache/"
|
||||
],
|
||||
"testPathIgnorePatterns": [
|
||||
"/build/",
|
||||
"/node_modules/"
|
||||
],
|
||||
"unmockedModulePathPatterns": [
|
||||
""
|
||||
]
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user