consolidate build scripts, reorganize source into src/ directory, fix favicon injection

2026-03-20 23:46:17 +01:00 · 2026-03-20 23:46:17 +01:00 · 0747a4540d
commit 0747a4540d
parent 2add5238b8
56 changed files with 46 additions and 45 deletions
--- a/6
+++ b/6
@ -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

--- a/build-ui.js
+++ b/build-ui.js
@ -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));
--- 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");

+Promise.all([
+  // Build shim-loader.js
  esbuild.build({
-  entryPoints: [path.join(__dirname, 'shims', 'loader.js')],
+    entryPoints: [path.join(__dirname, "src", "shims", "loader.js")],
    bundle: true,
-  outfile: path.join(__dirname, 'dist', 'shim-loader.js'),
-  format: 'iife',
-  platform: 'browser',
-  target: ['chrome90'],
+    outfile: path.join(__dirname, "dist", "shim-loader.js"),
+    format: "iife",
+    platform: "browser",
+    target: ["chrome90"],
    alias: {
-    'path': 'path-browserify',
+      path: "path-browserify",
    },
-  logLevel: 'info',
-}).catch(() => process.exit(1));
+    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));
--- 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"
  },
--- 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);
--- a/src/services/vault-service.js
+++ b/src/services/vault-service.js
--- a/src/shims/btime.js
+++ b/src/shims/btime.js
--- a/src/shims/crypto/create-hash.js
+++ b/src/shims/crypto/create-hash.js
--- a/src/shims/crypto/index.js
+++ b/src/shims/crypto/index.js
--- a/src/shims/crypto/random-bytes.js
+++ b/src/shims/crypto/random-bytes.js
--- a/src/shims/crypto/scrypt.js
+++ b/src/shims/crypto/scrypt.js
--- a/src/shims/electron/index.js
+++ b/src/shims/electron/index.js
--- a/src/shims/electron/ipc-renderer.js
+++ b/src/shims/electron/ipc-renderer.js
--- a/src/shims/electron/remote/app.js
+++ b/src/shims/electron/remote/app.js
--- a/src/shims/electron/remote/clipboard.js
+++ b/src/shims/electron/remote/clipboard.js
--- a/src/shims/electron/remote/dialog.js
+++ b/src/shims/electron/remote/dialog.js
--- a/src/shims/electron/remote/index.js
+++ b/src/shims/electron/remote/index.js
--- a/src/shims/electron/remote/menu.js
+++ b/src/shims/electron/remote/menu.js
--- a/src/shims/electron/remote/native-image.js
+++ b/src/shims/electron/remote/native-image.js
--- a/src/shims/electron/remote/notification.js
+++ b/src/shims/electron/remote/notification.js
--- a/src/shims/electron/remote/screen.js
+++ b/src/shims/electron/remote/screen.js
--- a/src/shims/electron/remote/session.js
+++ b/src/shims/electron/remote/session.js
--- a/src/shims/electron/remote/shell.js
+++ b/src/shims/electron/remote/shell.js
--- a/src/shims/electron/remote/system-preferences.js
+++ b/src/shims/electron/remote/system-preferences.js
--- a/src/shims/electron/remote/theme.js
+++ b/src/shims/electron/remote/theme.js
--- a/src/shims/electron/remote/window.js
+++ b/src/shims/electron/remote/window.js
--- a/src/shims/electron/web-frame.js
+++ b/src/shims/electron/web-frame.js
--- a/src/shims/fs/constants.js
+++ b/src/shims/fs/constants.js
--- a/src/shims/fs/content-cache.js
+++ b/src/shims/fs/content-cache.js
--- a/src/shims/fs/index.js
+++ b/src/shims/fs/index.js
--- a/src/shims/fs/metadata-cache.js
+++ b/src/shims/fs/metadata-cache.js
--- a/src/shims/fs/promises.js
+++ b/src/shims/fs/promises.js
--- a/src/shims/fs/sync.js
+++ b/src/shims/fs/sync.js
--- a/src/shims/fs/transport.js
+++ b/src/shims/fs/transport.js
--- a/src/shims/fs/watch.js
+++ b/src/shims/fs/watch.js
--- a/src/shims/loader.js
+++ b/src/shims/loader.js
--- a/src/shims/node/child_process.js
+++ b/src/shims/node/child_process.js
--- a/src/shims/node/events.js
+++ b/src/shims/node/events.js
--- a/src/shims/node/http.js
+++ b/src/shims/node/http.js
--- a/src/shims/node/net.js
+++ b/src/shims/node/net.js
--- a/src/shims/node/os.js
+++ b/src/shims/node/os.js
--- a/src/shims/path.js
+++ b/src/shims/path.js
--- a/src/shims/process.js
+++ b/src/shims/process.js
--- a/src/shims/request-url.js
+++ b/src/shims/request-url.js
--- a/src/shims/url.js
+++ b/src/shims/url.js
--- a/src/ui/bootstrap.js
+++ b/src/ui/bootstrap.js
--- a/src/ui/components/display/ListItem.svelte
+++ b/src/ui/components/display/ListItem.svelte
--- a/src/ui/components/input/Button.svelte
+++ b/src/ui/components/input/Button.svelte
--- a/src/ui/components/input/SearchInput.svelte
+++ b/src/ui/components/input/SearchInput.svelte
--- a/src/ui/components/layout/ConfirmDialog.svelte
+++ b/src/ui/components/layout/ConfirmDialog.svelte
--- a/src/ui/components/layout/MessageDialog.svelte
+++ b/src/ui/components/layout/MessageDialog.svelte
--- a/src/ui/components/layout/Modal.svelte
+++ b/src/ui/components/layout/Modal.svelte
--- a/src/ui/components/layout/PromptDialog.svelte
+++ b/src/ui/components/layout/PromptDialog.svelte
--- a/src/ui/components/menu/PopoverMenu.svelte
+++ b/src/ui/components/menu/PopoverMenu.svelte
--- a/src/ui/index.js
+++ b/src/ui/index.js
--- a/src/ui/views/VaultManager.svelte
+++ b/src/ui/views/VaultManager.svelte