Mirrors/notesnook
1
0
Fork 0
mirror of https://github.com/streetwriters/notesnook.git synced 2025-12-16 19:57:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

desktop: update electron to v30 (#6498)

Browse Source
This commit is contained in:
Abdullah Atta
2024-09-13 08:39:18 +05:00
committed by GitHub
parent 59085d7b19
commit 020244231f
44 changed files with 757 additions and 28671 deletions
Download Patch File Download Diff File Expand all files Collapse all files

600
apps/desktop/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

21
apps/desktop/package.json
View File

@@ -11,24 +11,25 @@
"repository": "https://github.com/streetwriters/notesnook",
"license": "GPL-3.0-or-later",
"dependencies": {
"@trpc/client": "10.38.3",
"@trpc/server": "10.38.3",
"better-sqlite3-multiple-ciphers": "^9.5.0",
"electron-trpc": "0.5.2",
"@trpc/client": "10.45.2",
"@trpc/server": "10.45.2",
"better-sqlite3-multiple-ciphers": "^11.2.1",
"electron-trpc": "0.6.1",
"electron-updater": "^6.2.1",
"icojs": "^0.17.1",
"icojs": "^0.19.4",
"typed-emitter": "^2.1.0",
"yargs": "^17.6.2",
"yargs": "^17.7.2",
"zod": "^3.21.4"
},
"devDependencies": {
"@types/node": "18.16.1",
"@types/yargs": "^17.0.24",
"@streetwriters/kysely": "^0.27.4",
"@types/node": "20.14.8",
"@types/yargs": "^17.0.33",
"chokidar": "^3.5.3",
"electron": "^29.3.1",
"electron": "^30.4.0",
"electron-builder": "^24.13.3",
"esbuild": "^0.23.0",
"kysely": "^0.27.3",
"node-abi": "^3.67.0",
"node-gyp-build": "^4.8.0",
"prebuildify": "^6.0.1",
"tree-kill": "^1.2.2",

2
apps/desktop/scripts/build.mjs
View File

@@ -94,7 +94,7 @@ async function patchBetterSQLite3() {
);
const json = JSON.parse(await readFile(jsonPath, "utf-8"));
json.version = "9.5.1";
json.version = "11.2.2";
json.homepage = "https://github.com/thecodrr/better-sqlite3-multiple-ciphers";
json.repository.url =
"git://github.com/thecodrr/better-sqlite3-multiple-ciphers.git";

2
apps/desktop/src/api/sqlite-kysely.ts
View File

@@ -18,7 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
import type { Database, Statement } from "better-sqlite3-multiple-ciphers";
import type { QueryResult } from "kysely";
import type { QueryResult } from "@streetwriters/kysely";
type SQLiteCompatibleType =
| number

4
apps/desktop/src/utils/asset-manager.ts
View File

@@ -20,7 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
import { NativeImage, nativeImage } from "electron";
import path from "path";
import { isDevelopment } from "./index";
import { parse, ParsedImage } from "icojs";
import { ParsedImage, parseICO } from "icojs";
import { getSystemTheme } from "./theme";
import { readFile } from "fs/promises";
@@ -71,7 +71,7 @@ export class AssetManager {
`${icon}${prefix}.ico`
);
const icoBuffer = await readFile(icoPath);
const images = await parse(icoBuffer, "image/png");
const images = await parseICO(icoBuffer, "image/png");
ALL_ICONS.push({ id: icon, images, prefix });
}
}

6
apps/mobile/app/common/database/index.js
View File

@@ -23,7 +23,11 @@ import { Platform } from "react-native";
import * as Gzip from "react-native-gzip";
import EventSource from "../../utils/sse/even-source-ios";
import AndroidEventSource from "../../utils/sse/event-source";
import { SqliteAdapter, SqliteIntrospector, SqliteQueryCompiler } from "kysely";
import {
SqliteAdapter,
SqliteIntrospector,
SqliteQueryCompiler
} from "@streetwriters/kysely";
import filesystem from "../filesystem";
import Storage from "./storage";
import { RNSqliteDriver } from "./sqlite.kysely";

6
apps/mobile/app/common/database/logger.js
View File

@@ -18,7 +18,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
import { initialize } from "@notesnook/core/dist/logger";
import { SqliteAdapter, SqliteIntrospector, SqliteQueryCompiler } from "kysely";
import {
SqliteAdapter,
SqliteIntrospector,
SqliteQueryCompiler
} from "@streetwriters/kysely";
import { Platform } from "react-native";
import { setLogger } from ".";
import { RNSqliteDriver } from "./sqlite.kysely";

