remove fancytree and bootstrap

bin/copy-dist.ts

@@ -80,7 +80,9 @@ const copy = async () => {
     "node_modules/vanilla-js-wheel-zoom/dist/",
     "node_modules/mark.js/dist/",
     "node_modules/knockout/build/output/",
-    "node_modules/normalize.css/"
+    "node_modules/normalize.css/",
+    "node_modules/jquery.fancytree/dist/",
+    "node_modules/bootstrap/dist/"
   ];
 
   for (const folder of nodeModulesFolder) {

package-lock.json

@@ -18,6 +18,7 @@
         "autocomplete.js": "^0.38.1",
         "axios": "^1.7.2",
         "better-sqlite3": "^11.1.2",
+        "bootstrap": "^4.6.2",
         "boxicons": "2.1.4",
         "chokidar": "3.6.0",
         "cls-hooked": "4.2.2",
@@ -55,6 +56,7 @@
         "joplin-turndown-plugin-gfm": "1.0.12",
         "jquery": "3.7.1",
         "jquery-hotkeys": "0.2.2",
+        "jquery.fancytree": "^2.38.3",
         "jsdom": "^24.1.0",
         "jsplumb": "^2.15.6",
         "katex": "^0.16.11",
@@ -5174,6 +5176,26 @@
       "integrity": "sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==",
       "optional": true
     },
+    "node_modules/bootstrap": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.2.tgz",
+      "integrity": "sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/twbs"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/bootstrap"
+        }
+      ],
+      "license": "MIT",
+      "peerDependencies": {
+        "jquery": "1.9.1 - 3",
+        "popper.js": "^1.16.1"
+      }
+    },
     "node_modules/boxicons": {
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/boxicons/-/boxicons-2.1.4.tgz",
@@ -11485,6 +11507,15 @@
       "resolved": "https://registry.npmjs.org/jquery-hotkeys/-/jquery-hotkeys-0.2.2.tgz",
       "integrity": "sha512-1LWIp+1ZQUluPsWEJ4Ett0CRfgGsGRGU7wTlj1TBBq0hWl7fLYxl/DyARku0fz9x8lIYi6v5VXJwZx8cpJmdpQ=="
     },
+    "node_modules/jquery.fancytree": {
+      "version": "2.38.3",
+      "resolved": "https://registry.npmjs.org/jquery.fancytree/-/jquery.fancytree-2.38.3.tgz",
+      "integrity": "sha512-C3CJcp4sPThy497YBXZNrDSVn/B34sv6kB+toC8gfHrPvJWgYkL3NSMovBxXo6fN6yXUnvWhWaON/ejG3Nsxdg==",
+      "license": "MIT",
+      "peerDependencies": {
+        "jquery": ">=1.9"
+      }
+    },
     "node_modules/js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -14184,6 +14215,18 @@
         "node": ">=12.13.0"
       }
     },
