plusui-native 0.2.106 → 0.2.107

package/templates/manager.js

@@ -1,275 +1,288 @@
-import { mkdir, readdir, readFile, writeFile, copyFile, stat } from 'fs/promises';
-import { join, dirname, resolve } from 'path';
-import { existsSync } from 'fs';
-import { fileURLToPath } from 'url';
-import { EnvironmentDoctor } from '../src/doctor/index.js';
-import chalk from 'chalk';
-import { spawn } from 'child_process';
-import { execSync } from 'child_process';
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-
-export class TemplateManager {
-  constructor() {
-    this.templatesDir = __dirname;
-    this.cliPackageJson = null;
-  }
-
-  async loadCliVersion() {
-    if (!this.cliPackageJson) {
-      const packageJsonPath = join(this.templatesDir, '..', 'package.json');
-      const content = await readFile(packageJsonPath, 'utf8');
-      this.cliPackageJson = JSON.parse(content);
-    }
-    return this.cliPackageJson.version;
-  }
-
-  async loadCliPackageJson() {
-    if (!this.cliPackageJson) {
-      const packageJsonPath = join(this.templatesDir, '..', 'package.json');
-      const content = await readFile(packageJsonPath, 'utf8');
-      this.cliPackageJson = JSON.parse(content);
-    }
-    return this.cliPackageJson;
-  }
-
-  getLatestPublishedVersion(packageName) {
-    try {
-      const version = execSync(`npm view ${packageName} version`, {
-        encoding: 'utf8',
-        stdio: ['pipe', 'pipe', 'ignore']
-      }).trim();
-      return version || null;
-    } catch {
-      return null;
-    }
-  }
-
-  toCompatibleRange(version) {
-    if (!version) {
-      return null;
-    }
-    return version.startsWith('^') || version.startsWith('~') ? version : `^${version}`;
-  }
-
-  async resolveTemplatePackageVersions() {
-    const cliPkg = await this.loadCliPackageJson();
-    const cliVersion = cliPkg.version;
-    const [major, minor] = cliVersion.split('.');
-
-    const fallbackCliRange = `^${major}.${minor}.0`;
-    const fallbackToolsRange = `^${major}.1.0`;
-
-    const publishedCli = this.getLatestPublishedVersion('plusui-native');
-    const publishedCore = this.getLatestPublishedVersion('plusui-native-core');
-    const publishedBuilder = this.getLatestPublishedVersion('plusui-native-builder');
-    const publishedConnect = this.getLatestPublishedVersion('plusui-native-connect');
-
-    const cliDependencyBuilder = cliPkg.dependencies?.['plusui-native-builder'] || null;
-    const cliDependencyConnect = cliPkg.dependencies?.['plusui-native-connect'] || null;
-
-    return {
-      cli: this.toCompatibleRange(publishedCli) || fallbackCliRange,
-      core: this.toCompatibleRange(publishedCore) || fallbackToolsRange,
-      builder: this.toCompatibleRange(publishedBuilder) || cliDependencyBuilder || fallbackToolsRange,
-      connect: this.toCompatibleRange(publishedConnect) || cliDependencyConnect || fallbackToolsRange
-    };
-  }
-
-  async create(projectName, options = {}) {
-    const template = options.template || 'react';
-    const templatePath = join(this.templatesDir, template);
-
-    // Determine target path and actual project name
-    let targetDirName = projectName;
-    let projectPath = resolve(projectName);
-
-    if (projectName === '.') {
-      targetDirName = require('path').basename(process.cwd());
-      projectPath = process.cwd();
-    }
-
-    console.log(chalk.bold(`\nCreating PlusUI project: ${targetDirName}\n`));
-
-    // 1. Check environment first
-    console.log(chalk.blue('Checking environment...'));
-    const doctor = new EnvironmentDoctor();
-    const quickCheck = await doctor.quickCheck();
-
-    if (!quickCheck.ready) {
-      console.log(chalk.red('\n✗ Environment not ready!\n'));
-      console.log(chalk.yellow('Run: plusui doctor --fix\n'));
-      throw new Error('Environment check failed');
-    }
-
-    console.log(chalk.green('✓ Environment ready\n'));
-
-    // 2. Create project directory
-    console.log(chalk.blue('Creating project structure...'));
-
-    if (projectName !== '.') {
-      if (existsSync(projectPath)) {
-        throw new Error(`Directory ${projectName} already exists`);
-      }
-      await mkdir(projectPath, { recursive: true });
-    } else {
-      // Warn but proceed if using current directory
-      console.log(chalk.yellow(`Initializing in current directory...`));
-    }
-
-    // 3. Resolve package versions for generated app dependencies
-    const resolvedVersions = await this.resolveTemplatePackageVersions();
-
-    // 4. Prepare template variables
-    const variables = {
-      PROJECT_NAME: targetDirName,
-      PROJECT_NAME_LOWER: targetDirName.toLowerCase(),
-      PROJECT_VERSION: '0.1.0',
-      PLUSUI_CLI_VERSION: resolvedVersions.cli,
-      PLUSUI_CORE_VERSION: resolvedVersions.core,
-      PLUSUI_BUILDER_VERSION: resolvedVersions.builder,
-      PLUSUI_CONNECT_VERSION: resolvedVersions.connect
-    };
-
-    console.log(chalk.dim(`Using versions: core=${variables.PLUSUI_CORE_VERSION}, builder=${variables.PLUSUI_BUILDER_VERSION}, connect=${variables.PLUSUI_CONNECT_VERSION}`));
-
-    // 5. Copy template files
-    await this.copyTemplate(templatePath, projectPath, variables);
-
-    // 5. Copy base files
-    const basePath = join(this.templatesDir, 'base');
-    await this.copyTemplate(basePath, projectPath, variables, true);
-
-    console.log(chalk.green('✓ Project structure created\n'));
-
-    // 6. Install npm dependencies
-    console.log(chalk.blue('Installing dependencies...'));
-    await this.runNpmInstall(projectPath);
-    console.log(chalk.green('✓ Dependencies installed\n'));
-
-    // 7. Start dev server in the created project immediately
-    process.chdir(projectPath);
-    console.log(chalk.green(`✓ Changed directory to: ${projectPath}`));
-    console.log(chalk.blue('Starting development server...'));
-    await this.runPlusuiDev(projectPath);
-
-    return { success: true, path: projectPath };
-  }
-
-  async copyTemplate(templatePath, destPath, variables, skipSubdirs = false) {
-    if (!existsSync(templatePath)) {
-      return;
-    }
-
-    const entries = await readdir(templatePath, { withFileTypes: true });
-
-    for (const entry of entries) {
-      const srcPath = join(templatePath, entry.name);
-      const destName = entry.name.replace('.template', '');
-      const destFilePath = join(destPath, destName);
-
-      if (entry.isDirectory()) {
-        if (!skipSubdirs) {
-          await mkdir(destFilePath, { recursive: true });
-          await this.copyTemplate(srcPath, destFilePath, variables, false);
-        }
-      } else {
-        // Ensure parent directory exists
-        await mkdir(dirname(destFilePath), { recursive: true });
-
-        // Read file content
-        let content = await readFile(srcPath, 'utf8');
-
-        // Replace variables
-        content = this.replaceVariables(content, variables);
-
-        // Write to destination
-        await writeFile(destFilePath, content, 'utf8');
-      }
-    }
-  }
-
-  replaceVariables(content, variables) {
-    let result = content;
-
-    for (const [key, value] of Object.entries(variables)) {
-      // Replace without spaces (e.g. {{PROJECT_NAME}})
-      result = result.split(`{{${key}}}`).join(value);
-      // Replace with spaces (e.g. {{ PROJECT_NAME }})
-      result = result.split(`{{ ${key} }}`).join(value);
-    }
-
-    return result;
-  }
-
-  async runNpmInstall(projectPath) {
-    return new Promise((resolve, reject) => {
-      const npm = process.platform === 'win32' ? 'npm.cmd' : 'npm';
-
-      // Install root dependencies
-      const rootProc = spawn(npm, ['install'], {
-        cwd: projectPath,
-        stdio: 'inherit',
-        shell: true
-      });
-
-      rootProc.on('close', (code) => {
-        if (code !== 0) {
-          reject(new Error(`npm install failed with code ${code}`));
-          return;
-        }
-
-        // Install frontend dependencies
-        const frontendPath = join(projectPath, 'frontend');
-        if (existsSync(join(frontendPath, 'package.json'))) {
-          const frontendProc = spawn(npm, ['install'], {
-            cwd: frontendPath,
-            stdio: 'inherit',
-            shell: true
-          });
-
-          frontendProc.on('close', (feCode) => {
-            if (feCode === 0) {
-              resolve();
-            } else {
-              reject(new Error(`frontend npm install failed with code ${feCode}`));
-            }
-          });
-
-          frontendProc.on('error', reject);
-        } else {
-          resolve();
-        }
-      });
-
-      rootProc.on('error', reject);
-    });
-  }
-
-  async runPlusuiDev(projectPath) {
-    return new Promise((resolve, reject) => {
-      const plusuiCmd = process.platform === 'win32' ? 'plusui.cmd' : 'plusui';
-
-      const devProc = spawn(plusuiCmd, ['dev'], {
-        cwd: projectPath,
-        stdio: 'inherit',
-        shell: true,
-      });
-
-      devProc.on('close', (code, signal) => {
-        // Normal shutdown via Ctrl+C should not be treated as an error.
-        if (signal === 'SIGINT' || code === 0 || code === null) {
-          resolve();
-          return;
-        }
-        reject(new Error(`plusui dev exited with code ${code}`));
-      });
-
-      devProc.on('error', reject);
-    });
-  }
-
-}
-
-
+import { mkdir, readdir, readFile, writeFile, copyFile, stat } from 'fs/promises';
+import { join, dirname, resolve } from 'path';
+import { existsSync } from 'fs';
+import { fileURLToPath } from 'url';
+import { EnvironmentDoctor } from '../src/doctor/index.js';
+import chalk from 'chalk';
+import { spawn } from 'child_process';
+import { execSync } from 'child_process';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+export class TemplateManager {
+  constructor() {
+    this.templatesDir = __dirname;
+    this.cliPackageJson = null;
+  }
+
+  async loadCliVersion() {
+    if (!this.cliPackageJson) {
+      const packageJsonPath = join(this.templatesDir, '..', 'package.json');
+      const content = await readFile(packageJsonPath, 'utf8');
+      this.cliPackageJson = JSON.parse(content);
+    }
+    return this.cliPackageJson.version;
+  }
+
+  async loadCliPackageJson() {
+    if (!this.cliPackageJson) {
+      const packageJsonPath = join(this.templatesDir, '..', 'package.json');
+      const content = await readFile(packageJsonPath, 'utf8');
+      this.cliPackageJson = JSON.parse(content);
+    }
+    return this.cliPackageJson;
+  }
+
+  getLatestPublishedVersion(packageName) {
+    try {
+      const version = execSync(`npm view ${packageName} version`, {
+        encoding: 'utf8',
+        stdio: ['pipe', 'pipe', 'ignore']
+      }).trim();
+      return version || null;
+    } catch {
+      return null;
+    }
+  }
+
+  toCompatibleRange(version) {
+    if (!version) {
+      return null;
+    }
+    return version.startsWith('^') || version.startsWith('~') ? version : `^${version}`;
+  }
+
+  async resolveTemplatePackageVersions() {
+    const cliPkg = await this.loadCliPackageJson();
+    const cliVersion = cliPkg.version;
+    const [major, minor] = cliVersion.split('.');
+
+    const fallbackCliRange = `^${major}.${minor}.0`;
+    const fallbackToolsRange = `^${major}.1.0`;
+
+    const publishedCli = this.getLatestPublishedVersion('plusui-native');
+    const publishedCore = this.getLatestPublishedVersion('plusui-native-core');
+    const publishedBuilder = this.getLatestPublishedVersion('plusui-native-builder');
+    const publishedConnect = this.getLatestPublishedVersion('plusui-native-connect');
+
+    const cliDependencyBuilder = cliPkg.dependencies?.['plusui-native-builder'] || null;
+    const cliDependencyConnect = cliPkg.dependencies?.['plusui-native-connect'] || null;
+
+    return {
+      cli: this.toCompatibleRange(publishedCli) || fallbackCliRange,
+      core: this.toCompatibleRange(publishedCore) || fallbackToolsRange,
+      builder: this.toCompatibleRange(publishedBuilder) || cliDependencyBuilder || fallbackToolsRange,
+      connect: this.toCompatibleRange(publishedConnect) || cliDependencyConnect || fallbackToolsRange
+    };
+  }
+
+  async create(projectName, options = {}) {
+    // Validate and sanitize project name
+    const invalidChars = projectName.replace(/[a-zA-Z0-9_-]/g, '');
+    if (invalidChars.length > 0) {
+      console.log(chalk.yellow(`\nWarning: Project name contains invalid characters: ${invalidChars}`));
+      console.log(chalk.yellow('Only lowercase letters, numbers, hyphens, and underscores are allowed.'));
+      projectName = projectName.toLowerCase().replace(/[^a-z0-9_-]/g, '-');
+      console.log(chalk.green(`Using sanitized name: ${projectName}\n`));
+    }
+
+    if (/^[0-9]/.test(projectName)) {
+      throw new Error('Project name cannot start with a number');
+    }
+
+    const template = options.template || 'react';
+    const templatePath = join(this.templatesDir, template);
+
+    // Determine target path and actual project name
+    let targetDirName = projectName;
+    let projectPath = resolve(projectName);
+
+    if (projectName === '.') {
+      targetDirName = require('path').basename(process.cwd());
+      projectPath = process.cwd();
+    }
+
+    console.log(chalk.bold(`\nCreating PlusUI project: ${targetDirName}\n`));
+
+    // 1. Check environment first
+    console.log(chalk.blue('Checking environment...'));
+    const doctor = new EnvironmentDoctor();
+    const quickCheck = await doctor.quickCheck();
+
+    if (!quickCheck.ready) {
+      console.log(chalk.red('\n✗ Environment not ready!\n'));
+      console.log(chalk.yellow('Run: plusui doctor --fix\n'));
+      throw new Error('Environment check failed');
+    }
+
+    console.log(chalk.green('✓ Environment ready\n'));
+
+    // 2. Create project directory
+    console.log(chalk.blue('Creating project structure...'));
+
+    if (projectName !== '.') {
+      if (existsSync(projectPath)) {
+        throw new Error(`Directory ${projectName} already exists`);
+      }
+      await mkdir(projectPath, { recursive: true });
+    } else {
+      // Warn but proceed if using current directory
+      console.log(chalk.yellow(`Initializing in current directory...`));
+    }
+
+    // 3. Resolve package versions for generated app dependencies
+    const resolvedVersions = await this.resolveTemplatePackageVersions();
+
+    // 4. Prepare template variables
+    const variables = {
+      PROJECT_NAME: targetDirName,
+      PROJECT_NAME_LOWER: targetDirName.toLowerCase(),
+      PROJECT_VERSION: '0.1.0',
+      PLUSUI_CLI_VERSION: resolvedVersions.cli,
+      PLUSUI_CORE_VERSION: resolvedVersions.core,
+      PLUSUI_BUILDER_VERSION: resolvedVersions.builder,
+      PLUSUI_CONNECT_VERSION: resolvedVersions.connect
+    };
+
+    console.log(chalk.dim(`Using versions: core=${variables.PLUSUI_CORE_VERSION}, builder=${variables.PLUSUI_BUILDER_VERSION}, connect=${variables.PLUSUI_CONNECT_VERSION}`));
+
+    // 5. Copy template files
+    await this.copyTemplate(templatePath, projectPath, variables);
+
+    // 5. Copy base files
+    const basePath = join(this.templatesDir, 'base');
+    await this.copyTemplate(basePath, projectPath, variables, true);
+
+    console.log(chalk.green('✓ Project structure created\n'));
+
+    // 6. Install npm dependencies
+    console.log(chalk.blue('Installing dependencies...'));
+    await this.runNpmInstall(projectPath);
+    console.log(chalk.green('✓ Dependencies installed\n'));
+
+    // 7. Start dev server in the created project immediately
+    process.chdir(projectPath);
+    console.log(chalk.green(`✓ Changed directory to: ${projectPath}`));
+    console.log(chalk.blue('Starting development server...'));
+    await this.runPlusuiDev(projectPath);
+
+    return { success: true, path: projectPath };
+  }
+
+  async copyTemplate(templatePath, destPath, variables, skipSubdirs = false) {
+    if (!existsSync(templatePath)) {
+      return;
+    }
+
+    const entries = await readdir(templatePath, { withFileTypes: true });
+
+    for (const entry of entries) {
+      const srcPath = join(templatePath, entry.name);
+      const destName = entry.name.replace('.template', '');
+      const destFilePath = join(destPath, destName);
+
+      if (entry.isDirectory()) {
+        if (!skipSubdirs) {
+          await mkdir(destFilePath, { recursive: true });
+          await this.copyTemplate(srcPath, destFilePath, variables, false);
+        }
+      } else {
+        // Ensure parent directory exists
+        await mkdir(dirname(destFilePath), { recursive: true });
+
+        // Read file content
+        let content = await readFile(srcPath, 'utf8');
+
+        // Replace variables
+        content = this.replaceVariables(content, variables);
+
+        // Write to destination
+        await writeFile(destFilePath, content, 'utf8');
+      }
+    }
+  }
+
+  replaceVariables(content, variables) {
+    let result = content;
+
+    for (const [key, value] of Object.entries(variables)) {
+      // Replace without spaces (e.g. {{PROJECT_NAME}})
+      result = result.split(`{{${key}}}`).join(value);
+      // Replace with spaces (e.g. {{ PROJECT_NAME }})
+      result = result.split(`{{ ${key} }}`).join(value);
+    }
+
+    return result;
+  }
+
+  async runNpmInstall(projectPath) {
+    return new Promise((resolve, reject) => {
+      const npm = process.platform === 'win32' ? 'npm.cmd' : 'npm';
+
+      // Install root dependencies
+      const rootProc = spawn(npm, ['install'], {
+        cwd: projectPath,
+        stdio: 'inherit',
+        shell: true
+      });
+
+      rootProc.on('close', (code) => {
+        if (code !== 0) {
+          reject(new Error(`npm install failed with code ${code}`));
+          return;
+        }
+
+        // Install frontend dependencies
+        const frontendPath = join(projectPath, 'frontend');
+        if (existsSync(join(frontendPath, 'package.json'))) {
+          const frontendProc = spawn(npm, ['install'], {
+            cwd: frontendPath,
+            stdio: 'inherit',
+            shell: true
+          });
+
+          frontendProc.on('close', (feCode) => {
+            if (feCode === 0) {
+              resolve();
+            } else {
+              reject(new Error(`frontend npm install failed with code ${feCode}`));
+            }
+          });
+
+          frontendProc.on('error', reject);
+        } else {
+          resolve();
+        }
+      });
+
+      rootProc.on('error', reject);
+    });
+  }
+
+  async runPlusuiDev(projectPath) {
+    return new Promise((resolve, reject) => {
+      const plusuiCmd = process.platform === 'win32' ? 'plusui.cmd' : 'plusui';
+
+      const devProc = spawn(plusuiCmd, ['dev'], {
+        cwd: projectPath,
+        stdio: 'inherit',
+        shell: true,
+      });
+
+      devProc.on('close', (code, signal) => {
+        // Normal shutdown via Ctrl+C should not be treated as an error.
+        if (signal === 'SIGINT' || code === 0 || code === null) {
+          resolve();
+          return;
+        }
+        reject(new Error(`plusui dev exited with code ${code}`));
+      });
+
+      devProc.on('error', reject);
+    });
+  }
+
+}
+
+

