From ccf0dce0464d8301d24e7f833427db5389ffc29a Mon Sep 17 00:00:00 2001
From: rishabh3112 <rishabh31121999@gmail.com>
Date: Tue, 26 Mar 2019 23:38:55 +0530
Subject: [PATCH] fix(add): apply suggestions

---
 packages/generators/add-generator.ts             | 2 +-
 packages/utils/generators/add/questions/index.ts | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/generators/add-generator.ts b/packages/generators/add-generator.ts
index ee775757668..0c9e33dfc52 100644
--- a/packages/generators/add-generator.ts
+++ b/packages/generators/add-generator.ts
@@ -116,7 +116,7 @@ export default class AddGenerator extends Generator {
 							.then((mergeFileAnswer: {
 								mergeFile: string;
 							}) => {
-								const resolvedPath = resolve(process.env.PWD, mergeFileAnswer.mergeFile);
+								const resolvedPath = resolve(process.cwd(), mergeFileAnswer.mergeFile);
 								const mergeConfig = require(resolvedPath);
 								this.configuration.config.merge = mergeConfig;
 							});
diff --git a/packages/utils/generators/add/questions/index.ts b/packages/utils/generators/add/questions/index.ts
index 9ee042fdc13..350bce2873e 100644
--- a/packages/utils/generators/add/questions/index.ts
+++ b/packages/utils/generators/add/questions/index.ts
@@ -45,16 +45,15 @@ export const topScopeQuestion = Input(
 const mergeFileQuestionFunction = () => {
  const question = "What is the location of webpack configuration with which you want to merge current configuration?";
  const validator = (path: string) => {
-		const resolvedPath = resolve(process.env.PWD, path);
+		const resolvedPath = resolve(process.cwd(), path);
 		if (existsSync(resolvedPath)) {
 			if (/\.js$/.test(path)) {
 				if (typeof require(resolvedPath) !== "object") {
 					return "Given file doesn't export an Object";
 				}
 				return true;
-			} else {
-				return "Path doesn't corresponds to a javascript file";
 			}
+			return "Path doesn't corresponds to a javascript file";
 		}
 		return "Invalid path provided";
 	};