Skip to content

Commit

Permalink
Merge branch 'release/0.6.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
awkay committed Jan 24, 2017
2 parents 7bb501a + 08407ba commit aa53ba8
Show file tree
Hide file tree
Showing 39 changed files with 1,395 additions and 532 deletions.
2 changes: 1 addition & 1 deletion .idea/runConfigurations/Figwheel.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ addons:
firefox: "49.0"
before_script:
- npm install
- "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start"
- sleep 3
script:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
- while [ ! -e /tmp/.X11-unix/X99 ]; do sleep 0.1; done
script:
- lein test-refresh :run-once
- lein doo firefox automated-tests once
11 changes: 10 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
0.6.1
-----
- Added support for nil as subquery class in load
- Fixed preprocess-merge to eliminate litter in app state
- Added support for server-side rendering.
- Removed forced root re-render on post mutations. POTENTIALLY BREAKING CHANGE!
- The intended use is to include :refresh with your loads that indicate what to re-render
- Fixed bug in InitialAppState that was missing the merge of nested unions on startup

0.6.0
-----
- Changed InitialAppState to overwrite any supplied initial app state atom.
Expand All @@ -10,7 +19,7 @@
- Fixed bug with removal/addition of markers when markers are off
- Added jump to and playback speed features to the support viewer.
- Added support for post-mutation parameters in load API.
- Added support for custom handling of merge of return values from server mutations (see `:mutation-merge`
- Added support for custom handling of merge of return values from server mutations (see `:mutation-merge`
in `new-untangled-client`).
- Added support for custom transit handlers on the client side. Server side is coming in a release soon.
- Added support for turning on/off Om path optimization
Expand Down
19 changes: 16 additions & 3 deletions dev/clj/user.clj
Original file line number Diff line number Diff line change
@@ -1,8 +1,21 @@
(ns clj.user
(:require [figwheel-sidecar.system :as fig]
[com.stuartsierra.component :as component]))
(:require
[clojure.pprint :refer [pprint]]
[clojure.repl :refer [doc source]]
[clojure.set :as set]
[clojure.spec :as s]
[clojure.spec.gen :as sg]
[clojure.tools.namespace.repl :refer [refresh]]
[figwheel-sidecar.system :as fig]
[com.stuartsierra.component :as component]))

(defn conform! [spec x]
(let [rt (s/conform spec x)]
(when (s/invalid? rt)
(throw (ex-info (s/explain-str spec x)
(s/explain-data spec x))))
rt))

;;FIGWHEEL
(def figwheel (atom nil))

(defn start-figwheel
Expand Down
15 changes: 10 additions & 5 deletions dev/cljs/user.cljs
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
(ns ^:figwheel-always cljs.user
(:require cljs.core
untangled.tests-to-run
[untangled-spec.reporters.suite :refer-macros [deftest-all-suite]]
[devtools.core :as devtools]
[cljs.test :as test :include-macros true :refer [report]]))
(:require
cljs.core
[clojure.pprint :refer [pprint]]
[clojure.repl :refer [doc source]]
[clojure.test :as test :include-macros true :refer [report]]
[clojure.spec :as s]
[devtools.core :as devtools]
[om.next :as om]
untangled.tests-to-run
[untangled-spec.reporters.suite :refer-macros [deftest-all-suite]]))

