Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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 local-cli/bundle/buildBundle.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,16 @@ function buildBundle(args, config, output = outputBundle, packagerInstance) {
process.env.NODE_ENV = args.dev ? 'development' : 'production';
}

const transformModulePath = args.transformer ?
path.resolve(args.transformer) :
config.getTransformModulePath();

const options = {
projectRoots: config.getProjectRoots(),
assetRoots: config.getAssetRoots(),
blacklistRE: config.getBlacklistRE(args.platform),
getTransformOptionsModulePath: config.getTransformOptionsModulePath,
transformModulePath: path.resolve(args.transformer),
transformModulePath: transformModulePath,
extraNodeModules: config.extraNodeModules,
nonPersistent: true,
resetCache: args['reset-cache'],
Expand Down
2 changes: 1 addition & 1 deletion local-cli/bundle/bundleCommandLineArgs.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ module.exports = [
command: 'transformer',
description: 'Specify a custom transformer to be used',
type: 'string',
default: require.resolve('../../packager/transformer'),
default: null,
}, {
command: 'dev',
description: 'If false, warnings are disabled and the bundle is minified',
Expand Down
10 changes: 9 additions & 1 deletion local-cli/default.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,15 @@ var config = {
*/
getBlacklistRE(platform) {
return blacklist(platform);
}
},

/**
* Returns the path to a custom transformer. This can also be overridden
* with the --transformer commandline argument.
*/
getTransformModulePath() {
return require.resolve('../packager/transformer');
},
};

function getRoots() {
Expand Down
8 changes: 6 additions & 2 deletions local-cli/dependencies/dependencies.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ function _dependencies(argv, config, resolve, reject, packagerInstance) {
}, {
command: 'transformer',
type: 'string',
default: require.resolve('../../packager/transformer'),
default: null,
description: 'Specify a custom transformer to be used'
}, {
command: 'verbose',
Expand All @@ -54,12 +54,16 @@ function _dependencies(argv, config, resolve, reject, packagerInstance) {
reject(`File ${rootModuleAbsolutePath} does not exist`);
}

const transformModulePath = args.transformer ?
path.resolve(args.transformer) :
config.getTransformModulePath();

const packageOpts = {
projectRoots: config.getProjectRoots(),
assetRoots: config.getAssetRoots(),
blacklistRE: config.getBlacklistRE(args.platform),
getTransformOptionsModulePath: config.getTransformOptionsModulePath,
transformModulePath: path.resolve(args.transformer),
transformModulePath: transformModulePath,
extraNodeModules: config.extraNodeModules,
verbose: config.verbose,
};
Expand Down
6 changes: 5 additions & 1 deletion local-cli/server/runServer.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,17 @@ function runServer(args, config, readyCallback) {
}

function getPackagerServer(args, config) {
const transformModulePath = args.transformer ?
path.resolve(args.transformer) :
config.getTransformModulePath();

return ReactPackager.createServer({
nonPersistent: args.nonPersistent,
projectRoots: args.projectRoots,
blacklistRE: config.getBlacklistRE(),
cacheVersion: '3',
getTransformOptionsModulePath: config.getTransformOptionsModulePath,
transformModulePath: path.resolve(args.transformer),
transformModulePath: transformModulePath,
extraNodeModules: config.extraNodeModules,
assetRoots: args.assetRoots,
assetExts: [
Expand Down
2 changes: 1 addition & 1 deletion local-cli/server/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ function _server(argv, config, resolve, reject) {
}, {
command: 'transformer',
type: 'string',
default: require.resolve('../../packager/transformer'),
default: null,
description: 'Specify a custom transformer to be used'
}, {
command: 'resetCache',
Expand Down
5 changes: 5 additions & 0 deletions packager/rn-cli.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,9 @@ module.exports = {
return [path.resolve(__dirname, '..')];
}
},

getTransformModulePath() {
return require.resolve('./transformer');
},

};