plusui-native 0.2.72 → 0.2.73

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "plusui-native",
-  "version": "0.2.72",
+  "version": "0.2.73",
   "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.71",
-    "plusui-native-connect": "^0.1.71"
+    "plusui-native-builder": "^0.1.72",
+    "plusui-native-connect": "^0.1.72"
   },
   "peerDependencies": {
-    "plusui-native-connect": "^0.1.71"
+    "plusui-native-connect": "^0.1.72"
   },
   "publishConfig": {
     "access": "public"

package/src/index.js

@@ -250,14 +250,57 @@ function findVcvarsall() {
     return null;
 }
 
+// Capture the full environment from vcvarsall.bat (cached per session)
+let _vcEnvCache = undefined;
+function getVcEnvironment() {
+    if (_vcEnvCache !== undefined) return _vcEnvCache;
+
+    if (process.platform !== 'win32') {
+        _vcEnvCache = null;
+        return null;
+    }
+
+    const vcvarsall = findVcvarsall();
+    if (!vcvarsall) {
+        _vcEnvCache = null;
+        return null;
+    }
+
+    try {
+        // Run vcvarsall and dump all environment variables
+        const output = execSync(
+            `cmd /c ""${vcvarsall}" x64 >nul 2>&1 && set"`,
+            { encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'], timeout: 30000, shell: true }
+        );
+
+        // Parse "KEY=VALUE" lines into an env object
+        const env = {};
+        for (const line of output.split(/\r?\n/)) {
+            const idx = line.indexOf('=');
+            if (idx > 0) {
+                env[line.substring(0, idx)] = line.substring(idx + 1);
+            }
+        }
+
+        // Sanity check: we should have PATH and INCLUDE set
+        if (env.PATH && env.INCLUDE) {
+            _vcEnvCache = env;
+            return env;
+        }
+    } catch { }
+
+    _vcEnvCache = 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)
+    // On Windows, use the captured vcvarsall environment so cl.exe + ninja are in PATH
     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 });
+        const vcEnv = getVcEnvironment();
+        if (vcEnv) {
+            return execSync(`"${cmake}" ${args}`, { stdio: 'inherit', env: vcEnv, ...options });
         }
     }