From 4795d5e98a22e50ba06e5609d343f1d0a0591e09 Mon Sep 17 00:00:00 2001 From: Bruce Hauman Date: Wed, 16 Aug 2017 18:01:08 -0400 Subject: [PATCH] deploy 0.5.13 --- CHANGES.md | 8 +- README.md | 4 +- example/project.clj | 7 +- plugin/project.clj | 2 +- plugin/src/leiningen/figwheel.clj | 2 +- sidecar/project.clj | 4 +- .../compiled-utils/figwheel-helper-deploy.js | 77 ++++++++++--------- sidecar/src/figwheel_sidecar/config.clj | 2 +- support/project.clj | 2 +- support/src/figwheel/client.cljs | 2 +- 10 files changed, 61 insertions(+), 49 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 375e1a0d..49cf1341 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,4 +1,10 @@ -## 0.5.12-SNAPSHOT Cache busting and more compiler option updates +## 0.5.13 Small updates + +* remove the use of a deprecated Google Closure library function + goog.net.jsloader.load +* add CLJS compile option `:process-shim` to validation code + +## 0.5.12 Cache busting and more compiler option updates There have been constant problems when reloading an application into Chrome where even a hard reload insists on pulling items from the diff --git a/README.md b/README.md index 5d0efdd7..838125e1 100644 --- a/README.md +++ b/README.md @@ -189,7 +189,7 @@ Then include `lein-figwheel` in the `:plugins` section of your project.clj. ```clojure -[lein-figwheel "0.5.12"] +[lein-figwheel "0.5.13"] ``` #### Configure your builds @@ -572,7 +572,7 @@ Figwheel has a Clojure that makes it easy to start, stop and control Figwheel from Clojure. In order for the following examples to work, you will need to have -`[figwheel-sidecar "0.5.12"]` in your dependencies. +`[figwheel-sidecar "0.5.13"]` in your dependencies. To start Figwheel from a script, you will need to require the `figwheel-sidecar.repl-api` and provide your build configuration to diff --git a/example/project.clj b/example/project.clj index 11b107d3..c9f23a80 100644 --- a/example/project.clj +++ b/example/project.clj @@ -5,8 +5,11 @@ :url "http://www.eclipse.org/legal/epl-v10.html"} :dependencies [ [org.clojure/clojure "1.9.0-alpha15"] + [org.clojure/clojurescript "1.9.908"] + + ;; trying to keep things compatible back to these versions at least #_[org.clojure/clojure "1.8.0"] - [org.clojure/clojurescript "1.9.671"] + #_[org.clojure/clojurescript "1.8.51"] [org.clojure/core.async "0.3.442" :exclusions [org.clojure/tools.reader]] [sablono "0.3.5"] @@ -19,7 +22,7 @@ :plugins [[lein-ring "0.8.13" :exclusions [org.clojure/clojure]] #_[lein-cljsbuild "1.1.2"] - [lein-figwheel "0.5.13-SNAPSHOT"] + [lein-figwheel "0.5.13"] #_[lein-npm "0.4.0"]] :node-dependencies [[source-map-support "0.2.8"] diff --git a/plugin/project.clj b/plugin/project.clj index 63a709bb..402a649d 100644 --- a/plugin/project.clj +++ b/plugin/project.clj @@ -1,4 +1,4 @@ -(defproject lein-figwheel "0.5.13-SNAPSHOT" +(defproject lein-figwheel "0.5.13" :description "ClojureScript Autobuilder/Server which pushes changed files to the browser. This is the lein plugin." :url "https://github.com/bhauman/lein-figwheel" :license {:name "Eclipse Public License - v 1.0" diff --git a/plugin/src/leiningen/figwheel.clj b/plugin/src/leiningen/figwheel.clj index ed4f7395..ad535ad6 100644 --- a/plugin/src/leiningen/figwheel.clj +++ b/plugin/src/leiningen/figwheel.clj @@ -10,7 +10,7 @@ [leiningen.figwheel.fuzzy :as fuz] [simple-lein-profile-merge.core :as lm])) -(def _figwheel-version_ "0.5.13-SNAPSHOT") +(def _figwheel-version_ "0.5.13") (defn make-subproject [project paths-to-add] (with-meta diff --git a/sidecar/project.clj b/sidecar/project.clj index 439e0d23..8d37fc06 100644 --- a/sidecar/project.clj +++ b/sidecar/project.clj @@ -1,4 +1,4 @@ -(defproject figwheel-sidecar "0.5.13-SNAPSHOT" +(defproject figwheel-sidecar "0.5.13" :description "ClojureScript Autobuilder/Server which pushes changed files to the browser." :url "https://github.com/bhauman/lein-figwheel" :license {:name "Eclipse Public License - v 1.0" @@ -23,7 +23,7 @@ [org.clojure/tools.reader org.clojure/clojure]] [clj-stacktrace "0.2.8"] - [figwheel "0.5.13-SNAPSHOT" + [figwheel "0.5.13" :exclusions [org.clojure/tools.reader]] [hawk "0.2.11" :exclusions [org.clojure/clojure]] diff --git a/sidecar/resources/compiled-utils/figwheel-helper-deploy.js b/sidecar/resources/compiled-utils/figwheel-helper-deploy.js index daeff65a..8f8a3cca 100644 --- a/sidecar/resources/compiled-utils/figwheel-helper-deploy.js +++ b/sidecar/resources/compiled-utils/figwheel-helper-deploy.js @@ -2224,8 +2224,8 @@ H,t),N=cljs.core.async.put_BANG_.call(null,M,u,h);c[12]=M;m=c;cljs.core.truth_(N e,ea);c[24]=Ba;var pa=m=c;pa[2]=db;pa[1]=41;return new cljs.core.Keyword(null,"recur","recur",-437573268)}if(33===k){var ca=c[25],Ca=cljs.core.chunked_seq_QMARK_.call(null,ca),m=c;m[1]=Ca?36:37;return new cljs.core.Keyword(null,"recur","recur",-437573268)}if(13===k){var ka=c[26],eb=cljs.core.async.close_BANG_.call(null,ka),Da=m=c;Da[2]=eb;Da[1]=15;return new cljs.core.Keyword(null,"recur","recur",-437573268)}if(22===k){var p=c[8],fb=cljs.core.async.close_BANG_.call(null,p),Ea=m=c;Ea[2]=fb;Ea[1]=24; return new cljs.core.Keyword(null,"recur","recur",-437573268)}if(36===k){var ca=c[25],qa=cljs.core.chunk_first.call(null,ca),W=cljs.core.chunk_rest.call(null,ca),Fa=cljs.core.count.call(null,qa),ba=W,H=qa,aa=Fa,t=0;c[20]=aa;c[10]=t;c[11]=H;c[21]=ba;var Ga=m=c;Ga[2]=null;Ga[1]=25;return new cljs.core.Keyword(null,"recur","recur",-437573268)}if(41===k){var ca=c[25],gb=c[2],ba=cljs.core.next.call(null,ca),H=null,t=aa=0;c[20]=aa;c[10]=t;c[11]=H;c[21]=ba;c[27]=gb;var Ha=m=c;Ha[2]=null;Ha[1]=25;return new cljs.core.Keyword(null, "recur","recur",-437573268)}if(43===k){var Ia=m=c;Ia[2]=null;Ia[1]=44;return new cljs.core.Keyword(null,"recur","recur",-437573268)}if(29===k){var Ja=c[2],ra=m=c;ra[2]=Ja;ra[1]=26;return new cljs.core.Keyword(null,"recur","recur",-437573268)}if(44===k){c[28]=c[2];var sa=m=c;sa[2]=null;sa[1]=2;return new cljs.core.Keyword(null,"recur","recur",-437573268)}if(6===k){var ia=c[29],hb=cljs.core.deref.call(null,d),la=cljs.core.keys.call(null,hb),ga=cljs.core.count.call(null,la),Ka=cljs.core.reset_BANG_.call(null, -g,ga),ba=cljs.core.seq.call(null,la),H=null,t=aa=0;c[20]=aa;c[10]=t;c[11]=H;c[29]=la;c[21]=ba;c[30]=Ka;var La=m=c;La[2]=null;La[1]=25;return new cljs.core.Keyword(null,"recur","recur",-437573268)}if(28===k){var ca=c[25],ba=c[21],Ma=cljs.core.seq.call(null,ba);c[25]=Ma;m=c;m[1]=Ma?33:34;return new cljs.core.Keyword(null,"recur","recur",-437573268)}if(25===k){var aa=c[20],t=c[10],Na=t=cljs.core.count.call(null,b)&&cljs.core.every_QMARK_.call(null,function(b){return cljs.core.contains_QMARK_.call(null,a,b)},b)};clojure.string={};clojure.string.seq_reverse=function(a){return cljs.core.reduce.call(null,cljs.core.conj,cljs.core.List.EMPTY,a)};clojure.string.re_surrogate_pair=RegExp("([\\uD800-\\uDBFF])([\\uDC00-\\uDFFF])","g");clojure.string.reverse=function(a){return a.replace(clojure.string.re_surrogate_pair,"$2$1").split("").reverse().join("")};clojure.string.replace_all=function(a,b,c){return a.replace(new RegExp(b.source,"g"),c)}; +clojure.set.subset_QMARK_=function(a,b){return cljs.core.count.call(null,a)<=cljs.core.count.call(null,b)&&cljs.core.every_QMARK_.call(null,function(a){return cljs.core.contains_QMARK_.call(null,b,a)},a)};clojure.set.superset_QMARK_=function(a,b){return cljs.core.count.call(null,a)>=cljs.core.count.call(null,b)&&cljs.core.every_QMARK_.call(null,function(b){return cljs.core.contains_QMARK_.call(null,a,b)},b)};goog.html.legacyconversions={};goog.html.legacyconversions.ALLOW_LEGACY_CONVERSIONS=!0;goog.html.legacyconversions.safeHtmlFromString=function(a){goog.html.legacyconversions.throwIfConversionsDisallowed();return goog.html.SafeHtml.createSafeHtmlSecurityPrivateDoNotAccessOrElse(a,null)};goog.html.legacyconversions.safeStyleFromString=function(a){goog.html.legacyconversions.throwIfConversionsDisallowed();return goog.html.SafeStyle.createSafeStyleSecurityPrivateDoNotAccessOrElse(a)}; +goog.html.legacyconversions.trustedResourceUrlFromString=function(a){goog.html.legacyconversions.throwIfConversionsDisallowed();return goog.html.TrustedResourceUrl.createTrustedResourceUrlSecurityPrivateDoNotAccessOrElse(a)};goog.html.legacyconversions.safeUrlFromString=function(a){goog.html.legacyconversions.throwIfConversionsDisallowed();return goog.html.SafeUrl.createSafeUrlSecurityPrivateDoNotAccessOrElse(a)};goog.html.legacyconversions.reportCallback_=goog.nullFunction; +goog.html.legacyconversions.setReportCallback=function(a){goog.html.legacyconversions.reportCallback_=a};goog.html.legacyconversions.throwIfConversionsDisallowed=function(){if(!goog.html.legacyconversions.ALLOW_LEGACY_CONVERSIONS)throw Error("Error: Legacy conversion from string to goog.html types is disabled");goog.html.legacyconversions.reportCallback_()};clojure.string={};clojure.string.seq_reverse=function(a){return cljs.core.reduce.call(null,cljs.core.conj,cljs.core.List.EMPTY,a)};clojure.string.re_surrogate_pair=RegExp("([\\uD800-\\uDBFF])([\\uDC00-\\uDFFF])","g");clojure.string.reverse=function(a){return a.replace(clojure.string.re_surrogate_pair,"$2$1").split("").reverse().join("")};clojure.string.replace_all=function(a,b,c){return a.replace(new RegExp(b.source,"g"),c)}; clojure.string.replace_with=function(a){return function(){var b=function(b){b=cljs.core.drop_last.call(null,2,b);return cljs.core._EQ_.call(null,cljs.core.count.call(null,b),1)?a.call(null,cljs.core.first.call(null,b)):a.call(null,cljs.core.vec.call(null,b))},c=function(a){var c=null;if(0