Skip to content

Commit

Permalink
Split namespaces by builds
Browse files Browse the repository at this point in the history
  • Loading branch information
@just-sultanov
just-sultanov committed May 5, 2022
1 parent d3968ab commit 0e6e4fe
Show file tree
Hide file tree
Showing 69 changed files with 307 additions and 349 deletions.
6 changes: 3 additions & 3 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ coverage
dist
design/backgrounds
node_modules
public/assets/js
public/assets/styles
public/test
public/downloader.js
public/main.js
public/js
public/runner.js
public/test
target
build.edn
*.iml
Expand Down
16 changes: 8 additions & 8 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@io.lazy-cat/metaverse",
"version": "0.1.206",
"version": "0.1.220",
"description": "The Metaverse of Clojurians",
"license": "MIT",
"author": "Ilshat Sultanov <[email protected]>",
Expand All @@ -27,21 +27,21 @@
"reagent",
"shadow-cljs"
],
"main": "public/main.js",
"main": "public/runner.js",
"scripts": {
"postinstall": "electron-builder install-app-deps",
"assets:icon:build": "electron-icon-builder -i public/assets/images/icon.png -o public/assets",
"assets:runner:clean": "rm -rf public/main.js",
"assets:runner:clean": "rm -rf public/runner.js",
"assets:downloader:clean": "rm -rf public/downloader.js",
"assets:app:clean": "rm -rf public/assets/js && rm -rf public/test",
"assets:clean": "rm -rf public/assets/styles/bundle.css && npm run assets:runner:clean && npm run assets:downloader:clean && npm run assets:app:clean",
"assets:renderer:clean": "rm -rf public/js && rm -rf public/test",
"assets:clean": "rm -rf public/assets/styles/bundle.css && npm run assets:runner:clean && npm run assets:downloader:clean && npm run assets:renderer:clean",
"assets:watch": "npx cross-env TAILWIND_MODE=watch postcss src/main/css/index.css --output public/assets/styles/bundle.css --verbose --watch",
"assets:build": "npm run assets:icon:build && npx cross-env NODE_ENV=production postcss src/main/css/index.css --output public/assets/styles/bundle.css --verbose",
"electron:clean": "rm -rf dist",
"electron:watch": "npx electron .",
"electron:build": "electron-builder build",
"shadow:watch": "npx shadow-cljs watch runner downloader app test",
"shadow:build": "npx shadow-cljs release runner downloader app",
"shadow:watch": "npx shadow-cljs watch runner downloader renderer test",
"shadow:build": "npx shadow-cljs release runner downloader renderer",
"test:build": "npx shadow-cljs compile ci",
"test:run": "npx karma start karma.config.js --single-run",
"clean": "npm run electron:clean && npm run assets:clean",
Expand Down
4 changes: 2 additions & 2 deletions public/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
Expand All @@ -8,7 +8,7 @@
<body>
<div id="root"></div>
<noscript>You need to enable JavaScript to run this app.</noscript>
<script src="assets/js/main.js"></script>
<script src="js/renderer.js"></script>
<script>
if (
localStorage.theme === "dark" ||
Expand Down
45 changes: 18 additions & 27 deletions shadow-cljs.edn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,56 +5,47 @@
:dev-http {3000 "public/"
3001 "public/test/"}

:build-defaults {:closure-defines {goog.DEBUG true
metaverse.env/sentry-dsn #shadow/env "METAVERSE_SENTRY_DSN"
metaverse.env/supabase-url #shadow/env "METAVERSE_SUPABASE_URL"
metaverse.env/supabase-public-key #shadow/env "METAVERSE_SUPABASE_PUBLIC_KEY"}

:build-defaults {:closure-defines {goog.DEBUG true
metaverse.common.env/sentry-dsn #shadow/env "METAVERSE_SENTRY_DSN"
metaverse.common.env/supabase-url #shadow/env "METAVERSE_SUPABASE_URL"
metaverse.common.env/supabase-public-key #shadow/env "METAVERSE_SUPABASE_PUBLIC_KEY"}
:compiler-options {:output-feature-set :es-next}}

:builds {:runner {:target :node-script
:output-to "public/main.js"
:main metaverse.runner.main/init!

:output-to "public/runner.js"
:main metaverse.runner/-main
:dev {:compiler-options {:closure-defines {re-frame.trace/trace-enabled? true
day8.re-frame.tracing/trace-enabled? true
metaverse.env/mode "develop"
metaverse.env/logger-level "trace"}}}}
metaverse.common.env/mode "develop"
metaverse.common.env/logger-level "trace"}}}}

:downloader {:target :node-script
:output-to "public/downloader.js"
:main metaverse.downloader/init!

:main metaverse.downloader/-main
:dev {:compiler-options {:closure-defines {re-frame.trace/trace-enabled? true
day8.re-frame.tracing/trace-enabled? true
metaverse.env/mode "develop"
metaverse.env/logger-level "trace"}}}}
metaverse.common.env/mode "develop"
metaverse.common.env/logger-level "trace"}}}}

