clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-02-01 22:47:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feat/db

Browse Source
This commit is contained in:
Gabriel Horner
2024-12-19 11:44:00 -05:00
parent d60ddd3291 0f63988b4e
commit 89a108f846
8 changed files with 335 additions and 636 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/build-desktop-release.yml vendored
View File

@@ -390,7 +390,7 @@ jobs:
build-macos-x64:
needs: [ compile-cljs ]
runs-on: macos-latest
runs-on: macos-13
steps:
- name: Download The Static Asset
@@ -466,7 +466,7 @@ jobs:
build-macos-arm64:
needs: [ compile-cljs ]
runs-on: macos-latest
runs-on: macos-14
steps:
- name: Download The Static Asset
@@ -568,7 +568,7 @@ jobs:
- name: Sign Windows Executable
run: |
ls -lah ./builds
jsign --storetype ETOKEN --storepass "${PASS}" -t http://timestamp.digicert.com ./builds/*.exe
jsign --storetype ETOKEN --storepass "${PASS}" -t http://timestamp.sectigo.com ./builds/*.exe
env:
PASS: ${{ secrets.CODE_SIGN_CERTIFICATE_PASSWORD }}

2
.github/workflows/build-ios-release.yml vendored
View File

@@ -17,7 +17,7 @@ env:
jobs:
build-app:
runs-on: macos-latest
runs-on: macos-13
steps:
- name: Check out Git repository
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0

2
.github/workflows/build-ios.yml vendored
View File

@@ -22,7 +22,7 @@ env:
jobs:
build-app:
runs-on: macos-latest
runs-on: macos-13
steps:
- name: Check out Git repository
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0

6
e2e-tests/page-search.spec.ts
View File

@@ -40,7 +40,7 @@ test('Search page and blocks (diacritics)', async ({ page, block }) => {
// check if diacritics are indexed
const results = await searchPage(page, 'Einführung in die Allgemeine Sprachwissenschaft' + rand)
await expect(results.length).toEqual(5) // 2 block + 1 current page
// await expect(results.length).toEqual(5) // 2 block + 1 current page
await closeSearchBox(page)
})
@@ -62,7 +62,7 @@ test('Search CJK', async ({ page, block }) => {
// check if CJK are indexed
const results = await searchPage(page, '进度')
await expect(results.length).toEqual(4) // 1 page + 1 block + new whiteboard
// await expect(results.length).toEqual(4) // 1 page + 1 block + new whiteboard
await closeSearchBox(page)
})
@@ -169,6 +169,6 @@ async function alias_test(block: Block, page: Page, page_name: string, search_kw
}
}
test('page diacritic alias', async ({ block, page }) => {
test.skip('page diacritic alias', async ({ block, page }) => {
await alias_test(block, page, "ü", ["ü", "ü", "Ü"])
})

2
package.json
View File

@@ -130,7 +130,7 @@
"d3-force": "3.0.0",
"diff": "5.0.0",
"dompurify": "2.4.0",
"electron": "28.3.1",
"electron": "31.7.5",
"electron-dl": "3.3.0",
"emoji-mart": "^5.5.2",
"fs": "0.0.1-security",

4
resources/package.json
View File

@@ -22,7 +22,7 @@
},
"dependencies": {
"@fastify/cors": "10.0.1",
"@logseq/rsapi": "0.0.84",
"@logseq/rsapi": "0.0.91",
"@sentry/electron": "2.5.1",
"abort-controller": "3.0.0",
"chokidar": "^3.5.1",
@@ -56,7 +56,7 @@
"@electron-forge/maker-zip": "^7.3.1",
"@electron/rebuild": "3.2.10",
"electron": "31.7.5",
"electron-builder": "^22.11.7",
"electron-builder": "25.1.8",
"electron-forge-maker-appimage": "https://github.com/logseq/electron-forge-maker-appimage.git"
},
"resolutions": {

929
static/yarn.lock
View File

File diff suppressed because it is too large Load Diff

20
yarn.lock
View File

@@ -1089,10 +1089,12 @@
dependencies:
undici-types "~6.19.2"
"@types/node@^18.11.18":
version "18.17.19"
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.17.19.tgz#80c9b8a89d3648d9e6098f4a7184e03833fee3c5"
integrity sha512-+pMhShR3Or5GR0/sp4Da7FnhVmTalWm81M6MkEldbwjETSaPalw138Z4KdpQaistvqQxLB7Cy4xwYdxpbSOs9Q==
"@types/node@^20.9.0":
version "20.17.10"
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.17.10.tgz#3f7166190aece19a0d1d364d75c8b0b5778c1e18"
integrity sha512-/jrvh5h6NXhEauFFexRin69nA0uHJ5gwk4iDivp/DeoEua3uwCUto6PC86IpRITBOs4+6i2I56K5x5b6WYGXHA==
dependencies:
undici-types "~6.19.2"
"@types/normalize-package-data@^2.4.0":
version "2.4.2"
@@ -2902,13 +2904,13 @@ electron-to-chromium@^1.4.526:
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.528.tgz#7c900fd73d9d2e8bb0dab0e301f25f0f4776ef2c"
integrity sha512-UdREXMXzLkREF4jA8t89FQjA8WHI6ssP38PMY4/4KhXFQbtImnghh4GkCgrtiZwLKUKVD2iTVXvDVQjfomEQuA==
electron@28.3.1:
version "28.3.1"
resolved "https://registry.yarnpkg.com/electron/-/electron-28.3.1.tgz#babb3ff8e246336e9cd1c1966f16a55ba723ea06"
integrity sha512-aF9fONuhVDJlctJS7YOw76ynxVAQdfIWmlhRMKits24tDcdSL0eMHUS0wWYiRfGWbQnUKB6V49Rf17o32f4/fg==
electron@31.7.5:
version "31.7.5"
resolved "https://registry.yarnpkg.com/electron/-/electron-31.7.5.tgz#98396c75041808b26c7b6a8844cbedacee93d8a6"
integrity sha512-8zFzVJdhxTRmoPcRiKkEmPW0bJHAUsTQJwEX2YJ8X0BVFIJLwSvHkSlpCjEExVbNCAk+gHnkIYX+2OyCXrRwHQ==
dependencies:
"@electron/get" "^2.0.0"
"@types/node" "^18.11.18"
"@types/node" "^20.9.0"
extract-zip "^2.0.1"
element-resize-detector@^1.1.14: