From 0747a4540dbc1a8b936d494e58d9d5bf963857a7 Mon Sep 17 00:00:00 2001
From: Nystik <236107-Nystik@users.noreply.gitlab.com>
Date: Fri, 20 Mar 2026 23:46:17 +0100
Subject: [PATCH] consolidate build scripts, reorganize source into src/
 directory, fix favicon injection

---
 Dockerfile                                    |  6 +--
 build-ui.js                                   | 17 -------
 build.js                                      | 47 +++++++++++++------
 package.json                                  |  6 +--
 scripts/patch-obsidian.js                     | 15 +++---
 {services => src/services}/vault-service.js   |  0
 {shims => src/shims}/btime.js                 |  0
 {shims => src/shims}/crypto/create-hash.js    |  0
 {shims => src/shims}/crypto/index.js          |  0
 {shims => src/shims}/crypto/random-bytes.js   |  0
 {shims => src/shims}/crypto/scrypt.js         |  0
 {shims => src/shims}/electron/index.js        |  0
 {shims => src/shims}/electron/ipc-renderer.js |  0
 {shims => src/shims}/electron/remote/app.js   |  0
 .../shims}/electron/remote/clipboard.js       |  0
 .../shims}/electron/remote/dialog.js          |  0
 {shims => src/shims}/electron/remote/index.js |  0
 {shims => src/shims}/electron/remote/menu.js  |  0
 .../shims}/electron/remote/native-image.js    |  0
 .../shims}/electron/remote/notification.js    |  0
 .../shims}/electron/remote/screen.js          |  0
 .../shims}/electron/remote/session.js         |  0
 {shims => src/shims}/electron/remote/shell.js |  0
 .../electron/remote/system-preferences.js     |  0
 {shims => src/shims}/electron/remote/theme.js |  0
 .../shims}/electron/remote/window.js          |  0
 {shims => src/shims}/electron/web-frame.js    |  0
 {shims => src/shims}/fs/constants.js          |  0
 {shims => src/shims}/fs/content-cache.js      |  0
 {shims => src/shims}/fs/index.js              |  0
 {shims => src/shims}/fs/metadata-cache.js     |  0
 {shims => src/shims}/fs/promises.js           |  0
 {shims => src/shims}/fs/sync.js               |  0
 {shims => src/shims}/fs/transport.js          |  0
 {shims => src/shims}/fs/watch.js              |  0
 {shims => src/shims}/loader.js                |  0
 {shims => src/shims}/node/child_process.js    |  0
 {shims => src/shims}/node/events.js           |  0
 {shims => src/shims}/node/http.js             |  0
 {shims => src/shims}/node/net.js              |  0
 {shims => src/shims}/node/os.js               |  0
 {shims => src/shims}/path.js                  |  0
 {shims => src/shims}/process.js               |  0
 {shims => src/shims}/request-url.js           |  0
 {shims => src/shims}/url.js                   |  0
 {ui => src/ui}/bootstrap.js                   |  0
 .../ui}/components/display/ListItem.svelte    |  0
 {ui => src/ui}/components/input/Button.svelte |  0
 .../ui}/components/input/SearchInput.svelte   |  0
 .../components/layout/ConfirmDialog.svelte    |  0
 .../components/layout/MessageDialog.svelte    |  0
 {ui => src/ui}/components/layout/Modal.svelte |  0
 .../ui}/components/layout/PromptDialog.svelte |  0
 .../ui}/components/menu/PopoverMenu.svelte    |  0
 {ui => src/ui}/index.js                       |  0
 {ui => src/ui}/views/VaultManager.svelte      |  0
 56 files changed, 46 insertions(+), 45 deletions(-)
 delete mode 100644 build-ui.js
 rename {services => src/services}/vault-service.js (100%)
 rename {shims => src/shims}/btime.js (100%)
 rename {shims => src/shims}/crypto/create-hash.js (100%)
 rename {shims => src/shims}/crypto/index.js (100%)
 rename {shims => src/shims}/crypto/random-bytes.js (100%)
 rename {shims => src/shims}/crypto/scrypt.js (100%)
 rename {shims => src/shims}/electron/index.js (100%)
 rename {shims => src/shims}/electron/ipc-renderer.js (100%)
 rename {shims => src/shims}/electron/remote/app.js (100%)
 rename {shims => src/shims}/electron/remote/clipboard.js (100%)
 rename {shims => src/shims}/electron/remote/dialog.js (100%)
 rename {shims => src/shims}/electron/remote/index.js (100%)
 rename {shims => src/shims}/electron/remote/menu.js (100%)
 rename {shims => src/shims}/electron/remote/native-image.js (100%)
 rename {shims => src/shims}/electron/remote/notification.js (100%)
 rename {shims => src/shims}/electron/remote/screen.js (100%)
 rename {shims => src/shims}/electron/remote/session.js (100%)
 rename {shims => src/shims}/electron/remote/shell.js (100%)
 rename {shims => src/shims}/electron/remote/system-preferences.js (100%)
 rename {shims => src/shims}/electron/remote/theme.js (100%)
 rename {shims => src/shims}/electron/remote/window.js (100%)
 rename {shims => src/shims}/electron/web-frame.js (100%)
 rename {shims => src/shims}/fs/constants.js (100%)
 rename {shims => src/shims}/fs/content-cache.js (100%)
 rename {shims => src/shims}/fs/index.js (100%)
 rename {shims => src/shims}/fs/metadata-cache.js (100%)
 rename {shims => src/shims}/fs/promises.js (100%)
 rename {shims => src/shims}/fs/sync.js (100%)
 rename {shims => src/shims}/fs/transport.js (100%)
 rename {shims => src/shims}/fs/watch.js (100%)
 rename {shims => src/shims}/loader.js (100%)
 rename {shims => src/shims}/node/child_process.js (100%)
 rename {shims => src/shims}/node/events.js (100%)
 rename {shims => src/shims}/node/http.js (100%)
 rename {shims => src/shims}/node/net.js (100%)
 rename {shims => src/shims}/node/os.js (100%)
 rename {shims => src/shims}/path.js (100%)
 rename {shims => src/shims}/process.js (100%)
 rename {shims => src/shims}/request-url.js (100%)
 rename {shims => src/shims}/url.js (100%)
 rename {ui => src/ui}/bootstrap.js (100%)
 rename {ui => src/ui}/components/display/ListItem.svelte (100%)
 rename {ui => src/ui}/components/input/Button.svelte (100%)
 rename {ui => src/ui}/components/input/SearchInput.svelte (100%)
 rename {ui => src/ui}/components/layout/ConfirmDialog.svelte (100%)
 rename {ui => src/ui}/components/layout/MessageDialog.svelte (100%)
 rename {ui => src/ui}/components/layout/Modal.svelte (100%)
 rename {ui => src/ui}/components/layout/PromptDialog.svelte (100%)
 rename {ui => src/ui}/components/menu/PopoverMenu.svelte (100%)
 rename {ui => src/ui}/index.js (100%)
 rename {ui => src/ui}/views/VaultManager.svelte (100%)

