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.

Sign up for GitHub

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

[Packager] Add "dev" option to CLI #112

Closed
wants to merge 1 commit into from
Closed

[Packager] Add "dev" option to CLI #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion packager/packager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ var options = parseCommandLine([{
}, {
command: 'root',
description: 'add another root(s) to be used by the packager in this project',
}, {
command: 'dev',
default: true,
description: 'produce development packages with extra warnings enabled',
}]);

if (!options.projectRoots) {
Expand Down Expand Up @@ -93,7 +97,7 @@ function openStackFrameInEditor(req, res, next) {

function getAppMiddleware(options) {
return ReactPackager.middleware({
dev: true,
dev: options.dev,
projectRoots: options.projectRoots,
blacklistRE: blacklist(false),
cacheVersion: '2',
Expand Down
17 changes: 11 additions & 6 deletions packager/react-packager/src/Packager/Package.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,17 @@ Package.prototype.finalize = function(options) {
Object.seal(this._modules);
};

Package.prototype.getSource = function() {
return this._source || (
this._source = _.pluck(this._modules, 'transformedCode').join('\n') + '\n' +
'RAW_SOURCE_MAP = ' + JSON.stringify(this.getSourceMap({excludeSource: true})) +
';\n' + '\/\/@ sourceMappingURL=' + this._sourceMapUrl
);
Package.prototype.getSource = function(options) {
if (!this._source) {
options = options || {};
this._source = _.pluck(this._modules, 'transformedCode').join('\n');
if (options.inlineSourceMap) {
var sourceMap = this.getSourceMap({excludeSource: true});
this._source += '\nRAW_SOURCE_MAP = ' + JSON.stringify(sourceMap) + ';';
}
this._source += '\n\/\/@ sourceMappingURL=' + this._sourceMapUrl;
}
return this._source;
};

Package.prototype.getSourceMap = function(options) {
Expand Down
4 changes: 2 additions & 2 deletions packager/react-packager/src/Packager/__tests__/Package-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ describe('Package', function() {
ppackage.addModule('transformed foo;', 'source foo', 'foo path');
ppackage.addModule('transformed bar;', 'source bar', 'bar path');
ppackage.finalize({});
expect(ppackage.getSource()).toBe([
expect(ppackage.getSource({inlineSourceMap: true})).toBe([
'transformed foo;',
'transformed bar;',
'RAW_SOURCE_MAP = "test-source-map";',
Expand All @@ -38,7 +38,7 @@ describe('Package', function() {
ppackage.addModule('transformed bar;', 'source bar', 'bar path');
ppackage.setMainModuleId('foo');
ppackage.finalize({runMainModule: true});
expect(ppackage.getSource()).toBe([
expect(ppackage.getSource({inlineSourceMap: true})).toBe([
'transformed foo;',
'transformed bar;',
';require("foo");',
Expand Down
9 changes: 6 additions & 3 deletions packager/react-packager/src/Server/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ var validateOpts = declareOpts({

function Server(options) {
var opts = validateOpts(options);
this._dev = opts.dev;
this._projectRoots = opts.projectRoots;
this._packages = Object.create(null);
this._packager = new Packager(opts);
Expand All @@ -69,13 +70,14 @@ Server.prototype._onFileChange = function(type, filepath, root) {
};

Server.prototype._rebuildPackages = function() {
var dev = this._dev;
var buildPackage = this._buildPackage.bind(this);
var packages = this._packages;
Object.keys(packages).forEach(function(key) {
var options = getOptionsFromPath(url.parse(key).pathname);
packages[key] = buildPackage(options).then(function(p) {
// Make a throwaway call to getSource to cache the source string.
p.getSource();
p.getSource({inlineSourceMap: dev});
return p;
});
});
Expand Down Expand Up @@ -154,12 +156,13 @@ Server.prototype.processRequest = function(req, res, next) {

var startReqEventId = Activity.startEvent('request:' + req.url);
var options = getOptionsFromPath(url.parse(req.url).pathname);
var building = this._packages[req.url] || this._buildPackage(options)
var building = this._packages[req.url] || this._buildPackage(options);
this._packages[req.url] = building;
var dev = this._dev;
building.then(
function(p) {
if (requestType === 'bundle') {
res.end(p.getSource());
res.end(p.getSource({inlineSourceMap: dev}));
Activity.endEvent(startReqEventId);
} else if (requestType === 'map') {
res.end(JSON.stringify(p.getSourceMap()));
Expand Down