package/templates/react/frontend/vite.config.ts

@@ -31,6 +31,6 @@ export default defineConfig({
   },
   server: {
     port: 5173,
-    strictPort: true,
+    strictPort: false,
   },
 });

package/templates/react/main.cpp.template

@@ -23,7 +23,6 @@ using json = nlohmann::json;
 struct AppConfig {
     std::string name    = "{{PROJECT_NAME}}";
     std::string version = "0.1.0";
-    bool showWhenFrontendReady = true; // Hides blank webview until React mounts
 } appConfig;
 
 struct WindowConfig {
@@ -38,6 +37,7 @@ struct WindowConfig {
     bool devTools       = true;
     bool scrollbars     = false;
     bool fileDrop      = true;    // Enable file drop from OS to webview
+    bool tray          = true;    // Enable system tray
     std::string route   = "/";     // Starting route
     int devServerPort   = 5173;
 } windowConfig;
@@ -80,30 +80,28 @@ int main() {
         .skipTaskbar(!windowConfig.showInTaskbar)
         .scrollbars(windowConfig.scrollbars)
         .fileDrop(windowConfig.fileDrop)
+        .tray(windowConfig.tray)
         .centered(true)
         .build();
 
     // Icon from embedded assets
     #ifdef ASSET_ICON_PNG
         mainWindow.setIconFromMemory(ASSET_ICON_PNG, ASSET_ICON_PNG_LEN);
+        mainWindow.setTrayIconFromMemory(ASSET_ICON_PNG, ASSET_ICON_PNG_LEN);
     #endif
 
-    // Hide until frontend signals it's ready (no blank flash)
-    if (appConfig.showWhenFrontendReady) {
-        mainWindow.hide();
-    }
-
     // Wire up connect system (for custom frontend ↔ backend communication)
     // Run `plusui connect` after adding custom connect methods
     static Connect conn;
     bindConnect(mainWindow, conn);
 
-    // Load frontend
+    // Load frontend then show.
     #ifdef PLUSUI_DEV_MODE
         mainWindow.navigate("http://localhost:" + std::to_string(windowConfig.devServerPort) + windowConfig.route);
     #else
         mainWindow.loadFile("frontend/dist/index.html" + (windowConfig.route == "/" ? "" : "#" + windowConfig.route));
     #endif
+    mainWindow.show();
 
     App runtime;
     runtime.run();

package/templates/solid/frontend/vite.config.ts

@@ -31,6 +31,6 @@ export default defineConfig({
   },
   server: {
     port: 5173,
-    strictPort: true,
+    strictPort: false,
   },
 });