Skip to content

Commit

Permalink
ci: upgrade typos to 1.16.8
Browse files Browse the repository at this point in the history
  • Loading branch information
hezhizhen authored and logseq-cldwalker committed Aug 24, 2023
1 parent 73b92a8 commit 4cb23ab
Show file tree
Hide file tree
Showing 10 changed files with 51 additions and 49 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Checkout Actions Repository
uses: actions/checkout@v3
- name: Check spelling with custom config file
uses: crate-ci/typos@v1.13.10
uses: crate-ci/typos@v1.16.8
with:
config: ./typos.toml

Expand Down
6 changes: 3 additions & 3 deletions deps/shui/src/logseq/shui/context.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@
:config app-config
;; Until components are converted over, they need to fallback to the old inline function
;; Wrap the old inline function to allow for interception, but fallback to the old inline function
:inline-block (inline->inline-block inline block-config)
:inline-block (inline->inline-block inline block-config)
:map-inline-block (inline->map-inline-block inline block-config)
;; Currently frontend component are provided an object map containin at least the following keys:
;; Currently frontend component are provided an object map containing at least the following keys:
;; These will be passed through in a whitelisted fashion so as to be able to track the dependencies
;; back to the core application
;; TODO: document the following
:block (:block block-config) ;; the db entity of the current block
:block? (:block? block-config)
:blocks-container-id (:blocks-container-id block-config)
:editor-box (:editor-box block-config)
:id (:id block-config)
:id (:id block-config)
:mode? (:mode? block-config)
:query-result (:query-result block-config)
:sidebar? (:sidebar? block-config)
Expand Down
6 changes: 3 additions & 3 deletions docs/develop-logseq-on-mobile.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
```
- Working directory: Logseq root directory
- Run `yarn && yarn app-watch` from the logseq project root directory in terminal.
- Run `npx cap sync ios` in another termimal to copy web assets from public to *ios/App/App/public*, and create *capacitor.config.json* in *ios/App/App*, and update iOS plugins.
- Run `npx cap sync ios` in another terminal to copy web assets from public to *ios/App/App/public*, and create *capacitor.config.json* in *ios/App/App*, and update iOS plugins.
- Connect your iOS device to MacBook.
- Run `npx cap open ios` to open Logseq project in Xcode, and build the app there.

Expand Down Expand Up @@ -70,13 +70,13 @@ or, you can run `bb release:ios-app` to do those steps with one command.
}
```
- Run `yarn && yarn app-watch` from the logseq project root directory in terminal.
- Run `npx cap sync android` in another termimal.
- Run `npx cap sync android` in another terminal.
- Run `npx cap run android` to install app into your device.

or, you can run `bb dev:android-app` to do those steps with one command if you are on macOS.

Then,
- In Android Studio, open **Tools** -> **AVD Manager** to create Android Virtual Device (AVD), and lanuch it in the emulator.
- In Android Studio, open **Tools** -> **AVD Manager** to create Android Virtual Device (AVD), and launch it in the emulator.
- In Android Studio, open **Run** -> **Run** to run Logseq.
- After logseq startup in Android virtual device, repl should be able to connect
- For browser console print and devtool remote debug, open chrome, type url chrome://inspect/#devices, you should see your device there, click inspect
Expand Down
11 changes: 5 additions & 6 deletions scripts/src/logseq/tasks/lang.clj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
(into {})))

(defn list-langs
"List translated langagues with their number of translations"
"List translated languages with their number of translations"
[]
(let [dicts (get-dicts)
en-count (count (dicts :en))
Expand Down Expand Up @@ -172,12 +172,11 @@
:host :settings-page/tab-editor :shortcut.category/plugins :whiteboard/link}
:pt-PT #{:plugins :settings-of-plugins :plugin/downloads :right-side-bar/flashcards
:settings-page/enable-flashcards :settings-page/plugin-system}
:nb-NO #{:port :type :whiteboard :right-side-bar/flashcards :right-side-bar/whiteboards
:search-item/whiteboard :settings-page/enable-flashcards :settings-page/enable-whiteboards
:settings-page/tab-editor :shortcut.category/whiteboard :whiteboard/medium
:nb-NO #{:port :type :whiteboard :right-side-bar/flashcards :right-side-bar/whiteboards
:search-item/whiteboard :settings-page/enable-flashcards :settings-page/enable-whiteboards
:settings-page/tab-editor :shortcut.category/whiteboard :whiteboard/medium
:whiteboard/twitter-url :whiteboard/youtube-url :right-side-bar/history-global}
:tr #{:help/awesome-logseq}
})
:tr #{:help/awesome-logseq}})

(defn- validate-languages-dont-have-duplicates
"Looks up duplicates for all languages"
Expand Down
2 changes: 1 addition & 1 deletion src/main/frontend/common.css
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ html[data-theme='dark'] {
--color-level-6: #3a7e8e;
}

/* You should always use .light-theme for light mode, the .white-theme is just for backword compatibility.
/* You should always use .light-theme for light mode, the .white-theme is just for backward compatibility.
See: https://github.com/logseq/logseq/pull/4652. */
.white-theme,
Expand Down
8 changes: 4 additions & 4 deletions src/main/frontend/components/conversion.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@
(ui/button (t :file-rn/confirm-proceed) ;; the button is for triple-lowbar only
:class "text-md p-2 mr-1"
:on-click #(do (reset! *target-format :triple-lowbar)
(reset! *dir-format (state/get-filename-format repo)) ;; assure it's uptodate
(write-filename-format! repo :triple-lowbar)
(reset! *solid-format :triple-lowbar)))]
(reset! *dir-format (state/get-filename-format repo)) ;; assure it's uptodate
(write-filename-format! repo :triple-lowbar)
(reset! *solid-format :triple-lowbar)))]
[:p (t :file-rn/instruct-3)]])

