Add back (fixed) deps.edn + shadow-cljs config

Fixes #1270 Fixes #1253 (the proper way)
BetterThanTomorrow · Aug 25, 2021 · 8caf18f · 8caf18f
1 parent 75426ed
commit 8caf18f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,9 @@ Changes to Calva.
 
 ## [Unreleased]
 
+## [2.0.208] - 2021-08-09
+- [Add back jack-in/connect config `deps.edn + shadow-cljs`](https://github.com/BetterThanTomorrow/calva/issues/1270)
+
 ## [2.0.209] - 2021-08-17
 - Fix [Statusbar buttons hard to see with light themes](https://github.com/BetterThanTomorrow/calva/issues/1264)
 

diff --git a/src/nrepl/connectSequence.ts b/src/nrepl/connectSequence.ts
@@ -64,6 +64,12 @@ const leiningenDefaults: ReplConnectSequence[] =
         projectType: ProjectTypes.Leiningen,
         cljsType: CljsTypes["Figwheel Main"]
     },
+    {
+        name: "Leiningen + shadow-cljs",
+        projectType: ProjectTypes.Leiningen,
+        cljsType: CljsTypes["shadow-cljs"],
+        nReplPortFile: [".shadow-cljs", "nrepl.port"]
+    },
     {
         name: "Leiningen + ClojureScript built-in for browser",
         projectType: ProjectTypes.Leiningen,
@@ -91,6 +97,12 @@ const cljDefaults: ReplConnectSequence[] =
         projectType: ProjectTypes["deps.edn"],
         cljsType: CljsTypes["Figwheel Main"]
     },
+    {
+        name: "deps.edn + shadow-cljs",
+        projectType: ProjectTypes["deps.edn"],
+        cljsType: CljsTypes["shadow-cljs"],
+        nReplPortFile: [".shadow-cljs", "nrepl.port"]
+    },
     {
         name: "deps.edn + ClojureScript built-in for browser",
         projectType: ProjectTypes["deps.edn"],
@@ -163,8 +175,8 @@ const defaultCljsTypes: { [id: string]: CljsTypeConfig } = {
         isStarted: false,
         // isReadyToStartRegExp: /To quit, type: :cljs\/quit/,
         connectCode: {
-            build: `(shadow.cljs.devtools.api/nrepl-select %BUILD%)`,
-            repl: `(shadow.cljs.devtools.api/%REPL%)`
+            build: `(do (require 'shadow.cljs.devtools.api) (shadow.cljs.devtools.api/nrepl-select %BUILD%))`,
+            repl: `(do (require 'shadow.cljs.devtools.api) (shadow.cljs.devtools.api/%REPL%))`
         },
         shouldOpenUrl: false,
         isConnectedRegExp: /To quit, type: :cljs\/quit/