8
apps/mobile/app/common/database/sqlite.kysely.ts
View File

@@ -17,8 +17,12 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
import type { DatabaseConnection, Driver, QueryResult } from "kysely";
import { CompiledQuery } from "kysely";
import type {
DatabaseConnection,
Driver,
QueryResult
} from "@streetwriters/kysely";
import { CompiledQuery } from "@streetwriters/kysely";
import { QuickSQLiteConnection, open } from "react-native-quick-sqlite";
type Config = { dbName: string; async: boolean; location: string };

10
apps/mobile/app/package.json
View File

@@ -36,11 +36,11 @@
"react-native-wheel-color-picker": "^1.3.1",
"tinycolor2": "1.6.0",
"@azure/core-asynciterator-polyfill": "^1.0.2",
"@tanstack/react-query": "^4.29.19",
"@trpc/client": "10.38.3",
"@trpc/react-query": "10.38.3",
"@trpc/server": "10.38.3",
"kysely": "^0.26.3",
"@tanstack/react-query": "^4.36.1",
"@trpc/client": "10.45.2",
"@trpc/react-query": "10.45.2",
"@trpc/server": "10.45.2",
"@streetwriters/kysely": "^0.27.4",
"pathe": "1.1.2"
},
"sideEffects": false

8944
apps/mobile/patches/kysely+0.26.3.patch
View File

File diff suppressed because it is too large Load Diff

25
apps/theme-builder/package-lock.json generated
View File

