mirror of https://github.com/status-im/metro.git
Fix react-native function call arity errors
Reviewed By: zertosh Differential Revision: D5081816 fbshipit-source-id: 5978770c30a69fb287d03aa7511999ce30f856a1
This commit is contained in:
parent
5bdaf4697d
commit
a3237f641e
|
@ -14,6 +14,7 @@
|
||||||
const assert = require('assert');
|
const assert = require('assert');
|
||||||
const crypto = require('crypto');
|
const crypto = require('crypto');
|
||||||
const debug = require('debug')('RNP:Bundler');
|
const debug = require('debug')('RNP:Bundler');
|
||||||
|
const emptyFunction = require('fbjs/lib/emptyFunction');
|
||||||
const fs = require('fs');
|
const fs = require('fs');
|
||||||
const Transformer = require('../JSTransformer');
|
const Transformer = require('../JSTransformer');
|
||||||
const Resolver = require('../Resolver');
|
const Resolver = require('../Resolver');
|
||||||
|
@ -89,8 +90,6 @@ export type ExtendedAssetDescriptor = AssetDescriptor & {
|
||||||
|
|
||||||
const sizeOf = denodeify(imageSize);
|
const sizeOf = denodeify(imageSize);
|
||||||
|
|
||||||
const noop = () => {};
|
|
||||||
|
|
||||||
const {
|
const {
|
||||||
createActionStartEntry,
|
createActionStartEntry,
|
||||||
createActionEndEntry,
|
createActionEndEntry,
|
||||||
|
@ -173,7 +172,7 @@ class Bundler {
|
||||||
|
|
||||||
this._getModuleId = createModuleIdFactory();
|
this._getModuleId = createModuleIdFactory();
|
||||||
|
|
||||||
let getCacheKey = () => '';
|
let getCacheKey = (options: mixed) => '';
|
||||||
if (opts.transformModulePath) {
|
if (opts.transformModulePath) {
|
||||||
/* $FlowFixMe: dynamic requires prevent static typing :'( */
|
/* $FlowFixMe: dynamic requires prevent static typing :'( */
|
||||||
const transformer = require(opts.transformModulePath);
|
const transformer = require(opts.transformModulePath);
|
||||||
|
@ -283,7 +282,7 @@ class Bundler {
|
||||||
const matchingRoot = this._projectRoots.find(root => filePath.startsWith(root));
|
const matchingRoot = this._projectRoots.find(root => filePath.startsWith(root));
|
||||||
|
|
||||||
if (!matchingRoot) {
|
if (!matchingRoot) {
|
||||||
throw new Error('No matching project root for ', filePath);
|
throw new Error('No matching project root for ' + filePath);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Replaces '\' with '/' for Windows paths.
|
// Replaces '\' with '/' for Windows paths.
|
||||||
|
@ -422,10 +421,10 @@ class Bundler {
|
||||||
isolateModuleIDs,
|
isolateModuleIDs,
|
||||||
generateSourceMaps,
|
generateSourceMaps,
|
||||||
assetPlugins,
|
assetPlugins,
|
||||||
onResolutionResponse = noop,
|
onResolutionResponse = emptyFunction,
|
||||||
onModuleTransformed = noop,
|
onModuleTransformed = emptyFunction,
|
||||||
finalizeBundle = noop,
|
finalizeBundle = emptyFunction,
|
||||||
onProgress = noop,
|
onProgress = emptyFunction,
|
||||||
}: *) {
|
}: *) {
|
||||||
const transformingFilesLogEntry =
|
const transformingFilesLogEntry =
|
||||||
log(createActionStartEntry({
|
log(createActionStartEntry({
|
||||||
|
@ -641,7 +640,7 @@ class Bundler {
|
||||||
bundle: Bundle,
|
bundle: Bundle,
|
||||||
entryFilePath: string,
|
entryFilePath: string,
|
||||||
options: BundlingOptions,
|
options: BundlingOptions,
|
||||||
getModuleId: () => number,
|
getModuleId: (module: Module) => number,
|
||||||
dependencyPairs: Array<[string, Module]>,
|
dependencyPairs: Array<[string, Module]>,
|
||||||
assetPlugins: Array<string>,
|
assetPlugins: Array<string>,
|
||||||
}): Promise<ModuleTransport> {
|
}): Promise<ModuleTransport> {
|
||||||
|
|
|
@ -166,11 +166,11 @@ function TransformError() {
|
||||||
}
|
}
|
||||||
util.inherits(TransformError, SyntaxError);
|
util.inherits(TransformError, SyntaxError);
|
||||||
|
|
||||||
function formatError(err, filename, source) {
|
function formatError(err, filename) {
|
||||||
if (err.loc) {
|
if (err.loc) {
|
||||||
return formatBabelError(err, filename, source);
|
return formatBabelError(err, filename);
|
||||||
} else {
|
} else {
|
||||||
return formatGenericError(err, filename, source);
|
return formatGenericError(err, filename);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -10,6 +10,7 @@
|
||||||
*/
|
*/
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
|
const emptyFunction = require('fbjs/lib/emptyFunction');
|
||||||
const invariant = require('fbjs/lib/invariant');
|
const invariant = require('fbjs/lib/invariant');
|
||||||
const memoize = require('async/memoize');
|
const memoize = require('async/memoize');
|
||||||
const nullthrows = require('fbjs/lib/nullthrows');
|
const nullthrows = require('fbjs/lib/nullthrows');
|
||||||
|
@ -51,11 +52,10 @@ type LoadQueue =
|
||||||
const createParentModule =
|
const createParentModule =
|
||||||
() => ({file: {code: '', type: 'script', path: ''}, dependencies: []});
|
() => ({file: {code: '', type: 'script', path: ''}, dependencies: []});
|
||||||
|
|
||||||
const noop = () => {};
|
|
||||||
const NO_OPTIONS = {};
|
const NO_OPTIONS = {};
|
||||||
|
|
||||||
exports.create = function create(resolve: ResolveFn, load: LoadFn): GraphFn {
|
exports.create = function create(resolve: ResolveFn, load: LoadFn): GraphFn {
|
||||||
function Graph(entryPoints, platform, options, callback = noop) {
|
function Graph(entryPoints, platform, options, callback = emptyFunction) {
|
||||||
const {
|
const {
|
||||||
log = (console: any),
|
log = (console: any),
|
||||||
optimize = false,
|
optimize = false,
|
||||||
|
@ -80,7 +80,7 @@ exports.create = function create(resolve: ResolveFn, load: LoadFn): GraphFn {
|
||||||
callback(null, collect());
|
callback(null, collect());
|
||||||
};
|
};
|
||||||
loadQueue.error = error => {
|
loadQueue.error = error => {
|
||||||
loadQueue.error = noop;
|
loadQueue.error = emptyFunction;
|
||||||
loadQueue.kill();
|
loadQueue.kill();
|
||||||
callback(error);
|
callback(error);
|
||||||
};
|
};
|
||||||
|
|
|
@ -16,6 +16,7 @@ const Bundler = require('../Bundler');
|
||||||
const MultipartResponse = require('./MultipartResponse');
|
const MultipartResponse = require('./MultipartResponse');
|
||||||
|
|
||||||
const defaults = require('../../defaults');
|
const defaults = require('../../defaults');
|
||||||
|
const emptyFunction = require('fbjs/lib/emptyFunction');
|
||||||
const mime = require('mime-types');
|
const mime = require('mime-types');
|
||||||
const parsePlatformFilePath = require('../node-haste/lib/parsePlatformFilePath');
|
const parsePlatformFilePath = require('../node-haste/lib/parsePlatformFilePath');
|
||||||
const path = require('path');
|
const path = require('path');
|
||||||
|
@ -26,7 +27,6 @@ const url = require('url');
|
||||||
const debug = require('debug')('RNP:Server');
|
const debug = require('debug')('RNP:Server');
|
||||||
|
|
||||||
import type Module, {HasteImpl} from '../node-haste/Module';
|
import type Module, {HasteImpl} from '../node-haste/Module';
|
||||||
import type {Stats} from 'fs';
|
|
||||||
import type {IncomingMessage, ServerResponse} from 'http';
|
import type {IncomingMessage, ServerResponse} from 'http';
|
||||||
import type ResolutionResponse from '../node-haste/DependencyGraph/ResolutionResponse';
|
import type ResolutionResponse from '../node-haste/DependencyGraph/ResolutionResponse';
|
||||||
import type Bundle from '../Bundler/Bundle';
|
import type Bundle from '../Bundler/Bundle';
|
||||||
|
@ -175,7 +175,7 @@ class Server {
|
||||||
watch: options.watch || false,
|
watch: options.watch || false,
|
||||||
};
|
};
|
||||||
const processFileChange =
|
const processFileChange =
|
||||||
({type, filePath, stat}) => this.onFileChange(type, filePath, stat);
|
({type, filePath}) => this.onFileChange(type, filePath);
|
||||||
|
|
||||||
this._reporter = options.reporter;
|
this._reporter = options.reporter;
|
||||||
this._projectRoots = this._opts.projectRoots;
|
this._projectRoots = this._opts.projectRoots;
|
||||||
|
@ -316,8 +316,8 @@ class Server {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
onFileChange(type: string, filePath: string, stat: Stats) {
|
onFileChange(type: string, filePath: string) {
|
||||||
this._assetServer.onFileChange(type, filePath, stat);
|
this._assetServer.onFileChange(type, filePath);
|
||||||
|
|
||||||
// If Hot Loading is enabled avoid rebuilding bundles and sending live
|
// If Hot Loading is enabled avoid rebuilding bundles and sending live
|
||||||
// updates. Instead, send the HMR updates right away and clear the bundles
|
// updates. Instead, send the HMR updates right away and clear the bundles
|
||||||
|
@ -653,7 +653,7 @@ class Server {
|
||||||
entry_point: options.entryFile,
|
entry_point: options.entryFile,
|
||||||
}));
|
}));
|
||||||
|
|
||||||
let reportProgress = () => {};
|
let reportProgress = emptyFunction;
|
||||||
if (!this._opts.silent) {
|
if (!this._opts.silent) {
|
||||||
reportProgress = (transformedFileCount, totalFileCount) => {
|
reportProgress = (transformedFileCount, totalFileCount) => {
|
||||||
this._reporter.update({
|
this._reporter.update({
|
||||||
|
|
|
@ -90,14 +90,16 @@ class TransformCache {
|
||||||
* close to each others, one of the workers is going to loose its results no
|
* close to each others, one of the workers is going to loose its results no
|
||||||
* matter what.
|
* matter what.
|
||||||
*/
|
*/
|
||||||
writeSync(props: {
|
writeSync(
|
||||||
|
props: {
|
||||||
filePath: string,
|
filePath: string,
|
||||||
sourceCode: string,
|
sourceCode: string,
|
||||||
getTransformCacheKey: GetTransformCacheKey,
|
getTransformCacheKey: GetTransformCacheKey,
|
||||||
transformOptions: WorkerOptions,
|
transformOptions: WorkerOptions,
|
||||||
transformOptionsKey: string,
|
transformOptionsKey: string,
|
||||||
result: CachedResult,
|
result: CachedResult,
|
||||||
}): void {
|
},
|
||||||
|
): void {
|
||||||
const cacheFilePath = this._getCacheFilePaths(props);
|
const cacheFilePath = this._getCacheFilePaths(props);
|
||||||
mkdirp.sync(path.dirname(cacheFilePath.transformedCode));
|
mkdirp.sync(path.dirname(cacheFilePath.transformedCode));
|
||||||
const {result} = props;
|
const {result} = props;
|
||||||
|
@ -233,7 +235,7 @@ class TransformCache {
|
||||||
mkdirp.sync(cacheDirPath);
|
mkdirp.sync(cacheDirPath);
|
||||||
const cacheCollectionFilePath = path.join(cacheDirPath, 'last_collected');
|
const cacheCollectionFilePath = path.join(cacheDirPath, 'last_collected');
|
||||||
const lastCollected = Number.parseInt(
|
const lastCollected = Number.parseInt(
|
||||||
tryReadFileSync(cacheCollectionFilePath, 'utf8'),
|
tryReadFileSync(cacheCollectionFilePath),
|
||||||
10,
|
10,
|
||||||
);
|
);
|
||||||
if (
|
if (
|
||||||
|
@ -253,10 +255,12 @@ class TransformCache {
|
||||||
* account because it would generate lots of file during development. (The
|
* account because it would generate lots of file during development. (The
|
||||||
* source hash is stored in the metadata instead).
|
* source hash is stored in the metadata instead).
|
||||||
*/
|
*/
|
||||||
_getCacheFilePaths(props: {
|
_getCacheFilePaths(
|
||||||
|
props: {
|
||||||
filePath: string,
|
filePath: string,
|
||||||
transformOptionsKey: string,
|
transformOptionsKey: string,
|
||||||
}): CacheFilePaths {
|
},
|
||||||
|
): CacheFilePaths {
|
||||||
const hasher = crypto
|
const hasher = crypto
|
||||||
.createHash('sha1')
|
.createHash('sha1')
|
||||||
.update(props.filePath)
|
.update(props.filePath)
|
||||||
|
@ -384,13 +388,15 @@ function tryParseJSON(str: string): any {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function hashSourceCode(props: {
|
function hashSourceCode(
|
||||||
|
props: {
|
||||||
filePath: string,
|
filePath: string,
|
||||||
sourceCode: string,
|
sourceCode: string,
|
||||||
getTransformCacheKey: GetTransformCacheKey,
|
getTransformCacheKey: GetTransformCacheKey,
|
||||||
transformOptions: WorkerOptions,
|
transformOptions: WorkerOptions,
|
||||||
transformOptionsKey: string,
|
transformOptionsKey: string,
|
||||||
}): string {
|
},
|
||||||
|
): string {
|
||||||
return crypto
|
return crypto
|
||||||
.createHash('sha1')
|
.createHash('sha1')
|
||||||
.update(props.getTransformCacheKey(props.transformOptions))
|
.update(props.getTransformCacheKey(props.transformOptions))
|
||||||
|
|
|
@ -156,8 +156,8 @@ class DependencyGraph extends EventEmitter {
|
||||||
this._filesByDirNameIndex = new FilesByDirNameIndex(hasteFS.getAllFiles());
|
this._filesByDirNameIndex = new FilesByDirNameIndex(hasteFS.getAllFiles());
|
||||||
this._assetResolutionCache.clear();
|
this._assetResolutionCache.clear();
|
||||||
this._moduleMap = moduleMap;
|
this._moduleMap = moduleMap;
|
||||||
eventsQueue.forEach(({type, filePath, stat}) =>
|
eventsQueue.forEach(({type, filePath}) =>
|
||||||
this._moduleCache.processFileChange(type, filePath, stat)
|
this._moduleCache.processFileChange(type, filePath)
|
||||||
);
|
);
|
||||||
this.emit('change');
|
this.emit('change');
|
||||||
}
|
}
|
||||||
|
@ -290,11 +290,11 @@ class DependencyGraph extends EventEmitter {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function NotFoundError() {
|
function NotFoundError(...args) {
|
||||||
/* $FlowFixMe: monkey-patching */
|
/* $FlowFixMe: monkey-patching */
|
||||||
Error.call(this);
|
Error.call(this);
|
||||||
Error.captureStackTrace(this, this.constructor);
|
Error.captureStackTrace(this, this.constructor);
|
||||||
var msg = util.format.apply(util, arguments);
|
var msg = util.format.apply(util, args);
|
||||||
this.message = msg;
|
this.message = msg;
|
||||||
this.type = this.name = 'NotFoundError';
|
this.type = this.name = 'NotFoundError';
|
||||||
this.status = 404;
|
this.status = 404;
|
||||||
|
|
Loading…
Reference in New Issue