From 43754b95dc060f0c67be8f2e8234c4e568da86bd Mon Sep 17 00:00:00 2001
From: WaldoJeffers <7644970+WaldoJeffers@users.noreply.github.com>
Date: Thu, 13 Sep 2018 13:20:42 +0200
Subject: [PATCH 1/2] Fix loadConfigFromFile

Fixes https://github.com/apollographql/apollo-cli/issues/549
---
 packages/apollo/src/config.ts | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/apollo/src/config.ts b/packages/apollo/src/config.ts
index f28d1c9e1a..382429862f 100644
--- a/packages/apollo/src/config.ts
+++ b/packages/apollo/src/config.ts
@@ -1,4 +1,4 @@
-import { basename, dirname, join, relative } from "path";
+import { basename, dirname, join, relative, resolve } from "path";
 import { fs, withGlobalFS } from "apollo-codegen-core/lib/localfs";
 
 import * as fg from "glob";
@@ -139,11 +139,12 @@ export function loadConfigFromFile(
   defaultSchema: boolean
 ): ApolloConfig {
   if (file.endsWith(".js")) {
-    delete require.cache[require.resolve(file)];
+    const filepath = resolve(file)
+    delete require.cache[require.resolve(filepath)];
     return loadConfig(
-      require(file),
-      file,
-      dirname(file),
+      require(filepath),
+      filepath,
+      dirname(filepath),
       defaultEndpoint,
       defaultSchema
     );

From cace28adc4e7b7121b138fdd2cb975c7121eec13 Mon Sep 17 00:00:00 2001
From: Achille Urbain <7644970+WaldoJeffers@users.noreply.github.com>
Date: Sun, 23 Sep 2018 12:01:36 +0200
Subject: [PATCH 2/2] Fix linter warnings

---
 packages/apollo/src/config.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/apollo/src/config.ts b/packages/apollo/src/config.ts
index 382429862f..b963318f2a 100644
--- a/packages/apollo/src/config.ts
+++ b/packages/apollo/src/config.ts
@@ -139,7 +139,7 @@ export function loadConfigFromFile(
   defaultSchema: boolean
 ): ApolloConfig {
   if (file.endsWith(".js")) {
-    const filepath = resolve(file)
+    const filepath = resolve(file);
     delete require.cache[require.resolve(filepath)];
     return loadConfig(
       require(filepath),