From 75f345f16e730c0528e773c06656110b4e0723a3 Mon Sep 17 00:00:00 2001 From: awb99 Date: Tue, 17 Sep 2024 22:21:27 -0500 Subject: [PATCH] 10x devtool support removed. --- README.md | 10 ------- demo/deps.edn | 8 +++--- demo/resources/demo.edn | 12 ++++----- demo/src/demo/page/main/ws.cljs | 2 +- demo/src/demo/test.clj | 1 - spa/deps.edn | 7 ++--- spa/src/webly/spa.cljs | 4 +-- spa/src/webly/spa/html/page.clj | 5 ++-- src-unused/tenx/deps.txt | 13 ++++++++++ .../tenx}/tenx/events_off.cljs | 0 .../tenx}/tenx/events_on.cljs | 0 .../spa => src-unused/tenx}/tenx/view.clj | 0 webly/deps.edn | 5 ++-- webly/src/webly/build/profile.clj | 26 +++++-------------- webly/src/webly/build/shadow_config.clj | 12 ++++----- 15 files changed, 44 insertions(+), 61 deletions(-) create mode 100644 src-unused/tenx/deps.txt rename {spa/src/webly/spa => src-unused/tenx}/tenx/events_off.cljs (100%) rename {spa/src/webly/spa => src-unused/tenx}/tenx/events_on.cljs (100%) rename {spa/src/webly/spa => src-unused/tenx}/tenx/view.clj (100%) diff --git a/README.md b/README.md index 50d4b3e..4d002e0 100644 --- a/README.md +++ b/README.md @@ -33,22 +33,12 @@ A simple demo is on [Webly Github Pages](https://pink-gorilla.github.io/webly/) # features -## 10x / tracing -- are included in watch / compile -- keybinding [alt+g t] to open 10x console -- touse trace-fn see: - - https://github.com/day8/re-frame-debux is included in watch profile - - frontend.notifications.events - - select :notification/add in tenx dev console - - ## web app - dynamically generated app html that works with csrf - ring middleware for api calls - routing with bidi (this allows to have links within the web-app) - this means a registry for ring-handlers and reagent-views - ## webly build - this feature is available for apps that use webly - compiles/watches via shadow-cljs diff --git a/demo/deps.edn b/demo/deps.edn index 96ac912..c265f44 100644 --- a/demo/deps.edn +++ b/demo/deps.edn @@ -42,17 +42,15 @@ ; 2. run unit tests ; BUILD BUNDLE (then exit) - :webly {:extra-deps {org.pinkgorilla/ui-repl {:mvn/version "0.1.105"} ; http cors test + :webly {:extra-deps {org.pinkgorilla/ui-repl {:mvn/version "0.1.108"} ; http cors test } :extra-paths ["src" "resources" "test" "test/resources"] :exec-fn webly.app.app/webly-build - :exec-args {:config ["demo.edn" - ;"creds-localhost.edn" - "/home/florian/repo/myLinux/myvault/trateg/creds.edn"] ; does not get used! + :exec-args {:config ["demo.edn"] :profile "npm-install"}} :npm-install {:exec-args {:profile "npm-install"}} - :compile {:exec-args {:profile "compile2"}} + :compile {:exec-args {:profile "compile"}} :release {:exec-args {:profile "release"}} :release-adv {:exec-args {:profile "release-adv"}} :static {:exec-args {:profile "static"}} diff --git a/demo/resources/demo.edn b/demo/resources/demo.edn index 8e88fec..f64b216 100644 --- a/demo/resources/demo.edn +++ b/demo/resources/demo.edn @@ -29,17 +29,15 @@ ; shift, ctrl, alt, win, cmd, defmod, "left" "right" ; "meta-shift-l" "alt-shift-p" "ctrl-shift-left" "ctrl-shift-right" {:kb "esc" :handler [:modal/close] :desc "Dialog Close"} ; for ALL dialogs! - {:kb "alt-g t" :handler [:reframe10x-toggle] :desc "10x visibility toggle"} - {:kb "alt-g k" :handler [:palette/show] :desc "Keybindings dialog"} {:kb "ctrl-g k" :handler [:palette/show] :desc "Keybindings dialog"} {:kb "win-g k" :handler [:palette/show] :desc "Keybindings dialog"} - {:kb "alt-g 1" :handler [:bidi/goto 'demo.page.main/main-page] :desc "goto main"} - {:kb "alt-g 2" :handler [:bidi/goto :demo/party :location "Vienna"] :desc "goto party vienna"} - {:kb "alt-g 3" :handler [:bidi/goto :demo/help] :desc "goto help"} - {:kb "alt-g 4" :handler [:bidi/goto 'demo.page.job/job-page] :desc "goto job"} - {:kb "alt-g 5" :handler [:bidi/goto :demo/party :location "Bali" :query-params {:expected-guests 299}] :desc "goto party bali"} + {:kb "alt-g 1" :handler [:bidi/goto demo.page.main/main-page] :desc "goto main"} + {:kb "alt-g 2" :handler [:bidi/goto demo.page.party/party-page :location "Vienna"] :desc "goto party vienna"} + {:kb "alt-g 3" :handler [:bidi/goto demo.page.help/help-page] :desc "goto help"} + {:kb "alt-g 4" :handler [:bidi/goto demo.page.job/job-page] :desc "goto job"} + {:kb "alt-g 5" :handler [:bidi/goto demo.page.party/party-page :location "Bali" :query-params {:expected-guests 299}] :desc "goto party bali"} {:kb "alt-y l" :handler [:login/dialog] :desc "login"} {:kb "ctrl-y l" :handler [:login/dialog] :desc "login"} {:kb "win-y l" :handler [:login/dialog] :desc "login"} diff --git a/demo/src/demo/page/main/ws.cljs b/demo/src/demo/page/main/ws.cljs index 2c191f7..01b329c 100644 --- a/demo/src/demo/page/main/ws.cljs +++ b/demo/src/demo/page/main/ws.cljs @@ -3,7 +3,7 @@ [taoensso.timbre :refer-macros [warn]] [reagent.core :as r] [re-frame.core :as rf] - [demo.helper.ui :refer [link-fn block2]])) + [demo.helper.ui :refer [block2]])) ; WEBSOCKET (defn print-status [x] diff --git a/demo/src/demo/test.clj b/demo/src/demo/test.clj index 28ce35c..ea603ad 100644 --- a/demo/src/demo/test.clj +++ b/demo/src/demo/test.clj @@ -2,7 +2,6 @@ (:require [extension :refer [discover write-service]] [bidi.bidi :as bidi] - [webly.module.build :refer [create-modules shadow-module-config create-modules get-lazy-ns]])) diff --git a/spa/deps.edn b/spa/deps.edn index b612a05..b8f0686 100644 --- a/spa/deps.edn +++ b/spa/deps.edn @@ -8,11 +8,8 @@ ; frontend reagent/reagent {:mvn/version "1.1.1"} ; https://github.com/reagent-project/reagent re-frame/re-frame {:mvn/version "1.2.0"} - cljs-ajax/cljs-ajax {:mvn/version "0.8.4"} ; needed for re-frame/http-fx day8.re-frame/http-fx {:mvn/version "0.2.3"} ; reframe based http requests - day8.re-frame/re-frame-10x {:mvn/version "1.1.12"} ;; https://github.com/day8/re-frame-10x - ;day8.re-frame/tracing {:mvn/version "0.6.2"} ; https://github.com/day8/re-frame-debux - ;{day8.re-frame/tracing-stubs "0.6.2"} + cljs-ajax/cljs-ajax {:mvn/version "0.8.4"} ; needed for re-frame/http-fx com.cemerick/url {:mvn/version "0.1.1"} ; url query-strings ; modular org.pinkgorilla/webserver {:mvn/version "0.0.12"} ; brings modular @@ -22,7 +19,7 @@ org.pinkgorilla/ui-dialog-keybindings {:mvn/version "0.1.10"} org.pinkgorilla/css-theme {:mvn/version "0.1.6"} ; devtools - org.pinkgorilla/devtools {:mvn/version "0.5.20"} + org.pinkgorilla/devtools {:mvn/version "0.5.21"} org.pinkgorilla/ui-pprint-frisk {:mvn/version "0.6.564"}} :aliases {:cljfmt {:extra-deps {cljfmt/cljfmt {:mvn/version "0.9.2"}} diff --git a/spa/src/webly/spa.cljs b/spa/src/webly/spa.cljs index e143a14..53f9c9d 100644 --- a/spa/src/webly/spa.cljs +++ b/spa/src/webly/spa.cljs @@ -16,7 +16,7 @@ [webly.spa.service.ws :refer [start-ws]] ; webly [webly.build.lazy] - [webly.spa.tenx.events] + ;[webly.spa.tenx.events] [webly.spa.views :refer [webly-app]] [webly.spa.events] ; side effects [webly.spa.loader.page] ; side-effects @@ -91,7 +91,7 @@ (defn ^:export start [_mode] (enable-console-print!) - (dispatch [:reframe10x-init]) + ;(dispatch [:reframe10x-init]) (dispatch [:webly/status :route-init]) (dispatch [:webly/status :loading-config]) (start-config) diff --git a/spa/src/webly/spa/html/page.clj b/spa/src/webly/spa/html/page.clj index e167ec5..5e9e1c1 100644 --- a/spa/src/webly/spa/html/page.clj +++ b/spa/src/webly/spa/html/page.clj @@ -5,7 +5,8 @@ [taoensso.timbre :refer [debug info error]] [frontend.analytics.google-tag :refer [script-tag-src script-tag-config]] [frontend.css.config :refer [css-app]] - [webly.spa.tenx.view :refer [tenx-script]])) + ;[webly.spa.tenx.view :refer [tenx-script]] + )) ;; CSS @@ -71,7 +72,7 @@ ; [:title title] [:link {:rel "shortcut icon" :href (str prefix icon)}] - (tenx-script) + ;(tenx-script) (body-loading-style (str prefix loading-image-url)) (script-tag-src google-analytics) (script-tag-config google-analytics)]] diff --git a/src-unused/tenx/deps.txt b/src-unused/tenx/deps.txt new file mode 100644 index 0000000..e3b5cf3 --- /dev/null +++ b/src-unused/tenx/deps.txt @@ -0,0 +1,13 @@ + + + +day8.re-frame/re-frame-10x {:mvn/version "1.1.12"} ;; https://github.com/day8/re-frame-10x + + +## 10x / tracing +- are included in watch / compile +- keybinding [alt+g t] to open 10x console +- touse trace-fn see: + - https://github.com/day8/re-frame-debux is included in watch profile + - frontend.notifications.events + - select :notification/add in tenx dev console \ No newline at end of file diff --git a/spa/src/webly/spa/tenx/events_off.cljs b/src-unused/tenx/tenx/events_off.cljs similarity index 100% rename from spa/src/webly/spa/tenx/events_off.cljs rename to src-unused/tenx/tenx/events_off.cljs diff --git a/spa/src/webly/spa/tenx/events_on.cljs b/src-unused/tenx/tenx/events_on.cljs similarity index 100% rename from spa/src/webly/spa/tenx/events_on.cljs rename to src-unused/tenx/tenx/events_on.cljs diff --git a/spa/src/webly/spa/tenx/view.clj b/src-unused/tenx/tenx/view.clj similarity index 100% rename from spa/src/webly/spa/tenx/view.clj rename to src-unused/tenx/tenx/view.clj diff --git a/webly/deps.edn b/webly/deps.edn index 98201f8..0ca997a 100644 --- a/webly/deps.edn +++ b/webly/deps.edn @@ -12,7 +12,7 @@ ; shadow-cljs MAY NOT be a dependency in lein deps :tree -> if so, bundler ; will fail because shadow contains core.async which is not compatible with ; self hosted clojurescript - thheller/shadow-cljs {:mvn/version "2.24.1"} ; 2.17.4 + thheller/shadow-cljs {:mvn/version "2.24.1"} ;:exclusions [org.clojure/tools.reader] ; outdated ;{thheller/shadow-cljsjs "0.0.21"} ; already referred to from shadow-cljs ;org.clojure/clojurescript {:mvn/version "1.10.879"} ; already referred from shadow-cljs @@ -20,8 +20,7 @@ luminus/ring-undertow-adapter {:mvn/version "1.3.1"} ; modular org.pinkgorilla/timbre {:mvn/version "0.0.7"} - org.pinkgorilla/extension {:mvn/version "0.0.12"} - ;org.pinkgorilla/permission {:mvn/version "0.2.19"} + org.pinkgorilla/extension {:mvn/version "0.0.13"} ; brings modular org.pinkgorilla/webserver {:mvn/version "0.0.12"} ; brings modular org.pinkgorilla/websocket {:mvn/version "0.0.18"} org.pinkgorilla/spa {:local/root "../spa" :deps/manifest :deps}} diff --git a/webly/src/webly/build/profile.clj b/webly/src/webly/build/profile.clj index 8e41ae5..7d0b83b 100644 --- a/webly/src/webly/build/profile.clj +++ b/webly/src/webly/build/profile.clj @@ -4,7 +4,7 @@ [webly.build.prefs :refer [prefs-atom]])) (defonce profiles - {:ci {:prefs {:tenx false} + {:ci {:prefs {} :bundle {:shadow-verbose false :cljs-build :ci :shadow-mode :release @@ -12,49 +12,37 @@ :static {:static? true} - :release {:prefs {:tenx false} + :release {:prefs {} :bundle {:shadow-verbose false :cljs-build :webly :shadow-mode :release ; production build - no source maps :size-report true}} - :release-adv {:prefs {:tenx false} + :release-adv {:prefs {} :bundle {:shadow-verbose false :cljs-build :webly :shadow-mode :release ; production build - no source maps :advanced true :size-report true}} - :npm-install {:prefs {:tenx false} + :npm-install {:prefs {} :bundle {:shadow-verbose false :cljs-build :webly :shadow-mode nil ; no build, just npm install :size-report false :npm-install true}} - :compile {:prefs {:tenx true} + :compile {:prefs {} :bundle {:shadow-verbose false :cljs-build :webly :shadow-mode :compile ; compile has source maps :size-report false}} - :compile2 {:prefs {:tenx false} - :bundle {:shadow-verbose false - :cljs-build :webly - :shadow-mode :compile ; compile has source maps - :size-report false}} - - :watch {:prefs {:tenx true} + :watch {:prefs {} :bundle {:shadow-verbose true :cljs-build :webly :shadow-mode :watch - :size-report false}} - - :watch2 {:prefs {:tenx false} - :bundle {:shadow-verbose true - :cljs-build :webly - :shadow-mode :watch - :size-report false}}}) + :size-report false}}}) (defn str->profile [profile-str] (let [p (keyword profile-str)] diff --git a/webly/src/webly/build/shadow_config.clj b/webly/src/webly/build/shadow_config.clj index a5fe3f6..a2ea812 100644 --- a/webly/src/webly/build/shadow_config.clj +++ b/webly/src/webly/build/shadow_config.clj @@ -7,12 +7,12 @@ [webly.module.build :refer [create-modules shadow-module-config]])) ;; build-options -(defn build-ns-aliases [] - (if-pref-fn :tenx - {'webly.spa.tenx.events 'webly.spa.tenx.events-on} - {'webly.spa.tenx.events 'webly.spa.tenx.events-off +#_(defn build-ns-aliases [] + (if-pref-fn :tenx + {'webly.spa.tenx.events 'webly.spa.tenx.events-on} + {'webly.spa.tenx.events 'webly.spa.tenx.events-off ;'day8.re-frame.tracing 'day8.re-frame.tracing-stubs - })) + })) ;; shadow config (defn shadow-config [exts @@ -69,7 +69,7 @@ :modules shadow-modules ;:devtools {:before-load (symbol "webly.web.app/before-load") ; :after-load (symbol "webly.web.app/after-load")} - :build-options {:ns-aliases (build-ns-aliases)} + ;:build-options {:ns-aliases (build-ns-aliases)} :compiler-options {:optimizations (if advanced? :advanced :simple)