diff --git a/Dockerfile b/Dockerfile
index d3bcf19..7a4cea0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,10 +6,8 @@ WORKDIR /build
 COPY package.json package-lock.json ./
 RUN npm ci --ignore-scripts
 
-COPY build.js build-ui.js ./
-COPY shims/ ./shims/
-COPY services/ ./services/
-COPY ui/ ./ui/
+COPY build.js ./
+COPY src/ ./src/
 
 RUN npm run build
 
diff --git a/build-ui.js b/build-ui.js
deleted file mode 100644
index e4e41bb..0000000
--- a/build-ui.js
+++ /dev/null
@@ -1,17 +0,0 @@
-const esbuild = require("esbuild");
-const sveltePlugin = require("esbuild-svelte");
-const path = require("path");
-
-esbuild.build({
-  entryPoints: [path.join(__dirname, "ui", "index.js")],
-  bundle: true,
-  outfile: path.join(__dirname, "dist", "ignis-ui.js"),
-  format: "iife",
-  globalName: "IgnisUI",
-  platform: "browser",
-  target: ["chrome90"],
-  mainFields: ["svelte", "browser", "module", "main"],
-  conditions: ["svelte", "browser"],
-  plugins: [sveltePlugin({ compilerOptions: { css: "injected" } })],
-  logLevel: "info",
-}).catch(() => process.exit(1));
diff --git a/build.js b/build.js
index fc2acec..789a4f0 100644
--- a/build.js
+++ b/build.js
@@ -1,15 +1,34 @@
-const esbuild = require('esbuild');
-const path = require('path');
+const esbuild = require("esbuild");
+const sveltePlugin = require("esbuild-svelte");
+const path = require("path");
 