:app {:target :browser
:output-dir "public/assets/js"
:renderer {:target :browser
:output-dir "public/js"
:asset-path "js"

:modules {:main {:init-fn metaverse.ui.main/init!}}

:modules {:renderer {:init-fn metaverse.renderer/-main}}
:devtools {:preloads [devtools.preload
day8.re-frame-10x.preload]}

:dev {:compiler-options {:closure-defines {re-frame.trace/trace-enabled? true
day8.re-frame.tracing/trace-enabled? true
metaverse.env/mode "develop"
metaverse.env/logger-level "trace"}}}

metaverse.common.env/mode "develop"
metaverse.common.env/logger-level "trace"}}}
:release {}}

:test {:target :browser-test
:test-dir "public/test"

:devtools {}

:dev {:compiler-options {:closure-defines {re-frame.trace/trace-enabled? true
day8.re-frame.tracing/trace-enabled? true
metaverse.env/mode "develop"
metaverse.env/logger-level "trace"}}}}
metaverse.common.env/mode "develop"
metaverse.common.env/logger-level "trace"}}}}

:ci {:target :karma
:output-to "public/test/assets/ci.js"}}}
4 changes: 2 additions & 2 deletions src/main/clojure/metaverse/env.cljs → src/main/clojure/metaverse/common/env.cljs
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
(ns metaverse.env
(ns metaverse.common.env
(:require
[cljs.reader :as reader]
[clojure.string :as str])
(:require-macros
[metaverse.utils.resource :as resource]))
[metaverse.common.utils.resource :as resource]))


(goog-define company-name "io.lazy-cat")
Expand Down
2 changes: 1 addition & 1 deletion src/main/clojure/metaverse/logger.clj → src/main/clojure/metaverse/common/logger.clj
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(ns metaverse.logger
(ns metaverse.common.logger
(:require
[lambdaisland.glogi :as log]))

Expand Down
4 changes: 2 additions & 2 deletions src/main/clojure/metaverse/logger.cljs → ...main/clojure/metaverse/common/logger.cljs
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
(ns metaverse.logger
(ns metaverse.common.logger
(:require
[lambdaisland.glogi :as log]
[lambdaisland.glogi.console :as console]
[metaverse.env :as env]))
[metaverse.common.env :as env]))


