diff --git a/apps/client/src/desktop.ts b/apps/client/src/desktop.ts index cbaaee53b..42e1c44e9 100644 --- a/apps/client/src/desktop.ts +++ b/apps/client/src/desktop.ts @@ -12,6 +12,7 @@ import type ElectronRemote from "@electron/remote"; import type Electron from "electron"; import "./stylesheets/bootstrap.scss"; import "boxicons"; +import "jquery-hotkeys"; import "autocomplete.js/index_jquery.js"; await appContext.earlyInit(); diff --git a/apps/client/src/setup.ts b/apps/client/src/setup.ts index 2e0dae151..1ade057c1 100644 --- a/apps/client/src/setup.ts +++ b/apps/client/src/setup.ts @@ -1,6 +1,7 @@ import utils from "./services/utils.js"; import ko from "knockout"; import "./stylesheets/bootstrap.scss"; +import "jquery-hotkeys"; // TriliumNextTODO: properly make use of below types // type SetupModelSetupType = "new-document" | "sync-from-desktop" | "sync-from-server" | ""; diff --git a/apps/server/package.json b/apps/server/package.json index 8947ee2f8..269b49390 100644 --- a/apps/server/package.json +++ b/apps/server/package.json @@ -5,8 +5,7 @@ "private": true, "dependencies": { "better-sqlite3": "11.10.0", - "jquery.fancytree": "2.38.5", - "jquery-hotkeys": "0.2.2" + "jquery.fancytree": "2.38.5" }, "devDependencies": { "@electron/remote": "2.1.2", diff --git a/apps/server/src/assets/views/desktop.ejs b/apps/server/src/assets/views/desktop.ejs index 1e7112e78..05cdd8a73 100644 --- a/apps/server/src/assets/views/desktop.ejs +++ b/apps/server/src/assets/views/desktop.ejs @@ -41,8 +41,6 @@ - - diff --git a/apps/server/src/assets/views/setup.ejs b/apps/server/src/assets/views/setup.ejs index 59c58dda1..062d3cd03 100644 --- a/apps/server/src/assets/views/setup.ejs +++ b/apps/server/src/assets/views/setup.ejs @@ -169,7 +169,6 @@ - diff --git a/apps/server/src/routes/assets.ts b/apps/server/src/routes/assets.ts index e712b31b4..a79ee7874 100644 --- a/apps/server/src/routes/assets.ts +++ b/apps/server/src/routes/assets.ts @@ -49,8 +49,6 @@ async function register(app: express.Application) { app.use(`/${assetPath}/node_modules/jquery/dist/`, persistentCacheStatic(path.join(nodeModulesDir, "jquery/dist/"))); - app.use(`/${assetPath}/node_modules/jquery-hotkeys/`, persistentCacheStatic(path.join(nodeModulesDir, "jquery-hotkeys/"))); - app.use(`/${assetPath}/node_modules/jquery.fancytree/dist/`, persistentCacheStatic(path.join(nodeModulesDir, "jquery.fancytree/dist/"))); } diff --git a/apps/server/webpack.config.cjs b/apps/server/webpack.config.cjs index 6b9711675..5bde75de2 100644 --- a/apps/server/webpack.config.cjs +++ b/apps/server/webpack.config.cjs @@ -14,7 +14,6 @@ function buildFilesToCopy() { const nodePaths = [ "jquery/dist", - "jquery-hotkeys", "jquery.fancytree/dist", // Required as they are native dependencies and cannot be well bundled. diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d1a47c03c..487e6692e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -484,9 +484,6 @@ importers: better-sqlite3: specifier: 11.10.0 version: 11.10.0 - jquery-hotkeys: - specifier: 0.2.2 - version: 0.2.2 jquery.fancytree: specifier: 2.38.5 version: 2.38.5(jquery@3.7.1)