Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
seki-seki committed Jan 20, 2017
2 parents 171728e + ef65825 commit 5e2f10e
Show file tree
Hide file tree
Showing 234 changed files with 70,454 additions and 73,731 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.10.0
1.0.0
11 changes: 10 additions & 1 deletion dev/dev.clj
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,16 @@
:output-to "target/figwheel/job-streamer-console/public/js/job-streamer.js"
:output-dir "target/figwheel/job-streamer-console/public/js"
:source-map true
:source-map-path "/js"}}]}})
:source-map-path "/js"}}
{:source-paths ["src/cljs-flowchart"]
:build-options
{:optimizations :none
:main "job-streamer.console.flowchart"
:asset-path "/js-flowchart"
:output-to "target/figwheel/job-streamer-console/public/js/flowchart.js"
:output-dir "target/figwheel/job-streamer-console/public/js-flowchart"
:source-map true
:source-map-path "/js-flowchart"}}]}})

(def config
(meta-merge config/defaults
Expand Down
21 changes: 18 additions & 3 deletions project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
[garden "1.3.2" :exclusions [org.clojure/clojure]]
[compojure "1.5.1"]
[environ "1.0.3"]
[org.jsoup/jsoup "1.9.2"]
[clj-http "2.3.0"]
[org.clojure/tools.logging "0.3.1"]

[com.stuartsierra/component "0.3.1"]
[duct "0.7.0"]
Expand Down Expand Up @@ -41,12 +42,26 @@
:libs ["resources/closure-js/libs"]
:pretty-print true
:optimizations :simple}}
{:id "dev-flowchart"
:source-paths ["src/cljs-flowchart"]
:compiler {:output-to "target/cljsbuild/job-streamer-console/public/js/flowchart.js"
:libs ["resources/closure-js/libs"]
:pretty-print true
:optimizations :simple}}
{:id "production"
:source-paths ["src/cljs"]
:compiler {:output-to "resources/job-streamer-console/public/js/job-streamer.min.js"
:libs ["resources/clojure-js/libs"]
:pretty-print false
:optimizations :advanced}}]}
:optimizations :advanced
:libs ["resources/clojure-js/libs"]}}
{:id "production-flowchart"
:source-paths ["src/cljs-flowchart"]
:compiler {:output-to "resources/job-streamer-console/public/js/flowchart.min.js"
:pretty-print false
:optimizations :advanced
:externs ["resources/job-streamer-console/public/js/jsr-352.js"]
:closure-warnings {:externs-validation :off
:non-standard-jsdoc :off}}}]}

:aliases {"run-task" ["with-profile" "+repl" "run" "-m"]
"setup" ["run-task" "dev.tasks/setup"]}
Expand Down
10 changes: 0 additions & 10 deletions resources/closure-js/externs/blockly.ext.js

This file was deleted.

1,666 changes: 0 additions & 1,666 deletions resources/closure-js/libs/blockly/blockly_uncompressed.js

This file was deleted.

133 changes: 0 additions & 133 deletions resources/closure-js/libs/blockly/blocks/colour.js

This file was deleted.

Loading

0 comments on commit 5e2f10e

Please sign in to comment.