Skip to content

Commit 966a2dc

Browse files
committed
Use figwheel-main
1 parent 979d513 commit 966a2dc

File tree

6 files changed

+43
-34
lines changed

6 files changed

+43
-34
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ pom.xml.asc
99
/.nrepl-port
1010
.hgignore
1111
.hg/
12+
*.~undo-tree~

dev.cljs.edn

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
^{:watch-dirs ["test" "src"]}
2+
{:output-dir
3+
"target/main/public/main/cljs-out"
4+
5+
:output-to
6+
"target/main/public/main.js"
7+
8+
:main
9+
cljs-workers.test}

project.clj

Lines changed: 20 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
(defproject jtk-dvlp/cljs-workers "1.1.2"
1+
(defproject jtk-dvlp/cljs-workers "1.2.0-SNAPSHOT"
22
:description
33
"A clojurescript lib for performing async tasks via web workers"
44

@@ -14,43 +14,31 @@
1414
:source-paths
1515
["src"]
1616

17-
:clean-targets
18-
^{:protect false}
19-
["resources/public/js"
20-
"target"]
17+
:resource-paths
18+
["target/main" "target/worker"]
2119

2220
:plugins
23-
[[lein-cljsbuild "1.1.4" :exclusions [[org.clojure/clojure]]]
24-
[lein-figwheel "0.5.0-1"]]
21+
[[lein-ancient "0.7.0"]]
2522

2623
:profiles
2724
{:provided
2825
{:dependencies
29-
[[org.clojure/clojure "1.8.0"]
30-
[org.clojure/clojurescript "1.9.229"]]}
26+
[[org.clojure/clojure "1.10.0"]
27+
[org.clojure/clojurescript "1.10.773"]
28+
[org.clojure/core.async "1.6.681"]]}
3129

3230
:dev
3331
{:dependencies
34-
[[figwheel-sidecar "0.5.8"]
35-
[com.cemerick/piggieback "0.2.1"]]}}
36-
37-
:repl-options
38-
{:nrepl-middleware
39-
[cemerick.piggieback/wrap-cljs-repl]}
40-
41-
:cljsbuild
42-
{:builds
43-
[{:id "test"
44-
:source-paths ["src" "test"]
45-
:figwheel true
46-
:compiler {:main cljs-workers.test
47-
:asset-path "js/test/out"
48-
:output-to "resources/public/js/test/test.js"
49-
:output-dir "resources/public/js/test/out" }}
50-
{:id "worker"
51-
:source-paths ["src" "test"]
52-
:compiler {:main cljs-workers.test
53-
:asset-path "js/worker/out"
54-
:output-to "resources/public/js/worker/worker.js"
55-
:output-dir "resources/public/js/worker/out"
56-
:optimizations :advanced}}]})
32+
[[com.bhauman/figwheel-main "0.2.12"]]}
33+
34+
:repl
35+
{:dependencies
36+
[[cider/piggieback "0.5.0"]]
37+
38+
:repl-options
39+
{:nrepl-middleware
40+
[cider.piggieback/wrap-cljs-repl]}}}
41+
42+
:aliases
43+
{"build-worker"
44+
["run" "-m" "figwheel.main" "-O" "advanced" "-bo" "worker"]})

resources/public/test.html

Lines changed: 0 additions & 1 deletion
This file was deleted.

test/cljs_workers/test.cljs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
(defn app
88
[]
99
(let [worker-pool
10-
(main/create-pool 2 "js/worker/worker.js")
10+
(main/create-pool 2 "worker.js")
1111

1212
print-result
1313
(fn [result-chan]

worker.cljs.edn

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
^{:watch-dirs ["test" "src"]}
2+
{:output-dir
3+
"target/worker/public/worker/cljs-out"
4+
5+
:output-to
6+
"target/worker/public/worker.js"
7+
8+
:main
9+
cljs-workers.test
10+
11+
:target
12+
:webworker}

0 commit comments

Comments
 (0)