@gxp-dev/tools 2.0.13 → 2.0.15

package/bin/lib/tui/App.tsx

@@ -451,30 +451,33 @@ export default function App({ autoStart, args }: AppProps) {
   };
 
   const addSystemLog = (message: string) => {
-    // Find or create system service for general messages
-    let systemService = services.find(s => s.id === 'system');
-    if (!systemService) {
-      const newService: Service = {
-        id: 'system',
-        name: 'System',
-        status: 'running',
-        logs: [message],
-      };
-      setServices(prev => {
-        const updated = [...prev, newService];
-        return updated;
-      });
-      if (services.length === 0) setActiveTab(0);
-    } else {
-      setServices(prev => prev.map(s =>
-        s.id === 'system' ? { ...s, logs: [...s.logs, message] } : s
-      ));
-    }
+    // Use functional update to properly handle rapid successive calls
+    setServices(prev => {
+      const existingSystem = prev.find(s => s.id === 'system');
+      if (existingSystem) {
+        // Add message to existing system service
+        return prev.map(s =>
+          s.id === 'system' ? { ...s, logs: [...s.logs, message] } : s
+        );
+      } else {
+        // Create new system service with the message
+        const newService: Service = {
+          id: 'system',
+          name: 'System',
+          status: 'running',
+          logs: [message],
+        };
+        return [...prev, newService];
+      }
+    });
 
     // Switch to system tab
     setTimeout(() => {
-      const sysIdx = services.findIndex(s => s.id === 'system');
-      if (sysIdx >= 0) setActiveTab(sysIdx);
+      setServices(current => {
+        const sysIdx = current.findIndex(s => s.id === 'system');
+        if (sysIdx >= 0) setActiveTab(sysIdx);
+        return current; // Don't modify, just read
+      });
     }, 50);
   };
 
@@ -524,11 +527,21 @@ export default function App({ autoStart, args }: AppProps) {
       // Use dynamic imports for ES modules
       const path = await import('path');
       const fs = await import('fs');
+      const url = await import('url');
       const { createRequire } = await import('module');
 
+      // Get the directory of this file and resolve to the utils directory
+      const __filename = url.fileURLToPath(import.meta.url);
+      const __dirname = path.dirname(__filename);
+
+      // The compiled JS is in dist/tui/, utils is in bin/lib/utils/
+      // From dist/tui/ we need to go up to package root, then into bin/lib/utils/
+      const packageRoot = path.resolve(__dirname, '..', '..');
+      const utilsPath = path.join(packageRoot, 'bin', 'lib', 'utils', 'extract-config.js');
+
       // Create a require function to load CommonJS modules
-      const require = createRequire(import.meta.url);
-      const extractConfigUtils = require('../utils/extract-config.js') as {
+      const requireCjs = createRequire(import.meta.url);
+      const extractConfigUtils = requireCjs(utilsPath) as {
         extractConfigFromSource: (srcDir: string) => ExtractedConfig;
         mergeConfig: (existing: Record<string, unknown>, extracted: ExtractedConfig, options: { overwrite: boolean }) => Record<string, unknown>;
         generateSummary: (config: ExtractedConfig) => string;

package/bin/lib/tui/services/ExtensionService.ts

@@ -20,6 +20,37 @@ function getToolkitRoot(): string {
   return path.resolve(__dirname, '..', '..', '..');
 }
 
+/**
+ * Generate extension defaults based on environment variables
+ * This creates a defaults.json file that the popup.js reads on load
+ */
+function generateExtensionDefaults(extensionPath: string, useHttps: boolean, port: number | string): void {
+  const protocol = useHttps ? 'https' : 'http';
+  const baseUrl = `${protocol}://localhost:${port}`;
+
+  const defaults = {
+    // Extension should be enabled by default when launched from CLI
+    enabled: true,
+    // JS redirect URL based on env
+    jsRedirectUrl: `${baseUrl}/src/Plugin.vue`,
+    // CSS redirect URL (empty by default, uses blank CSS)
+    cssRedirectUrl: '',
+    // CSS override should be enabled by default
+    cssRuleEnabled: true,
+    // Return blank CSS by default
+    cssReturnBlank: true,
+    // Use custom URL pattern by default
+    jsUseCustomPattern: true,
+    cssUseCustomPattern: true,
+    // Cache settings
+    clearCacheOnEnable: true,
+    disableCacheForRedirects: true,
+  };
+
+  const defaultsPath = path.join(extensionPath, 'defaults.json');
+  fs.writeFileSync(defaultsPath, JSON.stringify(defaults, null, 2));
+}
+
 // Find the extension path (project-local or toolkit built-in)
 function findExtensionPath(browser: BrowserType, cwd: string): string | null {
   // Check local project first
@@ -64,6 +95,9 @@ export function startExtension(options: ExtensionOptions): void {
     return;
   }
 
+  // Generate defaults.json for the extension based on environment
+  generateExtensionDefaults(extensionPath, useHttps, port);
+
   if (browser === 'firefox') {
     const config: ServiceConfig = {
       id: serviceId,

package/browser-extensions/chrome/manifest.json

@@ -56,7 +56,7 @@
   },
   
   "web_accessible_resources": [{
-    "resources": ["content.js", "inspector.js", "panel.html", "panel.js"],
+    "resources": ["content.js", "inspector.js", "panel.html", "panel.js", "defaults.json"],
     "matches": ["<all_urls>"]
   }],