Merge branch 'master' into patch-5

logseq · Mar 26, 2024 · 4b48857 · 4b48857
2 parents 47f7bc3 + 4a233e3
commit 4b48857
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 26 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -7,8 +7,8 @@ android {
  applicationId "com.logseq.app"
  minSdkVersion rootProject.ext.minSdkVersion
  targetSdkVersion rootProject.ext.targetSdkVersion
- versionCode 81
- versionName "0.10.7"
+ versionCode 82
+ versionName "0.10.8"
  testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
  aaptOptions {
  // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj
@@ -519,7 +519,7 @@
  INFOPLIST_FILE = App/Info.plist;
  IPHONEOS_DEPLOYMENT_TARGET = 14.0;
  LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
- MARKETING_VERSION = 0.10.7;
+ MARKETING_VERSION = 0.10.8;
  OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
  PRODUCT_BUNDLE_IDENTIFIER = com.logseq.logseq;
  PRODUCT_NAME = "$(TARGET_NAME)";
@@ -546,7 +546,7 @@
  INFOPLIST_FILE = App/Info.plist;
  IPHONEOS_DEPLOYMENT_TARGET = 14.0;
  LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
- MARKETING_VERSION = 0.10.7;
+ MARKETING_VERSION = 0.10.8;
  PRODUCT_BUNDLE_IDENTIFIER = com.logseq.logseq;
  PRODUCT_NAME = "$(TARGET_NAME)";
  SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
@@ -571,7 +571,7 @@
  INFOPLIST_KEY_NSHumanReadableCopyright = "";
  IPHONEOS_DEPLOYMENT_TARGET = 14.0;
  LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
- MARKETING_VERSION = 0.10.7;
+ MARKETING_VERSION = 0.10.8;
  MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
  MTL_FAST_MATH = YES;
  PRODUCT_BUNDLE_IDENTIFIER = com.logseq.logseq.ShareViewController;
@@ -598,7 +598,7 @@
  INFOPLIST_KEY_NSHumanReadableCopyright = "";
  IPHONEOS_DEPLOYMENT_TARGET = 14.0;
  LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
- MARKETING_VERSION = 0.10.7;
+ MARKETING_VERSION = 0.10.8;
  MTL_FAST_MATH = YES;
  PRODUCT_BUNDLE_IDENTIFIER = com.logseq.logseq.ShareViewController;
  PRODUCT_NAME = "$(TARGET_NAME)";

diff --git a/package.json b/package.json
@@ -9,7 +9,6 @@
  "@playwright/test": "=1.31.0",
  "@tailwindcss/aspect-ratio": "0.4.2",
  "@tailwindcss/forms": "0.5.3",
- "@tailwindcss/line-clamp": "0.4.2",
  "@tailwindcss/typography": "0.5.7",
  "@types/gulp": "^4.0.7",
  "autoprefixer": "^10.4.13",
@@ -126,7 +125,7 @@
  "inter-ui": "^3.19.3",
  "interactjs": "^1.10.17",
  "jszip": "3.8.0",
- "katex": "^0.16.7",
+ "katex": "^0.16.10",
  "marked": "^5.1.2",
  "mldoc": "1.5.7",
  "path": "0.12.7",

diff --git a/packages/amplify/yarn.lock b/packages/amplify/yarn.lock
@@ -4113,9 +4113,9 @@ find-up@^4.1.0:
  path-exists "^4.0.0"
 
 follow-redirects@^1.14.8:
- version "1.15.4"
- resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.4.tgz#cdc7d308bf6493126b17ea2191ea0ccf3e535adf"
- integrity sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==
+ version "1.15.6"
+ resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b"
+ integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==
 
 fs-extra@^10.0.0:
  version "10.1.0"

diff --git a/resources/forge.config.js b/resources/forge.config.js
@@ -4,7 +4,7 @@ module.exports = {
  packagerConfig: {
  name: 'Logseq',
  icon: './icons/logseq_big_sur.icns',
- buildVersion: 81,
+ buildVersion: 82,
  protocols: [
  {
  "protocol": "logseq",

diff --git a/resources/package.json b/resources/package.json
@@ -1,7 +1,7 @@
 {
  "name": "Logseq",
  "productName": "Logseq",
- "version": "0.10.7",
+ "version": "0.10.8",
  "main": "electron.js",
  "author": "Logseq",
  "license": "AGPL-3.0",

diff --git a/src/main/frontend/extensions/pdf/core.cljs b/src/main/frontend/extensions/pdf/core.cljs
@@ -415,7 +415,7 @@
  (when (and (not (.contains (.-classList target) "extensions__pdf-hls-area-region"))
  (.closest target ".page"))
  (and e (or (.-metaKey e)
- (and util/win32? (.-shiftKey e))
+ (.-shiftKey e)
  @*area-mode?)))))
 
  reset-coords! #(do

diff --git a/src/main/frontend/handler.cljs b/src/main/frontend/handler.cljs
@@ -49,13 +49,13 @@
  (set! js/window.onerror
  (fn [message, _source, _lineno, _colno, error]
  (when-not (error/ignored? message)
+ (js/console.error message)
  (log/error :exception error)))))
  ;; (notification/show!
  ;; (str "message=" message "\nsource=" source "\nlineno=" lineno "\ncolno=" colno "\nerror=" error)
  ;; :error
  ;; ;; Don't auto-hide
  ;; false)
-
 
 
 (defn- watch-for-date!

diff --git a/src/main/frontend/search/db.cljs b/src/main/frontend/search/db.cljs
@@ -113,6 +113,8 @@
  (clj->js {:keys ["name"]
  :shouldSort true
  :tokenize true
+ :distance 1024
+ :threshold 0.5 ;; search for 50% match from the start
  :minMatchCharLength 1}))]
  (swap! indices assoc-in [repo :pages] indice)
  indice)))
