From 8289003b8db1a76c698d6fd4300a96adc660ba66 Mon Sep 17 00:00:00 2001 From: Philipp Muens Date: Wed, 8 Aug 2018 14:01:40 +0200 Subject: [PATCH] Fix rc lookup --- lib/utils/config/index.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/utils/config/index.js b/lib/utils/config/index.js index 806664f04..33753dcf9 100644 --- a/lib/utils/config/index.js +++ b/lib/utils/config/index.js @@ -9,10 +9,12 @@ const fileExistsSync = require('../fs/fileExistsSync'); const readFileSync = require('../fs/readFileSync'); const initialSetup = require('./initialSetup'); -let serverlessrcPath = p.join(os.homedir(), '.serverlessrc'); +let rcFileBase = 'serverless'; +let serverlessrcPath = p.join(os.homedir(), `.${rcFileBase}rc`); if (process.env.SERVERLESS_PLATFORM_STAGE && process.env.SERVERLESS_PLATFORM_STAGE !== 'prod') { - serverlessrcPath = p.join(os.homedir(), '.serverlessdevrc'); + rcFileBase = 'serverlessdev'; + serverlessrcPath = p.join(os.homedir(), `.${rcFileBase}rc`); } function createConfig() { @@ -48,7 +50,8 @@ function getConfig() { createConfig(); } // then return config merged via rc module - return require('rc')('serverless'); // eslint-disable-line + + return require('rc')(rcFileBase); // eslint-disable-line } function getGlobalConfig() {