@fgv/ts-res-browser-cli 5.0.0-5 → 5.0.0-7

package/lib/{browserLauncher.js → simpleBrowserLauncher.js}

@@ -54,22 +54,28 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BrowserLauncher = void 0;
+exports.SimpleBrowserLauncher = void 0;
 const child_process_1 = require("child_process");
 const path = __importStar(require("path"));
-const http = __importStar(require("http"));
 const ts_utils_1 = require("@fgv/ts-utils");
 const zipArchiver_1 = require("./zipArchiver");
-const fs = __importStar(require("fs"));
 /**
- * Manages launching the browser application with specified options
+ * Simplified browser launcher using direct dependency on ts-res-browser
  */
-class BrowserLauncher {
+class SimpleBrowserLauncher {
     /**
      * Launches the browser with the specified options
      */
     async launch(options) {
         try {
+            // Validate options before proceeding
+            if (options.interactive && !options.dev && !options.serve && !options.url) {
+                return (0, ts_utils_1.fail)('Interactive mode requires either --dev/--serve to start a local server or --url to specify a remote server.\n\n' +
+                    'Examples:\n' +
+                    '  ts-res-browser-cli --interactive --dev\n' +
+                    '  ts-res-browser-cli --interactive --serve\n' +
+                    '  ts-res-browser-cli --interactive --url https://example.com/ts-res-browser');
+            }
             // Check if we need to create a ZIP archive for file-based inputs
             let zipCreated = false;
             let finalOptions = Object.assign({}, options);
@@ -91,25 +97,15 @@ class BrowserLauncher {
                     loadZip: true, zipFile: zipFileName, zipPath: zipResult.value.zipPath });
                 zipCreated = true;
             }
-            // Start development server if requested
-            if (finalOptions.dev && !finalOptions.url) {
+            // Start server if requested
+            if ((finalOptions.dev || finalOptions.serve) && !finalOptions.url) {
                 if (!finalOptions.quiet) {
-                    console.log('Starting TS-RES Browser development server...');
+                    console.log('Starting TS-RES Browser server...');
                 }
-                const serverResult = await this._startDevServer(finalOptions);
+                const serverResult = await this._startServer(finalOptions);
                 if (serverResult.isFailure()) {
                     return serverResult;
                 }
-                // Wait for server to be ready
-                const port = options.port || 3000;
-                const readyResult = await this._waitForServerReady(port, options.verbose || false);
-                if (readyResult.isFailure()) {
-                    this._stopDevServer();
-                    return readyResult;
-                }
-                if (!options.quiet) {
-                    console.log(`Development server started on port ${port}`);
-                }
             }
             // Build URL with parameters
             const url = this._buildUrl(finalOptions);
@@ -151,6 +147,39 @@ class BrowserLauncher {
             return (0, ts_utils_1.fail)(`Failed to launch browser: ${error}`);
         }
     }
+    /**
+     * Starts the server using ts-res-browser CLI directly
+     */
+    async _startServer(options) {
+        try {
+            // Use ts-res-browser directly from node_modules
+            const browserPath = require.resolve('@fgv/ts-res-browser/cli.js');
+            const command = `node "${browserPath}" ${options.dev ? 'dev' : 'serve'}`;
+            if (options.verbose) {
+                console.log(`Running: ${command}`);
+            }
+            return new Promise((resolve) => {
+                const child = (0, child_process_1.exec)(command, (error) => {
+                    if (error) {
+                        resolve((0, ts_utils_1.fail)(`Failed to start server: ${error.message}`));
+                    }
+                    else {
+                        resolve((0, ts_utils_1.succeed)(undefined));
+                    }
+                });
+                // Give server time to start, then assume success
+                setTimeout(() => {
+                    if (options.verbose) {
+                        console.log('Server startup initiated');
+                    }
+                    resolve((0, ts_utils_1.succeed)(undefined));
+                }, 2000);
+            });
+        }
+        catch (error) {
+            return (0, ts_utils_1.fail)(`Failed to start server: ${error}`);
+        }
+    }
     /**
      * Opens the browser to the specified URL
      */
@@ -174,8 +203,9 @@ class BrowserLauncher {
      * Builds the URL with query parameters based on options
      */
     _buildUrl(options) {
-        // Use provided URL or default to localhost
-        const baseUrl = options.url || `http://localhost:${options.port || 3000}`;
+        // Use provided URL or default based on server type
+        const defaultPort = options.dev ? 3000 : 8080;
+        const baseUrl = options.url || `http://localhost:${options.port || defaultPort}`;
         const params = new URLSearchParams();
         if (options.input) {
             params.set('input', options.input);
@@ -213,140 +243,6 @@ class BrowserLauncher {
         const queryString = params.toString();
         return queryString ? `${baseUrl}?${queryString}` : baseUrl;
     }
-    /**
-     * Starts the development server for ts-res-browser
-     */
-    async _startDevServer(options) {
-        try {
-            const port = options.port || 3000;
-            const env = Object.assign(Object.assign({}, process.env), { PORT: port.toString() });
-            // Detect if we're in a monorepo or using published packages
-            const isMonorepo = this._isMonorepoEnvironment();
-            if (isMonorepo) {
-                // Monorepo development: use rushx from sibling project
-                const browserProjectPath = path.resolve(__dirname, '../../ts-res-browser');
-                if (options.verbose) {
-                    console.log(`Looking for ts-res-browser at: ${browserProjectPath}`);
-                }
-                this._devServer = (0, child_process_1.spawn)('rushx', ['dev'], {
-                    cwd: browserProjectPath,
-                    env,
-                    stdio: options.verbose ? 'inherit' : ['ignore', 'pipe', 'pipe']
-                });
-            }
-            else {
-                // Published packages: dev server not available
-                return (0, ts_utils_1.fail)('Development server is not available in published packages.\n\n' +
-                    'The dev server requires webpack-cli and webpack-dev-server which are\n' +
-                    'not included in published packages to keep them lightweight.\n\n' +
-                    'To use the development server:\n' +
-                    '1. Clone the repository\n' +
-                    '2. Install dependencies: rush install\n' +
-                    '3. Run: rushx dev from tools/ts-res-browser\n\n' +
-                    'For published packages, omit the --dev flag to use static serving.');
-            }
-            this._devServer.on('error', (error) => {
-                return (0, ts_utils_1.fail)(`Failed to start development server: ${error}`);
-            });
-            // Give the server a moment to start
-            await this._sleep(3000);
-            if (this._devServer && !this._devServer.killed) {
-                if (options.verbose) {
-                    console.log('Development server process started successfully');
-                }
-                return (0, ts_utils_1.succeed)(undefined);
-            }
-            else {
-                return (0, ts_utils_1.fail)('Development server process failed to start');
-            }
-        }
-        catch (error) {
-            return (0, ts_utils_1.fail)(`Failed to start development server: ${error}`);
-        }
-    }
-    /**
-     * Waits for the development server to be ready by checking HTTP availability
-     */
-    async _waitForServerReady(port, verbose, maxAttempts = 60) {
-        for (let attempt = 1; attempt <= maxAttempts; attempt++) {
-            try {
-                const isReady = await this._checkServerHealth(port);
-                if (isReady) {
-                    if (verbose) {
-                        console.log(`Server is ready at http://localhost:${port}`);
-                    }
-                    return (0, ts_utils_1.succeed)(undefined);
-                }
-            }
-            catch (error) {
-                // Server not ready yet, continue waiting
-            }
-            if (verbose && attempt % 10 === 0) {
-                console.log(`Waiting for server to be ready... (attempt ${attempt}/${maxAttempts})`);
-            }
-            await this._sleep(1000);
-        }
-        return (0, ts_utils_1.fail)(`Server did not become ready after ${maxAttempts} attempts`);
-    }
-    /**
-     * Checks if the server is responding
-     */
-    async _checkServerHealth(port) {
-        return new Promise((resolve) => {
-            const request = http.get(`http://localhost:${port}`, (res) => {
-                resolve(res.statusCode !== undefined && res.statusCode >= 200 && res.statusCode < 400);
-            });
-            request.on('error', () => {
-                resolve(false);
-            });
-            request.setTimeout(3000, () => {
-                request.destroy();
-                resolve(false);
-            });
-        });
-    }
-    /**
-     * Stops the development server
-     */
-    _stopDevServer() {
-        if (this._devServer && !this._devServer.killed) {
-            this._devServer.kill('SIGTERM');
-            setTimeout(() => {
-                if (this._devServer && !this._devServer.killed) {
-                    this._devServer.kill('SIGKILL');
-                }
-            }, 5000);
-        }
-    }
-    /**
-     * Sleep for the specified number of milliseconds
-     */
-    _sleep(ms) {
-        return new Promise((resolve) => setTimeout(resolve, ms));
-    }
-    /**
-     * Detects if we're running in a monorepo environment
-     */
-    _isMonorepoEnvironment() {
-        try {
-            // Check if we have a rush.json file in parent directories (indicating monorepo)
-            let currentDir = __dirname;
-            for (let i = 0; i < 5; i++) {
-                // Look up to 5 levels up
-                const rushJsonPath = path.join(currentDir, 'rush.json');
-                if (fs.existsSync(rushJsonPath)) {
-                    return true;
-                }
-                currentDir = path.dirname(currentDir);
-            }
-            // Also check if ts-res-browser sibling directory exists
-            const browserProjectPath = path.resolve(__dirname, '../../ts-res-browser');
-            return (fs.existsSync(browserProjectPath) && fs.existsSync(path.join(browserProjectPath, 'package.json')));
-        }
-        catch (_a) {
-            return false;
-        }
-    }
     /**
      * Determines if a ZIP archive should be created based on the options
      */
@@ -374,12 +270,6 @@ class BrowserLauncher {
             return (0, ts_utils_1.fail)(`Failed to create ZIP archive: ${error instanceof Error ? error.message : String(error)}`);
         }
     }
-    /**
-     * Graceful shutdown - stops development server if running
-     */
-    shutdown() {
-        this._stopDevServer();
-    }
 }
-exports.BrowserLauncher = BrowserLauncher;
-//# sourceMappingURL=browserLauncher.js.map
+exports.SimpleBrowserLauncher = SimpleBrowserLauncher;
+//# sourceMappingURL=simpleBrowserLauncher.js.map

package/lib/simpleBrowserLauncher.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"simpleBrowserLauncher.js","sourceRoot":"","sources":["../src/simpleBrowserLauncher.ts"],"names":[],"mappings":"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","sourcesContent":["/*\n * Copyright (c) 2025 Erik Fortune\n *\n * Permission is hereby granted, free of charge, to any person obtaining a copy\n * of this software and associated documentation files (the \"Software\"), to deal\n * in the Software without restriction, including without limitation the rights\n * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n * copies of the Software, and to permit persons to whom the Software is\n * furnished to do so, subject to the following conditions:\n *\n * The above copyright notice and this permission notice shall be included in all\n * copies or substantial portions of the Software.\n *\n * THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n * SOFTWARE.\n */\n\nimport { exec } from 'child_process';\nimport * as path from 'path';\nimport * as http from 'http';\nimport { Result, succeed, fail } from '@fgv/ts-utils';\nimport { IBrowseOptions } from './options';\nimport { zipArchiver } from './zipArchiver';\n\n/**\n * Simplified browser launcher using direct dependency on ts-res-browser\n */\nexport class SimpleBrowserLauncher {\n  /**\n   * Launches the browser with the specified options\n   */\n  public async launch(options: IBrowseOptions): Promise<Result<void>> {\n    try {\n      // Validate options before proceeding\n      if (options.interactive && !options.dev && !options.serve && !options.url) {\n        return fail(\n          'Interactive mode requires either --dev/--serve to start a local server or --url to specify a remote server.\\n\\n' +\n            'Examples:\\n' +\n            '  ts-res-browser-cli --interactive --dev\\n' +\n            '  ts-res-browser-cli --interactive --serve\\n' +\n            '  ts-res-browser-cli --interactive --url https://example.com/ts-res-browser'\n        );\n      }\n\n      // Check if we need to create a ZIP archive for file-based inputs\n      let zipCreated = false;\n      let finalOptions = { ...options };\n\n      if (this._shouldCreateZip(options)) {\n        if (!options.quiet) {\n          console.log('Creating ZIP archive for file-based resources...');\n        }\n\n        const zipResult = await this._createZipArchive(options);\n        if (zipResult.isFailure()) {\n          return fail(`Failed to create ZIP archive: ${zipResult.message}`);\n        }\n\n        if (!options.quiet) {\n          console.log(`ZIP archive created: ${zipResult.value.zipPath}`);\n        }\n\n        // Modify options to use ZIP loading instead of file paths\n        const zipFileName = path.basename(zipResult.value.zipPath);\n        finalOptions = {\n          ...options,\n          input: undefined,\n          config: undefined,\n          // Add ZIP loading parameters\n          loadZip: true,\n          zipFile: zipFileName,\n          zipPath: zipResult.value.zipPath\n        };\n        zipCreated = true;\n      }\n\n      // Start server if requested\n      if ((finalOptions.dev || finalOptions.serve) && !finalOptions.url) {\n        if (!finalOptions.quiet) {\n          console.log('Starting TS-RES Browser server...');\n        }\n\n        const serverResult = await this._startServer(finalOptions);\n        if (serverResult.isFailure()) {\n          return serverResult;\n        }\n      }\n\n      // Build URL with parameters\n      const url = this._buildUrl(finalOptions);\n\n      if (!finalOptions.quiet) {\n        console.log('Opening TS-RES Browser...');\n        if (zipCreated) {\n          console.log('ZIP archive created - browser will load from Downloads folder');\n        } else {\n          if (finalOptions.input) {\n            console.log(`Resource file: ${finalOptions.input}`);\n          }\n          if (finalOptions.config) {\n            console.log(`Configuration: ${finalOptions.config}`);\n          }\n        }\n        if (finalOptions.contextFilter) {\n          console.log(`Context filter: ${finalOptions.contextFilter}`);\n        }\n        console.log(`URL: ${url}`);\n      }\n\n      // Open browser if requested (default to true)\n      const shouldOpen = finalOptions.open !== false;\n      if (shouldOpen) {\n        const openResult = await this._openBrowser(url, finalOptions.verbose || false);\n        if (openResult.isFailure()) {\n          return fail(`Could not open browser: ${openResult.message}`);\n        }\n\n        if (!finalOptions.quiet) {\n          console.log('Browser opened successfully');\n        }\n      } else {\n        console.log(`Browser URL: ${url}`);\n      }\n\n      return succeed(undefined);\n    } catch (error) {\n      return fail(`Failed to launch browser: ${error}`);\n    }\n  }\n\n  /**\n   * Starts the server using ts-res-browser CLI directly\n   */\n  private async _startServer(options: IBrowseOptions): Promise<Result<void>> {\n    try {\n      // Use ts-res-browser directly from node_modules\n      const browserPath = require.resolve('@fgv/ts-res-browser/cli.js');\n      const command = `node \"${browserPath}\" ${options.dev ? 'dev' : 'serve'}`;\n\n      if (options.verbose) {\n        console.log(`Running: ${command}`);\n      }\n\n      return new Promise((resolve) => {\n        const child = exec(command, (error) => {\n          if (error) {\n            resolve(fail(`Failed to start server: ${error.message}`));\n          } else {\n            resolve(succeed(undefined));\n          }\n        });\n\n        // Give server time to start, then assume success\n        setTimeout(() => {\n          if (options.verbose) {\n            console.log('Server startup initiated');\n          }\n          resolve(succeed(undefined));\n        }, 2000);\n      });\n    } catch (error) {\n      return fail(`Failed to start server: ${error}`);\n    }\n  }\n\n  /**\n   * Opens the browser to the specified URL\n   */\n  private async _openBrowser(url: string, verbose: boolean): Promise<Result<void>> {\n    return new Promise((resolve) => {\n      const command =\n        process.platform === 'darwin' ? 'open' : process.platform === 'win32' ? 'start \"\"' : 'xdg-open';\n\n      exec(`${command} \"${url}\"`, (error) => {\n        if (error) {\n          resolve(fail(`Failed to open browser: ${error.message}`));\n        } else {\n          if (verbose) {\n            console.log(`Opened browser to: ${url}`);\n          }\n          resolve(succeed(undefined));\n        }\n      });\n    });\n  }\n\n  /**\n   * Builds the URL with query parameters based on options\n   */\n  private _buildUrl(options: IBrowseOptions): string {\n    // Use provided URL or default based on server type\n    const defaultPort = options.dev ? 3000 : 8080;\n    const baseUrl = options.url || `http://localhost:${options.port || defaultPort}`;\n    const params = new URLSearchParams();\n\n    if (options.input) {\n      params.set('input', options.input);\n    }\n\n    if (options.config) {\n      params.set('config', options.config);\n    }\n\n    if (options.contextFilter) {\n      params.set('contextFilter', options.contextFilter);\n    }\n\n    if (options.qualifierDefaults) {\n      params.set('qualifierDefaults', options.qualifierDefaults);\n    }\n\n    if (options.resourceTypes) {\n      params.set('resourceTypes', options.resourceTypes);\n    }\n\n    if (options.maxDistance !== undefined) {\n      params.set('maxDistance', options.maxDistance.toString());\n    }\n\n    if (options.reduceQualifiers) {\n      params.set('reduceQualifiers', 'true');\n    }\n\n    if (options.interactive) {\n      params.set('interactive', 'true');\n    }\n\n    if (options.loadZip) {\n      params.set('loadZip', 'true');\n    }\n\n    if (options.zipFile) {\n      params.set('zipFile', options.zipFile);\n    }\n\n    if (options.zipPath) {\n      params.set('zipPath', options.zipPath);\n    }\n\n    const queryString = params.toString();\n    return queryString ? `${baseUrl}?${queryString}` : baseUrl;\n  }\n\n  /**\n   * Determines if a ZIP archive should be created based on the options\n   */\n  private _shouldCreateZip(options: IBrowseOptions): boolean {\n    // Create ZIP if input or config are file paths (not predefined names)\n    const hasFilePath = (path: string | undefined): boolean => {\n      if (!path) return false;\n      // Check if it's a file path (contains directory separators or file extensions)\n      return path.includes('/') || path.includes('\\\\') || (path.includes('.') && !path.startsWith('.'));\n    };\n\n    return hasFilePath(options.input) || hasFilePath(options.config);\n  }\n\n  /**\n   * Creates a ZIP archive containing the input and config files\n   */\n  private async _createZipArchive(\n    options: IBrowseOptions\n  ): Promise<Result<{ zipPath: string; manifest: any }>> {\n    try {\n      return await zipArchiver.createArchive({\n        input: options.input,\n        config: options.config\n      });\n    } catch (error) {\n      return fail(`Failed to create ZIP archive: ${error instanceof Error ? error.message : String(error)}`);\n    }\n  }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fgv/ts-res-browser-cli",
-  "version": "5.0.0-5",
+  "version": "5.0.0-7",
   "description": "Command-line interface to launch ts-res-browser with specified options",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -24,10 +24,11 @@
     "commander": "^11.0.0",
     "archiver": "~7.0.1",
     "@types/archiver": "~6.0.3",
-    "@fgv/ts-utils": "5.0.0-5",
-    "@fgv/ts-json": "5.0.0-5",
-    "@fgv/ts-json-base": "5.0.0-5",
-    "@fgv/ts-res": "5.0.0-5"
+    "@fgv/ts-res": "5.0.0-7",
+    "@fgv/ts-utils": "5.0.0-7",
+    "@fgv/ts-json-base": "5.0.0-7",
+    "@fgv/ts-json": "5.0.0-7",
+    "@fgv/ts-res-browser": "5.0.0-7"
   },
   "devDependencies": {
     "@rushstack/heft": "~0.74.0",
@@ -37,7 +38,7 @@
     "eslint": "^8.57.0",
     "jest": "^29.7.0",
     "typescript": "^5.7.3",
-    "@fgv/ts-utils-jest": "5.0.0-5"
+    "@fgv/ts-utils-jest": "5.0.0-7"
   },
   "scripts": {
     "build": "heft build --clean",

package/rush-logs/ts-res-browser-cli.build.cache.log

@@ -1,3 +1,3 @@
 Caching build output folders: lib, .rush/temp/operation/build
 Successfully set cache entry.
-Cache key: fc74ac6ba66e84321a437fc3494453b741d38afe
+Cache key: 7c88cbdeb72af5203580a2129e58017054b28dac

package/rush-logs/ts-res-browser-cli.build.log

@@ -1,5 +1,5 @@
 Invoking: heft build --clean 
  ---- build started ---- 
 [build:typescript] Using TypeScript version 5.8.3
- ---- build finished (5.006s) ---- 
--------------------- Finished (5.011s) --------------------
+ ---- build finished (2.328s) ---- 
+-------------------- Finished (2.332s) --------------------

package/src/cli.ts

@@ -27,20 +27,19 @@ import { promises as fs } from 'fs';
 import * as path from 'path';
 
 import { IBrowseOptions, IBrowseCommandOptions } from './options';
-import { BrowserLauncher } from './browserLauncher';
+import { SimpleBrowserLauncher } from './simpleBrowserLauncher';
 
 /**
  * Main CLI class for ts-res-browser-cli
  */
 export class TsResBrowserCliApp {
   private readonly _program: Command;
-  private readonly _launcher: BrowserLauncher;
+  private readonly _launcher: SimpleBrowserLauncher;
 
   public constructor() {
     this._program = new Command();
-    this._launcher = new BrowserLauncher();
+    this._launcher = new SimpleBrowserLauncher();
     this._setupCommands();
-    this._setupGracefulShutdown();
   }
 
   /**
@@ -89,6 +88,11 @@ export class TsResBrowserCliApp {
       .option('--no-open', 'Do not open browser automatically')
       .option('--interactive', 'Launch in interactive mode with sample data', false)
       .option('--dev', 'Automatically start development server locally', false)
+      .option(
+        '--serve',
+        'Start server (dev in monorepo, serve in published packages) and connect automatically',
+        false
+      )
       .action(async (options) => {
         // If no options provided, show help
         if (!this._hasOptions(options)) {
@@ -130,6 +134,11 @@ export class TsResBrowserCliApp {
       .option('--no-open', 'Do not open browser automatically')
       .option('--interactive', 'Launch in interactive mode with sample data', false)
       .option('--dev', 'Automatically start development server locally', false)
+      .option(
+        '--serve',
+        'Start server (dev in monorepo, serve in published packages) and connect automatically',
+        false
+      )
       .action(async (options) => {
         await this._handleBrowseCommand(options);
       });
@@ -167,7 +176,8 @@ export class TsResBrowserCliApp {
       options.reduceQualifiers ||
       options.interactive ||
       options.url ||
-      options.dev
+      options.dev ||
+      options.serve
     );
   }
 
@@ -398,7 +408,8 @@ export class TsResBrowserCliApp {
         url: options.url,
         open: options.open,
         interactive: options.interactive || false,
-        dev: options.dev || false
+        dev: options.dev || false,
+        serve: options.serve || false
       };
 
       return succeed(browseOptions);
@@ -406,18 +417,4 @@ export class TsResBrowserCliApp {
       return fail(`Failed to parse options: ${error}`);
     }
   }
-
-  /**
-   * Sets up graceful shutdown handling
-   */
-  private _setupGracefulShutdown(): void {
-    const shutdown = (signal: string) => {
-      console.log(`\nReceived ${signal}, shutting down gracefully...`);
-      this._launcher.shutdown();
-      process.exit(0);
-    };
-
-    process.on('SIGINT', () => shutdown('SIGINT'));
-    process.on('SIGTERM', () => shutdown('SIGTERM'));
-  }
 }

package/src/index.ts

@@ -23,4 +23,4 @@
 // Export main components
 export * from './cli';
 export * from './options';
-export * from './browserLauncher';
+export * from './simpleBrowserLauncher';

package/src/options.ts

@@ -95,6 +95,11 @@ export interface IBrowseOptions {
    */
   dev?: boolean;
 
+  /**
+   * Whether to start server (dev in monorepo, serve in published packages) and connect automatically
+   */
+  serve?: boolean;
+
   /**
    * Whether to use ZIP loading mode (internal flag)
    */
@@ -130,4 +135,5 @@ export interface IBrowseCommandOptions {
   interactive?: boolean;
   url?: string;
   dev?: boolean;
+  serve?: boolean;
 }