@stacksolo/cli 0.1.3 → 0.1.4

package/dist/index.js

@@ -877,25 +877,28 @@ async function scaffoldTemplates(cwd, projectType, uiFramework) {
 }
 async function scaffoldFunctionApi(cwd, name) {
   const dir = path.join(cwd, name);
-  await fs.mkdir(dir, { recursive: true });
+  const srcDir = path.join(dir, "src");
+  await fs.mkdir(srcDir, { recursive: true });
   await fs.writeFile(
     path.join(dir, "package.json"),
     JSON.stringify(
       {
         name,
         version: "1.0.0",
-        main: "index.js",
+        main: "dist/index.js",
         type: "module",
         scripts: {
-          start: "npx functions-framework --target=handler",
-          build: "tsc"
+          dev: "tsup src/index.ts --format esm --target node20 --watch --onSuccess 'functions-framework --source=dist --target=handler'",
+          build: "tsup src/index.ts --format esm --target node20",
+          start: "functions-framework --source=dist --target=handler"
         },
         dependencies: {
           "@google-cloud/functions-framework": "^3.3.0"
         },
         devDependencies: {
           typescript: "^5.0.0",
-          "@types/node": "^20.0.0"
+          "@types/node": "^20.0.0",
+          tsup: "^8.0.0"
         }
       },
       null,
@@ -903,15 +906,21 @@ async function scaffoldFunctionApi(cwd, name) {
     ) + "\n"
   );
   await fs.writeFile(
-    path.join(dir, "index.ts"),
-    `import functions from '@google-cloud/functions-framework';
+    path.join(srcDir, "index.ts"),
+    `/**
+ * ${name} HTTP function
+ * Generated by: stacksolo init
+ */
+
+import type { Request, Response } from '@google-cloud/functions-framework';
 
-functions.http('handler', (req, res) => {
+export function handler(req: Request, res: Response): void {
   const { method, path } = req;
 
   // Health check
   if (path === '/health') {
-    return res.json({ status: 'ok' });
+    res.json({ status: 'ok' });
+    return;
   }
 
   // Your API routes here
@@ -920,7 +929,7 @@ functions.http('handler', (req, res) => {
     method,
     path,
   });
-});
+}
 `
   );
   await fs.writeFile(
@@ -930,19 +939,31 @@ functions.http('handler', (req, res) => {
         compilerOptions: {
           target: "ES2022",
           module: "ESNext",
-          moduleResolution: "node",
+          moduleResolution: "bundler",
           esModuleInterop: true,
           strict: true,
+          skipLibCheck: true,
           outDir: "dist",
+          rootDir: "src",
           declaration: true
         },
-        include: ["*.ts"]
+        include: ["src/**/*"],
+        exclude: ["node_modules", "dist"]
       },
       null,
       2
     ) + "\n"
   );
-  return [`${name}/package.json`, `${name}/index.ts`, `${name}/tsconfig.json`];
+  await fs.writeFile(
+    path.join(dir, ".gitignore"),
+    `node_modules/
+dist/
+*.log
+.env
+.env.local
+`
+  );
+  return [`${name}/package.json`, `${name}/src/index.ts`, `${name}/tsconfig.json`, `${name}/.gitignore`];
 }
 async function scaffoldContainerApi(cwd, name) {
   const dir = path.join(cwd, name);
@@ -1027,25 +1048,28 @@ CMD ["node", "index.js"]
 }
 async function scaffoldFunctionCron(cwd, name) {
   const dir = path.join(cwd, name);
-  await fs.mkdir(dir, { recursive: true });
+  const srcDir = path.join(dir, "src");
+  await fs.mkdir(srcDir, { recursive: true });
   await fs.writeFile(
     path.join(dir, "package.json"),
     JSON.stringify(
       {
         name,
         version: "1.0.0",
-        main: "index.js",
+        main: "dist/index.js",
         type: "module",
         scripts: {
-          start: "npx functions-framework --target=handler",
-          build: "tsc"
+          dev: "tsup src/index.ts --format esm --target node20 --watch --onSuccess 'functions-framework --source=dist --target=handler'",
+          build: "tsup src/index.ts --format esm --target node20",
+          start: "functions-framework --source=dist --target=handler"
         },
         dependencies: {
           "@google-cloud/functions-framework": "^3.3.0"
         },
         devDependencies: {
           typescript: "^5.0.0",
-          "@types/node": "^20.0.0"
+          "@types/node": "^20.0.0",
+          tsup: "^8.0.0"
         }
       },
       null,
@@ -1053,17 +1077,22 @@ async function scaffoldFunctionCron(cwd, name) {
     ) + "\n"
   );
   await fs.writeFile(
-    path.join(dir, "index.ts"),
-    `import functions from '@google-cloud/functions-framework';
+    path.join(srcDir, "index.ts"),
+    `/**
+ * ${name} Cron function
+ * Generated by: stacksolo init
+ */
+
+import type { Request, Response } from '@google-cloud/functions-framework';
 
-functions.http('handler', (req, res) => {
+export function handler(req: Request, res: Response): void {
   console.log('Cron triggered:', new Date().toISOString());
 
   // Your scheduled job logic here
 
   console.log('Job complete');
   res.json({ status: 'ok' });
-});
+}
 `
   );
   await fs.writeFile(
@@ -1073,19 +1102,31 @@ functions.http('handler', (req, res) => {
         compilerOptions: {
           target: "ES2022",
           module: "ESNext",
-          moduleResolution: "node",
+          moduleResolution: "bundler",
           esModuleInterop: true,
           strict: true,
+          skipLibCheck: true,
           outDir: "dist",
+          rootDir: "src",
           declaration: true
         },
-        include: ["*.ts"]
+        include: ["src/**/*"],
+        exclude: ["node_modules", "dist"]
       },
       null,
       2
     ) + "\n"
   );
-  return [`${name}/package.json`, `${name}/index.ts`, `${name}/tsconfig.json`];
+  await fs.writeFile(
+    path.join(dir, ".gitignore"),
+    `node_modules/
+dist/
+*.log
+.env
+.env.local
+`
+  );
+  return [`${name}/package.json`, `${name}/src/index.ts`, `${name}/tsconfig.json`, `${name}/.gitignore`];
 }
 async function scaffoldStaticWeb(cwd, name) {
   const dir = path.join(cwd, name);
@@ -15552,6 +15593,9 @@ function generateConfigMap(options) {
   } else {
     data.PUBSUB_EMULATOR_HOST = "pubsub-emulator:8085";
   }
+  if (options.kernelUrl) {
+    data.KERNEL_URL = options.kernelUrl;
+  }
   if (options.additionalEnv) {
     Object.assign(data, options.additionalEnv);
   }
@@ -15660,9 +15704,31 @@ function generateFunctionManifests(options) {
   const functionName = sanitizeName(options.function.name);
   const runtimeConfig = getRuntimeConfig(options.function.runtime, options.function.entryPoint);
   const isPython = isPythonRuntime(options.function.runtime);
-  const installCmd = isPython ? "pip install -r requirements.txt 2>/dev/null || true && pip install functions-framework" : "npm install";
   const runCmd = isPython ? runtimeConfig.command.join(" ") : "npm run dev 2>/dev/null || " + runtimeConfig.command.join(" ");
-  const containerCommand = ["sh", "-c", `${installCmd} && ${runCmd}`];
+  const containerCommand = isPython ? [
+    "sh",
+    "-c",
+    [
+      "cp -r /source/* /app/ 2>/dev/null || true",
+      "cd /app",
+      "pip install -r requirements.txt 2>/dev/null || true",
+      "pip install functions-framework",
+      runCmd
+    ].join(" && ")
+  ] : [
+    "sh",
+    "-c",
+    [
+      // Copy source files to /app, excluding node_modules (macOS binaries don't work in Linux)
+      "cd /source",
+      "find . -maxdepth 1 ! -name node_modules ! -name . -exec cp -r {} /app/ \\;",
+      "cd /app",
+      // Always install fresh for Linux platform
+      "npm install",
+      // Run the dev server
+      runCmd
+    ].join(" && ")
+  ];
   const labels = {
     "app.kubernetes.io/name": functionName,
     "app.kubernetes.io/component": "function",
@@ -15711,16 +15777,21 @@ function generateFunctionManifests(options) {
               volumeMounts: [
                 {
                   name: "source",
+                  mountPath: "/source",
+                  readOnly: true
+                },
+                {
+                  name: "workdir",
                   mountPath: "/app"
                 }
               ],
               workingDir: "/app",
               resources: {
                 limits: {
-                  memory: options.function.memory || "256Mi"
+                  memory: options.function.memory || "512Mi"
                 },
                 requests: {
-                  memory: "128Mi"
+                  memory: "256Mi"
                 }
               }
             }
@@ -15732,6 +15803,10 @@ function generateFunctionManifests(options) {
                 path: options.sourceDir,
                 type: "DirectoryOrCreate"
               }
+            },
+            {
+              name: "workdir",
+              emptyDir: {}
             }
           ]
         }
@@ -15817,7 +15892,21 @@ function generateUIManifests(options) {
             {
               name: uiName,
               image: "node:20-slim",
-              command: ["sh", "-c", `npm install && ${frameworkConfig.command.join(" ")}`],
+              // Copy source (excluding node_modules) to working directory, then install fresh Linux deps
+              command: [
+                "sh",
+                "-c",
+                [
+                  // Copy source files to /app, excluding node_modules (macOS binaries don't work in Linux)
+                  "cd /source",
+                  "find . -maxdepth 1 ! -name node_modules ! -name . -exec cp -r {} /app/ \\;",
+                  "cd /app",
+                  // Always install fresh for Linux platform
+                  "npm install",
+                  // Run the dev server
+                  frameworkConfig.command.join(" ")
+                ].join(" && ")
+              ],
               ports: [
                 {
                   containerPort: options.port,
@@ -15832,16 +15921,21 @@ function generateUIManifests(options) {
               volumeMounts: [
                 {
                   name: "source",
+                  mountPath: "/source",
+                  readOnly: true
+                },
+                {
+                  name: "workdir",
                   mountPath: "/app"
                 }
               ],
               workingDir: "/app",
               resources: {
                 limits: {
-                  memory: "512Mi"
+                  memory: "1Gi"
                 },
                 requests: {
-                  memory: "256Mi"
+                  memory: "512Mi"
                 }
               }
             }
@@ -15853,6 +15947,10 @@ function generateUIManifests(options) {
                 path: options.sourceDir,
                 type: "DirectoryOrCreate"
               }
+            },
+            {
+              name: "workdir",
+              emptyDir: {}
             }
           ]
         }
@@ -16569,7 +16667,7 @@ function generateNginxConfig(routes, servicePortMap) {
     const basePath = route.path.replace(/\/?\*$/, "");
     return `
         location ${basePath}/ {
-            proxy_pass ${upstream}/;
+            proxy_pass ${upstream};
             proxy_http_version 1.1;
             proxy_set_header Upgrade $http_upgrade;
             proxy_set_header Connection 'upgrade';
@@ -16687,8 +16785,14 @@ function generateK8sManifests(options) {
   const projectName = config.project.name;
   const portAllocator = createPortAllocator();
   const servicePortMap = {};
+  let kernelUrl;
+  if (config.project.kernel) {
+    kernelUrl = `http://${config.project.kernel.name}:8090`;
+  } else if (config.project.gcpKernel) {
+    kernelUrl = `http://${config.project.gcpKernel.name}:8080`;
+  }
   manifests.push(generateNamespace(projectName));
-  manifests.push(generateConfigMap({ projectName }));
+  manifests.push(generateConfigMap({ projectName, kernelUrl }));
   if (includeEmulators) {
     manifests.push(generateFirebaseEmulator({ projectName }));
     manifests.push(generatePubSubEmulator({ projectName }));