diff --git a/src/main/frontend/version.cljs b/src/main/frontend/version.cljs
@@ -1,3 +1,3 @@
 (ns ^:no-doc frontend.version)
 
-(defonce version "0.10.7")
+(defonce version "0.10.8")
diff --git a/tailwind.config.js b/tailwind.config.js
@@ -140,7 +140,6 @@ module.exports = {
  require('@tailwindcss/forms'),
  require('@tailwindcss/typography'),
  require('@tailwindcss/aspect-ratio'),
- require('@tailwindcss/line-clamp'),
  require('tailwind-capitalize-first-letter'),
  require('tailwindcss-animate'),
  exposeColorsToCssVars

diff --git a/yarn.lock b/yarn.lock
@@ -886,11 +886,6 @@
  dependencies:
  mini-svg-data-uri "^1.2.3"
 
-"@tailwindcss/[email protected]":
- version "0.4.2"
- resolved "https://registry.yarnpkg.com/@tailwindcss/line-clamp/-/line-clamp-0.4.2.tgz#f353c5a8ab2c939c6267ac5b907f012e5ee130f9"
- integrity sha512-HFzAQuqYCjyy/SX9sLGB1lroPzmcnWv1FHkIpmypte10hptf4oPUfucryMKovZh2u0uiS9U5Ty3GghWfEJGwVw==
-
 "@tailwindcss/[email protected]":
  version "0.5.7"
  resolved "https://registry.yarnpkg.com/@tailwindcss/typography/-/typography-0.5.7.tgz#e0b95bea787ee14c5a34a74fc824e6fe86ea8855"
@@ -4474,10 +4469,10 @@ [email protected]:
  resolved "https://registry.yarnpkg.com/just-once/-/just-once-1.1.0.tgz#fe81a185ebaeeb0947a7e705bf01cb6808db0ad8"
  integrity sha512-+rZVpl+6VyTilK7vB/svlMPil4pxqIJZkbnN7DKZTOzyXfun6ZiFeq2Pk4EtCEHZ0VU4EkdFzG8ZK5F3PErcDw==
 
-katex@^0.16.7:
- version "0.16.8"
- resolved "https://registry.yarnpkg.com/katex/-/katex-0.16.8.tgz#89b453f40e8557f423f31a1009e9298dd99d5ceb"
- integrity sha512-ftuDnJbcbOckGY11OO+zg3OofESlbR5DRl2cmN8HeWeeFIV7wTXvAOx8kEjZjobhA+9wh2fbKeO6cdcA9Mnovg==
+katex@^0.16.10:
+ version "0.16.10"
+ resolved "https://registry.yarnpkg.com/katex/-/katex-0.16.10.tgz#6f81b71ac37ff4ec7556861160f53bc5f058b185"
+ integrity sha512-ZiqaC04tp2O5utMsl2TEZTXxa6WSC4yo0fv5ML++D3QZv/vx2Mct0mTlRx3O+uUkjfuAgOkzsCmq5MiUEsDDdA==
  dependencies:
  commander "^8.3.0"