status-im
/
re-frame
mirror of https://github.com/status-im/re-frame.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/Day8/re-frame into develop

This commit is contained in:
Mike Thompson 2016-08-30 17:41:24 +10:00
parent f8b7d082fd 5e01592ee8
commit 54ed26b0d1
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
karma.conf.js
View File

@ -7,7 +7,8 @@ module.exports = function (config) {
browsers: ['Chrome'], browsers: ['Chrome'],
files: [ files: [
root + '/../test.js', // same as :output-to root + '/../test.js', // same as :output-to
{pattern: root + '/../test.js.map', included: false} {pattern: root + '/../test.js.map', included: false},
{pattern: root + '/**/*.+(cljs|cljc|clj|js|js.map)', included: false}
], ],
client: { client: {

7
project.clj
View File

@ -8,11 +8,12 @@
[org.clojure/tools.logging "0.3.1"]] [org.clojure/tools.logging "0.3.1"]]
:profiles {:debug {:debug true} :profiles {:debug {:debug true}
:dev {:dependencies [[karma-reporter "0.3.0"] :dev {:dependencies [[karma-reporter "1.0.1"]
[binaryage/devtools "0.8.1"]] [binaryage/devtools "0.8.1"]]
:plugins [[lein-cljsbuild "1.1.3"] :plugins [[lein-ancient "0.6.10"]
[lein-cljsbuild "1.1.4"]
[lein-npm "0.6.2"] [lein-npm "0.6.2"]
[lein-figwheel "0.5.4-7"] [lein-figwheel "0.5.6"]
[lein-shell "0.5.0"]]}} [lein-shell "0.5.0"]]}}
:clean-targets [:target-path "run/compiled"] :clean-targets [:target-path "run/compiled"]