diff --git a/capacitor.config.ts b/capacitor.config.ts index 69fb96a24c..15f36b1bd4 100644 --- a/capacitor.config.ts +++ b/capacitor.config.ts @@ -39,4 +39,13 @@ const config: CapacitorConfig = { } } +if (process.env.LOGSEQ_APP_SERVER_URL) { + Object.assign(config, { + server: { + url: process.env.LOGSEQ_APP_SERVER_URL, + cleartext: true + } + }) +} + export = config; diff --git a/ios/App/Podfile b/ios/App/Podfile index b2fef1d02b..3a2c17bbe1 100644 --- a/ios/App/Podfile +++ b/ios/App/Podfile @@ -23,7 +23,6 @@ def capacitor_pods pod 'CapacitorStatusBar', :path => '../../node_modules/@capacitor/status-bar' pod 'CapawesomeCapacitorBackgroundTask', :path => '../../node_modules/@capawesome/capacitor-background-task' pod 'CapgoCapacitorNavigationBar', :path => '../../node_modules/@capgo/capacitor-navigation-bar' - pod 'LogseqCapacitorFileSync', :path => '../../node_modules/@logseq/capacitor-file-sync' pod 'CapacitorVoiceRecorder', :path => '../../node_modules/capacitor-voice-recorder' pod 'SendIntent', :path => '../../node_modules/send-intent' pod 'JcesarmobileSslSkip', :path => '../../node_modules/@jcesarmobile/ssl-skip' diff --git a/ios/App/Podfile.lock b/ios/App/Podfile.lock index 83bd22adfa..7a479acd60 100644 --- a/ios/App/Podfile.lock +++ b/ios/App/Podfile.lock @@ -1,9 +1,4 @@ PODS: - - AgeEncryption (1.0.6) - - Alamofire (5.6.2) - - AWSCore (2.27.10) - - AWSS3 (2.27.10): - - AWSCore (= 2.27.10) - Capacitor (7.2.0): - CapacitorCordova - CapacitorActionSheet (7.0.1): @@ -35,11 +30,6 @@ PODS: - Capacitor - JcesarmobileSslSkip (0.4.0): - Capacitor - - LogseqCapacitorFileSync (5.0.2): - - AgeEncryption (~> 1.0.6) - - Alamofire - - AWSS3 - - Capacitor - SendIntent (0.0.1): - Capacitor @@ -60,16 +50,8 @@ DEPENDENCIES: - "CapawesomeCapacitorBackgroundTask (from `../../node_modules/@capawesome/capacitor-background-task`)" - "CapgoCapacitorNavigationBar (from `../../node_modules/@capgo/capacitor-navigation-bar`)" - "JcesarmobileSslSkip (from `../../node_modules/@jcesarmobile/ssl-skip`)" - - "LogseqCapacitorFileSync (from `../../node_modules/@logseq/capacitor-file-sync`)" - SendIntent (from `../../node_modules/send-intent`) -SPEC REPOS: - trunk: - - AgeEncryption - - Alamofire - - AWSCore - - AWSS3 - EXTERNAL SOURCES: Capacitor: :path: "../../node_modules/@capacitor/ios" @@ -103,16 +85,10 @@ EXTERNAL SOURCES: :path: "../../node_modules/@capgo/capacitor-navigation-bar" JcesarmobileSslSkip: :path: "../../node_modules/@jcesarmobile/ssl-skip" - LogseqCapacitorFileSync: - :path: "../../node_modules/@logseq/capacitor-file-sync" SendIntent: :path: "../../node_modules/send-intent" SPEC CHECKSUMS: - AgeEncryption: 23c203675d5e4883a18b133ab1d5e61ff29e0c18 - Alamofire: d368e1ff8a298e6dde360e35a3e68e6c610e7204 - AWSCore: dbad318b7ff0fd86fb8387d3ad1f30049c05bc58 - AWSS3: 0cf2cedb263368f624ca721e5c56a8cb59fc44bc Capacitor: 106e7a4205f4618d582b886a975657c61179138d CapacitorActionSheet: 24609588961cc27c87e8b033be92b5eee65b5d4c CapacitorApp: d63334c052278caf5d81585d80b21905c6f93f39 @@ -129,9 +105,8 @@ SPEC CHECKSUMS: CapawesomeCapacitorBackgroundTask: 834d797abc9933fac4354490d1a2f3c0e389b98d CapgoCapacitorNavigationBar: 3a0e93a40b7da3d3cb74c0410bb761a1525406be JcesarmobileSslSkip: b0f921e9d397a57f7983731209ca1ee244119c1f - LogseqCapacitorFileSync: 541dcd5492b8aeb2257cce3d18bb9ed5800cfcad SendIntent: 0a17b6984c4f27e9dfa56513267ba2c044a5a6c8 -PODFILE CHECKSUM: 615b869df5e31ea8a2027fb6e2d192ce3aa95505 +PODFILE CHECKSUM: df64fb8749b799fc4571323f5341b09f84c86b69 -COCOAPODS: 1.11.2 +COCOAPODS: 1.16.2 diff --git a/yarn.lock b/yarn.lock index 0a7cc1ce80..6d3d5eba5a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -389,6 +389,24 @@ debug "^4.0.0" tslib "^2.0.1" +"@ionic/core@8.5.7", "@ionic/core@^8.5.4": + version "8.5.7" + resolved "https://registry.yarnpkg.com/@ionic/core/-/core-8.5.7.tgz#7297c88035f0372225b052db5426b4e1788b3b42" + integrity sha512-V5ZRYXD1MgAPdjfLyOejILAdTqIzpMY7/v6GSynFPPWoEpfFbGe/tNsimrYm1/D8iouigYLkJjWSeg2rpIpESA== + dependencies: + "@stencil/core" "4.20.0" + ionicons "^7.2.2" + tslib "^2.1.0" + +"@ionic/react@^8.5.4": + version "8.5.7" + resolved "https://registry.yarnpkg.com/@ionic/react/-/react-8.5.7.tgz#ad09cb3d1189e6f3cc52156fd56216655dd8d5e3" + integrity sha512-AgX4iu6SfuBhNgYr0H+K3oGsp7ESkCsnaqZdHRO2+GtKTmo4akMrFPihGj4LrZB/IaYwcvYQR/bPWHuZGJYsnw== + dependencies: + "@ionic/core" "8.5.7" + ionicons "^7.0.0" + tslib "*" + "@ionic/utils-array@2.1.6": version "2.1.6" resolved "https://registry.yarnpkg.com/@ionic/utils-array/-/utils-array-2.1.6.tgz#eee863be945ee1a28b9a10ff16fdea776fa18c22" @@ -540,6 +558,11 @@ just-debounce-it "1.1.0" just-once "1.1.0" +"@jcesarmobile/ssl-skip@^0.4.0": + version "0.4.0" + resolved "https://registry.yarnpkg.com/@jcesarmobile/ssl-skip/-/ssl-skip-0.4.0.tgz#7498da3b7813d1095e8dda08e55a2d35a3d0c167" + integrity sha512-GUVnexaLUHZS4f9TXBIwmKYvp/NVW8A4tcMoQJmNwViQMOGJbi7lWdRCVDWOY9tyq5XJxk80AcjJvxSgqA8V6w== + "@jridgewell/gen-mapping@^0.3.2", "@jridgewell/gen-mapping@^0.3.5": version "0.3.8" resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz#4f0e06362e01362f823d348f1872b08f666d8142" @@ -855,6 +878,46 @@ resolved "https://registry.yarnpkg.com/@radix-ui/colors/-/colors-0.1.9.tgz#aad732ecc4ce1018adcb3aedd3ce3c573c2256cc" integrity sha512-Vxq944ErPJsdVepjEUhOLO9ApUVOocA63knc+V2TkJ09D/AVOjiMIgkca/7VoYgODcla0qbSIBjje0SMfZMbAw== +"@rollup/rollup-darwin-arm64@4.34.9": + version "4.34.9" + resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.34.9.tgz#363467bc49fd0b1e17075798ac8e9ad1e1e29535" + integrity sha512-0CY3/K54slrzLDjOA7TOjN1NuLKERBgk9nY5V34mhmuu673YNb+7ghaDUs6N0ujXR7fz5XaS5Aa6d2TNxZd0OQ== + +"@rollup/rollup-darwin-x64@4.34.9": + version "4.34.9" + resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.34.9.tgz#c2fe3d85fffe47f0ed0f076b3563ada22c8af19c" + integrity sha512-eOojSEAi/acnsJVYRxnMkPFqcxSMFfrw7r2iD9Q32SGkb/Q9FpUY1UlAu1DH9T7j++gZ0lHjnm4OyH2vCI7l7Q== + +"@rollup/rollup-linux-arm64-gnu@4.34.9": + version "4.34.9" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.34.9.tgz#1015c9d07a99005025d13b8622b7600029d0b52f" + integrity sha512-6TZjPHjKZUQKmVKMUowF3ewHxctrRR09eYyvT5eFv8w/fXarEra83A2mHTVJLA5xU91aCNOUnM+DWFMSbQ0Nxw== + +"@rollup/rollup-linux-arm64-musl@4.34.9": + version "4.34.9" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.34.9.tgz#8f895eb5577748fc75af21beae32439626e0a14c" + integrity sha512-LD2fytxZJZ6xzOKnMbIpgzFOuIKlxVOpiMAXawsAZ2mHBPEYOnLRK5TTEsID6z4eM23DuO88X0Tq1mErHMVq0A== + +"@rollup/rollup-linux-x64-gnu@4.34.9": + version "4.34.9" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.34.9.tgz#7193cbd8d128212b8acda37e01b39d9e96259ef8" + integrity sha512-FwBHNSOjUTQLP4MG7y6rR6qbGw4MFeQnIBrMe161QGaQoBQLqSUEKlHIiVgF3g/mb3lxlxzJOpIBhaP+C+KP2A== + +"@rollup/rollup-linux-x64-musl@4.34.9": + version "4.34.9" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.34.9.tgz#29a6867278ca0420b891574cfab98ecad70c59d1" + integrity sha512-cYRpV4650z2I3/s6+5/LONkjIz8MBeqrk+vPXV10ORBnshpn8S32bPqQ2Utv39jCiDcO2eJTuSlPXpnvmaIgRA== + +"@rollup/rollup-win32-arm64-msvc@4.34.9": + version "4.34.9" + resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.34.9.tgz#89427dcac0c8e3a6d32b13a03a296a275d0de9a9" + integrity sha512-z4mQK9dAN6byRA/vsSgQiPeuO63wdiDxZ9yg9iyX2QTzKuQM7T4xlBoeUP/J8uiFkqxkcWndWi+W7bXdPbt27Q== + +"@rollup/rollup-win32-x64-msvc@4.34.9": + version "4.34.9" + resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.34.9.tgz#1973871850856ae72bc678aeb066ab952330e923" + integrity sha512-AyleYRPU7+rgkMWbEh71fQlrzRfeP6SyMnRf9XX4fCdDPAJumdSBqYEcWPMzVQ4ScAl7E4oFfK0GUVn77xSwbw== + "@sentry/browser@6.19.7": version "6.19.7" resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-6.19.7.tgz#a40b6b72d911b5f1ed70ed3b4e7d4d4e625c0b5f" @@ -940,6 +1003,25 @@ resolved "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.1.2.tgz#821f8442f4175d8f0467b9daf26e3a18e2d02af2" integrity sha512-9BCxFwvbGg/RsZK9tjXd8s4UcwR0MWeFQ1XEKIQVVvAGJyINdrqKMcTRyLoK8Rse1GjzLV9cwjWV1olXRWEXVA== +"@stencil/core@4.20.0": + version "4.20.0" + resolved "https://registry.yarnpkg.com/@stencil/core/-/core-4.20.0.tgz#221f2b36ab999891560449b02d6915862c435f49" + integrity sha512-WPrTHFngvN081RY+dJPneKQLwnOFD60OMCOQGmmSHfCW0f4ujPMzzhwWU1gcSwXPWXz5O+8cBiiCaxAbJU7kAg== + +"@stencil/core@^4.0.3": + version "4.31.0" + resolved "https://registry.yarnpkg.com/@stencil/core/-/core-4.31.0.tgz#57c5da8e46d9ad51406e7f542dcb2048be4f25d4" + integrity sha512-Ei9MFJ6LPD9BMFs+klkHylbVOOYhG10Jv4bvoFf3GMH15kA41rSYkEdr4DiX84ZdErQE2qtFV/2SUyWoXh0AhA== + optionalDependencies: + "@rollup/rollup-darwin-arm64" "4.34.9" + "@rollup/rollup-darwin-x64" "4.34.9" + "@rollup/rollup-linux-arm64-gnu" "4.34.9" + "@rollup/rollup-linux-arm64-musl" "4.34.9" + "@rollup/rollup-linux-x64-gnu" "4.34.9" + "@rollup/rollup-linux-x64-musl" "4.34.9" + "@rollup/rollup-win32-arm64-msvc" "4.34.9" + "@rollup/rollup-win32-x64-msvc" "4.34.9" + "@stylelint/postcss-css-in-js@^0.37.2": version "0.37.3" resolved "https://registry.yarnpkg.com/@stylelint/postcss-css-in-js/-/postcss-css-in-js-0.37.3.tgz#d149a385e07ae365b0107314c084cb6c11adbf49" @@ -4519,6 +4601,13 @@ invert-kv@^2.0.0: resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02" integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA== +ionicons@^7.0.0, ionicons@^7.2.2: + version "7.4.0" + resolved "https://registry.yarnpkg.com/ionicons/-/ionicons-7.4.0.tgz#9c285aaa8089befbd6c5a89ae13292d364cd9ace" + integrity sha512-ZK94MMqgzMCPPMhmk8Ouu6goyVHFIlw/ACP6oe3FrikcI0N7CX0xcwVaEbUc0G/v3W0shI93vo+9ve/KpvcNhQ== + dependencies: + "@stencil/core" "^4.0.3" + ip@1.1.9: version "1.1.9" resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.9.tgz#8dfbcc99a754d07f425310b86a99546b1151e396" @@ -8836,6 +8925,11 @@ ts-interface-checker@^0.1.9: resolved "https://registry.yarnpkg.com/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz#784fd3d679722bc103b1b4b8030bcddb5db2a699" integrity sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA== +tslib@*, tslib@^2.0.1, tslib@^2.1.0, tslib@^2.4.0, tslib@^2.6.2, tslib@^2.8.1: + version "2.8.1" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f" + integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w== + tslib@^1.9.3: version "1.14.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" @@ -8846,11 +8940,6 @@ tslib@^2.0.0: resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae" integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q== -tslib@^2.0.1, tslib@^2.1.0, tslib@^2.4.0, tslib@^2.6.2, tslib@^2.8.1: - version "2.8.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f" - integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w== - tty-browserify@0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"