npm - docs-combiner - Versions diffs - 0.0.1 → 0.1.1 - Mend

docs-combiner 0.0.1 → 0.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/cli.js CHANGED Viewed

@@ -1,13 +1,31 @@
 #!/usr/bin/env node
-const { spawn } = require('child_process');
+const spawn = require('cross-spawn');
 const electron = require('electron');
 const path = require('path');
+// require('electron') returns the path to Electron's executable from node_modules/electron
+// On Windows: .../node_modules/electron/dist/electron.exe
+// On macOS: .../node_modules/electron/dist/Electron.app/Contents/MacOS/Electron
+// On Linux: .../node_modules/electron/dist/electron
+const electronPath = electron;
+// Path to the app directory (where package.json and dist/ are located)
+// When installed via npx, __dirname points to the installed package location
 const appPath = path.join(__dirname);
-const child = spawn(electron, [appPath], { stdio: 'inherit' });
+// Use cross-spawn for cross-platform compatibility
+// cross-spawn correctly handles Windows paths, .exe extensions, and spaces in paths
+const child = spawn(electronPath, [appPath], {
+  stdio: 'inherit'
+});
+child.on('error', (err) => {
+  console.error('Failed to start Electron:', err.message);
+  process.exit(1);
+});
 child.on('close', (code) => {
-  process.exit(code);
+  process.exit(code || 0);
 });

package/dist/index.html CHANGED Viewed

@@ -1,11 +1,56 @@
 <!DOCTYPE html>
-<html>
+<html style="background-color: #ffffff; color: #000000;">
 <head>
     <meta charset="UTF-8">
     <title>Docs Combiner</title>
+    <style>
+        /* Set theme styles immediately to prevent white flash */
+        /* Default to light theme, then switch to dark if needed */
+        html {
+            background-color: #ffffff !important;
+            color: #000000 !important;
+        }
+        html[data-theme="dark"] {
+            background-color: #121212 !important;
+            color: #ffffff !important;
+        }
+        body {
+            margin: 0;
+            padding: 0;
+            background-color: inherit !important;
+            color: inherit !important;
+        }
+        #root {
+            background-color: inherit !important;
+            color: inherit !important;
+            min-height: 100vh;
+            width: 100vw;
+            height: 100vh;
+            margin: 0;
+            padding: 0;
+        }
+    </style>
+    <script>
+        // Execute immediately, before any rendering
+        (function() {
+            try {
+                const savedTheme = localStorage.getItem('themeMode');
+                const isDark = savedTheme === 'dark';
+                if (isDark) {
+                    document.documentElement.setAttribute('data-theme', 'dark');
+                    document.documentElement.style.setProperty('background-color', '#121212', 'important');
+                    document.documentElement.style.setProperty('color', '#ffffff', 'important');
+                } else {
+                    document.documentElement.removeAttribute('data-theme');
+                    document.documentElement.style.setProperty('background-color', '#ffffff', 'important');
+                    document.documentElement.style.setProperty('color', '#000000', 'important');
+                }
+            } catch(e) {}
+        })();
+    </script>
 <script defer src="./renderer.js"></script></head>
-<body>
-    <div id="root"></div>
+<body style="background-color: inherit; color: inherit;">
+    <div id="root" style="background-color: inherit; color: inherit;"></div>
     <!-- Webpack will inject the bundle here -->
 </body>
 </html>

package/dist/main.js CHANGED Viewed

