Enable custom source file extensions through cli args or 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;
 
@@ -64,6 +65,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 =
@@ -87,6 +89,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

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

local-cli/core/index.js

@@ -30,6 +30,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
@@ -55,6 +62,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

@@ -16,6 +16,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');
@@ -114,6 +115,7 @@ function getPackagerServer(args, config) {
     providesModuleNodeModules: providesModuleNodeModules,
     reporter: new LogReporter(),
     resetCache: args.resetCache,
+    sourceExts: defaultSourceExts.concat(args.sourceExts),
     transformModulePath: transformModulePath,
     verbose: args.verbose,
     watch: !args.nonPersistent,

local-cli/server/server.js

@@ -70,6 +70,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

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

packager/src/Bundler/index.js

@@ -116,6 +116,7 @@ type Options = {|
   +providesModuleNodeModules?: Array<string>,
   +reporter: Reporter,
   +resetCache: boolean,
+  +sourceExts: Array<string>,
   +transformModulePath?: string,
   +transformTimeoutInterval: ?number,
   +watch: boolean,
@@ -200,6 +201,7 @@ class Bundler {
         opts.providesModuleNodeModules || defaults.providesModuleNodeModules,
       reporter: opts.reporter,
       resetCache: opts.resetCache,
+      sourceExts: opts.sourceExts,
       transformCode:
         (module, code, transformCodeOptions) => this._transformer.transformFile(
           module.path,

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

@@ -33,6 +33,7 @@ const defaults = require('../../../defaults');
 
 type ResolveOptions = {|
   assetExts: Extensions,
+  sourceExts: Extensions,
   extraNodeModules: {[id: string]: string},
   transformedFiles: {[path: Path]: TransformedFile},
 |};
@@ -72,6 +73,7 @@ exports.createResolveFn = function(options: ResolveOptions): ResolveFn {
     assetExts,
     extraNodeModules,
     transformedFiles,
+    sourceExts,
   } = options;
   const files = Object.keys(transformedFiles);
   function getTransformedFile(path) {
@@ -93,7 +95,7 @@ exports.createResolveFn = function(options: ResolveOptions): ResolveFn {
     getTransformedFile,
   );
   const hasteMap = new HasteMap({
-    extensions: ['js', 'json'],
+    extensions: sourceExts,
     files,
     helpers,
     moduleCache,
@@ -119,6 +121,7 @@ exports.createResolveFn = function(options: ResolveOptions): ResolveFn {
         platform,
         platforms,
         preferNativePlatform: true,
+        sourceExts,
       });
     }
 

packager/src/Resolver/index.js

@@ -44,6 +44,7 @@ type Options = {|
   +providesModuleNodeModules: Array<string>,
   +reporter: Reporter,
   +resetCache: boolean,
+  +sourceExts: Array<string>,
   +transformCode: TransformCode,
   +watch: boolean,
 |};
@@ -63,7 +64,6 @@ class Resolver {
   static async load(opts: Options): Promise<Resolver> {
     const depGraphOpts = Object.assign(Object.create(opts), {
       assetDependencies: ['react-native/Libraries/Image/AssetRegistry'],
-      extensions: ['js', 'json'],
       forceNodeFilesystemAPI: false,
       ignoreFilePath(filepath) {
         return filepath.indexOf('__tests__') !== -1 ||

packager/src/Server/index.js

@@ -73,6 +73,7 @@ type Options = {
   reporter: Reporter,
   resetCache?: boolean,
   silent?: boolean,
+  sourceExts?: Array<string>,
   transformModulePath?: string,
   transformTimeoutInterval?: number,
   watch?: boolean,
@@ -144,6 +145,7 @@ class Server {
     reporter: Reporter,
     resetCache: boolean,
     silent: boolean,
+    sourceExts: Array<string>,
     transformModulePath: void | string,
     transformTimeoutInterval: ?number,
     watch: boolean,
@@ -179,6 +181,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

@@ -71,6 +71,7 @@ type Options<TModule, TPackage> = {|
   +platform: ?string,
   +platforms: Set<string>,
   +preferNativePlatform: boolean,
+  +sourceExts: Array<string>,
 |};
 
 /**
@@ -102,6 +103,7 @@ class ResolutionRequest<TModule: Moduleish, TPackage: Packageish> {
   _platform: ?string;
   _platforms: Set<string>;
   _preferNativePlatform: boolean;
+  _sourceExts: Array<string>;
   static emptyModule: string;
 
   constructor({
@@ -116,6 +118,7 @@ class ResolutionRequest<TModule: Moduleish, TPackage: Packageish> {
     platform,
     platforms,
     preferNativePlatform,
+    sourceExts,
   }: Options<TModule, TPackage>) {
     this._dirExists = dirExists;
     this._entryPath = entryPath;
@@ -128,6 +131,7 @@ class ResolutionRequest<TModule: Moduleish, TPackage: Packageish> {
     this._platform = platform;
     this._platforms = platforms;
     this._preferNativePlatform = preferNativePlatform;
+    this._sourceExts = sourceExts;
     this._resetResolutionCache();
   }
 
@@ -559,22 +563,32 @@ class ResolutionRequest<TModule: Moduleish, TPackage: Packageish> {
     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 {
-      throw new UnableToResolveError(
-        fromModule,
-        toModule,
-        `File ${potentialModulePath} doesn't exist`,
-      );
+      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,
+          `File ${potentialModulePath} doesn't exist`,
+        );
+      }
     }
 
     return this._moduleCache.getModule(file);

packager/src/node-haste/__tests__/DependencyGraph-test.js

@@ -72,7 +72,7 @@ describe('DependencyGraph', function() {
     emptyTransformOptions = {transformer: {transform: {}}};
     defaults = {
       assetExts: ['png', 'jpg'],
-      extensions: ['js', 'json'],
+      sourceExts: ['js', 'json'],
       forceNodeFilesystemAPI: true,
       providesModuleNodeModules: [
         'haste-fbjs',
@@ -5250,7 +5250,7 @@ describe('DependencyGraph', function() {
       var dgraph = DependencyGraph.load({
         ...defaults,
         roots: [root],
-        extensions: ['jsx', 'coffee'],
+        sourceExts: ['jsx', 'coffee'],
       });
 
       return dgraph
@@ -5284,6 +5284,83 @@ describe('DependencyGraph', function() {
           ]);
         });
     });
+    it('supports custom file extensions with relative paths', () => {
+      var root = '/root';
+      setMockFileSystem({
+        'root': {
+          'index.jsx': [
+            'require("./a")',
+          ].join('\n'),
+          'a.coffee': [
+          ].join('\n'),
+          'X.js': '',
+        },
+      });
+
+      var dgraph = DependencyGraph.load({
+        ...defaults,
+        roots: [root],
+        sourceExts: ['jsx', 'coffee'],
+      });
+
+      return dgraph
+        .then(dg => dg.matchFilesByPattern('.*'))
+        .then(files => {
+          expect(files).toEqual([
+            '/root/index.jsx', '/root/a.coffee',
+          ]);
+        })
+        .then(() => getOrderedDependenciesAsJSON(dgraph, '/root/index.jsx'))
+        .then(deps => {
+          expect(deps).toEqual([
+            {
+              dependencies: ['./a'],
+              id: '/root/index.jsx',
+              isAsset: false,
+              isJSON: false,
+              isPolyfill: false,
+              path: '/root/index.jsx',
+              resolution: undefined,
+            },
+            {
+              dependencies: [],
+              id: '/root/a.coffee',
+              isAsset: false,
+              isJSON: false,
+              isPolyfill: false,
+              path: '/root/a.coffee',
+              resolution: undefined,
+            },
+          ]);
+        });
+    });
+
+    it('does not support custom extensious without sourceExts', (done) => {
+      var root = '/root';
+      setMockFileSystem({
+        'root': {
+          'index.jsx': [
+            'require("./a")',
+          ].join('\n'),
+          'a.coffee': [
+          ].join('\n'),
+          'X.js': '',
+        },
+      });
+
+      var dgraph = DependencyGraph.load({
+        ...defaults,
+        roots: [root],
+      });
+
+      dgraph
+        .then(dg => dg.matchFilesByPattern('.*'))
+        .then(files => {
+          expect(files).toEqual(['/root/X.js']);
+        })
+        .then(() => getOrderedDependenciesAsJSON(dgraph, '/root/index.jsx'))
+        .catch(done);
+    });
   });
 
   describe('Progress updates', () => {