From 5fc88f3749072dbdcfd7451bed06cd1a19bd57bc Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Tue, 9 Apr 2019 19:55:42 +0100 Subject: [PATCH] Upgrade ClojureScript to 1.10.520 (#466) --- CHANGELOG.md | 1 + boot.properties | 2 +- build.boot | 8 +- package.json | 14 +-- scripts/bundle.js | 3 +- scripts/test-build | 2 +- scripts/test-build.bat | 2 +- src/test/lumo/lumo/lumo_build_api_tests.cljs | 16 +-- yarn.lock | 109 ++++++++++--------- 9 files changed, 81 insertions(+), 76 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b0418411..2a09d74d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### Changes - Upgrade Node.js to version 11.13.0. +- Upgrade ClojureScript to version 1.10.520. ### Bug fixes diff --git a/boot.properties b/boot.properties index d58709e1..9b229b1e 100644 --- a/boot.properties +++ b/boot.properties @@ -1,5 +1,5 @@ #http://boot-clj.com #Thu Oct 20 20:58:15 CEST 2016 BOOT_CLOJURE_NAME=org.clojure/clojure -BOOT_CLOJURE_VERSION=1.10.0-beta5 +BOOT_CLOJURE_VERSION=1.10.0 BOOT_VERSION=2.8.2 diff --git a/build.boot b/build.boot index 1d7cffad..99b7493f 100644 --- a/build.boot +++ b/build.boot @@ -1,5 +1,5 @@ (def +clojurescript-version+ (or (System/getenv "CANARY_CLOJURESCRIPT_VERSION") - "1.10.439")) + "1.10.520")) (def +node-version+ (or (System/getenv "BUILD_NODE_VERSION") "11.13.0")) @@ -7,13 +7,13 @@ (set-env! :source-paths #{"src/cljs/snapshot"} :asset-paths #{"src/js" "src/cljs/bundled"} - :dependencies (into [['org.clojure/clojure "1.10.0-beta5"] + :dependencies (into [['org.clojure/clojure "1.10.0"] ['org.clojure/clojurescript +clojurescript-version+]] '[[org.clojure/tools.reader "1.3.2"] [com.cognitect/transit-cljs "0.8.256"] [malabarba/lazy-map "1.3"] - [fipp "0.6.14"] - [org.clojure/test.check "0.10.0-alpha3" :scope "test"] + [fipp "0.6.17"] + [org.clojure/test.check "0.10.0-alpha4" :scope "test"] [com.cognitect/transit-clj "0.8.313" :scope "test"] [com.cemerick/piggieback "0.2.2" :scope "test"] [adzerk/boot-cljs "2.1.5" :scope "test"] diff --git a/package.json b/package.json index d5ac6896..1502bbf9 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "bundle": "node scripts/bundle.js --dev", "build": "cross-env NODE_ENV=production node scripts/bundle.js", "dev": "node target/bundle.js -k lumo-cache -c target", - "test-dev": "node target/bundle.js -k test-lumo-cache -c target:src/test/cljs:src/test/lumo:src/test/cljs_cp -D org.clojure/test.check:0.10.0-alpha3", + "test-dev": "node target/bundle.js -k test-lumo-cache -c target:src/test/cljs:src/test/lumo:src/test/cljs_cp -D org.clojure/test.check:0.10.0-alpha4", "build-download": "webpack --context download --config download/webpack.config.js", "prepublishOnly": "yarn build-download && cp /dev/null download/dist/lumo", "postinstall": "node download/install.js || nodejs download/install.js" @@ -73,12 +73,12 @@ "prettier": "1.15.1", "progress": "^2.0.0", "read-pkg": "^4.0.1", - "rollup": "0.67.0", - "rollup-plugin-babel": "4.0.3", - "rollup-plugin-babel-minify": "6.1.1", - "rollup-plugin-commonjs": "9.2.0", - "rollup-plugin-node-resolve": "3.4.0", - "rollup-plugin-replace": "2.1.0", + "rollup": "1.9.0", + "rollup-plugin-babel": "4.3.2", + "rollup-plugin-babel-minify": "8.0.0", + "rollup-plugin-commonjs": "9.3.4", + "rollup-plugin-node-resolve": "4.2.1", + "rollup-plugin-replace": "2.1.1", "webpack": "^4.25.1", "webpack-cli": "^3.1.2", "which-promise": "^1.0.0" diff --git a/scripts/bundle.js b/scripts/bundle.js index 5584446d..16425a4e 100644 --- a/scripts/bundle.js +++ b/scripts/bundle.js @@ -62,8 +62,7 @@ const plugins = [ }, }), resolve({ - jsnext: true, - main: true, + mainFields: ['module', 'main', 'jsnext:main'], preferBuiltins: true, }), commonjs({ diff --git a/scripts/test-build b/scripts/test-build index 376f6ffd..86ff7587 100755 --- a/scripts/test-build +++ b/scripts/test-build @@ -1,5 +1,5 @@ #!/bin/sh -./build/lumo -D org.clojure/test.check:0.10.0-alpha3 \ +./build/lumo -D org.clojure/test.check:0.10.0-alpha4 \ -c src/test/cljs:src/test/lumo:src/test/cljs_cp \ ./scripts/lumo_test.cljs --test-cli-option true diff --git a/scripts/test-build.bat b/scripts/test-build.bat index cd4547d2..e562b525 100644 --- a/scripts/test-build.bat +++ b/scripts/test-build.bat @@ -1,2 +1,2 @@ REM test the build artifact -build\lumo.exe -c src\test\cljs;src\test\lumo;src\test\cljs_cp -D org.clojure/test.check:0.10.0-alpha3 scripts\lumo_test.cljs --test-cli-option true +build\lumo.exe -c src\test\cljs;src\test\lumo;src\test\cljs_cp -D org.clojure/test.check:0.10.0-alpha4 scripts\lumo_test.cljs --test-cli-option true diff --git a/src/test/lumo/lumo/lumo_build_api_tests.cljs b/src/test/lumo/lumo/lumo_build_api_tests.cljs index 5d7cdc02..5a0bd8be 100644 --- a/src/test/lumo/lumo/lumo_build_api_tests.cljs +++ b/src/test/lumo/lumo/lumo_build_api_tests.cljs @@ -13,20 +13,14 @@ fs path)) -(use-fixtures :once - ;; backup and restore package.json cause we are executing these in the lumo - ;; folder. - {:before (fn [] (fs/copyFileSync "package.json" "package.json.bak")) - :after (fn [] (fs/copyFileSync "package.json.bak" "package.json"))}) - (deftest lumo-273-test (let [out (path/join (test/tmp-dir) "lumo-273-test-out") root "src/test/cljs_build"] (testing ":optimizations :none" (test/delete-out-files out) (is (build/build - (path/join root "test_check") - {:main 'hello + (build/inputs (path/join root "test_check")) + {:main 'test-check.core :optimizations :none :output-dir out} (env/default-compiler-env)) "It should successfully compile with :optimizations :none") @@ -39,18 +33,18 @@ (when-let [w (warning-type ana/*cljs-warnings*)] (let [err (ana/error-message warning-type extra)] (println "WARNING:" (ana/message env err)) - (is (nil? warning-type) "when compiling twice, it should not emit a WARNING for cljs.spec.test.alpha/instrument the second time"))))]] + (is (not= warning-type :undeclared-var) "when compiling twice, it should not emit a WARNING for cljs.spec.test.alpha/instrument the second time"))))]] (testing "correctly cljs.js/ns-side-effects on read analysis cache" (test/delete-out-files out) (build/build - (path/join root "instrument") + (build/inputs (path/join root "instrument")) {:main 'instrument.core :optimizations :none :warning-handlers warning-handlers :output-dir out} (env/default-compiler-env)) (build/build - (path/join root "instrument") + (build/inputs (path/join root "instrument")) {:main 'instrument.core :optimizations :none :warning-handlers warning-handlers diff --git a/yarn.lock b/yarn.lock index 2e8de9d4..eac38348 100644 --- a/yarn.lock +++ b/yarn.lock @@ -294,6 +294,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.0.0" +"@babel/plugin-syntax-dynamic-import@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.2.0.tgz#69c159ffaf4998122161ad8ebc5e6d1f55df8612" + integrity sha512-mVxuJ0YroI/h/tbFTPGZR8cv6ai+STMKNBq0f8hFxsxWjl94qqhsb+wXbpNMDPU3cfR1TIsVFzU3nXyZMqyK4w== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/plugin-syntax-json-strings@^7.2.0": version "7.2.0" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.2.0.tgz#72bd13f6ffe1d25938129d2a186b11fd62951470" @@ -731,11 +738,18 @@ resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d" integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== -"@types/node@*": +"@types/node@*", "@types/node@^11.13.0": version "11.13.2" resolved "https://registry.yarnpkg.com/@types/node/-/node-11.13.2.tgz#dc85dde46aa8740bb4aed54b8104250f8f849503" integrity sha512-HOtU5KqROKT7qX/itKHuTtt5fV0iXbheQvrgbLNXFJQBY/eh+VS5vmmTAVlo3qIGMsypm0G4N1t2AXjy1ZicaQ== +"@types/resolve@0.0.8": + version "0.0.8" + resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-0.0.8.tgz#f26074d238e02659e323ce1a13d041eee280e194" + integrity sha512-auApPaJf3NPfe18hSoJkp8EbZzer2ISk7o8mCC3M9he/a04+gbMF97NkpD2S8riMGvm4BMRI59/SZQSaLTKpsQ== + dependencies: + "@types/node" "*" + "@webassemblyjs/ast@1.8.5": version "1.8.5" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz#51b1c5fe6576a34953bf4b253df9f0d490d9e359" @@ -935,7 +949,7 @@ acorn@^5.5.3: resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279" integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw== -acorn@^6.0.1, acorn@^6.0.2, acorn@^6.0.4, acorn@^6.0.5: +acorn@^6.0.1, acorn@^6.0.2, acorn@^6.0.4, acorn@^6.0.5, acorn@^6.1.1: version "6.1.1" resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.1.tgz#7d25ae05bb8ad1f9b699108e1094ecd7884adc1f" integrity sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA== @@ -1839,10 +1853,10 @@ buffer@^5.2.1: base64-js "^1.0.2" ieee754 "^1.1.4" -builtin-modules@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-2.0.0.tgz#60b7ef5ae6546bd7deefa74b08b62a43a232648e" - integrity sha512-3U5kUA5VPsRUA3nofm/BXX7GVHKfxz0hOBAPxXrIvHzlDRkQVqEn6yi8QJegxl4LzOHLdvb7XF5dVawa/VVYBg== +builtin-modules@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.1.0.tgz#aad97c15131eb76b65b50ef208e7584cd76a7484" + integrity sha512-k0KL0aWZuBt2lrxrcASWDfwOLMnodeQjodT/1SxEQAXsHANgo6ZC/VEaSEHCXt7aSTZ4/4H5LKa+tBXmW7Vtvw== builtin-status-codes@^3.0.0: version "3.0.0" @@ -3000,11 +3014,6 @@ estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0: resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13" integrity sha1-De4/7TH81GlhjOc0IJn8GvoL2xM= -estree-walker@^0.5.2: - version "0.5.2" - resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.5.2.tgz#d3850be7529c9580d815600b53126515e146dd39" - integrity sha512-XpCnW/AE10ws/kDAs37cngSkvgIR8aN3G0MS85m7dUpuK2EREo9VJ00uvw6Dg/hXEpfsE1I1TvJOJr+Z+TL+ig== - estree-walker@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.0.tgz#5d865327c44a618dde5699f763891ae31f257dae" @@ -4996,7 +5005,7 @@ lru-cache@^5.1.1: dependencies: yallist "^3.0.2" -magic-string@^0.25.1: +magic-string@^0.25.2: version "0.25.2" resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.2.tgz#139c3a729515ec55e96e69e82a11fe890a293ad9" integrity sha512-iLs9mPjh9IuTtRsqqhNGYcZXGei0Nh/A4xirrsqW7c+QhKVFL2vm7U09ru6cHRD22azaP/wMDgI+HCqbETMTtg== @@ -5192,7 +5201,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1: resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo= -minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4: +minimatch@^3.0.3, minimatch@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== @@ -6488,7 +6497,7 @@ resolve@1.1.7: resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs= -resolve@^1.1.6, resolve@^1.10.0, resolve@^1.3.2, resolve@^1.5.0, resolve@^1.6.0, resolve@^1.8.1: +resolve@^1.10.0, resolve@^1.3.2, resolve@^1.5.0, resolve@^1.6.0, resolve@^1.8.1: version "1.10.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.10.0.tgz#3bdaaeaf45cc07f375656dfd2e54ed0810b101ba" integrity sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg== @@ -6535,53 +6544,54 @@ ripemd160@^2.0.0, ripemd160@^2.0.1: hash-base "^3.0.0" inherits "^2.0.1" -rollup-plugin-babel-minify@6.1.1: - version "6.1.1" - resolved "https://registry.yarnpkg.com/rollup-plugin-babel-minify/-/rollup-plugin-babel-minify-6.1.1.tgz#8fb568da0cc1ecd73e76f67c897055c21297cb81" - integrity sha512-MX0lqOHp1vHd7WbHTK5OG679msgPxzGzYf4VBEg6kKptO05fgheCbN51i3EoFYSa+8/VtNDjPc23iDdZfhO2uw== +rollup-plugin-babel-minify@8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/rollup-plugin-babel-minify/-/rollup-plugin-babel-minify-8.0.0.tgz#15a3f2047597f619f1ed8451ebb680e8d5d62633" + integrity sha512-w9bGqvFAFX4IzCqVNtE97tfZdfi2zT1O9uDUDjWa4bLzkQl+vg39abR+z7cXlDP4T7vfvUmHWRlUtZHr/cRjDQ== dependencies: "@babel/core" "^7.0.0" + "@babel/plugin-syntax-dynamic-import" "^7.2.0" "@comandeer/babel-plugin-banner" "^4.0.0" babel-preset-minify "^0.5.0" sourcemap-codec "^1.4.3" -rollup-plugin-babel@4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/rollup-plugin-babel/-/rollup-plugin-babel-4.0.3.tgz#8282b0e22233160d679e9c7631342e848422fb02" - integrity sha512-/PP0MgbPQyRywI4zRIJim6ySjTcOLo4kQbEbROqp9kOR3kHC3FeU++QpBDZhS2BcHtJTVZMVbBV46flbBN5zxQ== +rollup-plugin-babel@4.3.2: + version "4.3.2" + resolved "https://registry.yarnpkg.com/rollup-plugin-babel/-/rollup-plugin-babel-4.3.2.tgz#8c0e1bd7aa9826e90769cf76895007098ffd1413" + integrity sha512-KfnizE258L/4enADKX61ozfwGHoqYauvoofghFJBhFnpH9Sb9dNPpWg8QHOaAfVASUYV8w0mCx430i9z0LJoJg== dependencies: "@babel/helper-module-imports" "^7.0.0" rollup-pluginutils "^2.3.0" -rollup-plugin-commonjs@9.2.0: - version "9.2.0" - resolved "https://registry.yarnpkg.com/rollup-plugin-commonjs/-/rollup-plugin-commonjs-9.2.0.tgz#4604e25069e0c78a09e08faa95dc32dec27f7c89" - integrity sha512-0RM5U4Vd6iHjL6rLvr3lKBwnPsaVml+qxOGaaNUWN1lSq6S33KhITOfHmvxV3z2vy9Mk4t0g4rNlVaJJsNQPWA== +rollup-plugin-commonjs@9.3.4: + version "9.3.4" + resolved "https://registry.yarnpkg.com/rollup-plugin-commonjs/-/rollup-plugin-commonjs-9.3.4.tgz#2b3dddbbbded83d45c36ff101cdd29e924fd23bc" + integrity sha512-DTZOvRoiVIHHLFBCL4pFxOaJt8pagxsVldEXBOn6wl3/V21wVaj17HFfyzTsQUuou3sZL3lEJZVWKPFblJfI6w== dependencies: - estree-walker "^0.5.2" - magic-string "^0.25.1" - resolve "^1.8.1" - rollup-pluginutils "^2.3.3" + estree-walker "^0.6.0" + magic-string "^0.25.2" + resolve "^1.10.0" + rollup-pluginutils "^2.6.0" -rollup-plugin-node-resolve@3.4.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-3.4.0.tgz#908585eda12e393caac7498715a01e08606abc89" - integrity sha512-PJcd85dxfSBWih84ozRtBkB731OjXk0KnzN0oGp7WOWcarAFkVa71cV5hTJg2qpVsV2U8EUwrzHP3tvy9vS3qg== +rollup-plugin-node-resolve@4.2.1: + version "4.2.1" + resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-4.2.1.tgz#a949f3082c9839ca586d0e893425d1f83ed01fcf" + integrity sha512-zf2dcKBSv9KSnNbAPDYzwLpeI4Lc4bOsNlaRsq3ud80zquxWdu9iYA0ZgmHxFjBkbt8uHzXCGC4FkkejtngKng== dependencies: - builtin-modules "^2.0.0" + "@types/resolve" "0.0.8" + builtin-modules "^3.0.0" is-module "^1.0.0" - resolve "^1.1.6" + resolve "^1.10.0" -rollup-plugin-replace@2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/rollup-plugin-replace/-/rollup-plugin-replace-2.1.0.tgz#f9c07a4a89a2f8be912ee54b3f0f68d91e9ed0ae" - integrity sha512-SxrAIgpH/B5/W4SeULgreOemxcpEgKs2gcD42zXw50bhqGWmcnlXneVInQpAqzA/cIly4bJrOpeelmB9p4YXSQ== +rollup-plugin-replace@2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/rollup-plugin-replace/-/rollup-plugin-replace-2.1.1.tgz#e49cb8d07d6f91a7bf28b90b66692f2c8c0b9bba" + integrity sha512-IS5ZYBb3px0UfbDCYzKaKxelLd5dbPHhfplEXbymfvGlz9Ok44At4AjTOWe2qEax73bE8+pnMZN9C7PcVpFNlw== dependencies: - magic-string "^0.25.1" - minimatch "^3.0.2" - rollup-pluginutils "^2.0.1" + magic-string "^0.25.2" + rollup-pluginutils "^2.4.1" -rollup-pluginutils@^2.0.1, rollup-pluginutils@^2.3.0, rollup-pluginutils@^2.3.3: +rollup-pluginutils@^2.3.0, rollup-pluginutils@^2.4.1, rollup-pluginutils@^2.6.0: version "2.6.0" resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.6.0.tgz#203706edd43dfafeaebc355d7351119402fc83ad" integrity sha512-aGQwspEF8oPKvg37u3p7h0cYNwmJR1sCBMZGZ5b9qy8HGtETknqjzcxrDRrcAnJNXN18lBH4Q9vZYth/p4n8jQ== @@ -6589,13 +6599,14 @@ rollup-pluginutils@^2.0.1, rollup-pluginutils@^2.3.0, rollup-pluginutils@^2.3.3: estree-walker "^0.6.0" micromatch "^3.1.10" -rollup@0.67.0: - version "0.67.0" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.67.0.tgz#16d4f259c55224dded6408e7666b7731500797a3" - integrity sha512-p34buXxArhwv9ieTdHvdhdo65Cbig68s/Z8llbZuiX5e+3zCqnBF02Ck9IH0tECrmvvrJVMws32Ry84hTnS1Tw== +rollup@1.9.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.9.0.tgz#65f7db8d312a07d4e9702316025f91df56ce9f9c" + integrity sha512-cNZx9MLpKFMSaObdVFeu8nXw8gfw6yjuxWjt5mRCJcBZrAJ0NHAYwemKjayvYvhLaNNkf3+kS2DKRKS5J6NRVg== dependencies: "@types/estree" "0.0.39" - "@types/node" "*" + "@types/node" "^11.13.0" + acorn "^6.1.1" rsvp@^3.3.3: version "3.6.2"