chore: clean up namespace, eliminate refer-macro

src/main/frontend/components/block.cljs

@@ -1,58 +1,52 @@
 (ns frontend.components.block
   (:refer-clojure :exclude [range])
-  (:require [frontend.config :as config]
-            [cljs.core.match :refer-macros [match]]
-            [promesa.core :as p]
-            [frontend.fs :as fs]
+  (:require ["/frontend/utils" :as utils]
+            [cljs-bean.core :as bean]
+            [cljs.core.match :refer [match]]
+            [cljs.reader :as reader]
             [clojure.string :as string]
-            [frontend.util :as util]
-            [rum.core :as rum]
-            [frontend.state :as state]
-            [frontend.db :as db]
-            [frontend.db.model :as model]
-            [frontend.db.query-dsl :as query-dsl]
-            [dommy.core :as d]
+            [clojure.walk :as walk]
             [datascript.core :as dc]
-            [goog.dom :as gdom]
-            [frontend.components.svg :as svg]
+            [dommy.core :as d]
+            [frontend.commands :as commands]
             [frontend.components.datetime :as datetime-comp]
-            [frontend.ui :as ui]
-            [frontend.handler.editor :as editor-handler]
-            [frontend.handler.block :as block-handler]
-            [frontend.handler.route :as route-handler]
-            [frontend.handler.dnd :as dnd]
-            [frontend.handler.ui :as ui-handler]
-            [frontend.handler.repeated :as repeated]
-            [goog.object :as gobj]
-            [medley.core :as medley]
-            [cljs.reader :as reader]
-            [frontend.util :as util :refer-macros [profile]]
-            [frontend.db-mixins :as db-mixins]
-            [frontend.extensions.latex :as latex]
             [frontend.components.lazy-editor :as lazy-editor]
+            [frontend.components.svg :as svg]
+            [frontend.config :as config]
+            [frontend.context.i18n :as i18n]
+            [frontend.date :as date]
+            [frontend.db :as db]
+            [frontend.db-mixins :as db-mixins]
+            [frontend.db.model :as model]
+            [frontend.db.query-dsl :as query-dsl]
             [frontend.extensions.highlight :as highlight]
+            [frontend.extensions.latex :as latex]
             [frontend.extensions.sci :as sci]
-            ["/frontend/utils" :as utils]
             [frontend.format.block :as block]
-            [clojure.walk :as walk]
-            [cljs-bean.core :as bean]
-            [frontend.handler.image :as image-handler]
             [frontend.format.mldoc :as mldoc]
+            [frontend.handler.block :as block-handler]
+            [frontend.handler.dnd :as dnd]
+            [frontend.handler.editor :as editor-handler]
+            [frontend.handler.repeated :as repeated]
+            [frontend.handler.route :as route-handler]
+            [frontend.handler.ui :as ui-handler]
+            [frontend.modules.outliner.tree :as tree]
+            [frontend.search :as search]
+            [frontend.security :as security]
+            [frontend.state :as state]
+            [frontend.template :as template]
             [frontend.text :as text]
+            [frontend.ui :as ui]
+            [frontend.util :as util]
             [frontend.util.property :as property]
-            [frontend.utf8 :as utf8]
-            [frontend.date :as date]
-            [frontend.security :as security]
-            [reitit.frontend.easy :as rfe]
-            [frontend.commands :as commands]
+            [goog.dom :as gdom]
+            [goog.object :as gobj]
             [lambdaisland.glogi :as log]
-            [frontend.context.i18n :as i18n]
-            [frontend.template :as template]
-            [shadow.loader :as loader]
-            [frontend.search :as search]
-            [frontend.debug :as debug]
-            [frontend.modules.outliner.tree :as tree]
-            [clojure.walk :as walk]))
+            [medley.core :as medley]
+            [promesa.core :as p]
+            [reitit.frontend.easy :as rfe]
+            [rum.core :as rum]
+            [shadow.loader :as loader]))
 
 ;; TODO: remove rum/with-context because it'll make reactive queries not working
 

src/main/frontend/components/commit.cljs