-esbuild.build({
-  entryPoints: [path.join(__dirname, 'shims', 'loader.js')],
-  bundle: true,
-  outfile: path.join(__dirname, 'dist', 'shim-loader.js'),
-  format: 'iife',
-  platform: 'browser',
-  target: ['chrome90'],
-  alias: {
-    'path': 'path-browserify',
-  },
-  logLevel: 'info',
-}).catch(() => process.exit(1));
+Promise.all([
+  // Build shim-loader.js
+  esbuild.build({
+    entryPoints: [path.join(__dirname, "src", "shims", "loader.js")],
+    bundle: true,
+    outfile: path.join(__dirname, "dist", "shim-loader.js"),
+    format: "iife",
+    platform: "browser",
+    target: ["chrome90"],
+    alias: {
+      path: "path-browserify",
+    },
+    logLevel: "info",
+  }),
+
+  // Build ignis-ui.js
+  esbuild.build({
+    entryPoints: [path.join(__dirname, "src", "ui", "index.js")],
+    bundle: true,
+    outfile: path.join(__dirname, "dist", "ignis-ui.js"),
+    format: "iife",
+    globalName: "IgnisUI",
+    platform: "browser",
+    target: ["chrome90"],
+    mainFields: ["svelte", "browser", "module", "main"],
+    conditions: ["svelte", "browser"],
+    plugins: [sveltePlugin({ compilerOptions: { css: "injected" } })],
+    logLevel: "info",
+  }),
+]).catch(() => process.exit(1));
diff --git a/package.json b/package.json
index 3199247..30cc8b4 100644
--- a/package.json
+++ b/package.json
@@ -1,12 +1,10 @@
 {
   "name": "ignis",
-  "version": "0.1.0",
+  "version": "0.4.0",
   "private": true,
   "description": "An Electron shim and server bridge for running Obsidian in a browser.",
   "scripts": {
-    "build:ui": "node build-ui.js",
-    "build:shims": "node build.js",
-    "build": "npm run build:ui && npm run build:shims",
+    "build": "node build.js",
     "dev:server": "node server/index.js",
     "dev": "npm run build && npm run dev:server"
   },
diff --git a/scripts/patch-obsidian.js b/scripts/patch-obsidian.js
index 8d6dc75..c11b673 100644
--- a/scripts/patch-obsidian.js
+++ b/scripts/patch-obsidian.js
@@ -37,15 +37,18 @@ function patchHtml(filePath) {
     "\n",
   );
 
-  // Inject ignis assets before the first <script> tag
-  const ignisBlock =
-    '  <link rel="icon" type="image/png" href="favicon.png">\n' +
-    '  <script type="text/javascript" src="ignis-ui.js"></script>\n' +
-    '  <script type="text/javascript" src="shim-loader.js"></script>\n';
+  // Inject favicon into <head>
+  html = html.replace(
+    "</head>",
+    '  <link rel="icon" type="image/png" href="favicon.png">\n</head>',
+  );
 
+  // Inject ignis scripts before the first <script> tag
   html = html.replace(
     '<script type="text/javascript"',
-    ignisBlock + '<script type="text/javascript"',
+    '<script type="text/javascript" src="ignis-ui.js"></script>\n' +
+      '<script type="text/javascript" src="shim-loader.js"></script>\n' +
+      '<script type="text/javascript"',
   );
 
   fs.writeFileSync(filePath, html);
diff --git a/services/vault-service.js b/src/services/vault-service.js
similarity index 100%
rename from services/vault-service.js
rename to src/services/vault-service.js
diff --git a/shims/btime.js b/src/shims/btime.js
similarity index 100%
rename from shims/btime.js
rename to src/shims/btime.js
diff --git a/shims/crypto/create-hash.js b/src/shims/crypto/create-hash.js
similarity index 100%
rename from shims/crypto/create-hash.js
rename to src/shims/crypto/create-hash.js
diff --git a/shims/crypto/index.js b/src/shims/crypto/index.js
similarity index 100%
rename from shims/crypto/index.js
rename to src/shims/crypto/index.js
diff --git a/shims/crypto/random-bytes.js b/src/shims/crypto/random-bytes.js
similarity index 100%
rename from shims/crypto/random-bytes.js
rename to src/shims/crypto/random-bytes.js
diff --git a/shims/crypto/scrypt.js b/src/shims/crypto/scrypt.js
similarity index 100%
rename from shims/crypto/scrypt.js
rename to src/shims/crypto/scrypt.js
diff --git a/shims/electron/index.js b/src/shims/electron/index.js
similarity index 100%
rename from shims/electron/index.js
rename to src/shims/electron/index.js
diff --git a/shims/electron/ipc-renderer.js b/src/shims/electron/ipc-renderer.js
similarity index 100%
rename from shims/electron/ipc-renderer.js
rename to src/shims/electron/ipc-renderer.js
diff --git a/shims/electron/remote/app.js b/src/shims/electron/remote/app.js
similarity index 100%
rename from shims/electron/remote/app.js
rename to src/shims/electron/remote/app.js
diff --git a/shims/electron/remote/clipboard.js b/src/shims/electron/remote/clipboard.js
similarity index 100%
rename from shims/electron/remote/clipboard.js
rename to src/shims/electron/remote/clipboard.js
diff --git a/shims/electron/remote/dialog.js b/src/shims/electron/remote/dialog.js
similarity index 100%
rename from shims/electron/remote/dialog.js
rename to src/shims/electron/remote/dialog.js
diff --git a/shims/electron/remote/index.js b/src/shims/electron/remote/index.js
similarity index 100%
rename from shims/electron/remote/index.js
rename to src/shims/electron/remote/index.js
diff --git a/shims/electron/remote/menu.js b/src/shims/electron/remote/menu.js
similarity index 100%
rename from shims/electron/remote/menu.js
rename to src/shims/electron/remote/menu.js
diff --git a/shims/electron/remote/native-image.js b/src/shims/electron/remote/native-image.js
similarity index 100%
rename from shims/electron/remote/native-image.js
rename to src/shims/electron/remote/native-image.js
diff --git a/shims/electron/remote/notification.js b/src/shims/electron/remote/notification.js
similarity index 100%
rename from shims/electron/remote/notification.js
rename to src/shims/electron/remote/notification.js
diff --git a/shims/electron/remote/screen.js b/src/shims/electron/remote/screen.js
similarity index 100%
rename from shims/electron/remote/screen.js
rename to src/shims/electron/remote/screen.js
diff --git a/shims/electron/remote/session.js b/src/shims/electron/remote/session.js
similarity index 100%
rename from shims/electron/remote/session.js
rename to src/shims/electron/remote/session.js
diff --git a/shims/electron/remote/shell.js b/src/shims/electron/remote/shell.js
similarity index 100%
rename from shims/electron/remote/shell.js
rename to src/shims/electron/remote/shell.js
diff --git a/shims/electron/remote/system-preferences.js b/src/shims/electron/remote/system-preferences.js
similarity index 100%
rename from shims/electron/remote/system-preferences.js
rename to src/shims/electron/remote/system-preferences.js
diff --git a/shims/electron/remote/theme.js b/src/shims/electron/remote/theme.js
similarity index 100%
rename from shims/electron/remote/theme.js
rename to src/shims/electron/remote/theme.js
diff --git a/shims/electron/remote/window.js b/src/shims/electron/remote/window.js
similarity index 100%
rename from shims/electron/remote/window.js
rename to src/shims/electron/remote/window.js
diff --git a/shims/electron/web-frame.js b/src/shims/electron/web-frame.js
similarity index 100%
rename from shims/electron/web-frame.js
rename to src/shims/electron/web-frame.js
diff --git a/shims/fs/constants.js b/src/shims/fs/constants.js
similarity index 100%
rename from shims/fs/constants.js
rename to src/shims/fs/constants.js
diff --git a/shims/fs/content-cache.js b/src/shims/fs/content-cache.js
similarity index 100%
rename from shims/fs/content-cache.js
rename to src/shims/fs/content-cache.js
diff --git a/shims/fs/index.js b/src/shims/fs/index.js
similarity index 100%
rename from shims/fs/index.js
rename to src/shims/fs/index.js
diff --git a/shims/fs/metadata-cache.js b/src/shims/fs/metadata-cache.js
similarity index 100%
rename from shims/fs/metadata-cache.js
rename to src/shims/fs/metadata-cache.js
diff --git a/shims/fs/promises.js b/src/shims/fs/promises.js
similarity index 100%
rename from shims/fs/promises.js
rename to src/shims/fs/promises.js
diff --git a/shims/fs/sync.js b/src/shims/fs/sync.js
similarity index 100%
rename from shims/fs/sync.js
rename to src/shims/fs/sync.js
diff --git a/shims/fs/transport.js b/src/shims/fs/transport.js
similarity index 100%
rename from shims/fs/transport.js
rename to src/shims/fs/transport.js
diff --git a/shims/fs/watch.js b/src/shims/fs/watch.js
similarity index 100%
rename from shims/fs/watch.js
rename to src/shims/fs/watch.js
diff --git a/shims/loader.js b/src/shims/loader.js
similarity index 100%
rename from shims/loader.js
rename to src/shims/loader.js
diff --git a/shims/node/child_process.js b/src/shims/node/child_process.js
similarity index 100%
rename from shims/node/child_process.js
rename to src/shims/node/child_process.js
diff --git a/shims/node/events.js b/src/shims/node/events.js
similarity index 100%
rename from shims/node/events.js
rename to src/shims/node/events.js
diff --git a/shims/node/http.js b/src/shims/node/http.js
similarity index 100%
rename from shims/node/http.js
rename to src/shims/node/http.js
diff --git a/shims/node/net.js b/src/shims/node/net.js
similarity index 100%
rename from shims/node/net.js
rename to src/shims/node/net.js
diff --git a/shims/node/os.js b/src/shims/node/os.js
similarity index 100%
rename from shims/node/os.js
rename to src/shims/node/os.js
diff --git a/shims/path.js b/src/shims/path.js
similarity index 100%
rename from shims/path.js
rename to src/shims/path.js
diff --git a/shims/process.js b/src/shims/process.js
similarity index 100%
rename from shims/process.js
rename to src/shims/process.js
diff --git a/shims/request-url.js b/src/shims/request-url.js
similarity index 100%
rename from shims/request-url.js
rename to src/shims/request-url.js
diff --git a/shims/url.js b/src/shims/url.js
similarity index 100%
rename from shims/url.js
rename to src/shims/url.js
diff --git a/ui/bootstrap.js b/src/ui/bootstrap.js
similarity index 100%
rename from ui/bootstrap.js
rename to src/ui/bootstrap.js
diff --git a/ui/components/display/ListItem.svelte b/src/ui/components/display/ListItem.svelte
similarity index 100%
rename from ui/components/display/ListItem.svelte
rename to src/ui/components/display/ListItem.svelte
diff --git a/ui/components/input/Button.svelte b/src/ui/components/input/Button.svelte
similarity index 100%
rename from ui/components/input/Button.svelte
rename to src/ui/components/input/Button.svelte
diff --git a/ui/components/input/SearchInput.svelte b/src/ui/components/input/SearchInput.svelte
similarity index 100%
rename from ui/components/input/SearchInput.svelte
rename to src/ui/components/input/SearchInput.svelte
diff --git a/ui/components/layout/ConfirmDialog.svelte b/src/ui/components/layout/ConfirmDialog.svelte
similarity index 100%
rename from ui/components/layout/ConfirmDialog.svelte
rename to src/ui/components/layout/ConfirmDialog.svelte
diff --git a/ui/components/layout/MessageDialog.svelte b/src/ui/components/layout/MessageDialog.svelte
similarity index 100%
rename from ui/components/layout/MessageDialog.svelte
rename to src/ui/components/layout/MessageDialog.svelte
diff --git a/ui/components/layout/Modal.svelte b/src/ui/components/layout/Modal.svelte
similarity index 100%
rename from ui/components/layout/Modal.svelte
rename to src/ui/components/layout/Modal.svelte
diff --git a/ui/components/layout/PromptDialog.svelte b/src/ui/components/layout/PromptDialog.svelte
similarity index 100%
rename from ui/components/layout/PromptDialog.svelte
rename to src/ui/components/layout/PromptDialog.svelte
diff --git a/ui/components/menu/PopoverMenu.svelte b/src/ui/components/menu/PopoverMenu.svelte
similarity index 100%
rename from ui/components/menu/PopoverMenu.svelte
rename to src/ui/components/menu/PopoverMenu.svelte
diff --git a/ui/index.js b/src/ui/index.js
similarity index 100%
rename from ui/index.js
rename to src/ui/index.js
diff --git a/ui/views/VaultManager.svelte b/src/ui/views/VaultManager.svelte
similarity index 100%
rename from ui/views/VaultManager.svelte
rename to src/ui/views/VaultManager.svelte