@kithinji/pod 1.0.16 → 1.0.18

package/dist/types/plugins/transformers/j2d.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"j2d.d.ts","sourceRoot":"","sources":["../../../../src/plugins/transformers/j2d.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAY,MAAM,aAAa,CAAC;AACvD,OAAO,KAAK,UAAU,MAAM,cAAc,CAAC;AAE3C,UAAU,aAAa;IACrB,KAAK,EAAE,OAAO,UAAU,CAAC;CAC1B;AAED,UAAU,WAAW;IACnB,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AA23BD,wBAAgB,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,aAAa,GAAG,SAAS,CAAC,WAAW,CAAC,CAmKvE"}
+{"version":3,"file":"j2d.d.ts","sourceRoot":"","sources":["../../../../src/plugins/transformers/j2d.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAY,MAAM,aAAa,CAAC;AACvD,OAAO,KAAK,UAAU,MAAM,cAAc,CAAC;AAE3C,UAAU,aAAa;IACrB,KAAK,EAAE,OAAO,UAAU,CAAC;CAC1B;AAED,UAAU,WAAW;IACnB,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AA24BD,wBAAgB,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,aAAa,GAAG,SAAS,CAAC,WAAW,CAAC,CAmKvE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kithinji/pod",
-  "version": "1.0.16",
+  "version": "1.0.18",
   "description": "",
   "bin": {
     "pod": "./dist/main.js"

package/src/add/new/index.ts

@@ -125,7 +125,7 @@ build
 }
 
 function genEnv() {
-  return `NODE_ENV=development
+  return `host=localhost
 `;
 }
 

package/src/docker/docker.ts

@@ -67,7 +67,8 @@ async function selectServices(
     })),
   });
 
-  if (!response.services) return [];
+  // Fixed: Handle empty response when user cancels
+  if (!response.services || response.services.length === 0) return [];
   return detected.filter((s) => response.services.includes(s.name));
 }
 
@@ -106,13 +107,14 @@ async function createDockerfile(cwd: string, projectName: string) {
 WORKDIR /app
 
 COPY package*.json ./
-RUN npm ci --only=production
+
+RUN npm install
 
 COPY . .
-RUN if [ -f "tsconfig.json" ]; then npm run build || true; fi
 
-EXPOSE 3000
-CMD ["npm", "start"]
+EXPOSE 8080
+
+CMD ["npm", "run", "dev"]
 `;
 
   await fs.writeFile(dockerfilePath, dockerfile);
@@ -137,25 +139,38 @@ async function setupProduction(
           "--certificatesresolvers.myresolver.acme.email=admin@example.com",
           "--certificatesresolvers.myresolver.acme.storage=/letsencrypt/acme.json",
         ],
-        ports: ["80:80", "443:443", "8080:8080"],
+        labels: [
+          "traefik.enable=true",
+          "traefik.http.routers.dashboard.rule=Host(`traefik.${HOST}`)",
+          "traefik.http.routers.dashboard.entrypoints=websecure",
+          "traefik.http.routers.dashboard.tls.certresolver=myresolver",
+          "traefik.http.routers.dashboard.service=api@internal",
+        ],
+        ports: ["80:80", "443:443"],
         volumes: [
           "/var/run/docker.sock:/var/run/docker.sock:ro",
           "./letsencrypt:/letsencrypt",
         ],
         networks: ["web"],
+        env_file: [".env"], // Fixed: Added env_file to read HOST variable
       },
       [projectName]: {
-        build: ".",
+        build: {
+          context: `./${projectName}`,
+          dockerfile: "Dockerfile",
+        },
         labels: [
           "traefik.enable=true",
-          "traefik.http.routers.app.rule=Host(`localhost`)",
+          "traefik.http.routers.app.rule=Host(`${HOST}`)", // Fixed: Changed from app.${HOST} to ${HOST}
           "traefik.http.routers.app.entrypoints=websecure",
           "traefik.http.routers.app.tls.certresolver=myresolver",
-          "traefik.http.services.app.loadbalancer.server.port=3000",
+          "traefik.http.services.app.loadbalancer.server.port=8080",
         ],
         env_file: [".env"],
-        depends_on: [],
         networks: ["web"],
+        volumes: [`./${projectName}:/app`], // Fixed: Changed from ./web to ./${projectName}
+        command: "npm run dev",
+        depends_on: [], // Fixed: Added missing depends_on array
       },
     },
     networks: {
@@ -163,7 +178,7 @@ async function setupProduction(
         driver: "bridge",
       },
     },
-    volumes: {},
+    volumes: {}, // Fixed: Added missing volumes object
   };
 
   for (const service of services) {
@@ -180,7 +195,6 @@ async function setupProduction(
     composePath,
     yaml.dump(compose, { indent: 2, lineWidth: -1 })
   );
-  await createEnvTemplate(cwd, services, "prod");
 }
 
 async function setupDevelopment(
@@ -223,7 +237,7 @@ async function setupDevelopment(
         })),
       });
 
