CLI CDN fixes (#159)

* [client] Use merged config when checking for CDN flag * [core] Explicitly set useCdn to false when creating import client
sanity-io · Sep 14, 2017 · 1262dd3 · 1262dd3
1 parent 5099c33
commit 1262dd3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/packages/@sanity/client/src/config.js b/packages/@sanity/client/src/config.js
@@ -50,6 +50,10 @@ exports.initConfig = (config, prevConfig) => {
     throw new Error('Configuration must contain `projectId`')
   }
 
+  if (typeof newConfig.useCdn === 'undefined') {
+    printCdnWarning()
+  }
+
   if (projectBased) {
     validate.projectId(newConfig.projectId)
   }
@@ -79,9 +83,5 @@ exports.initConfig = (config, prevConfig) => {
     }
   }
 
-  if (typeof config.useCdn === 'undefined') {
-    printCdnWarning()
-  }
-
   return newConfig
 }
diff --git a/packages/@sanity/core/src/commands/dataset/importDatasetCommand.js b/packages/@sanity/core/src/commands/dataset/importDatasetCommand.js
@@ -167,6 +167,7 @@ function getSanityClient(options) {
     apiHost: options.gradient,
     dataset: options.dataset || config.dataset,
     token: options.token || config.token,
+    useCdn: false
   })
 }