(devtools/enable-feature! :sanity-hints)
(devtools/install!)
Expand Down
48 changes: 34 additions & 14 deletions project.clj
Original file line number Diff line number Diff line change
@@ -1,31 +1,42 @@
(defproject navis/untangled-client "0.6.0"
(defproject navis/untangled-client "0.6.1"
:description "Client-side code for Untangled Webapps"
:url ""
:license {:name "MIT"
:url "https://opensource.org/licenses/MIT"}

:dependencies [[org.clojure/clojure "1.9.0-alpha14" :scope "provided"]
[org.clojure/clojurescript "1.9.293" :scope "provided"]
[org.clojure/core.async "0.2.391"]
[differ "0.2.1"]
:dependencies [[com.lucasbradstreet/cljs-uuid-utils "1.0.2"]
[devcards "0.2.2" :exclusions [org.omcljs/om org.omcljs/om org.clojure/core.async] :scope "provided"]
[lein-doo "0.1.7" :scope "test"]
[com.lucasbradstreet/cljs-uuid-utils "1.0.2"]
[navis/untangled-spec "0.3.9" :scope "test"]
[org.omcljs/om "1.0.0-alpha47" :scope "provided"]]
[org.clojure/clojure "1.9.0-alpha14" :scope "provided"]
[org.clojure/clojurescript "1.9.293" :scope "provided"]
[org.clojure/core.async "0.2.391"]
[com.ibm.icu/icu4j "58.2"] ; needed for i18n on server-side rendering
[org.omcljs/om "1.0.0-alpha47" :scope "provided"]
[org.clojure/test.check "0.9.0" :scope "test"]]

:source-paths ["src" "src-cards"]
:resource-paths ["src" "resources"] ; maven deploy to internal artifactory needs src here

:jvm-opts ["-XX:-OmitStackTraceInFastThrow" "-Xmx512m" "-Xms256m"]
:clean-targets ^{:protect false} ["resources/private/js" "resources/public/js/test" "resources/public/js/compiled" "target"]

:resource-paths ["src" "resources"] ; maven deploy to internal artifactory needs src here

:plugins [[lein-cljsbuild "1.1.4"]
[lein-doo "0.1.7"]]
[lein-doo "0.1.7"]
[com.jakemccrary/lein-test-refresh "0.17.0"]]

:test-paths ["spec"]
:test-refresh {:report untangled-spec.reporters.terminal/untangled-report
:changes-only true
:with-repl true}
:test-selectors {:test/in-progress :test/in-progress
:focused :focused}

:doo {:build "automated-tests"
:paths {:karma "node_modules/karma/bin/karma"}}

:figwheel {:server-port 8080}
:figwheel {:open-file-command "fw-open-file"
:server-port 8080}

:cljsbuild {:builds
[{:id "test"
Expand All @@ -37,6 +48,15 @@
:recompile-dependents true
:asset-path "js/test/out"
:optimizations :none}}
{:id "cards"
:source-paths ["src" "src-cards" "dev"]
:figwheel {:devcards true}
:compiler {:main untangled.client.card-ui
:output-to "resources/public/js/cards/cards.js"
:output-dir "resources/public/js/cards/out"
:asset-path "js/cards/out"
:source-map-timestamp true
:optimizations :none}}
{:id "automated-tests"
:source-paths ["spec" "src"]
:compiler {:output-to "resources/private/js/unit-tests.js"
Expand All @@ -48,9 +68,9 @@
:profiles {:dev {:source-paths ["dev" "src" "spec"]
:repl-options {:init-ns clj.user
:nrepl-middleware [cemerick.piggieback/wrap-cljs-repl]}
:env {:dev true}
:dependencies [[figwheel-sidecar "0.5.7"]
[binaryage/devtools "0.5.2"]
:dependencies [[binaryage/devtools "0.5.2"]
[com.cemerick/piggieback "0.2.1"]
[figwheel-sidecar "0.5.7"]
[org.clojure/test.check "0.9.0"]
[org.clojure/tools.namespace "0.2.11"]
[org.clojure/tools.nrepl "0.2.12"]]}})
11 changes: 11 additions & 0 deletions resources/public/cards.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<!DOCTYPE html>
<html>
<head lang="en">
<meta charset="UTF-8">
<link href="css/cards.css" rel="stylesheet" type="text/css">
<title>Untangled Client Devcards</title>
</head>
<body>
<script src="js/cards/cards.js"></script>
</body>
</html>
80 changes: 80 additions & 0 deletions resources/public/css/cards.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
.highlight-element {
background-color: rgba(130, 180, 230, 0.4);
outline: solid 1px #0F4D9A;
box-sizing: border-box;
}

div.dev-panel-bottom {
position: fixed;
bottom: 0;
left: 0;
right: 0;
}

body {
padding : 1.5em;
background : #f8f8f8;
font-family : sans-serif;
line-height : 1.5;
}

.tabbed {
float : left;
width : 100%;
}

.tabbed > input {
display : none;
}

.tabbed > section > h1 {
float : left;
box-sizing : border-box;
margin : 0;
padding : 0.5em 0.5em 0;
overflow : hidden;
font-size : 1em;
font-weight : normal;
}

.tabbed > input:first-child + section > h1 {
padding-left : 1em;
}

.tabbed > section > h1 > label {
display : block;
padding : 0.25em 0.75em;
border : 1px solid #ddd;
border-bottom : none;
border-top-left-radius : 4px;
border-top-right-radius : 4px;
box-shadow : 0 0 0.5em rgba(0,0,0,0.0625);
background : #fff;
cursor : pointer;
-moz-user-select : none;
-ms-user-select : none;
-webkit-user-select : none;
}

.tabbed > section > div {
position : relative;
z-index : 1;
float : right;
box-sizing : border-box;
width : 100%;
margin : 2.5em 0 0 -100%;
padding : 0.5em 0.75em;
border : 1px solid #ddd;
border-radius : 4px;
box-shadow : 0 0 0.5em rgba(0,0,0,0.0625);
background : #fff;
}

.tabbed > input:checked + section > h1 {
position : relative;
z-index : 2;
}

.tabbed > input:not(:checked) + section > div {
display : none;
}
Loading

0 comments on commit aa53ba8

Please sign in to comment.