Skip to content
Merged
2 changes: 1 addition & 1 deletion deps.edn
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
com.cognitect/transit-java {:mvn/version "1.0.362"}
org.clojure/clojure {:mvn/version "1.10.0"}
org.clojure/core.specs.alpha {:mvn/version "0.1.24"}
org.clojure/google-closure-library {:mvn/version "0.0-20211011-0726fdeb"}
org.clojure/google-closure-library {:mvn/version "0.0-20230227-c7c0a541"}
org.clojure/spec.alpha {:mvn/version "0.1.143"}
org.clojure/tools.reader {:mvn/version "1.3.6"}
org.clojure/test.check {:mvn/version "1.1.1"}}
Expand Down
2 changes: 1 addition & 1 deletion pom.template.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<dependency>
<groupId>org.clojure</groupId>
<artifactId>google-closure-library</artifactId>
<version>0.0-20211011-0726fdeb</version>
<version>0.0-20230227-c7c0a541</version>
</dependency>
<dependency>
<groupId>org.clojure</groupId>
Expand Down
2 changes: 1 addition & 1 deletion project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
[org.clojure/tools.reader "1.3.6"]
[org.clojure/test.check "1.1.1" :scope "test"]
[com.cognitect/transit-java "1.0.362"]
[org.clojure/google-closure-library "0.0-20211011-0726fdeb"]
[org.clojure/google-closure-library "0.0-20230227-c7c0a541"]
[com.google.javascript/closure-compiler-unshaded "v20220502"]]
:profiles {:1.6 {:dependencies [[org.clojure/clojure "1.6.0"]]}
:uberjar {:aot :all :main cljs.main}
Expand Down
1 change: 0 additions & 1 deletion resources/self_parity_test.edn
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{:optimizations :none
:main self-parity.test
:language-in :es6
:language-out :es6
:verbose true
:output-to "builds/out-self-parity/main.js"
Expand Down
1 change: 0 additions & 1 deletion resources/test.edn
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
:npm-deps {:lodash "4.17.4"}
:closure-warnings {:non-standard-jsdoc :off :global-this :off}
:install-deps true
:language-in :es6
:language-out :es5
:foreign-libs
[{:file "src/test/cljs/calculator_global.js"
Expand Down
2 changes: 1 addition & 1 deletion script/bootstrap
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ CLOJURE_RELEASE="1.9.0"
SPEC_ALPHA_RELEASE="0.1.143"
CORE_SPECS_ALPHA_RELEASE="0.1.24"
CLOSURE_RELEASE="20220502"
GCLOSURE_LIB_RELEASE="0.0-20211011-0726fdeb"
GCLOSURE_LIB_RELEASE="0.0-20230227-c7c0a541"
TREADER_RELEASE="1.3.6"
TEST_CHECK_RELEASE="1.1.1"

Expand Down
1 change: 0 additions & 1 deletion script/test
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ if ! bin/cljsc src/test/cljs "{:optimizations :advanced
:npm-deps {:lodash \"4.17.4\"}
:closure-warnings {:non-standard-jsdoc :off :global-this :off}
:install-deps true
:language-in :es6
:language-out :es5
:foreign-libs [{:file \"src/test/cljs/calculator_global.js\"
:provides [\"calculator\"]
Expand Down
2 changes: 1 addition & 1 deletion script/test-self-parity
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ mkdir -p builds/out-self-parity/clojure/test
mv clojure/template.clj builds/out-self-parity/clojure
mv clojure/test builds/out-self-parity/clojure

if ! bin/cljsc src/test/self/self_parity "{:optimizations :simple :language-in :es6 :language-out :es5 :output-to \"builds/out-self-parity/main.js\" :output-dir \"builds/out-self-parity\" :main self-parity.test :target :nodejs}"; then
if ! bin/cljsc src/test/self/self_parity "{:optimizations :simple :language-out :es5 :output-to \"builds/out-self-parity/main.js\" :output-dir \"builds/out-self-parity\" :main self-parity.test :target :nodejs}"; then
>&2 echo ClojureScript compilation failed
exit 1
fi;
Expand Down
1 change: 0 additions & 1 deletion script/test-simple
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ if ! bin/cljsc src/test/cljs "{:optimizations :simple
:npm-deps {:lodash \"4.17.4\"}
:closure-warnings {:non-standard-jsdoc :off :global-this :off}
:install-deps true
:language-in :es6
:language-out :es5
:foreign-libs [{:file \"src/test/cljs/calculator_global.js\"
:provides [\"calculator\"]
Expand Down
4 changes: 2 additions & 2 deletions src/main/clojure/cljs/closure.clj
Original file line number Diff line number Diff line change
Expand Up @@ -2598,7 +2598,7 @@
(ensure-module-opts)

(nil? (:language-in opts))
(assoc :language-in :es6)
(assoc :language-in :ecmascript-next)

(:stable-names opts)
(as-> opts
Expand Down Expand Up @@ -3512,7 +3512,7 @@
(ana/write-analysis-cache 'cljs.core cache src)
(ana/write-analysis-cache 'cljs.core tcache src))
(create-client-js-file
{:language-in :es6
{:language-in :ecmascript-next
:optimizations :simple
:output-dir "aot_out"}
(io/file "resources" "brepl_client.js"))
Expand Down
5 changes: 0 additions & 5 deletions src/test/clojure/cljs/build_api_tests.clj
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@
["common" "app"])
opts {:optimizations :simple
:output-dir out
:language-in :es6
:modules {:common {:entries #{"hello.foo.bar"}
:output-to (.getAbsolutePath common-tmp)}
:app {:entries #{"hello.core"}
Expand Down Expand Up @@ -191,7 +190,6 @@
:opts
{:output-dir output-dir
:optimizations :none
:language-in :es6
:verbose true
:foreign-libs [{:file "src/test/cljs_build/loader_test/foreignA.js"
:provides ["foreign.a"]}
Expand Down Expand Up @@ -681,7 +679,6 @@
(let [out (io/file (test/tmp-dir) "cljs-2903-out")
opts {:output-to (.getPath (io/file out "main.js"))
:output-dir (.getPath out)
:language-in :es6
:fingerprint true
:stable-names true
:optimizations :advanced}]
Expand Down Expand Up @@ -715,7 +712,6 @@
out-file (io/file out "main.js")
{:keys [inputs opts]} {:inputs (str (io/file "src" "test" "cljs_build"))
:opts {:main 'trivial.core
:language-in :es6
:output-dir out
:output-to (.getPath out-file)
:optimizations :advanced}}
Expand All @@ -730,7 +726,6 @@
opts {:main 'trivial.core
:output-to (.getPath out-file)
:output-dir out
:language-in :es6
:optimizations :none}
cenv (env/default-compiler-env)]
(test/delete-out-files out)
Expand Down
1 change: 0 additions & 1 deletion src/test/clojure/cljs/test_util.clj
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
:output-dir output-dir
:optimizations :advanced
:verbose true
:language-in :es6
:modules
{:cljs-base
{:output-to (str (io/file output-dir "module-main.js"))}
Expand Down