(rum/defc filename-format-select
Expand Down Expand Up @@ -171,7 +171,7 @@
[:tr {:key (:block/name page)}
[:td [:div [:p "📄 " old-title]]
(case status
:breaking ;; if properety title override the title, it't not breaking change
:breaking ;; if property title override the title, it't not breaking change
[:div [:p "🟡 " (t :file-rn/suggest-rename) rename-but]
[:p (t :file-rn/otherwise-breaking) " \"" changed-title \"]]
:unreachable
Expand Down
2 changes: 1 addition & 1 deletion src/main/frontend/fs/capacitor_fs.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@
(if (mobile-util/native-ios?)
(cond
(or (string/includes? path "///private/")
;; virtual matchine
;; virtual machine
(string/starts-with? path "file:///Users/"))
path

Expand Down
56 changes: 28 additions & 28 deletions src/main/frontend/handler/page.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
(gp-util/safe-subs s 0 200)))

(defn- build-title [page]
;; Don't wrap `\"` anymore, as tiitle property is not effected by `,` now
;; Don't wrap `\"` anymore, as title property is not effected by `,` now
;; The previous extract behavior isn't unwrapping the `'"` either. So no need
;; to maintain the compatibility.
(:block/original-name page))
Expand Down Expand Up @@ -341,12 +341,12 @@
(defn toggle-favorite! []
;; NOTE: in journals or settings, current-page is nil
(when-let [page-name (state/get-current-page)]
(let [favorites (:favorites (state/sub-config))
favorited? (contains? (set (map string/lower-case favorites))
(string/lower-case page-name))]
(if favorited?
(unfavorite-page! page-name)
(favorite-page! page-name)))))
(let [favorites (:favorites (state/sub-config))
favorited? (contains? (set (map string/lower-case favorites))
(string/lower-case page-name))]
(if favorited?
(unfavorite-page! page-name)
(favorite-page! page-name)))))

(defn delete!
[page-name ok-handler & {:keys [delete-file?]
Expand Down Expand Up @@ -618,30 +618,30 @@
"Accepts unsanitized page names"
([old-name new-name] (rename! old-name new-name true))
([old-name new-name redirect?]
(let [repo (state/get-current-repo)
old-name (string/trim old-name)
new-name (string/trim new-name)
old-page-name (util/page-name-sanity-lc old-name)
new-page-name (util/page-name-sanity-lc new-name)
name-changed? (not= old-name new-name)]
(if (and old-name
(let [repo (state/get-current-repo)
old-name (string/trim old-name)
new-name (string/trim new-name)
old-page-name (util/page-name-sanity-lc old-name)
new-page-name (util/page-name-sanity-lc new-name)
name-changed? (not= old-name new-name)]
(if (and old-name
new-name
(not (string/blank? new-name))
name-changed?)
(do
(cond
(= old-page-name new-page-name)
(rename-page-aux old-name new-name redirect?)

(db/pull [:block/name new-page-name])
(merge-pages! old-page-name new-page-name)

:else
(rename-namespace-pages! repo old-name new-name))
(rename-nested-pages old-name new-name))
(when (string/blank? new-name)
(notification/show! "Please use a valid name, empty name is not allowed!" :error)))
(ui-handler/re-render-root!))))
(do
(cond
(= old-page-name new-page-name)
(rename-page-aux old-name new-name redirect?)

(db/pull [:block/name new-page-name])
(merge-pages! old-page-name new-page-name)

:else
(rename-namespace-pages! repo old-name new-name))
(rename-nested-pages old-name new-name))
(when (string/blank? new-name)
(notification/show! "Please use a valid name, empty name is not allowed!" :error)))
(ui-handler/re-render-root!))))

(defn- split-col-by-element
[col element]
Expand Down
2 changes: 1 addition & 1 deletion src/main/frontend/util/keycode.cljs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(ns frontend.util.keycode
"Provides names for common keycodes")

;; code / keycode should all be deprecated for non funcional keys
;; code / keycode should all be deprecated for non functional keys
;; (def left-square-bracket 219) ;; deprecated
;; (def left-paren 57) ;; deprecated
(def enter 13)
Expand Down
5 changes: 4 additions & 1 deletion typos.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
edn = "edn"
datas = "datas"
juxt = "juxt"
Ded = "Ded" # Shows up in ANDed
Ded = "Ded" # Shows up in ANDed
referer = "referer" # This is a misspelling in the http spec so not much we can do

# False positives
Expand All @@ -12,5 +12,8 @@ BA = "BA"
fo = "fo"
aks = "aks"
Mannor = "Mannor"
deleteable = "deleteable"
fom = "fom"
tne = "tne"
[files]
extend-exclude = ["resources/*", "src/resources/*"]

0 comments on commit 4cb23ab

Please sign in to comment.