@@ -17,7 +17,7 @@
"@notesnook/web": "file:../web",
"@theme-ui/components": "^0.14.7",
"@theme-ui/core": "^0.14.7",
"@trpc/client": "^10.38.3",
"@trpc/client": "10.45.2",
"@types/react-dom": "^18.3.0",
"clipboard-polyfill": "^4.0.0",
"file-saver": "^2.0.5",
@@ -979,7 +979,7 @@
},
"../web": {
"name": "@notesnook/web",
"version": "3.0.13",
"version": "3.0.17",
"hasInstallScript": true,
"license": "GPL-3.0-or-later",
"dependencies": {
@@ -993,7 +993,7 @@
"@henrygd/queue": "^1.0.6",
"@mdi/js": "^7.2.96",
"@mdi/react": "^1.6.1",
"@notesnook-importer/core": "^2.0.0",
"@notesnook-importer/core": "^2.1.1",
"@notesnook/common": "file:../../packages/common",
"@notesnook/core": "file:../../packages/core",
"@notesnook/crypto": "file:../../packages/crypto",
@@ -1007,13 +1007,14 @@
"@notesnook/web-clipper": "file:../../extensions/web-clipper",
"@react-pdf-viewer/core": "^3.12.0",
"@react-pdf-viewer/toolbar": "^3.12.0",
"@tanstack/react-query": "^4.29.19",
"@streetwriters/kysely": "^0.27.4",
"@tanstack/react-query": "^4.36.1",
"@tanstack/react-virtual": "^3.0.1",
"@theme-ui/color": "^0.16.1",
"@theme-ui/components": "^0.16.1",
"@theme-ui/core": "^0.16.1",
"@trpc/client": "10.38.3",
"@trpc/react-query": "10.38.3",
"@trpc/client": "10.45.2",
"@trpc/react-query": "10.45.2",
"@zip.js/zip.js": "^2.7.32",
"async-mutex": "^0.4.0",
"axios": "^1.3.4",
@@ -1031,8 +1032,6 @@
"hash-wasm": "^4.9.0",
"hotkeys-js": "^3.8.3",
"katex": "0.16.2",
"kysely": "^0.26.3",
"libsodium-wrappers": "^0.7.13",
"mac-scrollbar": "^0.13.5",
"marked": "^4.1.0",
"mutative": "^1.0.6",
@@ -1068,7 +1067,7 @@
"@playwright/test": "^1.43.1",
"@swc/core": "^1.5.24",
"@swc/plugin-react-remove-properties": "^2.0.4",
"@trpc/server": "10.38.3",
"@trpc/server": "10.45.2",
"@types/babel__core": "^7.20.1",
"@types/event-source-polyfill": "^1.0.1",
"@types/file-saver": "^2.0.5",
@@ -2019,14 +2018,14 @@
}
},
"node_modules/@trpc/client": {
"version": "10.38.3",
"resolved": "https://registry.npmjs.org/@trpc/client/-/client-10.38.3.tgz",
"integrity": "sha512-hHPsElTL4sB+UGzuAZ4iwRVHjELrk/Nsl2owsYw9ITJz3EY7VWRsQ6vK48kJvlHPYPhP+efID5UOgyZMs4bFXA==",
"version": "10.45.2",
"resolved": "https://registry.npmjs.org/@trpc/client/-/client-10.45.2.tgz",
"integrity": "sha512-ykALM5kYWTLn1zYuUOZ2cPWlVfrXhc18HzBDyRhoPYN0jey4iQHEFSEowfnhg1RvYnrAVjNBgHNeSAXjrDbGwg==",
"funding": [
"https://trpc.io/sponsor"
],
"peerDependencies": {
"@trpc/server": "10.38.3"
"@trpc/server": "10.45.2"
}
},
"node_modules/@types/babel__core": {

2
apps/theme-builder/package.json
View File

@@ -16,7 +16,7 @@
"@notesnook/web": "file:../web",
"@theme-ui/components": "^0.14.7",
"@theme-ui/core": "^0.14.7",
"@trpc/client": "^10.38.3",
"@trpc/client": "10.45.2",
"@types/react-dom": "^18.3.0",
"clipboard-polyfill": "^4.0.0",
"file-saver": "^2.0.5",

1672
apps/web/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

10
apps/web/package.json
View File

@@ -32,13 +32,13 @@
"@notesnook/web-clipper": "file:../../extensions/web-clipper",
"@react-pdf-viewer/core": "^3.12.0",
"@react-pdf-viewer/toolbar": "^3.12.0",
"@tanstack/react-query": "^4.29.19",
"@tanstack/react-query": "^4.36.1",
"@tanstack/react-virtual": "^3.0.1",
"@theme-ui/color": "^0.16.1",
"@theme-ui/components": "^0.16.1",
"@theme-ui/core": "^0.16.1",
"@trpc/client": "10.38.3",
"@trpc/react-query": "10.38.3",
"@trpc/client": "10.45.2",
"@trpc/react-query": "10.45.2",
"@zip.js/zip.js": "^2.7.32",
"async-mutex": "^0.4.0",
"axios": "^1.3.4",
@@ -56,7 +56,7 @@
"hash-wasm": "^4.9.0",
"hotkeys-js": "^3.8.3",
"katex": "0.16.2",
"kysely": "^0.26.3",
"@streetwriters/kysely": "^0.27.4",
"mac-scrollbar": "^0.13.5",
"marked": "^4.1.0",
"mutative": "^1.0.6",
@@ -92,7 +92,7 @@
"@playwright/test": "^1.43.1",
"@swc/core": "^1.5.24",
"@swc/plugin-react-remove-properties": "^2.0.4",
"@trpc/server": "10.38.3",
"@trpc/server": "10.45.2",
"@types/babel__core": "^7.20.1",
"@types/event-source-polyfill": "^1.0.1",
"@types/file-saver": "^2.0.5",

8944
apps/web/patches/kysely+0.26.3.patch
View File

File diff suppressed because it is too large Load Diff

2
apps/web/src/common/sqlite/index.desktop.ts
View File

@@ -26,7 +26,7 @@ import {
QueryResult,
CompiledQuery,
Driver
} from "kysely";
} from "@streetwriters/kysely";
import { desktop } from "../desktop-bridge";
import Worker from "./sqlite.worker.desktop.ts?worker";
import type { SQLiteWorker } from "./sqlite.worker.desktop";

2
apps/web/src/common/sqlite/index.ts
View File