@@ -1,6 +1,6 @@
 (ns frontend.components.commit
   (:require [rum.core :as rum]
-            [frontend.util :as util :refer-macros [profile]]
+            [frontend.util :as util :refer [profile]]
             [frontend.util.cursor :as cursor]
             [clojure.string :as string]
             [frontend.handler.repo :as repo-handler]

src/main/frontend/components/content.cljs

@@ -6,7 +6,7 @@
             [frontend.handler.editor :as editor-handler]
             [frontend.handler.export :as export-handler]
             [frontend.handler.image :as image-handler]
-            [frontend.util :as util :refer-macros [profile]]
+            [frontend.util :as util :refer [profile]]
             [frontend.state :as state]
             [frontend.mixins :as mixins]
             [frontend.ui :as ui]

src/main/frontend/components/datetime.cljs

@@ -1,6 +1,6 @@
 (ns frontend.components.datetime
   (:require [rum.core :as rum]
-            [frontend.util :as util :refer-macros [profile]]
+            [frontend.util :as util :refer [profile]]
             [frontend.components.svg :as svg]
             [frontend.date :as date]
             [frontend.state :as state]

src/main/frontend/components/encryption.cljs

@@ -2,7 +2,7 @@
   (:require [rum.core :as rum]
             [promesa.core :as p]
             [frontend.encrypt :as e]
-            [frontend.util :as util :refer-macros [profile]]
+            [frontend.util :as util :refer [profile]]
             [frontend.context.i18n :as i18n]
             [frontend.db.utils :as db-utils]
             [clojure.string :as string]

src/main/frontend/components/journal.cljs

@@ -1,7 +1,7 @@
 (ns frontend.components.journal
   (:require [rum.core :as rum]
             [reitit.frontend.easy :as rfe]
-            [frontend.util :as util :refer-macros [profile]]
+            [frontend.util :as util :refer [profile]]
             [frontend.config :as config]
             [frontend.date :as date]
             [frontend.db-mixins :as db-mixins]

src/main/frontend/components/page.cljs

@@ -1,6 +1,6 @@
 (ns frontend.components.page
   (:require [rum.core :as rum]
-            [frontend.util :as util :refer-macros [profile]]
+            [frontend.util :as util :refer [profile]]
             [frontend.util.marker :as marker]
             [frontend.tools.html-export :as html-export]
             [frontend.handler.file :as file]

src/main/frontend/db.cljs

@@ -1,20 +1,19 @@
 (ns frontend.db
-  (:require [frontend.namespaces :refer-macros [import-vars]]
+  (:require [clojure.core.async :as async]
+            [datascript.core :as d]
+            [frontend.db-schema :as db-schema]
             [frontend.db.conn :as conn]
-            [frontend.db.utils :as db-utils]
+            [frontend.db.default :as default-db]
+            [frontend.db.migrate :as migrate]
             [frontend.db.model]
-            [frontend.db.react]
             [frontend.db.query-custom]
             [frontend.db.query-react]
-            [frontend.db.migrate :as migrate]
-            [frontend.util :as util]
-            [datascript.core :as d]
+            [frontend.db.react]
+            [frontend.idb :as idb]
+            [frontend.namespaces :refer [import-vars]]
             [frontend.state :as state]
-            [promesa.core :as p]
-            [frontend.db-schema :as db-schema]
-            [frontend.db.default :as default-db]
-            [clojure.core.async :as async]
-            [frontend.idb :as idb]))
+            [frontend.util :as util]
+            [promesa.core :as p]))
 
 (import-vars
  [frontend.db.conn

src/main/frontend/db/model.cljs

@@ -1,24 +1,19 @@
 (ns frontend.db.model
   "Core db functions."
-  (:require [frontend.db.conn :as conn]
-            [frontend.db.utils :as db-utils]
-            [frontend.db.react :as react]
+  (:require [clojure.set :as set]
+            [clojure.string :as string]
+            [clojure.walk :as walk]
             [datascript.core :as d]
+            [frontend.config :as config]
             [frontend.date :as date]
-            [medley.core :as medley]
+            [frontend.db-schema :as db-schema]
+            [frontend.db.conn :as conn]
+            [frontend.db.react :as react]
+            [frontend.db.utils :as db-utils]
             [frontend.format :as format]
             [frontend.state :as state]
-            [clojure.string :as string]
-            [clojure.set :as set]
-            [frontend.utf8 :as utf8]
-            [frontend.config :as config]
-            [cljs.reader :as reader]
-            [cljs-time.core :as t]
-            [cljs-time.coerce :as tc]
-            [frontend.util :as util :refer [react] :refer-macros [profile]]
-            [frontend.db-schema :as db-schema]
-            [clojure.walk :as walk]
-            [clojure.string :as string]))
+            [frontend.util :as util :refer [react]]
+            [medley.core :as medley]))
 
 ;; TODO: extract to specific models and move data transform logic to the
 ;; correponding handlers.

src/main/frontend/db/react.cljs

@@ -4,16 +4,15 @@
   It'll be great if we can find an automatically resolving and performant
   solution.
   "
-  (:require [frontend.db.conn :as conn]
-            [frontend.state :as state]
-            [frontend.date :as date]
-            [frontend.util :as util :refer-macros [profile] :refer [react]]
-            [frontend.util.marker :as marker]
-            [clojure.string :as string]
-            [frontend.config :as config]
+  (:require [clojure.string :as string]
             [datascript.core :as d]
-            [lambdaisland.glogi :as log]
-            [frontend.db.utils :as db-utils]))
+            [frontend.config :as config]
+            [frontend.date :as date]
+            [frontend.db.conn :as conn]
+            [frontend.db.utils :as db-utils]
+            [frontend.state :as state]
+            [frontend.util :as util :refer [profile react]]
+            [frontend.util.marker :as marker]))
 
 ;; Query atom of map of Key ([repo q inputs]) -> atom
 ;; TODO: replace with LRUCache, only keep the latest 20 or 50 items?

src/main/frontend/extensions/excalidraw.cljs

@@ -2,7 +2,7 @@
   (:require [rum.core :as rum]
             [goog.object :as gobj]
             [frontend.rum :as r]
-            [frontend.util :as util :refer-macros [profile]]
+            [frontend.util :as util :refer [profile]]
             [frontend.mixins :as mixins]
             [frontend.storage :as storage]
             [frontend.components.svg :as svg]

src/main/frontend/extensions/html_parser.cljs

@@ -1,11 +1,10 @@
 (ns frontend.extensions.html-parser
-  (:require [goog.object :as gobj]
-            [hickory.core :as hickory]
-            [cljs.core.match :refer-macros [match]]
+  (:require [cljs.core.match :refer [match]]
+            [clojure.string :as string]
+            [clojure.walk :as walk]
             [frontend.config :as config]
             [frontend.util :as util]
-            [clojure.string :as string]
-            [clojure.walk :as walk]))
+            [hickory.core :as hickory]))
 
 (defonce *inside-pre? (atom false))
 (defn- hiccup-without-style

src/main/frontend/format/block.cljs

@@ -1,19 +1,17 @@
 (ns frontend.format.block
-  (:require [frontend.util :as util :refer-macros [profile]]
+  (:require [clojure.string :as string]
             [clojure.walk :as walk]
-            [clojure.string :as string]
-            [frontend.format :as format]
-            [frontend.utf8 :as utf8]
-            [medley.core :as medley]
             [frontend.config :as config]
-            [datascript.core :as d]
             [frontend.date :as date]
+            [frontend.db :as db]
+            [frontend.format :as format]
+            [frontend.state :as state]
             [frontend.text :as text]
+            [frontend.utf8 :as utf8]
+            [frontend.util :as util]
             [frontend.util.property :as property]
-            [medley.core :as medley]
-            [frontend.state :as state]
-            [frontend.db :as db]
-            [lambdaisland.glogi :as log]))
+            [lambdaisland.glogi :as log]
+            [medley.core :as medley]))
 
 (defn heading-block?
   [block]

src/main/frontend/format/mldoc.cljs

@@ -1,16 +1,15 @@
 (ns frontend.format.mldoc
-  (:require [frontend.format.protocol :as protocol]
-            [frontend.util :as util]
-            [frontend.utf8 :as utf8]
-            [frontend.text :as text]
+  (:require [cljs-bean.core :as bean]
+            [cljs.core.match :refer [match]]
             [clojure.string :as string]
-            [cljs-bean.core :as bean]
-            [cljs.core.match :refer-macros [match]]
-            [lambdaisland.glogi :as log]
-            [goog.object :as gobj]
+            [frontend.format.protocol :as protocol]
             [frontend.text :as text]
-            ["mldoc" :as mldoc :refer [Mldoc]]
-            [medley.core :as medley]))
+            [frontend.utf8 :as utf8]
+            [frontend.util :as util]
+            [goog.object :as gobj]
+            [lambdaisland.glogi :as log]
+            [medley.core :as medley]
+            ["mldoc" :as mldoc :refer [Mldoc]]))
 
 (defonce parseJson (gobj/get Mldoc "parseJson"))
 (defonce parseInlineJson (gobj/get Mldoc "parseInlineJson"))

src/main/frontend/fs.cljs

@@ -1,17 +1,17 @@
 (ns frontend.fs
-  (:require [frontend.util :as util :refer-macros [profile]]
-            [frontend.config :as config]
+  (:require [cljs-bean.core :as bean]
             [clojure.string :as string]
-            [promesa.core :as p]
-            [lambdaisland.glogi :as log]
-            [frontend.fs.protocol :as protocol]
-            [frontend.fs.nfs :as nfs]
+            [frontend.config :as config]
+            [frontend.db :as db]
+            [frontend.encrypt :as encrypt]
             [frontend.fs.bfs :as bfs]
+            [frontend.fs.nfs :as nfs]
             [frontend.fs.node :as node]
-            [frontend.db :as db]
-            [cljs-bean.core :as bean]
+            [frontend.fs.protocol :as protocol]
             [frontend.state :as state]
-            [frontend.encrypt :as encrypt]))
+            [frontend.util :as util]
+            [lambdaisland.glogi :as log]
+            [promesa.core :as p]))
 
 (defonce nfs-record (nfs/->Nfs))
 (defonce bfs-record (bfs/->Bfs))

src/main/frontend/handler/draw.cljs

@@ -1,6 +1,6 @@
 (ns frontend.handler.draw
   (:refer-clojure :exclude [load-file])
-  (:require [frontend.util :as util :refer-macros [profile]]
+  (:require [frontend.util :as util :refer [profile]]
             [frontend.fs :as fs]
             [promesa.core :as p]
             [frontend.state :as state]

src/main/frontend/handler/editor.cljs

@@ -1,58 +1,49 @@
 (ns frontend.handler.editor
-  (:require [frontend.state :as state]
+  (:require [cljs.core.match :refer [match]]
+            [clojure.set :as set]
+            [clojure.string :as string]
             [clojure.walk :as w]
-            [lambdaisland.glogi :as log]
+            [clojure.zip :as zip]
+            [dommy.core :as dom]
+            [frontend.commands :as commands
+             :refer [*angle-bracket-caret-pos *show-block-commands *show-commands *slash-caret-pos]]
+            [frontend.config :as config]
+            [frontend.date :as date]
+            [frontend.db :as db]
+            [frontend.db-schema :as db-schema]
             [frontend.db.model :as db-model]
             [frontend.db.utils :as db-utils]
-            [frontend.db-schema :as db-schema]
+            [frontend.diff :as diff]
+            [frontend.extensions.html-parser :as html-parser]
+            [frontend.format.block :as block]
+            [frontend.format.mldoc :as mldoc]
+            [frontend.fs :as fs]
+            [frontend.handler.block :as block-handler]
             [frontend.handler.common :as common-handler]
+            [frontend.handler.image :as image-handler]
+            [frontend.handler.notification :as notification]
+            [frontend.handler.repeated :as repeated]
+            [frontend.handler.repo :as repo-handler]
             [frontend.handler.route :as route-handler]
             [frontend.handler.ui :as ui-handler]
-            [frontend.handler.repo :as repo-handler]
-            [frontend.handler.notification :as notification]
-            [frontend.handler.block :as block-handler]
-            [frontend.format.mldoc :as mldoc]
-            [frontend.format :as format]
-            [frontend.format.block :as block]
             [frontend.image :as image]
-            [frontend.db :as db]
-            [goog.object :as gobj]
-            [goog.dom :as gdom]
-            [goog.dom.classes :as gdom-classes]
-            [clojure.string :as string]
-            [clojure.set :as set]
-            [clojure.zip :as zip]
-            [frontend.util :as util :refer-macros [profile]]
-            [frontend.util.cursor :as cursor]
-            [frontend.config :as config]
-            [dommy.core :as dom]
-            [frontend.utf8 :as utf8]
-            [frontend.fs :as fs]
-            [promesa.core :as p]
-            [frontend.diff :as diff]
+            [frontend.modules.outliner.core :as outliner-core]
+            [frontend.modules.outliner.tree :as tree]
             [frontend.search :as search]
-            [frontend.handler.image :as image-handler]
-            [frontend.commands :as commands
-             :refer [*show-commands
-                     *slash-caret-pos
-                     *angle-bracket-caret-pos
-                     *show-block-commands]]
-            [frontend.extensions.html-parser :as html-parser]
-            [medley.core :as medley]
+            [frontend.state :as state]
+            [frontend.template :as template]
             [frontend.text :as text]
+            [frontend.utf8 :as utf8]
+            [frontend.util :as util :refer [profile]]
+            [frontend.util.cursor :as cursor]
+            [frontend.util.marker :as marker]
             [frontend.util.property :as property]
-            [frontend.date :as date]
-            [frontend.handler.repeated :as repeated]
-            [frontend.template :as template]
-            [clojure.core.async :as async]
+            [goog.dom :as gdom]
+            [goog.dom.classes :as gdom-classes]
+            [goog.object :as gobj]
             [lambdaisland.glogi :as log]
-            [cljs.core.match :refer-macros [match]]
-            [frontend.modules.outliner.core :as outliner-core]
-            [frontend.db.outliner :as outliner-db]
-            [frontend.modules.outliner.tree :as tree]
-            [frontend.debug :as debug]
-            [datascript.core :as d]
-            [frontend.util.marker :as marker]))
+            [medley.core :as medley]
+            [promesa.core :as p]))
 
 ;; FIXME: should support multiple images concurrently uploading
 

src/main/frontend/handler/events.cljs

@@ -4,7 +4,7 @@
             [clojure.core.async :as async]
             [frontend.spec :as spec]
             [frontend.ui :as ui]
-            [frontend.util :as util :refer-macros [profile]]
+            [frontend.util :as util :refer [profile]]
             [frontend.config :as config]
             [frontend.handler.notification :as notification]
             [frontend.components.encryption :as encryption]

src/main/frontend/handler/export.cljs

@@ -8,13 +8,13 @@
             [frontend.config :as config]
             [frontend.db :as db]
             [frontend.extensions.zip :as zip]
+            [frontend.external.roam-export :as roam-export]
             [frontend.format :as f]
             [frontend.format.protocol :as fp]
             [frontend.handler.common :as common-handler]
             [frontend.handler.file :as file-handler]
             [frontend.modules.file.core :as outliner-file]
             [frontend.modules.outliner.tree :as outliner-tree]
-            [frontend.external.roam-export :as roam-export]
             [frontend.publishing.html :as html]
             [frontend.state :as state]
             [frontend.util :as util]

src/main/frontend/handler/file.cljs

@@ -1,28 +1,28 @@
 (ns frontend.handler.file
   (:refer-clojure :exclude [load-file])
-  (:require [frontend.util :as util :refer-macros [profile]]
+  (:require ["/frontend/utils" :as utils]
+            [borkdude.rewrite-edn :as rewrite]
+            [cljs-bean.core :as bean]
+            [cljs-time.coerce :as tc]
+            [cljs-time.core :as t]
+            [cljs.core.async.interop :refer [<p!]]
+            [clojure.core.async :as async]
+            [clojure.string :as string]
+            [frontend.config :as config]
+            [frontend.db :as db]
+            [frontend.format :as format]
             [frontend.fs :as fs]
             [frontend.fs.nfs :as nfs]
-            [promesa.core :as p]
-            [frontend.state :as state]
-            [frontend.db :as db]
             [frontend.git :as git]
             [frontend.handler.common :as common-handler]
             [frontend.handler.extract :as extract-handler]
-            [frontend.handler.ui :as ui-handler]
             [frontend.handler.route :as route-handler]
-            [cljs-bean.core :as bean]
-            [frontend.config :as config]
-            [frontend.format :as format]
-            [clojure.string :as string]
-            [lambdaisland.glogi :as log]
-            [clojure.core.async :as async]
-            [cljs.core.async.interop :refer-macros [<p!]]
-            [cljs-time.core :as t]
-            [cljs-time.coerce :as tc]
+            [frontend.handler.ui :as ui-handler]
+            [frontend.state :as state]
             [frontend.utf8 :as utf8]
-            [borkdude.rewrite-edn :as rewrite]
-            ["/frontend/utils" :as utils]))
+            [frontend.util :as util]
+            [lambdaisland.glogi :as log]
+            [promesa.core :as p]))
 
 ;; TODO: extract all git ops using a channel
 

src/main/frontend/handler/git.cljs

@@ -1,5 +1,5 @@
 (ns frontend.handler.git
-  (:require [frontend.util :as util :refer-macros [profile]]
+  (:require [frontend.util :as util :refer [profile]]
             [promesa.core :as p]
             [lambdaisland.glogi :as log]
             [frontend.state :as state]

src/main/frontend/handler/image.cljs

@@ -1,7 +1,7 @@
 (ns frontend.handler.image
   (:require [goog.object :as gobj]
             [frontend.handler.notification :as notification]
-            [frontend.util :as util :refer-macros [profile]]
+            [frontend.util :as util :refer [profile]]
             [frontend.config :as config]
             [frontend.image :as image]
             [frontend.state :as state]

src/main/frontend/handler/page.cljs

@@ -3,7 +3,7 @@
             [frontend.db :as db]
             [datascript.core :as d]
             [frontend.state :as state]
-            [frontend.util :as util :refer-macros [profile]]
+            [frontend.util :as util :refer [profile]]
             [frontend.util.cursor :as cursor]
             [frontend.config :as config]
             [frontend.handler.common :as common-handler]

src/main/frontend/handler/user.cljs

@@ -1,5 +1,5 @@
 (ns frontend.handler.user
-  (:require [frontend.util :as util :refer-macros [profile]]
+  (:require [frontend.util :as util :refer [profile]]
             [frontend.state :as state]
             [frontend.db :as db]
             [frontend.idb :as idb]

src/main/frontend/mixins.cljs

@@ -1,7 +1,7 @@
 (ns frontend.mixins
   (:require [rum.core :as rum]
             [goog.dom :as dom]
-            [frontend.util :refer-macros [profile]])
+            [frontend.util :refer [profile]])
   (:import [goog.events EventHandler]))
 
 (defn detach

src/main/frontend/modules/outliner/datascript.cljc

@@ -6,7 +6,7 @@
                      [frontend.modules.outliner.pipeline :as pipelines]
                      [frontend.modules.editor.undo-redo :as undo-redo]
                      [frontend.state :as state]
-                     [frontend.util :as util :refer-macros [profile]]
+                     [frontend.util :as util :refer [profile]]
                      [frontend.config :as config]
                      [frontend.util :as util]
                      [lambdaisland.glogi :as log])))

src/main/frontend/modules/outliner/file.cljs

@@ -5,7 +5,7 @@
             [frontend.modules.file.core :as file]
             [lambdaisland.glogi :as log]
             [clojure.core.async :as async]
-            [frontend.util :as util :refer-macros [profile]]
+            [frontend.util :as util :refer [profile]]
             [frontend.handler.notification :as notification]
             [goog.object :as gobj]
             [frontend.state :as state]

src/main/frontend/modules/shortcut/dict.cljs

@@ -1,6 +1,6 @@
 (ns frontend.modules.shortcut.dict
-  (:require [frontend.modules.shortcut.data-helper :as dh])
-  (:require-macros [frontend.modules.shortcut.macro :refer [shortcut-dict]]))
+  (:require [frontend.modules.shortcut.data-helper :as dh]
+            [frontend.modules.shortcut.macro :refer [shortcut-dict]]))
 
 (def dict
   (shortcut-dict

src/main/frontend/modules/shortcut/macro.clj → src/main/frontend/modules/shortcut/macro.cljc

@@ -1,4 +1,5 @@
-(ns frontend.modules.shortcut.macro)
+(ns frontend.modules.shortcut.macro
+  #?(:cljs (:require-macros [frontend.modules.shortcut.macro])))
 
 (defmacro shortcut-dict
   "All docs for EN are generated from :desc field of shortcut default-config map.

src/main/frontend/namespaces.cljc

@@ -1,4 +1,5 @@
-(ns frontend.namespaces)
+(ns frontend.namespaces
+  #?(:cljs (:require-macros [frontend.namespaces])))
 
 ;; copy from https://github.com/clj-commons/potemkin/issues/31#issuecomment-110689951
 (defmacro import-def

src/main/frontend/search.cljs

@@ -3,7 +3,7 @@
             [frontend.search.db :as search-db :refer [indices]]
             [frontend.config :as config]
             [frontend.state :as state]
-            [frontend.util :as util :refer-macros [profile]]
+            [frontend.util :as util :refer [profile]]
             [cljs-bean.core :as bean]
             [clojure.string :as string]
             [clojure.set :as set]

src/main/frontend/state.cljs

@@ -1,7 +1,7 @@
 (ns frontend.state
   (:require [frontend.storage :as storage]
             [rum.core :as rum]
-            [frontend.util :as util :refer-macros [profile]]
+            [frontend.util :as util :refer [profile]]
             [frontend.util.cursor :as cursor]
             [clojure.string :as string]
             [cljs-bean.core :as bean]

src/main/frontend/template.cljs

@@ -1,5 +1,5 @@
 (ns frontend.template
-  (:require [frontend.util :as util :refer-macros [profile]]
+  (:require [frontend.util :as util :refer [profile]]
             [frontend.date :as date]
             [clojure.string :as string]
             [cljs-time.coerce :as tc]

src/main/frontend/util.cljc

@@ -1,26 +1,25 @@
 (ns frontend.util
   #?(:clj (:refer-clojure :exclude [format]))
+  #?(:cljs (:require-macros [frontend.util]))
+  #?(:cljs (:require
+            ["/frontend/selection" :as selection]
+            ["/frontend/utils" :as utils]
+            [cljs-bean.core :as bean]
+            [cljs-time.coerce :as tc]
+            [cljs-time.core :as t]
+            [dommy.core :as d]
+            [frontend.react-impls :as react-impls]
+            [goog.dom :as gdom]
+            [goog.object :as gobj]
+            [goog.string :as gstring]
+            [goog.userAgent]
+            ["path" :as nodePath]
+            [promesa.core :as p]))
   (:require
-   #?(:cljs [cljs-bean.core :as bean])
-   #?(:cljs [cljs-time.coerce :as tc])
-   #?(:cljs [cljs-time.core :as t])
-   #?(:cljs [dommy.core :as d])
-   #?(:cljs ["/frontend/selection" :as selection])
-   #?(:cljs ["/frontend/utils" :as utils])
-   #?(:cljs ["path" :as nodePath])
-   #?(:cljs [goog.dom :as gdom])
-   #?(:cljs [goog.object :as gobj])
-   #?(:cljs [goog.string :as gstring])
-   #?(:cljs [goog.string.format])
-   #?(:cljs [goog.userAgent])
-   #?(:cljs [rum.core])
-   #?(:cljs [frontend.react-impls :as react-impls])
-   [clojure.string :as string]
    [clojure.core.async :as async]
    [clojure.pprint]
-   [clojure.walk :as walk]
-   [frontend.regex :as regex]
-   [promesa.core :as p]))
+   [clojure.string :as string]
+   [clojure.walk :as walk]))
 
 #?(:cljs (goog-define NODETEST false)
    :clj (def NODETEST false))