-      if (selected) {
+      if (selected && selected.length > 0) {
         servicesToTunnel.push(
           ...existingServices
             .filter((s) => selected.includes(s.name))
@@ -240,10 +254,13 @@ async function setupDevelopment(
   const compose: any = {
     services: {
       [projectName]: {
-        build: ".",
-        ports: ["3000:3000"],
+        build: {
+          context: `./${projectName}`,
+          dockerfile: "Dockerfile",
+        },
+        ports: ["8080:8080"],
         env_file: [".env"],
-        volumes: [".:/app", "/app/node_modules"],
+        volumes: [`./${projectName}:/app`, `/app/node_modules`], // Fixed: Changed from . to ./${projectName}
         command: "npm run dev",
         depends_on: [],
       },
@@ -276,7 +293,6 @@ async function setupDevelopment(
     devComposePath,
     yaml.dump(compose, { indent: 2, lineWidth: -1 })
   );
-  await createEnvTemplate(cwd, services, "dev");
 }
 
 async function createTunnelService(projectDir: string, serviceName: string) {
@@ -316,28 +332,6 @@ ssh -i $SSH_KEY \\
   await fs.writeFile(path.join(tunnelDir, "tunnel.sh"), tunnelScript);
 }
 
-async function createEnvTemplate(
-  projectDir: string,
-  services: DockerService[],
-  env: "dev" | "prod"
-) {
-  const envPath = path.join(projectDir, ".env.example");
-
-  let content = `NODE_ENV=${
-    env === "prod" ? "production" : "development"
-  }\nPORT=3000\n`;
-
-  if (services.length > 0) {
-    content += `\n`;
-    for (const service of services) {
-      const vars = getEnvVars(service.name);
-      content += vars.join("\n") + "\n\n";
-    }
-  }
-
-  await fs.writeFile(envPath, content);
-}
-
 function getServiceConfig(serviceName: string) {
   const configs: Record<string, any> = {
     postgres: {
@@ -441,7 +435,7 @@ function printNextSteps(
   if (env === "prod") {
     console.log(`  # Edit .env with your settings`);
     console.log(`  docker-compose up -d`);
-    console.log(`  # Access at https://localhost\n`);
+    console.log(`  # Access at https://\${HOST}\n`);
   } else {
     console.log(`  # Edit .env with your settings`);
     if (services.some((s) => s.needsTunnel)) {

package/src/main.ts

@@ -28,7 +28,7 @@ import { dockerize } from "./docker";
 
 const program = new Command();
 
-program.name("pod").description("Pod cli tool").version("1.0.16");
+program.name("pod").description("Pod cli tool").version("1.0.18");
 
 program
   .command("new <name>")

package/src/plugins/transformers/j2d.ts

@@ -419,9 +419,18 @@ class ElementTransformer {
       );
     }
 
+    /*
+      let cleanup = effect(() => {
+        el.innerHTML = {
+          __html: value
+        }.__html
+      })
+    */
+
     if (hasDangerousHTML && dangerousHTMLValue) {
-      statements.push(
-        this.t.expressionStatement(
+      const effectCall = this.t.callExpression(this.t.identifier("$effect"), [
+        this.t.arrowFunctionExpression(
+          [],
           this.t.assignmentExpression(
             "=",
             this.t.memberExpression(elId, this.t.identifier("innerHTML")),
@@ -430,8 +439,15 @@ class ElementTransformer {
               this.t.identifier("__html")
             )
           )
-        )
+        ),
+      ]);
+
+      const cleanupStatements = this.astUtils.addEffectCleanup(
+        scope,
+        effectCall
       );
+
+      statements.push(...cleanupStatements);
     }
 
     if (!hasDangerousHTML) {