@stacksolo/cli 0.1.8 → 0.1.10

package/dist/index.js

@@ -5175,7 +5175,7 @@ function resolveConfig(config) {
   }
   if (project.networks) {
     for (const network of project.networks) {
-      resources.push(...resolveNetwork(network, projectInfo.region));
+      resources.push(...resolveNetwork(network, projectInfo));
     }
   }
   if (project.crons) {
@@ -5295,10 +5295,11 @@ function resolveCron(cron, defaultRegion) {
     dependsOn
   };
 }
-function resolveNetwork(network, defaultRegion) {
+function resolveNetwork(network, projectInfo) {
   const resources = [];
   const networkId = `network-${network.name}`;
   const registryId = `registry-${network.name}`;
+  const defaultRegion = projectInfo.region;
   resources.push({
     id: networkId,
     type: "gcp:vpc_network",
@@ -5341,12 +5342,12 @@ function resolveNetwork(network, defaultRegion) {
   }
   if (network.containers) {
     for (const container of network.containers) {
-      resources.push(resolveContainer(container, network.name, defaultRegion, networkId, registryId));
+      resources.push(resolveContainer(container, network.name, defaultRegion, networkId, registryId, projectInfo));
     }
   }
   if (network.functions) {
     for (const fn of network.functions) {
-      resources.push(resolveFunction(fn, network.name, defaultRegion, networkId, registryId));
+      resources.push(resolveFunction(fn, network.name, defaultRegion, networkId, registryId, projectInfo));
     }
   }
   if (network.databases) {
@@ -5421,7 +5422,7 @@ function resolveFirewallRule(rule, networkName, networkId) {
     network: networkName
   };
 }
-function resolveContainer(container, networkName, defaultRegion, networkId, registryId) {
+function resolveContainer(container, networkName, defaultRegion, networkId, registryId, projectInfo) {
   const dependsOn = [networkId];
   if (registryId) {
     dependsOn.push(registryId);
@@ -5464,14 +5465,16 @@ function resolveContainer(container, networkName, defaultRegion, networkId, regi
       serviceAccount: container.serviceAccount,
       vpcConnector: container.vpcConnector,
       labels: container.labels,
-      location: defaultRegion
+      location: defaultRegion,
+      projectId: projectInfo?.gcpProjectId,
+      projectName: projectInfo?.name
     },
     dependsOn: [...new Set(dependsOn)],
     // Deduplicate
     network: networkName
   };
 }
-function resolveFunction(fn, networkName, defaultRegion, networkId, registryId) {
+function resolveFunction(fn, networkName, defaultRegion, networkId, registryId, projectInfo) {
   const dependsOn = [networkId];
   if (registryId) {
     dependsOn.push(registryId);
@@ -5522,7 +5525,9 @@ function resolveFunction(fn, networkName, defaultRegion, networkId, registryId)
       vpcConnector: fn.vpcConnector,
       labels: fn.labels,
       location: defaultRegion,
-      trigger: fn.trigger
+      trigger: fn.trigger,
+      projectId: projectInfo?.gcpProjectId,
+      projectName: projectInfo?.name
     },
     dependsOn: [...new Set(dependsOn)],
     network: networkName
@@ -5947,6 +5952,8 @@ function resolveCdktfConfig(config, projectInfo) {
       name: uiName,
       config: {
         name: uiName,
+        originalName: ui.name,
+        // Short name for route matching
         location: "US",
         // Multi-region for CDN
         sourceDir: ui.sourceDir || `apps/${ui.name}`,
@@ -5983,6 +5990,8 @@ function resolveCdktfConfig(config, projectInfo) {
     const isGcsUI = gcsUis.some((ui) => ui.name === r.backend);
     if (isGcsUI) {
       return {
+        host: r.host,
+        // Pass through host for host-based routing
         path: r.path,
         uiName: `${projectInfo.name}-${r.backend}`
       };
@@ -5990,11 +5999,15 @@ function resolveCdktfConfig(config, projectInfo) {
     const isContainer = containers.some((c) => c.name === r.backend);
     if (isContainer) {
       return {
+        host: r.host,
+        // Pass through host for host-based routing
         path: r.path,
         containerName: `${projectInfo.name}-${r.backend}`
       };
     }
     return {
+      host: r.host,
+      // Pass through host for host-based routing
       path: r.path,
       functionName: `${projectInfo.name}-${r.backend}`
     };
@@ -6013,6 +6026,7 @@ function resolveCdktfConfig(config, projectInfo) {
         functionName: functionNames.length > 0 ? functionNames[0] : void 0,
         // HTTPS configuration
         domain: lbHttpsConfig?.domain,
+        domains: lbHttpsConfig?.domains,
         enableHttps: lbHttpsConfig?.enableHttps,
         redirectHttpToHttps: lbHttpsConfig?.redirectHttpToHttps
       },
@@ -10612,7 +10626,39 @@ async function deployConfig(config, _stateDir, options = {}) {
         await execAsync6(`cd "${stagingDir}" && zip -r "${sourceZipPath}" .`, { timeout: 6e4 });
         await fs8.rm(stagingDir, { recursive: true, force: true });
       } else {
-        await execAsync6(`cd "${sourceDir}" && zip -r "${sourceZipPath}" . -x "*.git*" -x "node_modules/*"`, { timeout: 6e4 });
+        const stagingDir = path10.join(workDir, `staging-${fnName}`);
+        await fs8.mkdir(stagingDir, { recursive: true });
+        await execAsync6(`rsync -a --exclude='node_modules' --exclude='.git' "${sourceDir}/" "${stagingDir}/"`, { timeout: 3e4 });
+        const stagingPkgPath = path10.join(stagingDir, "package.json");
+        try {
+          const pkgContent = await fs8.readFile(stagingPkgPath, "utf-8");
+          const pkg2 = JSON.parse(pkgContent);
+          let modified = false;
+          if (pkg2.dependencies) {
+            for (const [name, version] of Object.entries(pkg2.dependencies)) {
+              if (typeof version === "string" && version.startsWith("workspace:")) {
+                delete pkg2.dependencies[name];
+                log(`Removed workspace dependency: ${name}@${version}`);
+                modified = true;
+              }
+            }
+          }
+          if (pkg2.devDependencies) {
+            for (const [name, version] of Object.entries(pkg2.devDependencies)) {
+              if (typeof version === "string" && version.startsWith("workspace:")) {
+                delete pkg2.devDependencies[name];
+                log(`Removed workspace devDependency: ${name}@${version}`);
+                modified = true;
+              }
+            }
+          }
+          if (modified) {
+            await fs8.writeFile(stagingPkgPath, JSON.stringify(pkg2, null, 2));
+          }
+        } catch {
+        }
+        await execAsync6(`cd "${stagingDir}" && zip -r "${sourceZipPath}" . -x "*.git*"`, { timeout: 6e4 });
+        await fs8.rm(stagingDir, { recursive: true, force: true });
       }
       sourceZips.push({ name: fnName, zipPath: sourceZipPath });
     }
@@ -10916,7 +10962,8 @@ terraform {
       log("Building and uploading UI assets...");
       for (const uiResource of uiResources) {
         const uiName = uiResource.config.name;
-        const sourceDir = path10.resolve(process.cwd(), uiResource.config.sourceDir || `apps/${uiName}`);
+        const uiOriginalName = uiResource.config.originalName || uiName;
+        const sourceDir = path10.resolve(process.cwd(), uiResource.config.sourceDir || `apps/${uiOriginalName}`);
         const framework = uiResource.config.framework;
         const buildCommand2 = uiResource.config.buildCommand || "npm run build";
         const buildOutputDir = uiResource.config.buildOutputDir;
@@ -10976,7 +11023,7 @@ terraform {
           const lb = network.loadBalancer;
           if (lb?.routes) {
             for (const route of lb.routes) {
-              if (route.backend === uiName && route.path) {
+              if (route.backend === uiOriginalName && route.path) {
                 const pathMatch = route.path.match(/^\/([^/*]+)/);
                 if (pathMatch) {
                   uploadPath = pathMatch[1];