From 5977f494fc6ab09527eb5492eb21fce3fdb9533d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Bigio?= Date: Fri, 16 Oct 2015 13:25:14 -0700 Subject: [PATCH] Allow user to configure transformer through cl argument Reviewed By: frantic Differential Revision: D2547435 fb-gh-sync-id: 77016ee5beba854a4cb58e9ac04b91a7dd76cf3e --- local-cli/generator/templates/rn-cli.config.js | 4 ---- packager/rn-cli.config.js | 4 ---- private-cli/src/bundle/bundle.js | 7 ++++++- private-cli/src/dependencies/dependencies.js | 7 ++++++- private-cli/src/server/server.js | 2 +- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/local-cli/generator/templates/rn-cli.config.js b/local-cli/generator/templates/rn-cli.config.js index b3aebb7bd..18e2e9269 100644 --- a/local-cli/generator/templates/rn-cli.config.js +++ b/local-cli/generator/templates/rn-cli.config.js @@ -14,10 +14,6 @@ var config = { getBlacklistRE(platform) { return blacklist(platform); - }, - - getTransformModulePath() { - return require.resolve('./node_modules/react-native/packager/transformer'); } }; diff --git a/packager/rn-cli.config.js b/packager/rn-cli.config.js index 760f1e874..f0f856802 100644 --- a/packager/rn-cli.config.js +++ b/packager/rn-cli.config.js @@ -21,10 +21,6 @@ module.exports = { return blacklist(''); }, - getTransformModulePath() { - return require.resolve('./transformer'); - }, - _getRoots() { // match on either path separator if (__dirname.match(/node_modules[\/\\]react-native[\/\\]packager$/)) { diff --git a/private-cli/src/bundle/bundle.js b/private-cli/src/bundle/bundle.js index 0ee55347c..9ea1aa93d 100644 --- a/private-cli/src/bundle/bundle.js +++ b/private-cli/src/bundle/bundle.js @@ -36,6 +36,11 @@ function _bundle(argv, config, resolve, reject) { description: 'Either "ios" or "android"', type: 'string', required: true, + }, { + command: 'transformer', + description: 'Specify a custom transformer to be used (absolute path)', + type: 'string', + default: require.resolve('../../../packager/transformer'), }, { command: 'dev', description: 'If false, warnings are disabled and the bundle is minified', @@ -64,7 +69,7 @@ function _bundle(argv, config, resolve, reject) { projectRoots: config.getProjectRoots(), assetRoots: config.getAssetRoots(), blacklistRE: config.getBlacklistRE(args.platform), - transformModulePath: config.getTransformModulePath(), + transformModulePath: args.transformer, }; const requestOpts = { diff --git a/private-cli/src/dependencies/dependencies.js b/private-cli/src/dependencies/dependencies.js index 1775b2697..893a8ce6d 100644 --- a/private-cli/src/dependencies/dependencies.js +++ b/private-cli/src/dependencies/dependencies.js @@ -39,6 +39,11 @@ function _dependencies(argv, config, resolve, reject) { command: 'platform', description: 'The platform extension used for selecting modules', type: 'string', + }, { + command: 'transformer', + type: 'string', + default: require.resolve('../../../packager/transformer'), + description: 'Specify a custom transformer to be used (absolute path)' } ], argv); @@ -51,7 +56,7 @@ function _dependencies(argv, config, resolve, reject) { projectRoots: config.getProjectRoots(), assetRoots: config.getAssetRoots(), blacklistRE: config.getBlacklistRE(args.platform), - transformModulePath: config.getTransformModulePath(), + transformModulePath: args.transformer, }; const relativePath = packageOpts.projectRoots.map(root => diff --git a/private-cli/src/server/server.js b/private-cli/src/server/server.js index 1fe438e57..cd0bb49f0 100644 --- a/private-cli/src/server/server.js +++ b/private-cli/src/server/server.js @@ -48,7 +48,7 @@ function _server(argv, config, resolve, reject) { }, { command: 'transformer', type: 'string', - default: config.getTransformModulePath(), + default: require.resolve('../../../packager/transformer'), description: 'Specify a custom transformer to be used (absolute path)' }, { command: 'resetCache',