Permalink
Browse files

packager: add support for relative files with custom extensions

Reviewed By: cpojer

Differential Revision: D4994139

fbshipit-source-id: 5e47c5bc6f8b2cd750f1ca0df940c23234c66600
  • Loading branch information...
jeanlauliac authored and facebook-github-bot committed May 4, 2017
1 parent 264d67c commit 4a86f93982ede66a993a72e31cadb85d9bd4b3a3
@@ -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 =
@@ -88,6 +90,7 @@ function buildBundle(
providesModuleNodeModules: providesModuleNodeModules,
resetCache: args.resetCache,
reporter: new TerminalReporter(),
sourceExts: defaultSourceExts.concat(sourceExts),
transformModulePath: transformModulePath,
watch: false,
};
@@ -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');
@@ -93,7 +94,7 @@ function getPackagerServer(args, config) {
// First we let require resolve it, so we can require packages in node_modules
// as expected. eg: require('my-package/reporter');
LogReporter = require(args.customLogReporterPath);
} catch(e) {
} catch (e) {
// If that doesn't work, then we next try relative to the cwd, eg:
// require('./reporter');
LogReporter = require(path.resolve(args.customLogReporterPath));
@@ -116,6 +117,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,
@@ -67,9 +67,14 @@ module.exports = {
default: (config) => config.getProjectRoots(),
}, {
command: '--assetExts [list]',
description: 'Specify any additional asset extentions to be used by the packager',
description: 'Specify any additional asset extensions to be used by the packager',
parse: (val) => val.split(','),
default: (config) => config.getAssetExts(),
}, {
command: '--sourceExts [list]',
description: 'Specify any additional source extensions 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',
View
@@ -28,7 +28,7 @@ import type {HasteImpl} from '../../packager/src/node-haste/Module';
export type ConfigT = {
extraNodeModules: {[id: string]: string},
/**
* Specify any additional asset extentions to be used by the packager.
* Specify any additional asset file extensions to be used by the packager.
* For example, if you want to include a .ttf file, you would return ['ttf']
* from here and use `require('./fonts/example.ttf')` inside your app.
*/
@@ -54,6 +54,15 @@ export type ConfigT = {
* providesModule declarations.
*/
getProvidesModuleNodeModules?: () => Array<string>,
/**
* Specify any additional source file extensions 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>,
/**
* Returns the path to a custom transformer. This can also be overridden
* with the --transformer commandline argument.
@@ -90,6 +99,7 @@ const defaultConfig: ConfigT = {
getPlatforms: () => [],
getProjectRoots: () => [process.cwd()],
getProvidesModuleNodeModules: () => providesModuleNodeModules.slice(),
getSourceExts: () => [],
getTransformModulePath: () => path.resolve(__dirname, '../../packager/transformer'),
getTransformOptions: async () => ({}),
postMinifyProcess: x => x,
View
@@ -10,13 +10,15 @@
*/
'use strict';
exports.assetExts = [
exports.assetExts = [
'bmp', 'gif', 'jpg', 'jpeg', 'png', 'psd', 'svg', 'webp', // Image formats
'm4v', 'mov', 'mp4', 'mpeg', 'mpg', 'webm', // Video formats
'aac', 'aiff', 'caf', 'm4a', 'mp3', 'wav', // Audio formats
'html', 'pdf', // Document formats
];
exports.sourceExts = ['js', 'json'];

This comment has been minimized.

Show comment
Hide comment
@daneharrigan

daneharrigan May 28, 2017

Should 'jsx' be added to this array, or is that better passed as an argument to react-native/local-cli/cli.js start?

@daneharrigan

daneharrigan May 28, 2017

Should 'jsx' be added to this array, or is that better passed as an argument to react-native/local-cli/cli.js start?

exports.moduleSystem = require.resolve('./src/Resolver/polyfills/require.js');
exports.platforms = ['ios', 'android', 'windows', 'web'];
@@ -16,8 +16,8 @@ const Logger = require('./src/Logger');
const debug = require('debug');
const invariant = require('fbjs/lib/invariant');
import type Server from './src/Server';
import type {PostProcessModules, PostMinifyProcess} from './src/Bundler';
import type Server from './src/Server';
import type {GlobalTransformCache} from './src/lib/GlobalTransformCache';
import type {Reporter} from './src/lib/reporting';
import type {HasteImpl} from './src/node-haste/Module';
@@ -33,6 +33,7 @@ type Options = {
postMinifyProcess?: PostMinifyProcess,
projectRoots: Array<string>,
reporter?: Reporter,
+sourceExts: ?Array<string>,
watch?: boolean,
};
@@ -22,6 +22,10 @@ module.exports = {
return [];
},
getSourceExts() {
return [];
},
getBlacklistRE() {
return blacklist();
},
@@ -44,6 +44,7 @@ var commonOptions = {
extraNodeModules: {},
platforms: defaults.platforms,
resetCache: false,
sourceExts: defaults.sourceExts,
watch: false,
};
@@ -132,6 +132,7 @@ type Options = {|
+providesModuleNodeModules?: Array<string>,
+reporter: Reporter,
+resetCache: boolean,
+sourceExts: Array<string>,
+transformModulePath?: string,
+transformTimeoutInterval: ?number,
+watch: boolean,
@@ -217,6 +218,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,
@@ -34,6 +34,7 @@ const defaults = require('../../../defaults');
type ResolveOptions = {|
assetExts: Extensions,
extraNodeModules: {[id: string]: string},
+sourceExts: Extensions,
transformedFiles: {[path: Path]: TransformedCodeFile},
|};
@@ -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,
});
}
@@ -46,6 +46,7 @@ type Options = {|
+providesModuleNodeModules: Array<string>,
+reporter: Reporter,
+resetCache: boolean,
+sourceExts: Array<string>,
+transformCode: TransformCode,
+watch: boolean,
|};
@@ -67,7 +68,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 ||
@@ -74,6 +74,7 @@ type Options = {
reporter: Reporter,
resetCache?: boolean,
silent?: boolean,
+sourceExts: ?Array<string>,
transformModulePath?: string,
transformTimeoutInterval?: number,
watch?: boolean,
@@ -129,6 +130,7 @@ class Server {
reporter: Reporter,
resetCache: boolean,
silent: boolean,
+sourceExts: Array<string>,
transformModulePath: void | string,
transformTimeoutInterval: ?number,
watch: boolean,
@@ -166,6 +168,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,
@@ -71,6 +71,7 @@ type Options<TModule, TPackage> = {|
+platform: ?string,
+platforms: Set<string>,
+preferNativePlatform: boolean,
+sourceExts: Array<string>,
|};
/**
@@ -528,22 +529,39 @@ class ResolutionRequest<TModule: Moduleish, TPackage: Packageish> {
let file;
if (this._options.hasteFS.exists(potentialModulePath)) {
file = potentialModulePath;
} else if (this._options.platform != null &&
this._options.hasteFS.exists(potentialModulePath + '.' + this._options.platform + '.js')) {
file = potentialModulePath + '.' + this._options.platform + '.js';
} else if (this._preferNativePlatform &&
this._options.hasteFS.exists(potentialModulePath + '.native.js')) {
file = potentialModulePath + '.native.js';
} else if (this._options.hasteFS.exists(potentialModulePath + '.js')) {
file = potentialModulePath + '.js';
} else if (this._options.hasteFS.exists(potentialModulePath + '.json')) {
file = potentialModulePath + '.json';
} else {
throw new UnableToResolveError(
fromModule,
toModule,
`File ${potentialModulePath} doesn't exist`,
);
const {platform, preferNativePlatform, hasteFS} = this._options;
for (let i = 0; i < this._options.sourceExts.length; i++) {
const ext = this._options.sourceExts[i];
if (platform != null) {
const platformSpecificPath = `${potentialModulePath}.${platform}.${ext}`;
if (hasteFS.exists(platformSpecificPath)) {
file = platformSpecificPath;
break;
}
}
if (preferNativePlatform) {
const nativeSpecificPath = `${potentialModulePath}.native.${ext}`;
if (hasteFS.exists(nativeSpecificPath)) {
file = nativeSpecificPath;
break;
}
}
const genericPath = `${potentialModulePath}.${ext}`;
if (hasteFS.exists(genericPath)) {
file = genericPath;
break;
}
}
if (file == null) {
throw new UnableToResolveError(
fromModule,
toModule,
`File ${potentialModulePath} doesn't exist`,
);
}
}
return this._options.moduleCache.getModule(file);
Oops, something went wrong.

0 comments on commit 4a86f93

Please sign in to comment.