From 4c9864153785629bfb88bd755e9afd851758185c Mon Sep 17 00:00:00 2001 From: Jean Lauliac Date: Wed, 21 Dec 2016 03:39:50 -0800 Subject: [PATCH] packager: Fix typing of more Resolver options Reviewed By: davidaurelio Differential Revision: D4351879 fbshipit-source-id: aab3eb031ae3137d43d88ad1853aa7e6f5d165c5 --- react-packager/src/Resolver/index.js | 29 ++++------------------------ 1 file changed, 4 insertions(+), 25 deletions(-) diff --git a/react-packager/src/Resolver/index.js b/react-packager/src/Resolver/index.js index 31e99496..e2af69ab 100644 --- a/react-packager/src/Resolver/index.js +++ b/react-packager/src/Resolver/index.js @@ -13,7 +13,6 @@ const DependencyGraph = require('../node-haste'); -const declareOpts = require('../lib/declareOpts'); const defaults = require('../../../defaults'); const pathJoin = require('path').join; @@ -44,25 +43,6 @@ type Options = { watch?: boolean, }; -const getDependenciesValidateOpts = declareOpts({ - dev: { - type: 'boolean', - default: true, - }, - platform: { - type: 'string', - required: false, - }, - unbundle: { - type: 'boolean', - default: false, - }, - recursive: { - type: 'boolean', - default: true, - }, -}); - class Resolver { _depGraph: DependencyGraph; @@ -116,12 +96,12 @@ class Resolver { getDependencies( entryPath: string, - options: {}, + options: {platform: string, recursive?: boolean}, transformOptions: TransformOptions, onProgress?: ?(finishedModules: number, totalModules: number) => mixed, getModuleId: mixed, ): Promise { - const {platform, recursive} = getDependenciesValidateOpts(options); + const {platform, recursive = true} = options; return this._depGraph.getDependencies({ entryPath, platform, @@ -138,10 +118,9 @@ class Resolver { }); } - getModuleSystemDependencies(options: {}): Array { - const opts = getDependenciesValidateOpts(options); + getModuleSystemDependencies({dev = true}: {dev?: boolean}): Array { - const prelude = opts.dev + const prelude = dev ? pathJoin(__dirname, 'polyfills/prelude_dev.js') : pathJoin(__dirname, 'polyfills/prelude.js');