(defn init!
Expand Down
20 changes: 10 additions & 10 deletions ...lojure/metaverse/downloader/reporter.cljs → ...in/clojure/metaverse/common/reporter.cljs
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
(ns metaverse.downloader.reporter
(ns metaverse.common.reporter
(:require
[metaverse.env :as env]
[metaverse.logger :as log :include-macros true]
[metaverse.sentry.nodejs :as sentry]
[metaverse.utils.string :as str]
[metaverse.common.env :as env]
[metaverse.common.logger :as log :include-macros true]
[metaverse.common.utils.string :as str]
[tenet.response :as r]))


;; TODO: [2022-05-02, [email protected]] validate opts

(defn init!
([]
(init! {}))
([{:keys [dsn] :as opts}]
([^js sentry]
(init! sentry {}))
([^js sentry {:keys [dsn] :as opts}]
(let [dsn (or dsn env/sentry-dsn)]
(if (= "N/A" dsn)
(do
Expand All @@ -28,7 +27,8 @@
:debug env/develop?
:release (str/format "%s@%s:%s" env/company-name env/product-name version)
:initialScope {:build build}}
(merge opts))
reporter (sentry/init! opts')]
(merge opts)
(clj->js))
reporter (.init sentry opts')]
(log/info :msg "Sentry reporter successfully initialized" :opts opts')
(r/as-success reporter))))))
21 changes: 21 additions & 0 deletions src/main/clojure/metaverse/common/rss.cljs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
(ns metaverse.common.rss
(:require
["feed-reader" :rename {read get-feed}]
[metaverse.common.logger :as log :include-macros true]
[tenet.response :as r]))


(defn fetch
([url]
(fetch url {}))
([url {:keys [on-success on-failure]
:or {on-success identity
on-failure identity}}]
(log/debug :msg "RSS feed downloading has started" :url url)
(-> (get-feed url)
(.then (fn [response]
(log/debug :msg "RSS feed was downloaded successfully" :url url)
(on-success (r/as-success response))))
(.catch (fn [error]
(log/error :msg "RSS feed was downloaded with an error" :url url :error error)
(on-failure (r/as-error error)))))))
8 changes: 4 additions & 4 deletions src/main/clojure/metaverse/supabase.cljs → ...in/clojure/metaverse/common/supabase.cljs
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
(ns metaverse.supabase
(ns metaverse.common.supabase
(:require
["@supabase/supabase-js" :as supabase]
[applied-science.js-interop :as j]
[metaverse.env :as env]
[metaverse.logger :as log :include-macros true]
[metaverse.utils.bean :as b]
[metaverse.common.env :as env]
[metaverse.common.logger :as log :include-macros true]
[metaverse.common.utils.bean :as b]
[tenet.response :as r]))


Expand Down
7 changes: 6 additions & 1 deletion src/main/clojure/metaverse/utils/bean.cljs → .../clojure/metaverse/common/utils/bean.cljs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(ns metaverse.utils.bean
(ns metaverse.common.utils.bean
(:require
[cljs-bean.core :as b]))

Expand All @@ -8,6 +8,11 @@
(b/->js x))


(defn ->clj
[x]
(b/->clj x))


(defn bean
[^js x]
(when (some? x)
Expand Down
2 changes: 1 addition & 1 deletion ...main/clojure/metaverse/utils/resource.clj → ...ojure/metaverse/common/utils/resource.clj
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(ns metaverse.utils.resource
(ns metaverse.common.utils.resource
(:refer-clojure :exclude [slurp])
(:require
[clojure.core :as c]
Expand Down
2 changes: 1 addition & 1 deletion src/main/clojure/metaverse/utils/string.cljs → ...lojure/metaverse/common/utils/string.cljs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(ns metaverse.utils.string
(ns metaverse.common.utils.string
(:require
[goog.string :as gstr]
[goog.string.format]))
Expand Down
2 changes: 1 addition & 1 deletion ...main/clojure/metaverse/utils/transit.cljs → ...ojure/metaverse/common/utils/transit.cljs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(ns metaverse.utils.transit
(ns metaverse.common.utils.transit
(:require
[cljs-bean.transit :as bt]
[cognitect.transit :as t]
Expand Down
12 changes: 6 additions & 6 deletions src/main/clojure/metaverse/downloader.cljs
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
(ns metaverse.downloader
(:require
[metaverse.downloader.reporter :as reporter]
[metaverse.logger :as log]
[metaverse.supabase :as supabase]))
[metaverse.common.logger :as log]
[metaverse.common.supabase :as supabase]
[metaverse.downloader.sentry :as sentry]))


(defn setup-tools
[]
(log/init!)
(reporter/init!)
(sentry/init!)
(supabase/init!))


(defn init!
"Downloader initializer."
(defn -main
"Downloader entry point."
{:export true}
[& _args]
(setup-tools)
Expand Down
10 changes: 10 additions & 0 deletions src/main/clojure/metaverse/downloader/sentry.cljs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
(ns metaverse.downloader.sentry
(:require
["@sentry/node" :as sentry]
["@sentry/tracing"]
[metaverse.common.reporter :as reporter]))


(defn init!
[]
(reporter/init! sentry))
Loading

0 comments on commit 0e6e4fe

Please sign in to comment.