plusui-native 0.2.69 → 0.2.70

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "plusui-native",
-  "version": "0.2.69",
+  "version": "0.2.70",
   "description": "PlusUI CLI - Build C++ desktop apps modern UI ",
   "main": "src/index.js",
   "type": "module",
@@ -27,11 +27,11 @@
     "semver": "^7.6.0",
     "which": "^4.0.0",
     "execa": "^8.0.1",
-    "plusui-native-builder": "^0.1.68",
-    "plusui-native-connect": "^0.1.68"
+    "plusui-native-builder": "^0.1.69",
+    "plusui-native-connect": "^0.1.69"
   },
   "peerDependencies": {
-    "plusui-native-connect": "^0.1.68"
+    "plusui-native-connect": "^0.1.69"
   },
   "publishConfig": {
     "access": "public"

package/src/index.js

@@ -211,8 +211,56 @@ function getCMakePath() {
     return 'cmake';
 }
 
+// Find vcvarsall.bat for Windows builds (needed for Ninja generator)
+let _vcvarsallCache = undefined;
+function findVcvarsall() {
+    if (_vcvarsallCache !== undefined) return _vcvarsallCache;
+
+    const vswherePath = 'C:\\Program Files (x86)\\Microsoft Visual Studio\\Installer\\vswhere.exe';
+    if (existsSync(vswherePath)) {
+        try {
+            const installPath = execSync(
+                `"${vswherePath}" -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath`,
+                { stdio: ['pipe', 'pipe', 'pipe'], encoding: 'utf8', timeout: 10000 }
+            ).trim();
+            if (installPath) {
+                const vcvars = join(installPath, 'VC', 'Auxiliary', 'Build', 'vcvarsall.bat');
+                if (existsSync(vcvars)) {
+                    _vcvarsallCache = vcvars;
+                    return vcvars;
+                }
+            }
+        } catch { }
+    }
+
+    // Fallback: scan known paths
+    const vsYears = ['2026', '2025', '2024', '2023', '2022', '2019'];
+    const vsEditions = ['Community', 'Professional', 'Enterprise', 'BuildTools'];
+    for (const year of vsYears) {
+        for (const edition of vsEditions) {
+            const vcvars = `C:\\Program Files\\Microsoft Visual Studio\\${year}\\${edition}\\VC\\Auxiliary\\Build\\vcvarsall.bat`;
+            if (existsSync(vcvars)) {
+                _vcvarsallCache = vcvars;
+                return vcvars;
+            }
+        }
+    }
+
+    _vcvarsallCache = null;
+    return null;
+}
+
 function runCMake(args, options = {}) {
     const cmake = getCMakePath();
+
+    // On Windows, wrap cmake in vcvarsall to ensure cl.exe is in PATH (needed for Ninja)
+    if (process.platform === 'win32') {
+        const vcvarsall = findVcvarsall();
+        if (vcvarsall) {
+            return execSync(`cmd /c ""${vcvarsall}" x64 >nul 2>&1 && "${cmake}" ${args}"`, { stdio: 'inherit', shell: true, ...options });
+        }
+    }
+
     return execSync(`"${cmake}" ${args}`, { stdio: 'inherit', ...options });
 }
 
@@ -598,6 +646,9 @@ function buildBackend(platform = null, devMode = false) {
 
     if (platformConfig.generator) {
         cmakeArgs += ` -G "${platformConfig.generator}"`;
+    } else if (process.platform === 'win32') {
+        // Use Ninja on Windows to avoid VS generator compatibility issues
+        cmakeArgs += ' -G Ninja';
     }
 
     log(`Configuring CMake...`, 'blue');
@@ -789,9 +840,15 @@ async function startBackend() {
 
     const buildDir = getDevBuildDir();
 
+    // On Windows, use Ninja generator to avoid VS generator compatibility issues
+    let generatorArgs = '';
+    if (process.platform === 'win32') {
+        generatorArgs = ' -G Ninja';
+    }
+
     // Always configure with dev mode to ensure PLUSUI_DEV_MODE is set correctly
     log('Configuring CMake...', 'blue');
-    runCMake(`-S . -B "${buildDir}" -DPLUSUI_DEV_MODE=ON`);
+    runCMake(`-S . -B "${buildDir}" -DPLUSUI_DEV_MODE=ON${generatorArgs}`);
 
     log('Compiling...', 'blue');
     runCMake(`--build "${buildDir}"`);
@@ -799,16 +856,17 @@ async function startBackend() {
     // Find executable
     let exePath;
     if (process.platform === 'win32') {
-        // Visual Studio puts exe in build/dev/<projectname>/Debug/<projectname>.exe
-        exePath = join(buildDir, projectName, 'Debug', `${projectName}.exe`);
+        // Ninja puts exe directly in build dir
+        exePath = join(buildDir, `${projectName}.exe`);
         if (!existsSync(exePath)) {
-            exePath = join(buildDir, 'Debug', `${projectName}.exe`);
+            exePath = join(buildDir, 'bin', `${projectName}.exe`);
         }
+        // Fallback for VS generator (Debug subfolder)
         if (!existsSync(exePath)) {
-            exePath = join(buildDir, 'bin', `${projectName}.exe`);
+            exePath = join(buildDir, projectName, 'Debug', `${projectName}.exe`);
         }
         if (!existsSync(exePath)) {
-            exePath = join(buildDir, `${projectName}.exe`);
+            exePath = join(buildDir, 'Debug', `${projectName}.exe`);
         }
     } else {
         exePath = join(buildDir, projectName);