Merge branch 'master' into feat/db

android/app/build.gradle

@@ -6,8 +6,8 @@ android {
         applicationId "com.logseq.app"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 64
-        versionName "0.9.11"
+        versionCode 66
+        versionName "0.9.13"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

gulpfile.js

@@ -60,8 +60,20 @@ const common = {
         'node_modules/interactjs/dist/interact.min.js',
         'node_modules/photoswipe/dist/umd/*.js',
         'node_modules/reveal.js/dist/reveal.js',
-        'node_modules/shepherd.js/dist/js/shepherd.min.js'
+        'node_modules/shepherd.js/dist/js/shepherd.min.js',
+        'node_modules/marked/marked.min.js',
+        'node_modules/@highlightjs/cdn-assets/highlight.min.js',
+        'node_modules/@isomorphic-git/lightning-fs/dist/lightning-fs.min.js',
+        'packages/amplify/dist/amplify.js'
       ]).pipe(gulp.dest(path.join(outputPath, 'js'))),
+      () => gulp.src([
+        'node_modules/pdfjs-dist/build/pdf.js',
+        'node_modules/pdfjs-dist/build/pdf.worker.js',
+        'node_modules/pdfjs-dist/web/pdf_viewer.js'
+      ]).pipe(gulp.dest(path.join(outputPath, 'js', 'pdfjs'))),
+      () => gulp.src([
+        'node_modules/pdfjs-dist/cmaps/*.*',
+      ]).pipe(gulp.dest(path.join(outputPath, 'js', 'pdfjs', 'cmaps'))),
       () => gulp.src([
         'node_modules/@tabler/icons/iconfont/tabler-icons.min.css',
         'node_modules/inter-ui/inter.css',

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.9.11;
+				MARKETING_VERSION = 0.9.13;
 				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.9.11;
+				MARKETING_VERSION = 0.9.13;
 				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.9.11;
+				MARKETING_VERSION = 0.9.13;
 				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.9.11;
+				MARKETING_VERSION = 0.9.13;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.logseq.logseq.ShareViewController;
 				PRODUCT_NAME = "$(TARGET_NAME)";

package.json

@@ -72,7 +72,8 @@
         "ios:dev": "cross-env PLATFORM=ios gulp cap",
         "android:dev": "cross-env PLATFORM=android gulp cap",
         "tldraw:build": "yarn --cwd tldraw install",
-        "postinstall": "yarn tldraw:build"
+        "amplify:build": "yarn --cwd packages/amplify install",
+        "postinstall": "yarn tldraw:build && yarn amplify:build "
     },
     "dependencies": {
         "@capacitor/android": "^4.0.0",
@@ -91,9 +92,11 @@
         "@emoji-mart/data": "^1.1.2",
         "@emoji-mart/react": "^1.1.1",
         "@excalidraw/excalidraw": "0.12.0",
+        "@highlightjs/cdn-assets": "10.4.1",
         "@hugotomazi/capacitor-navigation-bar": "^2.0.0",
+        "@isomorphic-git/lightning-fs": "^4.6.0",
         "@logseq/capacitor-file-sync": "0.0.32",
-        "@logseq/diff-merge": "0.1.0",
+        "@logseq/diff-merge": "0.2.2",
         "@logseq/react-tweet-embed": "1.3.1-1",
         "@radix-ui/colors": "^0.1.8",
         "@sentry/react": "^6.18.2",
@@ -117,16 +120,17 @@
         "fuse.js": "6.4.6",
         "grapheme-splitter": "1.0.4",
         "graphology": "0.20.0",
-        "highlight.js": "10.4.1",
         "html2canvas": "^1.4.1",
         "ignore": "5.1.8",
         "inter-ui": "^3.19.3",
         "interactjs": "^1.10.17",
         "jszip": "3.8.0",
         "katex": "^0.16.7",
+        "marked": "^5.1.2",
         "mldoc": "1.5.7",
         "path": "0.12.7",
         "path-complete-extname": "1.0.0",
+        "pdfjs-dist": "^3.9.179",
         "photoswipe": "^5.3.7",
         "pixi-graph-fork": "0.2.0",
         "pixi.js": "6.2.0",

packages/amplify/package.json

@@ -6,7 +6,8 @@
   "scripts": {
     "dev:amplify": "parcel watch ./src/amplify.ts --dist-dir ../src/main/frontend/ --no-hmr --no-source-maps",
     "dev:examples": "parcel serve ./examples/index.html",
-    "build:amplify": "parcel build ./src/amplify.ts --dist-dir ../../resources/js --no-source-maps && mv ../../resources/js/amplify.css ../../resources/css/"
+    "build:amplify": "parcel build ./src/amplify.ts --no-source-maps",
+    "postinstall": "yarn build:amplify"
   },
   "devDependencies": {
     "buffer": "^5.5.0",

packages/amplify/src/LSAuthenticator.tsx

@@ -9,6 +9,12 @@ export function LSAuthenticator({ termsLink, children }: any) {
           username: { order: 2 },
           password: { order: 3 },
           confirm_password: { order: 4 },
+        },
+        signIn: {
+          username: {
+            placeholder: 'Enter your Username or Email',
+            label: 'Username or Email'
+          }
         }
       }}
       loginMechanisms={['username']}

packages/amplify/src/amplify.ts

@@ -5,7 +5,6 @@ import { dict } from 'aws-amplify-react/lib-esm/AmplifyI18n'
 
 // fix i18n
 dict.zh['Reset Password'] = '重置密码'
-dict.zh['Enter your username'] = '请输入用户名'
 dict.zh['Enter your email'] = '请输入邮箱'
 dict.zh['Enter your password'] = '请输入密码'
 dict.zh['Confirm Password'] = '确认密码'
@@ -26,7 +25,7 @@ const fixesMapping = {
   'Forgot Password': ['Forgot your password?'],
   'Enter your email': ['Enter your Email'],
   'Enter your password': ['Enter your Password'],
-  'Enter your username': ['Enter your Username']
+  'Enter your username': ['Enter your Username or Email']
 }
 
 Object.keys(dict).forEach((k) => {

resources/css/datepicker.css

@@ -1,230 +0,0 @@
-/*----------------------------------------------------------------------------------------
- Stylesheet for re-com.date Date Picker variants inline-picker & dropdown-picker
- Day8 variation loosely based on:
- Copyright 2013 Dan Grossman ( http://www.dangrossman.info )
- Licensed under the Apache License v2.0
- http://www.apache.org/licenses/LICENSE-2.0
- Built for http://www.improvely.com
- http://eternicode.github.io/bootstrap-datepicker
-
-  START OF DATE PICKER SECTION...
-----------------------------------------------------------------------------------------*/
-.noselect {
-    -webkit-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
-    user-select: none;
-}
-
-.datepicker.single .calendar {
-    float: none;
-}
-
-.datepicker .calendar {
-    display: none;
-    max-width: 200px;
-}
-
-.datepicker .calendar.single .calendar-date {
-    border: none;
-}
-
-.datepicker .calendar th, .datepicker .calendar td {
-    white-space: nowrap;
-    text-align: center;
-    min-width: 32px;
-}
-
-.datepicker .calendar-date {
-    border: 1px solid #ddd;
-    padding: 4px;
-    border-radius: 4px;
-    /* background: #fff; */
-}
-
-.datepicker .calendar-time {
-    text-align: center;
-    margin: 8px auto 0 auto;
-    line-height: 30px;
-}
-
-.datepicker {
-    position: absolute;
-    top: 100px;
-    left: 20px;
-    padding: 10px;
-    margin-top: 1px;
-    -webkit-border-radius: 4px;
-    -moz-border-radius: 4px;
-    line-height: 16px;
-    border-radius: 4px;
-    background: #efefef;
-}
-
-.datepicker table {
-    width: 100%;
-    margin: 0;
-    border-collapse: separate;
-    border-spacing: 0;
-    background: transparent;
-    border: none;
-}
-
-.datepicker td, .datepicker th {
-    text-align: center;
-    width: 27px;
-    height: 26px;
-    max-width: 27px;
-    max-height: 26px;
-    min-width: 27px;
-    min-height: 26px;
-    padding: 4px;
-    cursor: default;
-    white-space: nowrap;
-    font-weight: normal;
-}
-
-.datepicker td.off {
-    padding: 4px;
-    color: #999;
-}
-
-.datepicker td.disabled {
-    color: #999;
-}
-
-.datepicker th.disabled {
-    color: #999;
-}
-
-.datepicker td.available:hover, .datepicker th.available:hover {
-    background: #357ebd;
-    cursor: pointer;
-    color: #FFF;
-    border-radius: 4px;
-}
-
-.datepicker td.in-range {
-    background: #ebf4f8;
-    -webkit-border-radius: 0;
-    -moz-border-radius: 0;
-  border-radius: 0;
-}
-
-.datepicker td.start-date {
-    -webkit-border-radius: 4px 0 0 4px;
-    -moz-border-radius: 4px 0 0 4px;
-    border-radius: 4px 0 0 4px;
-}
-
-.datepicker td.end-date {
-    -webkit-border-radius: 0 4px 4px 0;
-    -moz-border-radius: 0 4px 4px 0;
-    border-radius: 0 4px 4px 0;
-}
-
-.datepicker td.start-date.end-date {
-    -webkit-border-radius: 4px;
-    -moz-border-radius: 4px;
-    border-radius: 4px;
-}
-
-.datepicker td.active, .datepicker td.active:hover {
-    background-color: #357ebd;
-    border-color: #3071a9;
-    color: #fff;
-}
-
-/* Introduced by Day8 from http://eternicode.github.io/bootstrap-datepicker */
-.datepicker td.today, .datepicker td.today:hover {
-    background-color: #ffcd70;
-    border-color: #f59e00;
-    border-radius: 18px;
-    color: #fff;
-}
-
-.datepicker th.day-enabled, label.day-enabled {
-    font-weight: normal;
-    font-size: 10px;
-    color: #333;
-}
-
-.datepicker th.selectable {
-    font-weight: normal;
-    color: #357ebd;
-}
-
-.datepicker th.day-disabled {
-    font-weight: normal;
-    font-size: 10px;
-    color: #999;
-}
-
-.datepicker td.week, .datepicker th.week {
-  font-size: 80%;
-  color: #ccc;
-}
-
-.datepicker th.month {
-    width: auto;
-    font-size: 14px;
-    color: var(--ls-title-text-color);
-}
-
-.dropdown-button {
-    cursor: pointer;
-    height: 32px;
-    font-size: 13px;
-    font-weight: normal;
-}
-
-.dropdown-button.activator {
-    width: 40px;
-    color: #777;
-    /* background-color: #F7F7F7 */
-}
-
-.table-condensed > thead > tr > th,
-.table-condensed > tbody > tr > th,
-.table-condensed > tfoot > tr > th,
-.table-condensed > thead > tr > td,
-.table-condensed > tbody > tr > td,
-.table-condensed > tfoot > tr > td {
-    padding: 5px;
-}
-
-.dark-theme .datepicker {
-    background: var(--ls-secondary-background-color);
-}
-
-.dark-theme .datepicker th.day-disabled, .dark-theme .datepicker th.disabled, .dark-theme .datepicker td.disabled, .dark-theme .datepicker td.off {
-    color: #666;
-}
-
-.dark-theme .datepicker th.day-enabled, .dark-theme  label.day-enabled {
-    color: currentColor;
-}
-
-.dark-theme .datepicker td.active, .dark-theme .datepicker td.active:hover {
-    background-color: var(--ls-block-properties-background-color);
-    border-color: var(--ls-block-properties-background-color);
-}
-
-.dark-theme .datepicker th.selectable {
-     color: var(--ls-primary-text-color);
-}
-
-.dark-theme .datepicker td.available:hover, .dark-theme .datepicker th.available:hover {
-    background: var(--ls-block-properties-background-color);
-}
-
-.datepicker tr:nth-child(odd), .datepicker tr:nth-child(even), .dark-theme .datepicker tr:nth-child(odd), .dark-theme .datepicker tr:nth-child(even) {
-    background: transparent;
-}
-
-.datepicker th, .datepicker tr, .datepicker td, .dark-theme .datepicker th, .dark-theme .datepicker tr, .dark-theme .datepicker td {
-    border-bottom: none;
-}
-/*----------------------------------------------------------------------------------------
-  END OF DATE PICKER SECTION...
-----------------------------------------------------------------------------------------*/

resources/css/table.css

@@ -1,47 +0,0 @@
-div.table-wrapper {
-    overflow: auto;
-}
-
-table {
-    width: 100%;
-    border-collapse: collapse;
-    text-align: left;
-    margin: 1rem 0;
-}
-
-th {
-    font-size: 14px;
-    font-weight: 400;
-    color: var(--ls-primary-text-color);
-    border-bottom: 2px solid var(--ls-border-color);
-    padding: 10px 8px;
-}
-
-td {
-    padding: 6px 8px;
-    text-align: left;
-}
-
-tr:nth-child(even) {background: var(--ls-table-tr-even-background-color);}
-tr:nth-child(odd) {background: var(--ls-primary-background-color);}
-
-caption.t-above {caption-side:top}
-caption.t-bottom {caption-side:bottom}
-caption {margin-bottom:.3em}
-figcaption{margin-top:.3em}
-.org-right{text-align:right}
-.org-left{text-align:left}
-.org-center{text-align:center}
-
-.dark-theme th {
-    color: var(--ls-primary-text-color);
-}
-
-.dark-theme tr:nth-child(even) {background: var(--ls-table-tr-even-background-color);}
-.dark-theme tr:nth-child(odd) {background: var(--ls-primary-background-color);}
-.dark-theme td, .dark-theme tr {
-    border-bottom: none;
-}
-.dark-theme th {
-    border-bottom: 2px solid var(--ls-border-color);
-}

resources/css/tooltip.css

@@ -1,665 +0,0 @@
-.tippy-touch {
-  cursor: pointer !important
-}
-
-.tippy-notransition {
-  transition: none !important
-}
-
-.tippy-popper {
-  max-width: 800px;
-  -webkit-perspective: 800px;
-  perspective: 800px;
-  z-index: 9999;
-  outline: 0;
-  transition-timing-function: cubic-bezier(.165, .84, .44, 1);
-  pointer-events: none
-}
-
-.tippy-popper.html-template {
-  max-width: 96%;
-  max-width: calc(100% - 20px)
-}
-
-.tippy-popper[x-placement^=top] [x-arrow] {
-  border-top: 7px solid var(--ls-quaternary-background-color);
-  border-right: 7px solid transparent;
-  border-left: 7px solid transparent;
-  bottom: -7px;
-  margin: 0 9px
-}
-
-.tippy-popper[x-placement^=top] [x-arrow].arrow-small {
-  border-top: 5px solid var(--ls-quaternary-background-color);
-  border-right: 5px solid transparent;
-  border-left: 5px solid transparent;
-  bottom: -5px
-}
-
-.tippy-popper[x-placement^=top] [x-arrow].arrow-big {
-  border-top: 10px solid var(--ls-quaternary-background-color);
-  border-right: 10px solid transparent;
-  border-left: 10px solid transparent;
-  bottom: -10px
-}
-
-.tippy-popper[x-placement^=top] [x-circle] {
-  -webkit-transform-origin: 0 33%;
-  transform-origin: 0 33%
-}
-
-.tippy-popper[x-placement^=top] [x-circle].enter {
-  -webkit-transform: scale(1) translate(-50%, -55%);
-  transform: scale(1) translate(-50%, -55%);
-  opacity: 1
-}
-
-.tippy-popper[x-placement^=top] [x-circle].leave {
-  -webkit-transform: scale(.15) translate(-50%, -50%);
-  transform: scale(.15) translate(-50%, -50%);
-  opacity: 0
-}
-
-.tippy-popper[x-placement^=top] .tippy-tooltip.light-theme [x-circle] {
-  background-color: #fff
-}
-
-.tippy-popper[x-placement^=top] .tippy-tooltip.light-theme [x-arrow] {
-  border-top: 7px solid #fff;
-  border-right: 7px solid transparent;
-  border-left: 7px solid transparent
-}
-
-.tippy-popper[x-placement^=top] .tippy-tooltip.light-theme [x-arrow].arrow-small {
-  border-top: 5px solid #fff;
-  border-right: 5px solid transparent;
-  border-left: 5px solid transparent
-}
-
-.tippy-popper[x-placement^=top] .tippy-tooltip.light-theme [x-arrow].arrow-big {
-  border-top: 10px solid #fff;
-  border-right: 10px solid transparent;
-  border-left: 10px solid transparent
-}
-
-.tippy-popper[x-placement^=top] .tippy-tooltip.transparent-theme [x-circle] {
-  background-color: var(--ls-secondary-background-color)
-}
-
-.tippy-popper[x-placement^=top] .tippy-tooltip.transparent-theme [x-arrow] {
-  border-top: 7px solid var(--ls-secondary-background-color);
-  border-right: 7px solid transparent;
-  border-left: 7px solid transparent
-}
-
-.tippy-popper[x-placement^=top] .tippy-tooltip.transparent-theme [x-arrow].arrow-small {
-  border-top: 5px solid var(--ls-secondary-background-color);
-  border-right: 5px solid transparent;
-  border-left: 5px solid transparent
-}
-
-.tippy-popper[x-placement^=top] .tippy-tooltip.transparent-theme [x-arrow].arrow-big {
-  border-top: 10px solid var(--ls-secondary-background-color);
-  border-right: 10px solid transparent;
-  border-left: 10px solid transparent
-}
-
-.tippy-popper[x-placement^=top] [data-animation=perspective] {
-  -webkit-transform-origin: bottom;
-  transform-origin: bottom
-}
-
-.tippy-popper[x-placement^=top] [data-animation=perspective].enter {
-  opacity: 1;
-  -webkit-transform: translateY(-10px) rotateX(0);
-  transform: translateY(-10px) rotateX(0)
-}
-
-.tippy-popper[x-placement^=top] [data-animation=perspective].leave {
-  opacity: 0;
-  -webkit-transform: translateY(0) rotateX(90deg);
-  transform: translateY(0) rotateX(90deg)
-}
-
-.tippy-popper[x-placement^=top] [data-animation=fade].enter {
-  opacity: 1;
-  -webkit-transform: translateY(-10px);
-  transform: translateY(-10px)
-}
-
-.tippy-popper[x-placement^=top] [data-animation=fade].leave {
-  opacity: 0;
-  -webkit-transform: translateY(-10px);
-  transform: translateY(-10px)
-}
-
-.tippy-popper[x-placement^=top] [data-animation=shift].enter {
-  opacity: 1;
-  -webkit-transform: translateY(-10px);
-  transform: translateY(-10px)
-}
-
-.tippy-popper[x-placement^=top] [data-animation=shift].leave {
-  opacity: 0;
-  -webkit-transform: translateY(0);
-  transform: translateY(0)
-}
-
-.tippy-popper[x-placement^=top] [data-animation=scale].enter {
-  opacity: 1;
-  -webkit-transform: translateY(-10px) scale(1);
-  transform: translateY(-10px) scale(1)
-}
-
-.tippy-popper[x-placement^=top] [data-animation=scale].leave {
-  opacity: 0;
-  -webkit-transform: translateY(0) scale(0);
-  transform: translateY(0) scale(0)
-}
-
-.tippy-popper[x-placement^=bottom] [x-arrow] {
-  border-bottom: 7px solid var(--ls-quaternary-background-color);
-  border-right: 7px solid transparent;
-  border-left: 7px solid transparent;
-  top: -7px;
-  margin: 0 9px
-}
-
-.tippy-popper[x-placement^=bottom] [x-arrow].arrow-small {
-  border-bottom: 5px solid var(--ls-quaternary-background-color);
-  border-right: 5px solid transparent;
-  border-left: 5px solid transparent;
-  top: -5px
-}
-
-.tippy-popper[x-placement^=bottom] [x-arrow].arrow-big {
-  border-bottom: 10px solid var(--ls-quaternary-background-color);
-  border-right: 10px solid transparent;
-  border-left: 10px solid transparent;
-  top: -10px
-}
-
-.tippy-popper[x-placement^=bottom] [x-circle] {
-  -webkit-transform-origin: 0 -50%;
-  transform-origin: 0 -50%
-}
-
-.tippy-popper[x-placement^=bottom] [x-circle].enter {
-  -webkit-transform: scale(1) translate(-50%, -45%);
-  transform: scale(1) translate(-50%, -45%);
-  opacity: 1
-}
-
-.tippy-popper[x-placement^=bottom] [x-circle].leave {
-  -webkit-transform: scale(.15) translate(-50%, -5%);
-  transform: scale(.15) translate(-50%, -5%);
-  opacity: 0
-}
-
-.tippy-popper[x-placement^=bottom] .tippy-tooltip.light-theme [x-circle] {
-  background-color: #fff
-}
-
-.tippy-popper[x-placement^=bottom] .tippy-tooltip.light-theme [x-arrow] {
-  border-bottom: 7px solid #fff;
-  border-right: 7px solid transparent;
-  border-left: 7px solid transparent
-}
-
-.tippy-popper[x-placement^=bottom] .tippy-tooltip.light-theme [x-arrow].arrow-small {
-  border-bottom: 5px solid #fff;
-  border-right: 5px solid transparent;
-  border-left: 5px solid transparent
-}
-
-.tippy-popper[x-placement^=bottom] .tippy-tooltip.light-theme [x-arrow].arrow-big {
-  border-bottom: 10px solid #fff;
-  border-right: 10px solid transparent;
-  border-left: 10px solid transparent
-}
-
-.tippy-popper[x-placement^=bottom] .tippy-tooltip.transparent-theme [x-circle] {
-  background-color: var(--ls-secondary-background-color)
-}
-
-.tippy-popper[x-placement^=bottom] .tippy-tooltip.transparent-theme [x-arrow] {
-  border-bottom: 7px solid var(--ls-secondary-background-color);
-  border-right: 7px solid transparent;
-  border-left: 7px solid transparent
-}
-
-.tippy-popper[x-placement^=bottom] .tippy-tooltip.transparent-theme [x-arrow].arrow-small {
-  border-bottom: 5px solid var(--ls-secondary-background-color);
-  border-right: 5px solid transparent;
-  border-left: 5px solid transparent
-}
-
-.tippy-popper[x-placement^=bottom] .tippy-tooltip.transparent-theme [x-arrow].arrow-big {
-  border-bottom: 10px solid var(--ls-secondary-background-color);
-  border-right: 10px solid transparent;
-  border-left: 10px solid transparent
-}
-
-.tippy-popper[x-placement^=bottom] [data-animation=perspective] {
-  -webkit-transform-origin: top;
-  transform-origin: top
-}
-
-.tippy-popper[x-placement^=bottom] [data-animation=perspective].enter {
-  opacity: 1;
-  -webkit-transform: translateY(10px) rotateX(0);
-  transform: translateY(10px) rotateX(0)
-}
-
-.tippy-popper[x-placement^=bottom] [data-animation=perspective].leave {
-  opacity: 0;
-  -webkit-transform: translateY(0) rotateX(-90deg);
-  transform: translateY(0) rotateX(-90deg)
-}
-
-.tippy-popper[x-placement^=bottom] [data-animation=fade].enter {
-  opacity: 1;
-  -webkit-transform: translateY(10px);
-  transform: translateY(10px)
-}
-
-.tippy-popper[x-placement^=bottom] [data-animation=fade].leave {
-  opacity: 0;
-  -webkit-transform: translateY(10px);
-  transform: translateY(10px)
-}
-
-.tippy-popper[x-placement^=bottom] [data-animation=shift].enter {
-  opacity: 1;
-  -webkit-transform: translateY(10px);
-  transform: translateY(10px)
-}
-
-.tippy-popper[x-placement^=bottom] [data-animation=shift].leave {
-  opacity: 0;
-  -webkit-transform: translateY(0);
-  transform: translateY(0)
-}
-
-.tippy-popper[x-placement^=bottom] [data-animation=scale].enter {
-  opacity: 1;
-  -webkit-transform: translateY(10px) scale(1);
-  transform: translateY(10px) scale(1)
-}
-
-.tippy-popper[x-placement^=bottom] [data-animation=scale].leave {
-  opacity: 0;
-  -webkit-transform: translateY(0) scale(0);
-  transform: translateY(0) scale(0)
-}
-
-.tippy-popper[x-placement^=left] [x-arrow] {
-  border-left: 7px solid var(--ls-quaternary-background-color);
-  border-top: 7px solid transparent;
-  border-bottom: 7px solid transparent;
-  right: -7px;
-  margin: 6px 0
-}
-
-.tippy-popper[x-placement^=left] [x-arrow].arrow-small {
-  border-left: 5px solid var(--ls-quaternary-background-color);
-  border-top: 5px solid transparent;
-  border-bottom: 5px solid transparent;
-  right: -5px
-}
-
-.tippy-popper[x-placement^=left] [x-arrow].arrow-big {
-  border-left: 10px solid var(--ls-quaternary-background-color);
-  border-top: 10px solid transparent;
-  border-bottom: 10px solid transparent;
-  right: -10px
-}
-
-.tippy-popper[x-placement^=left] [x-circle] {
-  -webkit-transform-origin: 50% 0;
-  transform-origin: 50% 0
-}
-
-.tippy-popper[x-placement^=left] [x-circle].enter {
-  -webkit-transform: scale(1) translate(-50%, -50%);
-  transform: scale(1) translate(-50%, -50%);
-  opacity: 1
-}
-
-.tippy-popper[x-placement^=left] [x-circle].leave {
-  -webkit-transform: scale(.15) translate(-50%, -50%);
-  transform: scale(.15) translate(-50%, -50%);
-  opacity: 0
-}
-
-.tippy-popper[x-placement^=left] .tippy-tooltip.light-theme [x-circle] {
-  background-color: #fff
-}
-
-.tippy-popper[x-placement^=left] .tippy-tooltip.light-theme [x-arrow] {
-  border-left: 7px solid #fff;
-  border-top: 7px solid transparent;
-  border-bottom: 7px solid transparent
-}
-
-.tippy-popper[x-placement^=left] .tippy-tooltip.light-theme [x-arrow].arrow-small {
-  border-left: 5px solid #fff;
-  border-top: 5px solid transparent;
-  border-bottom: 5px solid transparent
-}
-
-.tippy-popper[x-placement^=left] .tippy-tooltip.light-theme [x-arrow].arrow-big {
-  border-left: 10px solid #fff;
-  border-top: 10px solid transparent;
-  border-bottom: 10px solid transparent
-}
-
-.tippy-popper[x-placement^=left] .tippy-tooltip.transparent-theme [x-circle] {
-  background-color: var(--ls-secondary-background-color)
-}
-
-.tippy-popper[x-placement^=left] .tippy-tooltip.transparent-theme [x-arrow] {
-  border-left: 7px solid var(--ls-secondary-background-color);
-  border-top: 7px solid transparent;
-  border-bottom: 7px solid transparent
-}
-
-.tippy-popper[x-placement^=left] .tippy-tooltip.transparent-theme [x-arrow].arrow-small {
-  border-left: 5px solid var(--ls-secondary-background-color);
-  border-top: 5px solid transparent;
-  border-bottom: 5px solid transparent
-}
-
-.tippy-popper[x-placement^=left] .tippy-tooltip.transparent-theme [x-arrow].arrow-big {
-  border-left: 10px solid var(--ls-secondary-background-color);
-  border-top: 10px solid transparent;
-  border-bottom: 10px solid transparent
-}
-
-.tippy-popper[x-placement^=left] [data-animation=perspective] {
-  -webkit-transform-origin: right;
-  transform-origin: right
-}
-
-.tippy-popper[x-placement^=left] [data-animation=perspective].enter {
-  opacity: 1;
-  -webkit-transform: translateX(-10px) rotateY(0);
-  transform: translateX(-10px) rotateY(0)
-}
-
-.tippy-popper[x-placement^=left] [data-animation=perspective].leave {
-  opacity: 0;
-  -webkit-transform: translateX(0) rotateY(-90deg);
-  transform: translateX(0) rotateY(-90deg)
-}
-
-.tippy-popper[x-placement^=left] [data-animation=fade].enter {
-  opacity: 1;
-  -webkit-transform: translateX(-10px);
-  transform: translateX(-10px)
-}
-
-.tippy-popper[x-placement^=left] [data-animation=fade].leave {
-  opacity: 0;
-  -webkit-transform: translateX(-10px);
-  transform: translateX(-10px)
-}
-
-.tippy-popper[x-placement^=left] [data-animation=shift].enter {
-  opacity: 1;
-  -webkit-transform: translateX(-10px);
-  transform: translateX(-10px)
-}
-
-.tippy-popper[x-placement^=left] [data-animation=shift].leave {
-  opacity: 0;
-  -webkit-transform: translateX(0);
-  transform: translateX(0)
-}
-
-.tippy-popper[x-placement^=left] [data-animation=scale].enter {
-  opacity: 1;
-  -webkit-transform: translateX(-10px) scale(1);
-  transform: translateX(-10px) scale(1)
-}
-
-.tippy-popper[x-placement^=left] [data-animation=scale].leave {
-  opacity: 0;
-  -webkit-transform: translateX(0) scale(0);
-  transform: translateX(0) scale(0)
-}
-
-.tippy-popper[x-placement^=right] [x-arrow] {
-  border-right: 7px solid var(--ls-quaternary-background-color);
-  border-top: 7px solid transparent;
-  border-bottom: 7px solid transparent;
-  left: -7px;
-  margin: 6px 0
-}
-
-.tippy-popper[x-placement^=right] [x-arrow].arrow-small {
-  border-right: 5px solid var(--ls-quaternary-background-color);
-  border-top: 5px solid transparent;
-  border-bottom: 5px solid transparent;
-  left: -5px
-}
-
-.tippy-popper[x-placement^=right] [x-arrow].arrow-big {
-  border-right: 10px solid var(--ls-quaternary-background-color);
-  border-top: 10px solid transparent;
-  border-bottom: 10px solid transparent;
-  left: -10px
-}
-
-.tippy-popper[x-placement^=right] [x-circle] {
-  -webkit-transform-origin: -50% 0;
-  transform-origin: -50% 0
-}
-
-.tippy-popper[x-placement^=right] [x-circle].enter {
-  -webkit-transform: scale(1) translate(-50%, -50%);
-  transform: scale(1) translate(-50%, -50%);
-  opacity: 1
-}
-
-.tippy-popper[x-placement^=right] [x-circle].leave {
-  -webkit-transform: scale(.15) translate(-50%, -50%);
-  transform: scale(.15) translate(-50%, -50%);
-  opacity: 0
-}
-
-.tippy-popper[x-placement^=right] .tippy-tooltip.light-theme [x-circle] {
-  background-color: #fff
-}
-
-.tippy-popper[x-placement^=right] .tippy-tooltip.light-theme [x-arrow] {
-  border-right: 7px solid #fff;
-  border-top: 7px solid transparent;
-  border-bottom: 7px solid transparent
-}
-
-.tippy-popper[x-placement^=right] .tippy-tooltip.light-theme [x-arrow].arrow-small {
-  border-right: 5px solid #fff;
-  border-top: 5px solid transparent;
-  border-bottom: 5px solid transparent
-}
-
-.tippy-popper[x-placement^=right] .tippy-tooltip.light-theme [x-arrow].arrow-big {
-  border-right: 10px solid #fff;
-  border-top: 10px solid transparent;
-  border-bottom: 10px solid transparent
-}
-
-.tippy-popper[x-placement^=right] .tippy-tooltip.transparent-theme [x-circle] {
-  background-color: var(--ls-secondary-background-color)
-}
-
-.tippy-popper[x-placement^=right] .tippy-tooltip.transparent-theme [x-arrow] {
-  border-right: 7px solid var(--ls-secondary-background-color);
-  border-top: 7px solid transparent;
-  border-bottom: 7px solid transparent
-}
-
-.tippy-popper[x-placement^=right] .tippy-tooltip.transparent-theme [x-arrow].arrow-small {
-  border-right: 5px solid var(--ls-secondary-background-color);
-  border-top: 5px solid transparent;
-  border-bottom: 5px solid transparent
-}
-
-.tippy-popper[x-placement^=right] .tippy-tooltip.transparent-theme [x-arrow].arrow-big {
-  border-right: 10px solid var(--ls-secondary-background-color);
-  border-top: 10px solid transparent;
-  border-bottom: 10px solid transparent
-}
-
-.tippy-popper[x-placement^=right] [data-animation=perspective] {
-  -webkit-transform-origin: left;
-  transform-origin: left
-}
-
-.tippy-popper[x-placement^=right] [data-animation=perspective].enter {
-  opacity: 1;
-  -webkit-transform: translateX(10px) rotateY(0);
-  transform: translateX(10px) rotateY(0)
-}
-
-.tippy-popper[x-placement^=right] [data-animation=perspective].leave {
-  opacity: 0;
-  -webkit-transform: translateX(0) rotateY(90deg);
-  transform: translateX(0) rotateY(90deg)
-}
-
-.tippy-popper[x-placement^=right] [data-animation=fade].enter {
-  opacity: 1;
-  -webkit-transform: translateX(10px);
-  transform: translateX(10px)
-}
-
-.tippy-popper[x-placement^=right] [data-animation=fade].leave {
-  opacity: 0;
-  -webkit-transform: translateX(10px);
-  transform: translateX(10px)
-}
-
-.tippy-popper[x-placement^=right] [data-animation=shift].enter {
-  opacity: 1;
-  -webkit-transform: translateX(10px);
-  transform: translateX(10px)
-}
-
-.tippy-popper[x-placement^=right] [data-animation=shift].leave {
-  opacity: 0;
-  -webkit-transform: translateX(0);
-  transform: translateX(0)
-}
-
-.tippy-popper[x-placement^=right] [data-animation=scale].enter {
-  opacity: 1;
-  -webkit-transform: translateX(10px) scale(1);
-  transform: translateX(10px) scale(1)
-}
-
-.tippy-popper[x-placement^=right] [data-animation=scale].leave {
-  opacity: 0;
-  -webkit-transform: translateX(0) scale(0);
-  transform: translateX(0) scale(0)
-}
-
-.tippy-popper .tippy-tooltip.transparent-theme {
-  background-color: var(--ls-secondary-background-color)
-}
-
-.tippy-popper .tippy-tooltip.transparent-theme[data-animatefill] {
-  background-color: transparent
-}
-
-.tippy-popper .tippy-tooltip.light-theme {
-  color: #26323d;
-  box-shadow: 0 4px 20px 4px rgba(0, 20, 60, .1), 0 4px 80px -8px rgba(0, 20, 60, .2);
-  background-color: #fff
-}
-
-.tippy-popper .tippy-tooltip.light-theme[data-animatefill] {
-  background-color: transparent
-}
-
-.tippy-tooltip {
-  position: relative;
-  color: var(--ls-primary-text-color);
-  border-radius: 4px;
-  text-align: center;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  background-color: var(--ls-quaternary-background-color);
-}
-
-.tippy-tooltip--small {
-  padding: .25rem .5rem;
-  font-size: .8rem
-}
-
-.tippy-tooltip--big {
-  padding: .6rem 1.2rem;
-  font-size: 1.2rem
-}
-
-.tippy-tooltip[data-animatefill] {
-  overflow: hidden;
-  background-color: transparent
-}
-
-.tippy-tooltip[data-interactive] {
-  pointer-events: auto
-}
-
-.tippy-tooltip[data-inertia] {
-  transition-timing-function: cubic-bezier(.53, 2, .36, .85)
-}
-
-.tippy-tooltip [x-arrow] {
-  position: absolute;
-  width: 0;
-  height: 0
-}
-
-.tippy-tooltip [x-circle] {
-  position: absolute;
-  background-color: var(--ls-quaternary-background-color);
-  border-radius: 50%;
-  width: 130%;
-  width: calc(110% + 2rem);
-  left: 50%;
-  top: 50%;
-  z-index: -1;
-  overflow: hidden;
-  transition: all ease
-}
-
-.tippy-tooltip [x-circle]:before {
-  content: "";
-  padding-top: 90%;
-  float: left
-}
-
-@media (max-width: 450px) {
-  .tippy-popper {
-    max-width: 96%;
-    max-width: calc(100% - 20px)
-  }
-}
-
-.tippy-popper .tippy-tooltip.customized-theme * {
-  text-align: left;
-}
-
-.tippy-wrapper {
-  background-color: var(--ls-quaternary-background-color);
-}
-
-.tippy-hover {
-  cursor: pointer;
-}
-
-.tippy-popper .tippy-tooltip.monospace-theme {
-  font-family: 'Fira Code', Monaco, Menlo, Consolas, 'COURIER NEW', monospace;
-}

resources/forge.config.js

@@ -4,7 +4,7 @@ module.exports = {
   packagerConfig: {
     name: 'Logseq',
     icon: './icons/logseq_big_sur.icns',
-    buildVersion: 64,
+    buildVersion: 66,
     protocols: [
       {
         "protocol": "logseq",

resources/js/pdfjs/cmaps/CNS2-V.bcmap

@@ -1,3 +0,0 @@
-àRCopyright 1990-2009 Adobe Systems Incorporated.
-All rights reserved.
-See ./LICENSEáCNS2-H

resources/js/pdfjs/cmaps/ETenms-B5-H.bcmap

@@ -1,3 +0,0 @@
-àRCopyright 1990-2009 Adobe Systems Incorporated.
-All rights reserved.
-See ./LICENSEá	ETen-B5-H`
 ^

resources/js/pdfjs/cmaps/GB-H.bcmap

@@ -1,4 +0,0 @@
-àRCopyright 1990-2009 Adobe Systems Incorporated.
-All rights reserved.
-See ./LICENSE

!!�º]aX!!]`�21�>	�p�z�$]‚�"R‚d�-Uƒ7�*„
4„%�+ „Z „{�/…%…<�9K…b�1]†.�"‡‰`]‡,�"]ˆ
-�"]ˆh�"]‰F�"]Š$�"]‹�"]‹`�"]Œ>�"]��"]�z�"]ŽX�"]�6�"]��"]�r�"]‘P�"]’.�"]“�"]“j�"]”H�"]•&�"]–�"]–b�"]—@�"]˜�"]˜|�"]™Z�"]š8�"]›�"]›t�"]œR�"]�0�"]ž�"]žl�"]ŸJ�"] (�"]¡�"]¡d�"]¢B�"]£ �"X£~�']¤W�"]¥5�"]¦�"]¦q�"]§O�"]¨-�"]©�"]©i�"]ªG�"]«%�"]¬�"]¬a�"]­?�"]®�"]®{�"]¯Y�"]°7�"]±�"]±s�"]²Q�"]³/�"]´
�"]´k�"]µI�"]¶'�"]·�"]·c�"]¸A�"]¹�"]¹}�"]º[�"]»9