@@ -22,7 +22,7 @@ import {
SqliteQueryCompiler,
SqliteIntrospector,
Dialect
} from "kysely";
} from "@streetwriters/kysely";
import {
WaSqliteWorkerMultipleTabDriver,
WaSqliteWorkerSingleTabDriver

2
apps/web/src/common/sqlite/sqlite.worker.ts
View File

@@ -21,7 +21,7 @@ import type { SQLiteAPI, SQLiteCompatibleType } from "./sqlite-types";
import { Factory, SQLITE_ROW, SQLiteError } from "./sqlite-api";
import { expose, transfer } from "comlink";
import type { RunMode } from "./type";
import { QueryResult } from "kysely";
import { QueryResult } from "@streetwriters/kysely";
import { DatabaseSource } from "./sqlite-export";
import { createSharedServicePort } from "./shared-service";
import type { IDBBatchAtomicVFS } from "./IDBBatchAtomicVFS";

2
apps/web/src/common/sqlite/type.ts
View File

@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
import type { QueryResult } from "kysely";
import type { QueryResult } from "@streetwriters/kysely";
export type Promisable<T> = T | Promise<T>;

8
apps/web/src/common/sqlite/wa-sqlite-kysely-driver.ts
View File

@@ -17,8 +17,12 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
import type { DatabaseConnection, Driver, QueryResult } from "kysely";
import { CompiledQuery } from "kysely";
import type {
DatabaseConnection,
Driver,
QueryResult
} from "@streetwriters/kysely";
import { CompiledQuery } from "@streetwriters/kysely";
import Worker from "./sqlite.worker.ts?worker";
import type { SQLiteWorker } from "./sqlite.worker";
import SQLiteSyncURI from "./wa-sqlite.wasm?url";

8
packages/common/package-lock.json generated
View File

@@ -35,7 +35,8 @@
"@microsoft/signalr": "^8.0.0",
"@notesnook/logger": "file:../logger",
"@readme/data-urls": "^3.0.0",
"@streetwriters/showdown": "^3.0.7-alpha",
"@streetwriters/kysely": "^0.27.4",
"@streetwriters/showdown": "^3.0.8-alpha",
"async-mutex": "^0.3.2",
"dayjs": "1.11.9",
"dom-serializer": "^2.0.0",
@@ -46,7 +47,6 @@
"html-to-text": "^9.0.5",
"htmlparser2": "^8.0.1",
"katex": "0.16.2",
"kysely": "^0.26.3",
"linkedom": "^0.14.17",
"liqe": "^1.13.0",
"mime-db": "1.52.0",
@@ -1828,7 +1828,8 @@
"@notesnook/crypto": "file:../crypto",
"@notesnook/logger": "file:../logger",
"@readme/data-urls": "^3.0.0",
"@streetwriters/showdown": "^3.0.7-alpha",
"@streetwriters/kysely": "^0.27.4",
"@streetwriters/showdown": "^3.0.8-alpha",
"@types/better-sqlite3": "^7.6.5",
"@types/event-source-polyfill": "^1.0.1",
"@types/html-to-text": "^9.0.0",
@@ -1858,7 +1859,6 @@
"isomorphic-fetch": "^3.0.0",
"jsdom": "^22.1.0",
"katex": "0.16.2",
"kysely": "^0.26.3",
"linkedom": "^0.14.17",
"liqe": "^1.13.0",
"mime-db": "1.52.0",

2
packages/core/__e2e__/sync.test.js
View File

@@ -25,7 +25,7 @@ import { CHECK_IDS, EV, EVENTS } from "../src/common";
import { EventSource } from "event-source-polyfill";
import { test, expect, vitest } from "vitest";
import { login } from "./utils";
import { SqliteDialect } from "kysely";
import { SqliteDialect } from "@streetwriters/kysely";
import BetterSQLite3 from "better-sqlite3-multiple-ciphers";
const TEST_TIMEOUT = 60 * 1000;

2
packages/core/__tests__/logger.test.ts
View File

@@ -19,7 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
import { describe, it, expect } from "vitest";
import { initialize, logManager, logger } from "../src/logger";
import { SqliteDialect } from "kysely";
import { SqliteDialect } from "@streetwriters/kysely";
import BetterSQLite3 from "better-sqlite3-multiple-ciphers";
import { NoopLogger } from "@notesnook/logger";
import { delay } from "./utils";

2
packages/core/__tests__/utils/index.ts
View File

@@ -25,7 +25,7 @@ import { EventSourcePolyfill as EventSource } from "event-source-polyfill";
import { randomBytes } from "../../src/utils/random";
import { Note, Notebook } from "../../src/types";
import { NoteContent } from "../../src/collections/session-content";
import { SqliteDialect } from "kysely";
import { SqliteDialect } from "@streetwriters/kysely";
import BetterSQLite3 from "better-sqlite3-multiple-ciphers";
import path from "path";
import { tmpdir } from "os";

18
packages/core/package-lock.json generated
View File

@@ -14,6 +14,7 @@
"@microsoft/signalr": "^8.0.0",
"@notesnook/logger": "file:../logger",
"@readme/data-urls": "^3.0.0",
"@streetwriters/kysely": "^0.27.4",
"@streetwriters/showdown": "^3.0.8-alpha",
"async-mutex": "^0.3.2",
"dayjs": "1.11.9",
@@ -25,7 +26,6 @@
"html-to-text": "^9.0.5",
"htmlparser2": "^8.0.1",
"katex": "0.16.2",
"kysely": "^0.26.3",
"linkedom": "^0.14.17",
"liqe": "^1.13.0",
"mime-db": "1.52.0",
@@ -2216,6 +2216,14 @@
"integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==",
"dev": true
},
"node_modules/@streetwriters/kysely": {
"version": "0.27.4",
"resolved": "https://registry.npmjs.org/@streetwriters/kysely/-/kysely-0.27.4.tgz",
"integrity": "sha512-c2p+wtX8WESSVjJAc16j4lT44w/g1DvJFEIeKj/CFy36vmi0uq9FOAzxc50VtRc7rp0UlECCfl3Sxd+BTZOHFg==",
"engines": {
"node": ">=14.0.0"
}
},
"node_modules/@streetwriters/showdown": {
"version": "3.0.8-alpha",
"resolved": "https://registry.npmjs.org/@streetwriters/showdown/-/showdown-3.0.8-alpha.tgz",
@@ -3559,14 +3567,6 @@
"node": ">= 12"
}
},
"node_modules/kysely": {
"version": "0.26.3",
"resolved": "https://registry.npmjs.org/kysely/-/kysely-0.26.3.tgz",
"integrity": "sha512-yWSgGi9bY13b/W06DD2OCDDHQmq1kwTGYlQ4wpZkMOJqMGCstVCFIvxCCVG4KfY1/3G0MhDAcZsip/Lw8/vJWw==",
"engines": {
"node": ">=14.0.0"
}
},
"node_modules/leac": {
"version": "0.6.0",
"license": "MIT",

2
packages/core/package.json
View File

@@ -62,7 +62,7 @@
"html-to-text": "^9.0.5",
"htmlparser2": "^8.0.1",
"katex": "0.16.2",
"kysely": "^0.26.3",
"@streetwriters/kysely": "^0.27.4",
"linkedom": "^0.14.17",
"liqe": "^1.13.0",
"mime-db": "1.52.0",

8944
packages/core/patches/kysely+0.26.3.patch
View File

File diff suppressed because it is too large Load Diff

2
packages/core/src/api/index.ts
View File

@@ -70,7 +70,7 @@ import {
createDatabase,
initializeDatabase
} from "../database";
import { Kysely, Transaction, sql } from "kysely";
import { Kysely, Transaction, sql } from "@streetwriters/kysely";
import { CachedCollection } from "../database/cached-collection";
import { Vaults } from "../collections/vaults";
import { KVStorage } from "../database/kv";

2
packages/core/src/api/lookup.ts
View File

@@ -21,7 +21,7 @@ import { match } from "fuzzyjs";
import Database from ".";
import { Item, Note, TrashItem } from "../types";
import { DatabaseSchema, RawDatabaseSchema } from "../database";
import { AnyColumnWithTable, Kysely, sql } from "kysely";
import { AnyColumnWithTable, Kysely, sql } from "@streetwriters/kysely";
import { FilteredSelector } from "../database/sql-collection";
import { VirtualizedGrouping } from "../utils/virtualized-grouping";
import { logger } from "../logger";

2
packages/core/src/collections/attachments.ts
View File

@@ -29,7 +29,7 @@ import { Attachment } from "../types";
import Database from "../api";
import { FilteredSelector, SQLCollection } from "../database/sql-collection";
import { isFalse } from "../database";
import { sql } from "kysely";
import { sql } from "@streetwriters/kysely";
import { logger } from "../logger";
export class Attachments implements ICollection {

2
packages/core/src/collections/notebooks.ts
View File

@@ -23,7 +23,7 @@ import { Notebook, TrashOrItem, isTrashItem } from "../types";
import { ICollection } from "./collection";
import { SQLCollection } from "../database/sql-collection";
import { isFalse } from "../database";
import { sql } from "kysely";
import { sql } from "@streetwriters/kysely";
import { deleteItems } from "../utils/array";
import { CHECK_IDS, checkIsUserPremium } from "../common";

2
packages/core/src/collections/relations.ts
View File

@@ -29,7 +29,7 @@ import {
import Database from "../api";
import { FilteredSelector, SQLCollection } from "../database/sql-collection";
import { DatabaseSchema, UnlinkEvent, isFalse } from "../database";
import { SelectQueryBuilder } from "kysely";
import { SelectQueryBuilder } from "@streetwriters/kysely";
import { EVENTS } from "../common";
export class Relations implements ICollection {

2
packages/core/src/collections/reminders.ts
View File

@@ -29,7 +29,7 @@ import { Reminder } from "../types";
import Database from "../api";
import { SQLCollection } from "../database/sql-collection";
import { isFalse } from "../database";
import { sql } from "kysely";
import { sql } from "@streetwriters/kysely";
dayjs.extend(isTomorrow);
dayjs.extend(isSameOrBefore);

2
packages/core/src/collections/tags.ts
View File

@@ -23,7 +23,7 @@ import Database from "../api";
import { ICollection } from "./collection";
import { SQLCollection } from "../database/sql-collection";
import { isFalse } from "../database";
import { sql } from "kysely";
import { sql } from "@streetwriters/kysely";
import { CHECK_IDS, checkIsUserPremium } from "../common";
export class Tags implements ICollection {

2
packages/core/src/collections/trash.ts
View File

@@ -27,7 +27,7 @@ import {
getSortSelectors,
groupArray
} from "../utils/grouping";
import { sql } from "kysely";
import { sql } from "@streetwriters/kysely";
import { MAX_SQL_PARAMETERS } from "../database/sql-collection";
export default class Trash {

2
packages/core/src/database/fts.ts
View File

@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
import { Kysely, sql } from "kysely";
import { Kysely, sql } from "@streetwriters/kysely";
import { RawDatabaseSchema } from ".";
export async function rebuildSearchIndex(db: Kysely<RawDatabaseSchema>) {

2
packages/core/src/database/index.ts
View File

@@ -36,7 +36,7 @@ import {
ReferenceExpression,
Dialect,
MigrationProvider
} from "kysely";
} from "@streetwriters/kysely";
import {
Attachment,
Color,

5
packages/core/src/database/migrations.ts
View File

@@ -20,10 +20,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
import {
ColumnBuilderCallback,
CreateTableBuilder,
ExpressionBuilder,
Migration,
MigrationProvider,
sql
} from "kysely";
} from "@streetwriters/kysely";
import { rebuildSearchIndex } from "./fts";
const COLLATE_NOCASE: ColumnBuilderCallback = (col) =>
@@ -294,7 +295,7 @@ export class NNMigrationProvider implements MigrationProvider {
async up(db) {
await db
.updateTable("notes")
.where("id", "in", (eb) =>
.where("id", "in", (eb: ExpressionBuilder<any, string>) =>
eb
.selectFrom("content")
.select("noteId as id")

2
packages/core/src/database/sql-cached-collection.ts
View File

@@ -21,7 +21,7 @@ import { MaybeDeletedItem, isDeleted } from "../types";
import EventManager from "../utils/event-manager";
import { DatabaseAccessor, DatabaseCollection, DatabaseSchema } from ".";
import { SQLCollection } from "./sql-collection";
import { Kysely } from "kysely";
import { Kysely } from "@streetwriters/kysely";
import { Sanitizer } from "./sanitizer";
export class SQLCachedCollection<

2
packages/core/src/database/sql-collection.ts
View File

@@ -45,7 +45,7 @@ import {
SelectQueryBuilder,
SqlBool,
sql
} from "kysely";
} from "@streetwriters/kysely";
import { VirtualizedGrouping } from "../utils/virtualized-grouping";
import { createKeySelector, groupArray } from "../utils/grouping";
import { toChunks } from "../utils/array";

2
packages/core/src/database/triggers.ts
View File

@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
import { Kysely, sql } from "kysely";
import { Kysely, sql } from "@streetwriters/kysely";
import { DatabaseSchema, RawDatabaseSchema } from ".";
export async function createTriggers(db: Kysely<RawDatabaseSchema>) {

2
packages/core/src/logger.ts
View File

@@ -28,7 +28,7 @@ import {
format,
ILogger
} from "@notesnook/logger";
import { Kysely, Migration, MigrationProvider } from "kysely";
import { Kysely, Migration, MigrationProvider } from "@streetwriters/kysely";
import { SQLiteOptions, createDatabase } from "./database";
import { toChunks } from "./utils/array";

104
packages/editor-mobile/package-lock.json generated
View File

@@ -42,70 +42,76 @@
"@notesnook/core": "file:../core",
"@notesnook/theme": "file:../theme",
"@notesnook/ui": "file:../ui",
"@social-embed/lib": "^0.0.2-next.1",
"@tiptap/core": "2.2.4",
"@tiptap/extension-character-count": "2.2.4",
"@tiptap/extension-color": "2.2.4",
"@tiptap/extension-font-family": "2.2.4",
"@tiptap/extension-history": "2.2.4",
"@tiptap/extension-horizontal-rule": "2.2.4",
"@tiptap/extension-list-keymap": "2.2.4",
"@tiptap/extension-placeholder": "2.2.4",
"@tiptap/extension-subscript": "2.2.4",
"@tiptap/extension-superscript": "2.2.4",
"@tiptap/extension-table": "2.2.4",
"@tiptap/extension-table-cell": "2.2.4",
"@tiptap/extension-table-header": "2.2.4",
"@tiptap/extension-table-row": "2.2.4",
"@tiptap/extension-task-item": "2.2.4",
"@tiptap/extension-task-list": "2.2.4",
"@tiptap/extension-text-align": "2.2.4",
"@tiptap/extension-text-style": "2.2.4",
"@tiptap/extension-underline": "2.2.4",
"@tiptap/pm": "2.2.4",
"@tiptap/starter-kit": "2.2.4",
"@social-embed/lib": "^0.1.0-next.7",
"@tiptap/core": "2.6.6",
"@tiptap/extension-blockquote": "^2.6.6",
"@tiptap/extension-bullet-list": "^2.6.6",
"@tiptap/extension-character-count": "2.6.6",
"@tiptap/extension-code": "^2.6.6",
"@tiptap/extension-color": "2.6.6",
"@tiptap/extension-font-family": "2.6.6",
"@tiptap/extension-heading": "^2.6.6",
"@tiptap/extension-history": "2.6.6",
"@tiptap/extension-horizontal-rule": "2.6.6",
"@tiptap/extension-list-item": "^2.6.6",
"@tiptap/extension-list-keymap": "2.6.6",
"@tiptap/extension-ordered-list": "^2.6.6",
"@tiptap/extension-placeholder": "2.6.6",
"@tiptap/extension-subscript": "2.6.6",
"@tiptap/extension-superscript": "2.6.6",
"@tiptap/extension-table": "2.6.6",
"@tiptap/extension-table-cell": "2.6.6",
"@tiptap/extension-table-header": "2.6.6",
"@tiptap/extension-table-row": "2.6.6",
"@tiptap/extension-task-item": "2.6.6",
"@tiptap/extension-task-list": "2.6.6",
"@tiptap/extension-text-align": "2.6.6",
"@tiptap/extension-text-style": "2.6.6",
"@tiptap/extension-underline": "2.6.6",
"@tiptap/pm": "2.6.6",
"@tiptap/starter-kit": "2.6.6",
"alfaaz": "^1.1.0",
"async-mutex": "^0.4.0",
"clipboard-polyfill": "4.0.0",
"detect-indent": "^7.0.0",
"entities": "^4.5.0",
"katex": "0.16.9",
"async-mutex": "^0.5.0",
"clipboard-polyfill": "4.1.0",
"detect-indent": "^7.0.1",
"entities": "^5.0.0",
"katex": "0.16.11",
"linkifyjs": "^4.1.3",
"nanoid": "^4.0.1",
"nanoid": "^5.0.7",
"prism-themes": "^1.9.0",
"prosemirror-codemark": "^0.4.2",
"prosemirror-view": "1.33.1",
"re-resizable": "^6.9.11",
"prosemirror-view": "1.34.2",
"re-resizable": "^6.9.18",
"react-colorful": "^5.6.1",
"redent": "^4.0.0",
"refractor": "^4.8.1",
"strip-indent": "^4.0.0",
"unfurl.js": "^6.3.2"
"unfurl.js": "^6.4.0"
},
"devDependencies": {
"@emotion/react": "11.11.1",
"@mdi/js": "^7.2.96",
"@emotion/react": "11.13.3",
"@mdi/js": "^7.4.47",
"@mdi/react": "^1.6.1",
"@theme-ui/components": "^0.16.1",
"@theme-ui/core": "^0.16.1",
"@types/katex": "^0.14.0",
"@types/prismjs": "^1.26.0",
"@types/react": "^18.2.39",
"@types/react-color": "^3.0.6",
"@types/react-dom": "^18.2.17",
"@theme-ui/components": "^0.16.2",
"@theme-ui/core": "^0.16.2",
"@types/katex": "^0.16.7",
"@types/prismjs": "^1.26.4",
"@types/react": "^18.3.5",
"@types/react-color": "^3.0.12",
"@types/react-dom": "^18.3.0",
"@types/react-modal": "^3.16.3 ",
"@types/tinycolor2": "^1.4.3",
"framer-motion": "^10.16.8",
"happy-dom": "^8.9.0",
"@types/tinycolor2": "^1.4.6",
"framer-motion": "^11.5.4",
"happy-dom": "^15.7.4",
"isomorphic-fetch": "^3.0.0",
"prosemirror-test-builder": "^1.1.0",
"react": "18.2.0",
"react-dom": "18.2.0",
"prosemirror-test-builder": "^1.1.1",
"react": "18.3.1",
"react-dom": "18.3.1",
"react-modal": "3.16.1",
"tinycolor2": "^1.6.0",
"vitest": "^0.29.2",
"web-vitals": "^2.1.4",
"zustand": "4.4.7"
"vitest": "^2.0.5",
"web-vitals": "^4.2.3",
"zustand": "4.5.5"
},
"peerDependencies": {
"@emotion/react": ">=11",

41
packages/editor/package-lock.json generated
View File

@@ -108,6 +108,7 @@
"@microsoft/signalr": "^8.0.0",
"@notesnook/logger": "file:../logger",
"@readme/data-urls": "^3.0.0",
"@streetwriters/kysely": "^0.27.4",
"@streetwriters/showdown": "^3.0.8-alpha",
"async-mutex": "^0.3.2",
"dayjs": "1.11.9",
@@ -119,7 +120,6 @@
"html-to-text": "^9.0.5",
"htmlparser2": "^8.0.1",
"katex": "0.16.2",
"kysely": "^0.26.3",
"linkedom": "^0.14.17",
"liqe": "^1.13.0",
"mime-db": "1.52.0",
@@ -1323,22 +1323,6 @@
"@styled-system/css": "^5.1.5"
}
},
"node_modules/@theme-ui/color-modes": {
"version": "0.16.2",
"resolved": "https://registry.npmjs.org/@theme-ui/color-modes/-/color-modes-0.16.2.tgz",
"integrity": "sha512-jWEWx53lxNgWCT38i/kwLV2rsvJz8lVZgi5oImnVwYba9VejXD23q1ckbNFJHosQ8KKXY87ht0KPC6BQFIiHtQ==",
"dev": true,
"peer": true,
"dependencies": {
"@theme-ui/core": "^0.16.2",
"@theme-ui/css": "^0.16.2",
"deepmerge": "^4.2.2"
},
"peerDependencies": {
"@emotion/react": "^11.11.1",
"react": ">=18"
}
},
"node_modules/@theme-ui/components": {
"version": "0.16.2",
"resolved": "https://registry.npmjs.org/@theme-ui/components/-/components-0.16.2.tgz",
@@ -1384,22 +1368,6 @@
"@emotion/react": "^11.11.1"
}
},
"node_modules/@theme-ui/theme-provider": {
"version": "0.16.2",
"resolved": "https://registry.npmjs.org/@theme-ui/theme-provider/-/theme-provider-0.16.2.tgz",
"integrity": "sha512-LRnVevODcGqO0JyLJ3wht+PV3ZoZcJ7XXLJAJWDoGeII4vZcPQKwVy4Lpz/juHsZppQxKcB3U+sQDGBnP25irQ==",
"dev": true,
"peer": true,
"dependencies": {
"@theme-ui/color-modes": "^0.16.2",
"@theme-ui/core": "^0.16.2",
"@theme-ui/css": "^0.16.2"
},
"peerDependencies": {
"@emotion/react": "^11.11.1",
"react": ">=18"
}
},
"node_modules/@tiptap/core": {
"version": "2.6.6",
"resolved": "https://registry.npmjs.org/@tiptap/core/-/core-2.6.6.tgz",
@@ -2855,7 +2823,8 @@
"node_modules/js-tokens": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
"dev": true
},
"node_modules/jsesc": {
"version": "2.5.2",
@@ -2913,6 +2882,7 @@
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
"integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
"dev": true,
"dependencies": {
"js-tokens": "^3.0.0 || ^4.0.0"
},
@@ -3477,6 +3447,7 @@
"version": "18.3.1",
"resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz",
"integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==",
"dev": true,
"dependencies": {
"loose-envify": "^1.1.0"
},
@@ -3497,6 +3468,7 @@
"version": "18.3.1",
"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
"integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==",
"dev": true,
"dependencies": {
"loose-envify": "^1.1.0",
"scheduler": "^0.23.2"
@@ -3647,6 +3619,7 @@
"version": "0.23.2",
"resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz",
"integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==",
"dev": true,
"dependencies": {
"loose-envify": "^1.1.0"
}