forked from jsnbuchanan/crowd-funder-for-time-pwa
3ec2364394
This commit updates the Electron preload script and type definitions to improve SQLite integration and IPC communication. The changes include: - Enhanced preload script (electron/src/preload.ts): * Added detailed logging for SQLite operations and IPC communication * Implemented retry logic for SQLite operations (3 attempts, 1s delay) * Added proper type definitions for SQLite connection options * Defined strict channel validation for IPC communication * Improved error handling and logging throughout - Updated type definitions (src/types/electron.d.ts): * Aligned ElectronAPI interface with actual implementation * Added proper typing for all SQLite operations * Added environment variables (platform, isDev) * Structured IPC renderer interface with proper method signatures Current Status: - Preload script initializes successfully - SQLite availability check works (returns true) - SQLite ready signal is properly received - Database operations are failing with two types of errors: 1. "CapacitorSQLite not available" during initialization 2. "Cannot read properties of undefined" for SQLite methods Next Steps: - Verify context bridge exposure in renderer process - Check main process SQLite handlers - Debug database initialization - Address Content Security Policy warning Affected Files: - Modified: electron/src/preload.ts - Modified: src/types/electron.d.ts Note: This is a transitional commit. While the preload script and type definitions are now properly structured, database operations are not yet functional. Further debugging and fixes are required to resolve the SQLite integration issues.
97 lines
3.3 KiB
JavaScript
97 lines
3.3 KiB
JavaScript
const fs = require("fs");
|
|
const fse = require("fs-extra");
|
|
const path = require("path");
|
|
const { execSync } = require('child_process');
|
|
|
|
console.log("Starting Electron build finalization...");
|
|
|
|
// Define paths
|
|
const distPath = path.join(__dirname, "..", "dist");
|
|
const electronDistPath = path.join(__dirname, "..", "dist-electron");
|
|
const wwwPath = path.join(electronDistPath, "www");
|
|
const builtIndexPath = path.join(distPath, "index.html");
|
|
const finalIndexPath = path.join(wwwPath, "index.html");
|
|
|
|
// Ensure target directory exists
|
|
if (!fs.existsSync(wwwPath)) {
|
|
fs.mkdirSync(wwwPath, { recursive: true });
|
|
}
|
|
|
|
// Copy assets directory
|
|
const assetsSrc = path.join(distPath, "assets");
|
|
const assetsDest = path.join(wwwPath, "assets");
|
|
if (fs.existsSync(assetsSrc)) {
|
|
fse.copySync(assetsSrc, assetsDest, { overwrite: true });
|
|
}
|
|
|
|
// Copy favicon.ico
|
|
const faviconSrc = path.join(distPath, "favicon.ico");
|
|
if (fs.existsSync(faviconSrc)) {
|
|
fs.copyFileSync(faviconSrc, path.join(wwwPath, "favicon.ico"));
|
|
}
|
|
|
|
// Copy manifest.webmanifest
|
|
const manifestSrc = path.join(distPath, "manifest.webmanifest");
|
|
if (fs.existsSync(manifestSrc)) {
|
|
fs.copyFileSync(manifestSrc, path.join(wwwPath, "manifest.webmanifest"));
|
|
}
|
|
|
|
// Load and modify index.html from Vite output
|
|
let indexContent = fs.readFileSync(builtIndexPath, "utf-8");
|
|
|
|
// Inject the window.process shim after the first <script> block
|
|
indexContent = indexContent.replace(
|
|
/<script[^>]*type="module"[^>]*>/,
|
|
match => `${match}\n window.process = { env: { VITE_PLATFORM: 'electron' } };`
|
|
);
|
|
|
|
// Write the modified index.html to dist-electron/www
|
|
fs.writeFileSync(finalIndexPath, indexContent);
|
|
|
|
// Copy preload script to resources
|
|
const preloadSrc = path.join(electronDistPath, "preload.mjs");
|
|
const preloadDest = path.join(electronDistPath, "resources", "preload.js");
|
|
|
|
// Ensure resources directory exists
|
|
const resourcesDir = path.join(electronDistPath, "resources");
|
|
if (!fs.existsSync(resourcesDir)) {
|
|
fs.mkdirSync(resourcesDir, { recursive: true });
|
|
}
|
|
|
|
if (fs.existsSync(preloadSrc)) {
|
|
// Read the preload script
|
|
let preloadContent = fs.readFileSync(preloadSrc, 'utf-8');
|
|
|
|
// Convert ESM to CommonJS if needed
|
|
preloadContent = preloadContent
|
|
.replace(/import\s*{\s*([^}]+)\s*}\s*from\s*['"]electron['"];?/g, 'const { $1 } = require("electron");')
|
|
.replace(/export\s*{([^}]+)};?/g, '')
|
|
.replace(/export\s+default\s+([^;]+);?/g, 'module.exports = $1;');
|
|
|
|
// Write the modified preload script
|
|
fs.writeFileSync(preloadDest, preloadContent);
|
|
console.log("Preload script copied and converted to resources directory");
|
|
} else {
|
|
console.error("Preload script not found at:", preloadSrc);
|
|
process.exit(1);
|
|
}
|
|
|
|
// Copy capacitor.config.json to dist-electron
|
|
try {
|
|
console.log("Copying capacitor.config.json to dist-electron...");
|
|
const configPath = path.join(process.cwd(), 'capacitor.config.json');
|
|
const targetPath = path.join(process.cwd(), 'dist-electron', 'capacitor.config.json');
|
|
|
|
if (!fs.existsSync(configPath)) {
|
|
throw new Error('capacitor.config.json not found in project root');
|
|
}
|
|
|
|
fs.copyFileSync(configPath, targetPath);
|
|
console.log("Successfully copied capacitor.config.json");
|
|
} catch (error) {
|
|
console.error("Failed to copy capacitor.config.json:", error);
|
|
throw error;
|
|
}
|
|
|
|
console.log("Electron index.html copied and patched for Electron context.");
|