clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-05-16 00:42:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: remove ENABLE-FILE-SYNC-PRODUCTION

Browse Source
This commit is contained in:
Tienson Qin
2026-04-29 17:14:18 +08:00
parent 743e389961
commit e0076fcffc
4 changed files with 12 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
deps/common/src/logseq/common/cognito_config.cljs vendored
View File

@@ -1,21 +1,13 @@
(ns logseq.common.cognito-config
"Shared Cognito configuration for frontend and CLI-safe consumers.")
(goog-define ENABLE-FILE-SYNC-PRODUCTION false)
(def COGNITO-CLIENT-ID
(if ENABLE-FILE-SYNC-PRODUCTION
"69cs1lgme7p8kbgld8n5kseii6"
"1qi1uijg8b6ra70nejvbptis0q"))
"69cs1lgme7p8kbgld8n5kseii6")
(def CLI-COGNITO-CLIENT-ID
(if ENABLE-FILE-SYNC-PRODUCTION
"69cs1lgme7p8kbgld8n5kseii6"
"1qi1uijg8b6ra70nejvbptis0q"))
"69cs1lgme7p8kbgld8n5kseii6")
(def OAUTH-DOMAIN
(if ENABLE-FILE-SYNC-PRODUCTION
"logseq-prod.auth.us-east-1.amazoncognito.com"
"logseq-test2.auth.us-east-2.amazoncognito.com"))
"logseq-prod.auth.us-east-1.amazoncognito.com")
(def OAUTH-SCOPE "email openid phone")

5
shadow-cljs.edn
View File

@@ -42,7 +42,6 @@
frontend.modules.instrumentation.posthog/POSTHOG-TOKEN #shadow/env "LOGSEQ_POSTHOG_TOKEN"
frontend.config/ENABLE-PLUGINS #shadow/env ["ENABLE_PLUGINS" :as :bool :default true]
;; Set to switch file sync server to dev, set this to false in `pnpm watch`
frontend.config/ENABLE-FILE-SYNC-PRODUCTION #shadow/env ["ENABLE_FILE_SYNC_PRODUCTION" :as :bool :default true]
frontend.config/ENABLE-RTC-SYNC-PRODUCTION #shadow/env ["ENABLE_RTC_SYNC_PRODUCTION" :as :bool :default true]
frontend.config/ENABLE-DB-SYNC-LOCAL #shadow/env ["ENABLE_DB_SYNC_LOCAL" :as :bool :default false]
@@ -104,8 +103,7 @@
:main logseq.cli.main/main
:devtools {:enabled false}
:build-hooks [(shadow.hooks/logseq-cli-metadata-hook "--long --always --dirty")]
:closure-defines {logseq.common.cognito-config/ENABLE-FILE-SYNC-PRODUCTION #shadow/env ["ENABLE_FILE_SYNC_PRODUCTION" :as :bool :default true]
goog.debug.LOGGING_ENABLED true
:closure-defines {goog.debug.LOGGING_ENABLED true
lambdaisland.glogi.console/colorize "false"
lambdaisland.glogi.console/timestamp "true"}
:compiler-options {:infer-externs :auto
@@ -147,7 +145,6 @@
frontend.modules.instrumentation.posthog/POSTHOG-TOKEN #shadow/env "LOGSEQ_POSTHOG_TOKEN"
;; frontend.config/ENABLE-PLUGINS #shadow/env ["ENABLE_PLUGINS" :as :bool :default true]
;; Set to switch file sync server to dev, set this to false in `pnpm watch`
frontend.config/ENABLE-FILE-SYNC-PRODUCTION #shadow/env ["ENABLE_FILE_SYNC_PRODUCTION" :as :bool :default true]
frontend.config/ENABLE-RTC-SYNC-PRODUCTION #shadow/env ["ENABLE_RTC_SYNC_PRODUCTION" :as :bool :default true]
frontend.config/ENABLE-DB-SYNC-LOCAL #shadow/env ["ENABLE_DB_SYNC_LOCAL" :as :bool :default false]

23
src/main/frontend/config.cljs
View File

@@ -28,20 +28,12 @@
(def COGNITO-CLIENT-ID cognito-config/COGNITO-CLIENT-ID)
(def OAUTH-DOMAIN cognito-config/OAUTH-DOMAIN)
(if cognito-config/ENABLE-FILE-SYNC-PRODUCTION
(do (def API-DOMAIN "api.logseq.com")
(def COGNITO-IDP "https://cognito-idp.us-east-1.amazonaws.com/")
(def REGION "us-east-1")
(def USER-POOL-ID "us-east-1_dtagLnju8")
(def IDENTITY-POOL-ID "us-east-1:d6d3b034-1631-402b-b838-b44513e93ee0")
(def default-publish-api-base "https://logseq.io"))
(do (def API-DOMAIN "api-dev.logseq.com")
(def COGNITO-IDP "https://cognito-idp.us-east-2.amazonaws.com/")
(def REGION "us-east-2")
(def USER-POOL-ID "us-east-2_kAqZcxIeM")
(def IDENTITY-POOL-ID "us-east-2:cc7d2ad3-84d0-4faf-98fe-628f6b52c0a5")
(def default-publish-api-base "https://logseq-publish-staging.logseq.workers.dev")))
(def API-DOMAIN "api.logseq.com")
(def COGNITO-IDP "https://cognito-idp.us-east-1.amazonaws.com/")
(def REGION "us-east-1")
(def USER-POOL-ID "us-east-1_dtagLnju8")
(def IDENTITY-POOL-ID "us-east-1:d6d3b034-1631-402b-b838-b44513e93ee0")
(def default-publish-api-base "https://logseq.io")
;; Enable for local development
;; (def default-publish-api-base "http://localhost:8787")
@@ -140,8 +132,7 @@
(defn publish-api-base
"Return the base URL for the single-page publish service. Uses the user-configured
URL from localStorage when set, otherwise the default from the ENABLE-FILE-SYNC-PRODUCTION
branch above. Read on each call so URL changes take effect without a restart."
URL from localStorage when set, otherwise the default url above. Read on each call so URL changes take effect without a restart."
[]
(if-let [custom (get-custom-publish-server-url)]
(custom-url->publish-api-base custom)

8
src/test/logseq/common/cognito_config_test.cljs
View File

@@ -1,14 +1,8 @@
(ns logseq.common.cognito-config-test
(:require [cljs.test :refer [deftest is]]
[frontend.config :as config]
[logseq.common.cognito-config :as cognito-config]
["fs" :as fs]))
[logseq.common.cognito-config :as cognito-config]))
(deftest test-shared-cognito-config-matches-frontend-config
(is (= config/COGNITO-CLIENT-ID cognito-config/COGNITO-CLIENT-ID))
(is (= config/OAUTH-DOMAIN cognito-config/OAUTH-DOMAIN)))
(deftest test-logseq-cli-build-enables-prod-file-sync-by-default
(let [shadow-config (.toString (fs/readFileSync "shadow-cljs.edn") "utf8")]
(is (re-find #"(?s):logseq-cli\s+\{:target :node-script.*?logseq\.common\.cognito-config/ENABLE-FILE-SYNC-PRODUCTION #shadow/env \[\"ENABLE_FILE_SYNC_PRODUCTION\" :as :bool :default true\]"
shadow-config))))