make source extensions configurable in rn-cli.config.js

local-cli/bundle/buildBundle.js

@@ -19,6 +19,7 @@ const outputBundle = require('./output/bundle');
 const path = require('path');
 const saveAssets = require('./saveAssets');
 const defaultAssetExts = require('../../packager/defaults').assetExts;
+const defaultSourceExts = require('../../packager/defaults').sourceExts;
 const defaultPlatforms = require('../../packager/defaults').platforms;
 const defaultProvidesModuleNodeModules = require('../../packager/defaults').providesModuleNodeModules;
 
@@ -59,6 +60,7 @@ function buildBundle(
   var shouldClosePackager = false;
   if (!packagerInstance) {
     const assetExts = (config.getAssetExts && config.getAssetExts()) || [];
+    const sourceExts = (config.getSourceExts && config.getSourceExts()) || [];
     const platforms = (config.getPlatforms && config.getPlatforms()) || [];
 
     const transformModulePath =
@@ -81,6 +83,7 @@ function buildBundle(
       providesModuleNodeModules: providesModuleNodeModules,
       resetCache: args.resetCache,
       reporter: new TerminalReporter(),
+      sourceExts: defaultSourceExts.concat(sourceExts),
       transformModulePath: transformModulePath,
       watch: false,
     };

local-cli/core/default.config.js

@@ -91,6 +91,9 @@ const config: ConfigT = {
   getAssetExts() {
     return [];
   },
+  getSourceExts() {
+    return [];
+  },
   getPlatforms() {
     return [];
   },

local-cli/core/index.js

@@ -29,6 +29,13 @@ export type ConfigT = {
    * from here and use `require('./fonts/example.ttf')` inside your app.
    */
   getAssetExts?: () => Array<string>,
+  /**
+   * Specify any additional source file extentions to be used by the packager.
+   * For example, if you want to include a .ts file, you would return ['ts']
+   * from here and use `require('./module/example')` to require the file with
+   * path 'module/example.ts' inside your app.
+   */
+  getSourceExts?: () => Array<string>,
   /**
    * Specify any additional platforms to be used by the packager.
    * For example, if you want to add a "custom" platform, and use modules
@@ -54,6 +61,7 @@ export type ConfigT = {
   getBlacklistRE(): RegExp,
   getProjectRoots(): Array<string>,
   getAssetExts(): Array<string>,
+  getSourceExts(): Array<string>,
   /**
    * Returns an array of project commands used by the CLI to load
    */

local-cli/server/runServer.js

@@ -17,6 +17,7 @@ const connect = require('connect');
 const copyToClipBoardMiddleware = require('./middleware/copyToClipBoardMiddleware');
 const cpuProfilerMiddleware = require('./middleware/cpuProfilerMiddleware');
 const defaultAssetExts = require('../../packager/defaults').assetExts;
+const defaultSourceExts = require('../../packager/defaults').sourceExts;
 const defaultPlatforms = require('../../packager/defaults').platforms;
 const defaultProvidesModuleNodeModules = require('../../packager/defaults').providesModuleNodeModules;
 const getDevToolsMiddleware = require('./middleware/getDevToolsMiddleware');
@@ -100,6 +101,7 @@ function getPackagerServer(args, config) {
     providesModuleNodeModules: providesModuleNodeModules,
     reporter: new TerminalReporter(),
     resetCache: args.resetCache,
+    sourceExts: defaultSourceExts.concat(args.sourceExts),
     transformModulePath: transformModulePath,
     verbose: args.verbose,
     watch: !args.nonPersistent,

local-cli/server/server.js

@@ -91,6 +91,11 @@ module.exports = {
     description: 'Specify any additional asset extentions to be used by the packager',
     parse: (val) => val.split(','),
     default: (config) => config.getAssetExts(),
+  }, {
+    command: '--sourceExts [list]',
+    description: 'Specify any additional source extentions to be used by the packager',
+    parse: (val) => val.split(','),
+    default: (config) => config.getSourceExts(),
   }, {
     command: '--platforms [list]',
     description: 'Specify any additional platforms to be used by the packager',

packager/defaults.js

@@ -17,6 +17,8 @@ exports.assetExts =  [
   'html', 'pdf', // Document formats
 ];
 
+exports.sourceExts = ['js', 'json'];
+
 exports.moduleSystem = require.resolve('./src/Resolver/polyfills/require.js');
 
 exports.platforms = ['ios', 'android', 'windows', 'web'];

packager/rn-cli.config.js

@@ -22,6 +22,10 @@ module.exports = {
     return [];
   },
 
+  getSourceExts() {
+    return [];
+  },
+
   getBlacklistRE() {
     return blacklist();
   },

packager/src/Bundler/__tests__/Bundler-test.js

@@ -39,6 +39,7 @@ var commonOptions = {
   extraNodeModules: {},
   platforms: defaults.platforms,
   resetCache: false,
+  sourceExts: defaults.sourceExts,
   watch: false,
 };
 

packager/src/Bundler/index.js

@@ -79,6 +79,7 @@ type Options = {
   providesModuleNodeModules?: Array<string>,
   reporter: Reporter,
   resetCache: boolean,
+  sourceExts: Array<string>,
   transformModulePath?: string,
   transformTimeoutInterval: ?number,
   watch: boolean,
@@ -161,6 +162,7 @@ class Bundler {
       providesModuleNodeModules: opts.providesModuleNodeModules,
       reporter: opts.reporter,
       resetCache: opts.resetCache,
+      sourceExts: opts.sourceExts,
       transformCacheKey,
       transformCode:
         (module, code, transformCodeOptions) => this._transformer.transformFile(

packager/src/ModuleGraph/node-haste/node-haste.js

@@ -32,6 +32,7 @@ const defaults = require('../../../defaults');
 
 type ResolveOptions = {|
   assetExts: Extensions,
+  sourceExts: Extensions,
   extraNodeModules: {[id: string]: string},
   transformedFiles: {[path: Path]: TransformedFile},
 |};
@@ -43,6 +44,7 @@ exports.createResolveFn = function(options: ResolveOptions): ResolveFn {
     assetExts,
     extraNodeModules,
     transformedFiles,
+    sourceExts,
   } = options;
   const files = Object.keys(transformedFiles);
   const getTransformedFile =
@@ -61,7 +63,7 @@ exports.createResolveFn = function(options: ResolveOptions): ResolveFn {
     getTransformedFile,
   );
   const hasteMap = new HasteMap({
-    extensions: ['js', 'json'],
+    extensions: sourceExts,
     files,
     helpers,
     moduleCache,
@@ -86,6 +88,7 @@ exports.createResolveFn = function(options: ResolveOptions): ResolveFn {
         platform,
         platforms,
         preferNativePlatform: true,
+        sourceExts,
       });
     }
 

packager/src/Resolver/index.js

@@ -41,6 +41,7 @@ type Options = {
   providesModuleNodeModules?: Array<string>,
   reporter: Reporter,
   resetCache: boolean,
+  sourceExts: Array<string>,
   transformCacheKey: string,
   transformCode: TransformCode,
   watch?: boolean,
@@ -73,6 +74,7 @@ class Resolver {
       reporter: opts.reporter,
       resetCache: opts.resetCache,
       roots: opts.projectRoots,
+      sourceExts: opts.sourceExts,
       transformCacheKey: opts.transformCacheKey,
       transformCode: opts.transformCode,
       watch: opts.watch || false,

packager/src/Server/index.js

@@ -69,6 +69,7 @@ type Options = {
   reporter: Reporter,
   resetCache?: boolean,
   silent?: boolean,
+  sourceExts?: Array<string>,
   transformModulePath?: string,
   transformTimeoutInterval?: number,
   watch?: boolean,
@@ -185,6 +186,7 @@ class Server {
     reporter: Reporter,
     resetCache: boolean,
     silent: boolean,
+    sourceExts: Array<string>,
     transformModulePath: ?string,
     transformTimeoutInterval: ?number,
     watch: boolean,
@@ -218,6 +220,7 @@ class Server {
       reporter: options.reporter,
       resetCache: options.resetCache || false,
       silent: options.silent || false,
+      sourceExts: options.sourceExts || defaults.sourceExts,
       transformModulePath: options.transformModulePath,
       transformTimeoutInterval: options.transformTimeoutInterval,
       watch: options.watch || false,

packager/src/node-haste/DependencyGraph/ResolutionRequest.js

@@ -41,6 +41,7 @@ type Options = {
   platform: string,
   platforms: Set<string>,
   preferNativePlatform: boolean,
+  sourceExts: Array<string>,
 };
 
 class ResolutionRequest {
@@ -55,6 +56,7 @@ class ResolutionRequest {
   _platform: string;
   _platforms: Set<string>;
   _preferNativePlatform: boolean;
+  _sourceExts: Array<string>;
   static emptyModule: string;
 
   constructor({
@@ -68,6 +70,7 @@ class ResolutionRequest {
     platform,
     platforms,
     preferNativePlatform,
+    sourceExts,
   }: Options) {
     this._dirExists = dirExists;
     this._entryPath = entryPath;
@@ -79,6 +82,7 @@ class ResolutionRequest {
     this._platform = platform;
     this._platforms = platforms;
     this._preferNativePlatform = preferNativePlatform;
+    this._sourceExts = sourceExts;
     this._resetResolutionCache();
   }
 
@@ -417,17 +421,27 @@ class ResolutionRequest {
       let file;
       if (this._hasteFS.exists(potentialModulePath)) {
         file = potentialModulePath;
-      } else if (this._platform != null &&
-                 this._hasteFS.exists(potentialModulePath + '.' + this._platform + '.js')) {
-        file = potentialModulePath + '.' + this._platform + '.js';
-      } else if (this._preferNativePlatform &&
-                 this._hasteFS.exists(potentialModulePath + '.native.js')) {
-        file = potentialModulePath + '.native.js';
-      } else if (this._hasteFS.exists(potentialModulePath + '.js')) {
-        file = potentialModulePath + '.js';
       } else if (this._hasteFS.exists(potentialModulePath + '.json')) {
         file = potentialModulePath + '.json';
       } else {
+        for (let i = 0; i < this._sourceExts.length; i++) {
+          const ext = this._sourceExts[i];
+          if (this._platform != null &&
+                    this._hasteFS.exists(potentialModulePath + '.' + this._platform + '.' + ext)) {
+            file = potentialModulePath + '.' + this._platform + '.' + ext;
+            break;
+          } else if (this._preferNativePlatform &&
+                    this._hasteFS.exists(potentialModulePath + '.native.' + ext)) {
+            file = potentialModulePath + '.native.' + ext;
+            break;
+          } else if (this._hasteFS.exists(potentialModulePath + '.' + ext)) {
+            file = potentialModulePath + '.' + ext;
+            break;
+          }
+        }
+      }
+
+      if (file === undefined) {
         throw new UnableToResolveError(
           fromModule,
           toModule,

packager/src/node-haste/index.js

@@ -51,7 +51,6 @@ const ERROR_BUILDING_DEP_GRAPH = 'DependencyGraphError';
 class DependencyGraph {
   _opts: {|
     assetExts: Array<string>,
-    extensions: Array<string>,
     extraNodeModules: ?Object,
     forceNodeFilesystemAPI: boolean,
     globalTransformCache: ?GlobalTransformCache,
@@ -65,6 +64,7 @@ class DependencyGraph {
     resetCache: boolean,
     roots: Array<string>,
     shouldThrowOnUnresolvedErrors: () => boolean,
+    sourceExts: Array<string>,
     transformCacheKey: string,
     transformCode: TransformCode,
     useWatchman: boolean,
@@ -86,7 +86,6 @@ class DependencyGraph {
     assetDependencies,
     assetExts,
     cache,
-    extensions,
     extraNodeModules,
     forceNodeFilesystemAPI,
     globalTransformCache,
@@ -100,6 +99,7 @@ class DependencyGraph {
     resetCache,
     roots,
     shouldThrowOnUnresolvedErrors = () => true,
+    sourceExts,
     transformCacheKey,
     transformCode,
     useWatchman,
@@ -109,7 +109,6 @@ class DependencyGraph {
     assetDependencies: Array<string>,
     assetExts: Array<string>,
     cache: Cache,
-    extensions?: ?Array<string>,
     extraNodeModules: ?Object,
     forceNodeFilesystemAPI?: boolean,
     globalTransformCache: ?GlobalTransformCache,
@@ -123,6 +122,7 @@ class DependencyGraph {
     resetCache: boolean,
     roots: Array<string>,
     shouldThrowOnUnresolvedErrors?: () => boolean,
+    sourceExts: Array<string>,
     transformCacheKey: string,
     transformCode: TransformCode,
     useWatchman?: ?boolean,
@@ -131,7 +131,6 @@ class DependencyGraph {
   }) {
     this._opts = {
       assetExts: assetExts || [],
-      extensions: extensions || ['js', 'json'],
       extraNodeModules,
       forceNodeFilesystemAPI: !!forceNodeFilesystemAPI,
       globalTransformCache,
@@ -147,6 +146,7 @@ class DependencyGraph {
       resetCache,
       roots,
       shouldThrowOnUnresolvedErrors,
+      sourceExts,
       transformCacheKey,
       transformCode,
       useWatchman: useWatchman !== false,
@@ -167,7 +167,7 @@ class DependencyGraph {
 
     const mw = this._opts.maxWorkers;
     this._haste = new JestHasteMap({
-      extensions: this._opts.extensions.concat(this._opts.assetExts),
+      extensions: this._opts.sourceExts.concat(this._opts.assetExts),
       forceNodeFilesystemAPI: this._opts.forceNodeFilesystemAPI,
       ignorePattern: {test: this._opts.ignoreFilePath},
       maxWorkers: typeof mw === 'number' && mw >= 1 ? mw : getMaxWorkers(),
@@ -213,7 +213,7 @@ class DependencyGraph {
 
       this._hasteMap = new HasteMap({
         files: hasteFSFiles,
-        extensions: this._opts.extensions,
+        extensions: this._opts.sourceExts,
         moduleCache: this._moduleCache,
         preferNativePlatform: this._opts.preferNativePlatform,
         helpers: this._helpers,
@@ -310,6 +310,7 @@ class DependencyGraph {
         platform,
         platforms: this._opts.platforms,
         preferNativePlatform: this._opts.preferNativePlatform,
+        sourceExts: this._opts.sourceExts,
       });
 
       const response = new ResolutionResponse({transformOptions});