Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to ClojureScript 1.11.132 #1102

Merged
merged 2 commits into from
Feb 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# Change Log
All notable changes to this project will be documented in this file. This change log follows the conventions of [keepachangelog.com](http://keepachangelog.com/).

## [Unreleased]
### Changed
- Update to ClojureScript 1.11.132 ([#1102](https://github.com/planck-repl/planck/issues/1102))

## [2.27.0] - 2022-11-19
### Added
- Bundle `cljs.math` ([#1078](https://github.com/planck-repl/planck/issues/1078))
Expand Down
2 changes: 1 addition & 1 deletion planck-cljs/deps.edn
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{:deps {org.clojure/clojurescript {:mvn/version "1.11.60"}
{:deps {org.clojure/clojurescript {:mvn/version "1.11.132"}
org.clojure/core.rrb-vector {:mvn/version "0.1.2"}
org.clojure/test.check {:mvn/version "1.1.1"}
com.cognitect/transit-clj {:mvn/version "1.0.329"}
Expand Down
4 changes: 2 additions & 2 deletions planck-cljs/script/bundle
Original file line number Diff line number Diff line change
Expand Up @@ -105,14 +105,14 @@ then
crc=`shasum $file | cut -f1 -d" "`
fi

if [ $CLOSURE_OPTIMIZATIONS != "NONE" ] && [ ${file: -3} == ".js" ] && [ "${file: -7}" != "deps.js" ] && [ "${file: -9}" != "bundle.js" ] && [ "${file: -9}" != "jscomp.js" ] && [ "${file: -10}" != "paredit.js" ] && [ "${file: -6}" != "csv.js" ] && [ "${file: -19}" != "performancetimer.js" ] && [ "${file: 0:10}" != "goog/labs/" ] && [ "${file: 0:15}" != "goog/useragent/" ] && [ "${file}" != "goog/array/array.js" ] && [ "${file}" != "goog/crypt/aes.js" ] && [ "${file}" != "goog/async/run.js" ] && [ "${file: 0:10}" != "goog/html/" ] && [ "${file}" != "goog/math/long.js" ] && [ "${file: 0:13}" != "goog/testing/" ] && [ "${file: 0:13}" != "goog/memoize/" ] && [ "${file: 0:13}" != "goog/asserts/" ] && [ "${file}" != "goog/object/object.js" ] && [ "${file: 0:12}" != "goog/proto2/" ] && [ "${file}" != "goog/base.js" ] && [ "${file: 0:9}" != "goog/dom/" ] && [ "${file: 0:12}" != "goog/events/" ] && [ "${file: 0:10}" != "goog/i18n/" ] && [ "${file: 0:17}" != "goog/collections/" ] && [ "${file: 0:16}" != "goog/disposable/" ] && [ "${file: 0:11}" != "goog/debug/" ]
if [ $CLOSURE_OPTIMIZATIONS != "NONE" ] && [ ${file: -3} == ".js" ] && [ "${file: -7}" != "deps.js" ] && [ "${file: -9}" != "bundle.js" ] && [ "${file: -9}" != "jscomp.js" ] && [ "${file: -10}" != "paredit.js" ] && [ "${file: -6}" != "csv.js" ] && [ "${file: -19}" != "performancetimer.js" ] && [ "${file: 0:10}" != "goog/labs/" ] && [ "${file: 0:15}" != "goog/useragent/" ] && [ "${file}" != "goog/array/array.js" ] && [ "${file}" != "goog/crypt/aes.js" ] && [ "${file}" != "goog/crypt/crypt.js" ] && [ "${file}" != "goog/async/run.js" ] && [ "${file: 0:10}" != "goog/html/" ] && [ "${file: 0:12}" != "goog/loader/" ] && [ "${file}" != "goog/math/long.js" ] && [ "${file: 0:13}" != "goog/promise/" ] && [ "${file: 0:13}" != "goog/testing/" ] && [ "${file: 0:13}" != "goog/memoize/" ] && [ "${file: 0:13}" != "goog/asserts/" ] && [ "${file}" != "goog/object/object.js" ] && [ "${file}" != "goog/string/linkify.js" ] && [ "${file: 0:12}" != "goog/proto2/" ] && [ "${file}" != "goog/base.js" ] && [ "${file: 0:9}" != "goog/dom/" ] && [ "${file: 0:12}" != "goog/events/" ] && [ "${file: 0:10}" != "goog/i18n/" ] && [ "${file: 0:17}" != "goog/collections/" ] && [ "${file: 0:16}" != "goog/disposable/" ] && [ "${file: 0:11}" != "goog/debug/" ]
then
if [ ! -f $buildcache/$file.$crc.optim ]
then
if [ ! -f $file.optim ] || [ $file -nt $file.optim ]
then
# Process goog.define, converting to default value expression
sed -E -ibak 's/goog.define\(".*",(.*)\);/\1;/g' $file
sed -E -ibak 's/goog.define\((["'\''].*["'\'']),(.*)\);/\2;/g' $file
if [ -f $file.map ]
then
java -jar ../../compiler/closure-compiler-v$GCC_RELEASE.jar --compilation_level $CLOSURE_OPTIMIZATIONS --language_in ECMASCRIPT6 --language_out ECMASCRIPT6 --process_closure_primitives false --jscomp_off=suspiciousCode --js $file --js_output_file $file.optim --source_map_input $file\|$file.map --create_source_map $file.map.optim
Expand Down
2 changes: 1 addition & 1 deletion script/build
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export GCC_RELEASE="20210808"
export CLOSURE_JS_RELEASE=20190301.0.0
script/get-closure-compiler

export GCL_RELEASE="0.0-20211011-0726fdeb"
export GCL_RELEASE="0.0-20230227-c7c0a541"
script/get-closure-library

script/get-build-cache
Expand Down
Loading