From 3f981765b0697d62477f0b3cf501e5eeae772a49 Mon Sep 17 00:00:00 2001 From: Mike Grabowski Date: Mon, 20 May 2019 14:19:37 +0200 Subject: [PATCH 1/3] Improve RNPM warnings --- packages/cli/src/tools/config/index.js | 5 +---- .../cli/src/tools/config/readConfigFromDisk.js | 16 ++++++---------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/packages/cli/src/tools/config/index.js b/packages/cli/src/tools/config/index.js index 9c402b84e..704f03bee 100644 --- a/packages/cli/src/tools/config/index.js +++ b/packages/cli/src/tools/config/index.js @@ -12,7 +12,6 @@ import makeHook from './makeHook'; import { readConfigFromDisk, readDependencyConfigFromDisk, - readLegacyDependencyConfigFromDisk, } from './readConfigFromDisk'; import {type ConfigT} from 'types'; @@ -39,9 +38,7 @@ function loadConfig(projectRoot: string = process.cwd()): ConfigT { let config; try { root = resolveNodeModuleDir(projectRoot, dependencyName); - config = - readLegacyDependencyConfigFromDisk(root) || - readDependencyConfigFromDisk(root); + config = readDependencyConfigFromDisk(root); } catch (error) { logger.warn( inlineString(` diff --git a/packages/cli/src/tools/config/readConfigFromDisk.js b/packages/cli/src/tools/config/readConfigFromDisk.js index dc2688fa9..ced9efaac 100644 --- a/packages/cli/src/tools/config/readConfigFromDisk.js +++ b/packages/cli/src/tools/config/readConfigFromDisk.js @@ -55,7 +55,9 @@ export function readDependencyConfigFromDisk( searchPlaces, }); - const {config} = explorer.searchSync(rootFolder) || {config: undefined}; + const {config} = explorer.searchSync(rootFolder) || { + config: readLegacyDependencyConfigFromDisk(rootFolder), + }; const result = Joi.validate(config, schema.dependencyConfig); @@ -90,7 +92,7 @@ const loadProjectCommands = ( /** * Reads a legacy configuration from a `package.json` "rnpm" key. */ -export function readLegacyDependencyConfigFromDisk( +function readLegacyDependencyConfigFromDisk( rootFolder: string, ): ?UserDependencyConfigT { const {rnpm: config, name} = require(path.join(rootFolder, 'package.json')); @@ -113,7 +115,7 @@ export function readLegacyDependencyConfigFromDisk( commands: loadProjectCommands(rootFolder, config.plugin), platforms: config.platform ? require(path.join(rootFolder, config.platform)) - : undefined, + : {}, }; // @todo: paste a link to documentation that explains the migration steps @@ -123,11 +125,5 @@ export function readLegacyDependencyConfigFromDisk( )} is using deprecated "rnpm" config that will stop working from next release. Consider upgrading to the new config format.`, ); - const result = Joi.validate(transformedConfig, schema.dependencyConfig); - - if (result.error) { - throw new JoiError(result.error); - } - - return result.value; + return transformedConfig; } From e0484afb483e838aabb6a9f2e3e225901e13ade2 Mon Sep 17 00:00:00 2001 From: Mike Grabowski Date: Mon, 20 May 2019 14:27:05 +0200 Subject: [PATCH 2/3] Update packages/cli/src/tools/config/readConfigFromDisk.js MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Michał Pierzchała --- packages/cli/src/tools/config/readConfigFromDisk.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/cli/src/tools/config/readConfigFromDisk.js b/packages/cli/src/tools/config/readConfigFromDisk.js index ced9efaac..0a56286ae 100644 --- a/packages/cli/src/tools/config/readConfigFromDisk.js +++ b/packages/cli/src/tools/config/readConfigFromDisk.js @@ -122,7 +122,7 @@ function readLegacyDependencyConfigFromDisk( logger.warn( `Package ${chalk.bold( path.basename(name), - )} is using deprecated "rnpm" config that will stop working from next release. Consider upgrading to the new config format.`, + )} is using deprecated "rnpm" config that will stop working from next release. Please notify its maintainers about it.`, ); return transformedConfig; From ed0180efc5dda974b85702453eacabb794c7ce0c Mon Sep 17 00:00:00 2001 From: Mike Grabowski Date: Mon, 20 May 2019 14:33:11 +0200 Subject: [PATCH 3/3] Fix lint error --- packages/cli/src/tools/config/readConfigFromDisk.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/cli/src/tools/config/readConfigFromDisk.js b/packages/cli/src/tools/config/readConfigFromDisk.js index 0a56286ae..babfb3887 100644 --- a/packages/cli/src/tools/config/readConfigFromDisk.js +++ b/packages/cli/src/tools/config/readConfigFromDisk.js @@ -122,7 +122,7 @@ function readLegacyDependencyConfigFromDisk( logger.warn( `Package ${chalk.bold( path.basename(name), - )} is using deprecated "rnpm" config that will stop working from next release. Please notify its maintainers about it.`, + )} is using deprecated "rnpm" config that will stop working from next release. Please notify its maintainers about it.`, ); return transformedConfig;