Merge branch 'fix/figwheel-main-deps-when-no-cljs-317' into dev

BetterThanTomorrow · Sep 14, 2019 · c29c4a2 · c29c4a2
2 parents 37c0fbe + d5d87e3
commit c29c4a2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@ Changes to Calva. (We really will try to keep this updated now.)
 
 ## [Unreleased]
 - [Support connecting to Leiningen and CLI project using shadow-cljs watcher](https://github.com/BetterThanTomorrow/calva/issues/314)
+- Fix [Figwheel Main deps added to non-cljs projects](https://github.com/BetterThanTomorrow/calva/issues/317)
 
 ## [2.0.36] - 12.09.2019
 - Fix [REPL Window namespace being reset to user](https://github.com/BetterThanTomorrow/calva/issues/302)

diff --git a/calva/nrepl/jack-in.ts b/calva/nrepl/jack-in.ts
@@ -92,11 +92,9 @@ export async function calvaJackIn() {
     state.extensionContext.workspaceState.update('selectedCljTypeName', projectConnectSequence.projectType);
     let selectedCljsType: CljsTypes;
 
-    if (projectConnectSequence.cljsType == undefined) {
-        selectedCljsType = CljsTypes["Figwheel Main"];
-    } else if (typeof projectConnectSequence.cljsType == "string") {
+    if (typeof projectConnectSequence.cljsType == "string") {
         selectedCljsType = projectConnectSequence.cljsType;
-    } else {
+    } else if (projectConnectSequence.cljsType) {
         selectedCljsType = projectConnectSequence.cljsType.dependsOn;
     }