@@ -48,9 +48,23 @@ const fs = __importStar(require("fs"));
 const http = __importStar(require("http"));
 const url = __importStar(require("url"));
 function createWindow() {
+    // Try to read theme preference from localStorage file
+    // In Electron, localStorage is stored in a specific location
+    let backgroundColor = '#ffffff'; // Default light theme
+    try {
+        const userDataPath = electron_1.app.getPath('userData');
+        // Electron stores localStorage in Local Storage file
+        // For now, we'll default to light and let preload handle it
+        // But we can try to read from the actual localStorage file if needed
+    }
+    catch (e) {
+        // Use default
+    }
     const mainWindow = new electron_1.BrowserWindow({
         width: 1000,
         height: 800,
+        backgroundColor: '#121212', // Set to dark by default, will be corrected by preload if light
+        show: false, // Don't show until ready to prevent flash
         webPreferences: {
             preload: path.join(__dirname, 'preload.js'),
             nodeIntegration: false,
@@ -58,6 +72,25 @@ function createWindow() {
             sandbox: false
         },
     });
+    // Show window only after page is ready to prevent white flash
+    mainWindow.webContents.once('did-finish-load', () => {
+        // Ensure theme is applied before showing
+        mainWindow.webContents.executeJavaScript(`
+      (function() {
+        const savedTheme = localStorage.getItem('themeMode');
+        const isDark = savedTheme === 'dark';
+        const bgColor = isDark ? '#121212' : '#ffffff';
+        document.documentElement.style.setProperty('background-color', bgColor, 'important');
+        document.body.style.setProperty('background-color', bgColor, 'important');
+        const root = document.getElementById('root');
+        if (root) root.style.setProperty('background-color', bgColor, 'important');
+      })();
+    `).then(() => {
+            mainWindow.show();
+        }).catch(() => {
+            mainWindow.show();
+        });
+    });
     // We need to point to the webpack output html
     mainWindow.loadFile(path.join(__dirname, 'index.html'));
     // DevTools disabled by default as requested
@@ -147,6 +180,33 @@ electron_1.app.whenReady().then(() => {
     electron_1.ipcMain.handle('open-external', (event, url) => __awaiter(void 0, void 0, void 0, function* () {
         yield electron_1.shell.openExternal(url);
     }));
+    electron_1.ipcMain.handle('log', (event, level, ...args) => __awaiter(void 0, void 0, void 0, function* () {
+        const timestamp = new Date().toISOString();
+        const message = args.map(arg => {
+            if (typeof arg === 'object') {
+                try {
+                    return JSON.stringify(arg, null, 2);
+                }
+                catch (_a) {
+                    return String(arg);
+                }
+            }
+            return String(arg);
+        }).join(' ');
+        const formattedMessage = `[${timestamp}] ${message}`;
+        switch (level) {
+            case 'log':
+            case 'info':
+                console.log(formattedMessage);
+                break;
+            case 'warn':
+                console.warn(formattedMessage);
+                break;
+            case 'error':
+                console.error(formattedMessage);
+                break;
+        }
+    }));
     createWindow();
     electron_1.app.on('activate', function () {
         if (electron_1.BrowserWindow.getAllWindows().length === 0)

package/dist/preload.js CHANGED Viewed

@@ -1,6 +1,52 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const electron_1 = require("electron");
+// Set theme immediately before React loads to prevent white flash
+// This runs in Electron's preload context, before the page loads
+(function () {
+    // Use DOMContentLoaded to ensure DOM is ready, but execute as early as possible
+    const applyTheme = () => {
+        try {
+            const savedTheme = localStorage.getItem('themeMode');
+            const isDark = savedTheme === 'dark';
+            const bgColor = isDark ? '#121212' : '#ffffff';
+            const textColor = isDark ? '#ffffff' : '#000000';
+            // Set data-theme attribute for CSS fallback
+            if (isDark) {
+                document.documentElement.setAttribute('data-theme', 'dark');
+            }
+            else {
+                document.documentElement.removeAttribute('data-theme');
+            }
+            // Set inline styles with !important for highest priority
+            document.documentElement.style.setProperty('background-color', bgColor, 'important');
+            document.documentElement.style.setProperty('color', textColor, 'important');
+            // Set body styles when available
+            if (document.body) {
+                document.body.style.setProperty('background-color', bgColor, 'important');
+                document.body.style.setProperty('color', textColor, 'important');
+            }
+            // Set root element styles when available (for lock screen)
+            const root = document.getElementById('root');
+            if (root) {
+                root.style.setProperty('background-color', bgColor, 'important');
+                root.style.setProperty('color', textColor, 'important');
+            }
+        }
+        catch (e) {
+            // Ignore errors if localStorage is not available yet
+        }
+    };
+    // Try immediately, and also on DOMContentLoaded as fallback
+    if (document.readyState === 'loading') {
+        document.addEventListener('DOMContentLoaded', applyTheme);
+    }
+    else {
+        applyTheme();
+    }
+    // Also try immediately (in case DOM is already ready)
+    applyTheme();
+})();
 electron_1.contextBridge.exposeInMainWorld('electronAPI', {
     // Add any specific API requirements here if needed
     // For now, standard browser fetch works for many things, but if we need
@@ -10,4 +56,5 @@ electron_1.contextBridge.exposeInMainWorld('electronAPI', {
     loadConfig: () => electron_1.ipcRenderer.invoke('load-config'),
     startAuth: (clientId) => electron_1.ipcRenderer.invoke('start-auth', clientId),
     openExternal: (url) => electron_1.ipcRenderer.invoke('open-external', url),
+    log: (level, ...args) => electron_1.ipcRenderer.invoke('log', level, ...args),
 });