From 161e1bde7f5664a513490654c65cf31a4a2e9c9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20W=C5=82adyka?= Date: Wed, 22 Jun 2022 16:04:41 +0200 Subject: [PATCH 1/3] upgrading deps in progress --- project.clj | 96 ++++++++++++++++++++++++++++------------------------- 1 file changed, 50 insertions(+), 46 deletions(-) diff --git a/project.clj b/project.clj index 775f753f..d29c7f61 100644 --- a/project.clj +++ b/project.clj @@ -7,29 +7,29 @@ ;; TODO migration from cljs-web3 to cljs-web3-next can be completed ;; only when the latter contains all so far missing functionality [cljs-web3 "0.19.0-0-11"] - [cljs-web3-next "0.1.3"] + ;[cljs-web3-next "0.1.4"] [cljsjs/filesaverjs "1.3.3-0"] - [cljsjs/prop-types "15.6.0-0"] - [cljsjs/react "16.4.1-0"] - [cljsjs/react-datepicker "1.5.0-0"] - [cljsjs/react-dom "16.4.1-0"] + [cljsjs/prop-types "15.7.2-0"] + [cljsjs/react "17.0.2-0"] + [cljsjs/react-datepicker "2.3.0-0"] + [cljsjs/react-dom "17.0.2-0"] [cljsjs/react-infinite "0.13.0-0"] [cljsjs/react-meta-tags "0.3.0-1"] - [com.rpl/specter "1.1.1"] - [compojure "1.6.2"] - [day8.re-frame/async-flow-fx "0.0.8"] - [day8.re-frame/forward-events-fx "0.0.5"] - [honeysql "0.9.3"] - [medley "1.3.0"] - [org.clojure/clojurescript "1.10.439"] - [org.clojure/core.match "0.3.0-alpha4"] + [com.rpl/specter "1.1.4"] + [compojure "1.6.3"] + [day8.re-frame/async-flow-fx "0.3.0"] + [day8.re-frame/forward-events-fx "0.0.6"] + [honeysql "1.0.461"] + [medley "1.4.0"] + [org.clojure/clojurescript "1.11.57"] + [org.clojure/core.match "1.0.0"] [print-foo-cljs "2.0.3"] - [re-frame "0.10.6"] + [re-frame "1.2.0"] [re-promise "0.1.1"] - [ring/ring-defaults "0.3.2"] + [ring/ring-defaults "0.3.3"] ;; Can be removed when re-frame vbump includes reagent 8.0.1+ - [reagent "0.8.1"] - [soda-ash "0.76.0"] + [reagent "1.1.1"] + [soda-ash "0.83.0"] [district0x/async-helpers "0.1.3"] [district0x/bignumber "1.0.3"] @@ -39,56 +39,58 @@ [district0x/district-server-db "1.0.4"] ;; TODO: Update to latest version. ;; Version 1.0.2 splits the package into two separate modules. - [district0x/district-server-endpoints "1.0.1"] + [district0x/district-server-endpoints "1.0.3"] [district0x/district-server-logging "1.0.6"] - [district0x/district-server-smart-contracts "1.2.6"] - [district0x/district-server-web3 "1.2.6"] - [district0x/district-server-web3-events "1.1.10"] + [district0x/district-server-smart-contracts "1.2.9"] + [district0x/district-server-web3 "1.2.7"] + [district0x/district-server-web3-events "1.1.12"] [district0x/district-ui-logging "1.1.0"] [district0x/district-ui-mobile "1.0.0"] [district0x/error-handling "1.0.4"] ;; d0xINFRA temporary here - [akiroz.re-frame/storage "0.1.2"] - [bidi "2.1.2"] - [mount "0.1.11"] - [camel-snake-kebab "0.4.0"] - [cljs-ajax "0.7.2"] - [cljsjs/bignumber "2.1.4-1"] + [akiroz.re-frame/storage "0.1.4"] + [bidi "2.1.6"] + [mount "0.1.16"] + [camel-snake-kebab "0.4.3"] + [cljs-ajax "0.8.4"] + [cljsjs/bignumber "9.0.0-0"] [cljsjs/react-flexbox-grid "1.0.0-0"] [cljsjs/react-highlight "1.0.7-2"] [cljsjs/react-truncate "2.0.3-0"] - [cljsjs/react-ultimate-pagination "0.8.0-0"] + [cljsjs/react-ultimate-pagination "1.2.0-0"] [com.andrewmcveigh/cljs-time "0.5.2"] - [com.cognitect/transit-cljs "0.8.243"] - [com.taoensso/timbre "4.10.0"] - [com.taoensso/encore "2.92.0"] - [day8.re-frame/http-fx "0.1.4"] + [com.cognitect/transit-cljs "0.8.269"] + [com.taoensso/timbre "5.2.1"] + [com.taoensso/encore "3.23.0"] + [day8.re-frame/http-fx "0.2.4"] [kibu/pushy "0.3.8"] [madvas.re-frame/google-analytics-fx "0.1.0"] [madvas/cemerick-url-patched "0.1.2-SNAPSHOT"] ;; Temporary until cemerick merges PR26 - [madvas.re-frame/web3-fx "0.2.3"]] + [madvas.re-frame/web3-fx "0.2.3"] + ] :exclusions [[com.taoensso/encore] [org.clojure/clojure] [org.clojure/clojurescript]] - :plugins [[lein-auto "0.1.2"] - [lein-cljsbuild "1.1.7"] - [lein-figwheel "0.5.18"] + :plugins [[lein-auto "0.1.3"] + [lein-cljsbuild "1.1.8"] + [lein-figwheel "0.5.20"] [lein-shell "0.5.0"] - [lein-doo "0.1.8"] + [lein-doo "0.1.11"] [lein-npm "0.6.2"] [lein-pdo "0.1.1"]] - :npm {:dependencies [["@ensdomains/ens-contracts" "0.0.4"] + :npm {:dependencies [ + ;["@ensdomains/ens-contracts" "0.0.4"] ["@openzeppelin/contracts" "4.1.0"] ["@sentry/node" "4.2.1"] ["@ungap/global-this" "0.4.4"] ;; https://github.com/district0x/district-server-db/blob/3839edd/project.clj#L12 ;; After deployment changes, (transitive) dependencies are not installed automatically ;; TODO: remove, they should be installed automatically - [better-sqlite3 "5.4.0"] + ;[better-sqlite3 "5.4.0"] [chalk "2.3.0"] ;; https://github.com/district0x/district-server-smart-contracts/blob/682e649/project.clj#L17 ;; After deployment changes, (transitive) dependencies are not installed automatically @@ -98,18 +100,20 @@ ;; After deployment changes, (transitive) dependencies are not installed automatically ;; TODO: remove, they should be installed automatically [eccjs "0.3.1"] - [chalk "2.3.0"] [eth-ens-namehash "2.0.0"] - [semantic-ui "2.4.1"] + ;[semantic-ui "2.4.1"] [source-map-support "0.4.0"] [ws "2.3.1"] - [xhr2 "0.1.4"]] - :devDependencies [["@testing-library/cypress" "7.0.3"] - ["@truffle/hdwallet-provider" "1.2.2"] + [xhr2 "0.1.4"] + ] + :devDependencies [ + ["@testing-library/cypress" "8.0.3"] + ["@truffle/hdwallet-provider" "2.0.9"] [ethlint "1.2.5"] - [cypress "6.4.0"] + [cypress "10.1.0"] [jsedn "0.4.1"] - [truffle "5.2.3"]] + [truffle "5.5.18"] + ] :package {:scripts {:ethlint "./node_modules/ethlint/bin/solium.js --dir resources/public/contracts/src/" :ethlint-fix"./node_modules/ethlint/bin/solium.js --dir resources/public/contracts/src/ --fix" :cypress-open " ./node_modules/cypress/bin/cypress open" From 3fc5cb08b90a98ac8cf843bbf1797311724d8032 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20W=C5=82adyka?= Date: Thu, 23 Jun 2022 20:59:43 +0200 Subject: [PATCH 2/3] this works with node v10.23.1 and without pyenv (should use python3 then) --- project.clj | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/project.clj b/project.clj index d29c7f61..def59385 100644 --- a/project.clj +++ b/project.clj @@ -83,14 +83,14 @@ [lein-pdo "0.1.1"]] :npm {:dependencies [ - ;["@ensdomains/ens-contracts" "0.0.4"] + ["@ensdomains/ens-contracts" "0.0.11"] ["@openzeppelin/contracts" "4.1.0"] ["@sentry/node" "4.2.1"] ["@ungap/global-this" "0.4.4"] ;; https://github.com/district0x/district-server-db/blob/3839edd/project.clj#L12 ;; After deployment changes, (transitive) dependencies are not installed automatically ;; TODO: remove, they should be installed automatically - ;[better-sqlite3 "5.4.0"] + [better-sqlite3 "7.5.3"] [chalk "2.3.0"] ;; https://github.com/district0x/district-server-smart-contracts/blob/682e649/project.clj#L17 ;; After deployment changes, (transitive) dependencies are not installed automatically @@ -101,7 +101,7 @@ ;; TODO: remove, they should be installed automatically [eccjs "0.3.1"] [eth-ens-namehash "2.0.0"] - ;[semantic-ui "2.4.1"] + [semantic-ui "2.4.2"] [source-map-support "0.4.0"] [ws "2.3.1"] [xhr2 "0.1.4"] @@ -148,12 +148,12 @@ "build-qa" ["pdo" ["build-prod-server"] ["build-qa-ui"] ["build-css"]] "run-slither" ["shell" "./run-slither.sh"]} - :profiles {:dev {:dependencies [[org.clojure/clojure "1.9.0"] - [binaryage/devtools "0.9.10"] - [cider/piggieback "0.4.0"] - [figwheel-sidecar "0.5.18"] - [day8.re-frame/re-frame-10x "0.3.6"] - [day8.re-frame/tracing "0.5.1"]] + :profiles {:dev {:dependencies [[org.clojure/clojure "1.11.1"] + [binaryage/devtools "1.0.6"] + [cider/piggieback "0.5.3"] + [figwheel-sidecar "0.5.20"] + [day8.re-frame/re-frame-10x "1.2.7"] + [day8.re-frame/tracing "0.6.2"]] :repl-options {:nrepl-middleware [cider.piggieback/wrap-cljs-repl]} :source-paths ["dev" "src"] :resource-paths ["resources"]}} From 02047cf0b19172461811f7890b81099aee2358b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20W=C5=82adyka?= Date: Mon, 4 Jul 2022 16:47:02 +0200 Subject: [PATCH 3/3] this works with node v10.23.1 and with Python 2, but there are breaking changes and project does not compile --- project.clj | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/project.clj b/project.clj index def59385..481a3885 100644 --- a/project.clj +++ b/project.clj @@ -6,8 +6,8 @@ :dependencies [[cljs-http "0.1.46"] ;; TODO migration from cljs-web3 to cljs-web3-next can be completed ;; only when the latter contains all so far missing functionality - [cljs-web3 "0.19.0-0-11"] - ;[cljs-web3-next "0.1.4"] + ;[cljs-web3 "0.19.0-0-11"] + [cljs-web3-next "0.1.4"] [cljsjs/filesaverjs "1.3.3-0"] [cljsjs/prop-types "15.7.2-0"] [cljsjs/react "17.0.2-0"] @@ -67,8 +67,7 @@ [kibu/pushy "0.3.8"] [madvas.re-frame/google-analytics-fx "0.1.0"] [madvas/cemerick-url-patched "0.1.2-SNAPSHOT"] ;; Temporary until cemerick merges PR26 - [madvas.re-frame/web3-fx "0.2.3"] - ] + [madvas.re-frame/web3-fx "0.2.3"]] :exclusions [[com.taoensso/encore] [org.clojure/clojure] @@ -82,8 +81,7 @@ [lein-npm "0.6.2"] [lein-pdo "0.1.1"]] - :npm {:dependencies [ - ["@ensdomains/ens-contracts" "0.0.11"] + :npm {:dependencies [["@ensdomains/ens-contracts" "0.0.11"] ["@openzeppelin/contracts" "4.1.0"] ["@sentry/node" "4.2.1"] ["@ungap/global-this" "0.4.4"] @@ -104,21 +102,17 @@ [semantic-ui "2.4.2"] [source-map-support "0.4.0"] [ws "2.3.1"] - [xhr2 "0.1.4"] - ] - :devDependencies [ - ["@testing-library/cypress" "8.0.3"] + [xhr2 "0.1.4"]] + :devDependencies [["@testing-library/cypress" "8.0.3"] ["@truffle/hdwallet-provider" "2.0.9"] [ethlint "1.2.5"] [cypress "10.1.0"] [jsedn "0.4.1"] - [truffle "5.5.18"] - ] + [truffle "5.5.19"]] :package {:scripts {:ethlint "./node_modules/ethlint/bin/solium.js --dir resources/public/contracts/src/" :ethlint-fix"./node_modules/ethlint/bin/solium.js --dir resources/public/contracts/src/ --fix" :cypress-open " ./node_modules/cypress/bin/cypress open" - :cypress-run " ./node_modules/cypress/bin/cypress run" - }}} + :cypress-run " ./node_modules/cypress/bin/cypress run"}}} :min-lein-version "2.5.3"