@rebasepro/cli 0.9.1-canary.e2fc7b6 → 0.9.1-canary.eab7ae2

package/dist/utils/package-manager.d.ts

@@ -20,13 +20,27 @@ export interface PMCommands {
     workspaceProtocol: string;
 }
 /**
- * Detect the package manager from the environment or the target directory.
+ * Whether pnpm is runnable on this machine.
+ *
+ * Used to decide whether a fresh project can be scaffolded with pnpm. Kept
+ * cheap and non-interactive (short timeout, output discarded) so it never
+ * hangs detection if a corepack shim misbehaves.
+ */
+export declare function isPnpmAvailable(): boolean;
+/**
+ * Detect the package manager for a Rebase project.
+ *
+ * Rebase recommends pnpm, so detection prefers it. Crucially, *how the CLI was
+ * invoked* (`npx` vs `pnpm dlx`, i.e. `npm_config_user_agent`) is deliberately
+ * ignored: running `npx @rebasepro/cli init` says nothing about how the user
+ * wants to manage the project they're creating, and letting it pin the scaffold
+ * to npm is what made every `npx`-invoked project an npm project.
  *
  * Detection order:
- * 1. Explicit override (if provided)
- * 2. `npm_config_user_agent` env var (set by npm/pnpm when running via `npx`/`pnpm dlx`)
- * 3. Lock-file presence in the target directory
- * 4. Default to pnpm (Rebase's recommended PM)
+ * 1. An existing lock file — an explicit choice we always respect
+ *    (`pnpm-lock.yaml` wins over `package-lock.json` when both are present).
+ * 2. pnpm, whenever it is installed.
+ * 3. npm, only as a fallback when pnpm is genuinely unavailable.
  */
 export declare function detectPackageManager(targetDir?: string): PackageManager;
 /** Build the command helpers for a given package manager. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rebasepro/cli",
-  "version": "0.9.1-canary.e2fc7b6",
+  "version": "0.9.1-canary.eab7ae2",
   "description": "Developer tools for Rebase projects",
   "main": "./dist/index.es.js",
   "module": "./dist/index.es.js",
@@ -31,12 +31,12 @@
     "execa": "^9.6.1",
     "inquirer": "14.0.2",
     "jiti": "^2.7.0",
-    "@rebasepro/agent-skills": "0.9.1-canary.e2fc7b6",
-    "@rebasepro/client": "0.9.1-canary.e2fc7b6",
-    "@rebasepro/server": "0.9.1-canary.e2fc7b6",
-    "@rebasepro/server-postgres": "0.9.1-canary.e2fc7b6",
-    "@rebasepro/codegen": "0.9.1-canary.e2fc7b6",
-    "@rebasepro/types": "0.9.1-canary.e2fc7b6"
+    "@rebasepro/agent-skills": "0.9.1-canary.eab7ae2",
+    "@rebasepro/codegen": "0.9.1-canary.eab7ae2",
+    "@rebasepro/server": "0.9.1-canary.eab7ae2",
+    "@rebasepro/server-postgres": "0.9.1-canary.eab7ae2",
+    "@rebasepro/client": "0.9.1-canary.eab7ae2",
+    "@rebasepro/types": "0.9.1-canary.eab7ae2"
   },
   "devDependencies": {
     "@types/node": "^25.9.3",

package/templates/overlays/baas/backend/package.json

@@ -7,7 +7,7 @@
     "scripts": {
         "dev": "tsx watch --include=\"./functions/**/*\" src/index.ts",
         "build": "tsc",
-        "start": "node dist/backend/src/index.js"
+        "start": "node dist/index.js"
     },
     "dependencies": {
         "@rebasepro/server": "workspace:*",

package/templates/overlays/baas/backend/tsconfig.json

@@ -5,6 +5,7 @@
     "moduleResolution": "node",
     "lib": ["ES2022"],
     "outDir": "./dist",
+    "rootDir": "./src",
     "strict": true,
     "esModuleInterop": true,
     "allowSyntheticDefaultImports": true,
@@ -14,5 +15,5 @@
     "declaration": true,
     "sourceMap": true
   },
-  "include": ["src/**/*", "drizzle.config.ts"]
+  "include": ["src/**/*"]
 }

package/templates/template/backend/src/env.ts

@@ -1,4 +1,5 @@
 import * as dotenv from "dotenv";
+import fs from "fs";
 import path from "path";
 import { fileURLToPath } from "url";
 import { loadEnv } from "@rebasepro/server";
@@ -7,7 +8,35 @@ import { z } from "zod";
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
-dotenv.config({ path: path.resolve(__dirname, "../../.env") });
+/**
+ * Locate the project's `.env` by walking up the directory tree.
+ *
+ * A fixed relative path can't work in both modes: in dev this file runs from
+ * source at `backend/src/env.ts`, but the compiled output lives at
+ * `backend/dist/backend/src/env.js` — two directories deeper — so
+ * `../../.env` points at a file that doesn't exist in production. Walking up
+ * finds the root `.env` from either location.
+ */
+function findEnvFile(startDir: string): string | undefined {
+    let dir = startDir;
+    // eslint-disable-next-line no-constant-condition
+    while (true) {
+        const candidate = path.join(dir, ".env");
+        if (fs.existsSync(candidate)) return candidate;
+        const parent = path.dirname(dir);
+        if (parent === dir) return undefined;
+        dir = parent;
+    }
+}
+
+// `rebase start` sets DOTENV_CONFIG_PATH to the project's .env; honor it first,
+// then fall back to searching up from this file. When neither is found (e.g. a
+// production host that injects env vars directly), skip dotenv entirely and let
+// the real process environment flow through.
+const envPath = process.env.DOTENV_CONFIG_PATH || findEnvFile(__dirname);
+if (envPath && fs.existsSync(envPath)) {
+    dotenv.config({ path: envPath });
+}
 
 export const env = loadEnv({
     extend: z.object({