+    "node_modules/popper.js": {
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
+      "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==",
+      "deprecated": "You can find the new Popper v2 at @popperjs/core, this package is dedicated to the legacy v1",
+      "license": "MIT",
+      "peer": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/popperjs"
+      }
+    },
     "node_modules/postcss": {
       "version": "8.4.5",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.5.tgz",

package.json

@@ -57,6 +57,7 @@
     "autocomplete.js": "^0.38.1",
     "axios": "^1.7.2",
     "better-sqlite3": "^11.1.2",
+    "bootstrap": "^4.6.2",
     "boxicons": "2.1.4",
     "chokidar": "3.6.0",
     "cls-hooked": "4.2.2",
@@ -94,6 +95,7 @@
     "joplin-turndown-plugin-gfm": "1.0.12",
     "jquery": "3.7.1",
     "jquery-hotkeys": "0.2.2",
+    "jquery.fancytree": "^2.38.3",
     "jsdom": "^24.1.0",
     "jsplumb": "^2.15.6",
     "katex": "^0.16.11",

src/public/app/widgets/note_detail.js

@@ -273,7 +273,7 @@ export default class NoteDetailWidget extends NoteContextAwareWidget {
             loadCSS: [
                 `${assetPath}/libraries/codemirror/codemirror.css`,
                 `${assetPath}/libraries/ckeditor/ckeditor-content.css`,
-                `${assetPath}/libraries/bootstrap/css/bootstrap.min.css`,
+                `${assetPath}/node_modules/bootstrap/dist/css/bootstrap.min.css`,
                 `${assetPath}/node_modules/katex/dist/katex.min.css`,
                 `${assetPath}/stylesheets/print.css`,
                 `${assetPath}/stylesheets/relation_map.css`,

src/routes/assets.ts

@@ -90,6 +90,10 @@ function register(app: express.Application) {
     app.use(`/${assetPath}/node_modules/knockout/build/output/`, persistentCacheStatic(path.join(srcRoot, '..', 'node_modules/knockout/build/output/')));
 
     app.use(`/${assetPath}/node_modules/normalize.css/`, persistentCacheStatic(path.join(srcRoot, '..', 'node_modules/normalize.css/')));
+
+    app.use(`/${assetPath}/node_modules/jquery.fancytree/dist/`, persistentCacheStatic(path.join(srcRoot, '..', 'node_modules/jquery.fancytree/dist/')));
+
+    app.use(`/${assetPath}/node_modules/bootstrap/dist/`, persistentCacheStatic(path.join(srcRoot, '..', 'node_modules/bootstrap/dist/')));
 }
 
 export default {

src/views/desktop.ejs

@@ -51,12 +51,12 @@
 
 <script src="<%= assetPath %>/node_modules/jquery/dist/jquery.min.js"></script>
 
-<link href="<%= assetPath %>/libraries/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+<link href="<%= assetPath %>/node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
-<script src="<%= assetPath %>/libraries/bootstrap/js/bootstrap.bundle.min.js"></script>
+<script src="<%= assetPath %>/node_modules/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
 
 <!-- Include Fancytree library and skip -->
 <link href="<%= assetPath %>/stylesheets/tree.css" rel="stylesheet">
-<script src="<%= assetPath %>/libraries/fancytree/jquery.fancytree-all-deps.min.js"></script>
+<script src="<%= assetPath %>/node_modules/jquery.fancytree/dist/jquery.fancytree-all-deps.min.js"></script>
 
 <script src="<%= assetPath %>/node_modules/jquery-hotkeys/jquery-hotkeys.js"></script>
 

src/views/login.ejs

@@ -78,6 +78,6 @@
     }
 </script>
 
-<link href="<%= assetPath %>/libraries/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+<link href="<%= assetPath %>/node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
 </body>
 </html>

src/views/mobile.ejs

@@ -130,8 +130,8 @@
 <link href="<%= assetPath %>/stylesheets/tree.css" rel="stylesheet">
 <script src="<%= assetPath %>/libraries/fancytree/jquery.fancytree-all-deps.min.js"></script>
 
-<link href="<%= assetPath %>/libraries/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+<link href="<%= assetPath %>/node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
-<script src="<%= assetPath %>/libraries/bootstrap/js/bootstrap.bundle.min.js"></script>
+<script src="<%= assetPath %>/node_modules/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
 
 <script src="<%= appPath %>/mobile.js" crossorigin type="module"></script>
 

src/views/set_password.ejs

@@ -46,6 +46,6 @@
     if (typeof module === 'object') {window.module = module; module = undefined;}
 </script>
 
-<link href="<%= assetPath %>/libraries/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+<link href="<%= assetPath %>/node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
 </body>
 </html>

src/views/setup.ejs

@@ -156,8 +156,8 @@
 <script src="<%= assetPath %>/node_modules/jquery/dist/jquery.min.js"></script>
 <script src="<%= assetPath %>/node_modules/jquery-hotkeys/jquery-hotkeys.js"></script>
 
-<link href="<%= assetPath %>/libraries/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+<link href="<%= assetPath %>/node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
-<script src="<%= assetPath %>/libraries/bootstrap/js/bootstrap.bundle.min.js"></script>
+<script src="<%= assetPath %>/node_modules/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
 
 <script src="<%= assetPath %>/node_modules/knockout/build/output/knockout-latest.js"></script>