create-newt-app 0.31.4 → 0.31.6

package/dist/index.d.ts

@@ -23,6 +23,7 @@ type Options = {
   nestDiOnly: boolean;
   includeExample: boolean;
   extras: readonly Extra[];
+  explicitFlags: readonly string[];
 };
 declare function doInit(options: Options): Promise<void>;
 //#endregion

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","names":[],"sources":["../src/templates/types.ts","../src/index.ts"],"mappings":";KAgCY;;;cCdN;cACA;cACA;cACA;KAGD,kBAAkB;KAClB,mBAAmB;KACnB,iBAAiB;KACjB,qBAAqB;KAcrB;EACH;EACA;EACA;EACA;EACA;EACA,SAAS;EACT,UAAU;EACV,QAAQ;EACR,YAAY;EACZ;EACA;EACA,iBAAiB;;iBAWG,OAAO,SAAS,UAAO"}
+{"version":3,"file":"index.d.ts","names":[],"sources":["../src/templates/types.ts","../src/index.ts"],"mappings":";KAgCY;;;cCbN;cACA;cACA;cACA;KAGD,kBAAkB;KAClB,mBAAmB;KACnB,iBAAiB;KACjB,qBAAqB;KAcrB;EACH;EACA;EACA;EACA;EACA;EACA,SAAS;EACT,UAAU;EACV,QAAQ;EACR,YAAY;EACZ;EACA;EACA,iBAAiB;EACjB;;iBAWoB,OAAO,SAAS,UAAO"}

package/dist/index.js

@@ -9,8 +9,12 @@ import { execa } from "execa";
 import ejs from "ejs";
 import { existsSync, promises } from "fs";
 import path from "path";
+import { homedir } from "node:os";
+import { promises as promises$1 } from "node:fs";
+import https from "node:https";
+import path$1 from "node:path";
 //#region package.json
-var version = "0.31.4";
+var version = "0.31.6";
 var engines = { "node": ">=24.0.0" };
 //#endregion
 //#region src/templates/root/index.ts
@@ -10836,8 +10840,9 @@ CMD ["pnpm", "db:migrate"]`
   # Better Auth trusts this origin; without it every deployment falls back to
   # localhost:3000 and rejects requests from the real one.
   BETTER_AUTH_URL: \${BETTER_AUTH_URL:-http://localhost:3000}
-  DATABASE_URL: postgresql://postgres:\${POSTGRES_PASSWORD:-postgres}@db:5432/postgres
-
+<% if (database === 'postgres') { %>  DATABASE_URL: postgresql://postgres:\${POSTGRES_PASSWORD:-postgres}@db:5432/postgres
+<% } else { %>  DATABASE_URL: /data/app.db
+<% } %>
 services:
   web:
     build:
@@ -10849,6 +10854,9 @@ services:
       - "3000:3000"
     environment:
       <<: *app-env
+<% if (database === 'sqlite') { %>    volumes:
+      - db_data:/data
+<% } -%>
     depends_on:
       - api
 
@@ -10858,9 +10866,12 @@ services:
       target: migrate
     environment:
       <<: *app-env
-    depends_on:
+<% if (database === 'postgres') { %>    depends_on:
       db:
         condition: service_healthy
+<% } else { %>    volumes:
+      - db_data:/data
+<% } -%>
     restart: "no"
 
   api:
@@ -10871,13 +10882,17 @@ services:
       - "3001:3001"
     environment:
       <<: *app-env
+<% if (database === 'sqlite') { %>    volumes:
+      - db_data:/data
+<% } -%>
     depends_on:
-      db:
+<% if (database === 'postgres') { %>      db:
         condition: service_healthy
+<% } -%>
       migrate:
         condition: service_completed_successfully
 
-  db:
+<% if (database === 'postgres') { %>  db:
     image: postgres:17-alpine
     ports:
       - "5432:5432"
@@ -10891,6 +10906,7 @@ services:
       timeout: 5s
       retries: 5
 
+<% } -%>
 volumes:
   db_data:`
 	},
@@ -11269,8 +11285,9 @@ CMD ["pnpm", "db:migrate"]`
   # Better Auth trusts this origin; without it every deployment falls back to
   # localhost:3000 and rejects requests from the real one.
   BETTER_AUTH_URL: \${BETTER_AUTH_URL:-http://localhost:3000}
-  DATABASE_URL: postgresql://postgres:\${POSTGRES_PASSWORD:-postgres}@db:5432/postgres
-
+<% if (database === 'postgres') { %>  DATABASE_URL: postgresql://postgres:\${POSTGRES_PASSWORD:-postgres}@db:5432/postgres
+<% } else { %>  DATABASE_URL: /data/app.db
+<% } %>
 services:
   web:
     build:
@@ -11280,9 +11297,13 @@ services:
       - "3000:3000"
     environment:
       <<: *app-env
+<% if (database === 'sqlite') { %>    volumes:
+      - db_data:/data
+<% } -%>
     depends_on:
-      db:
+<% if (database === 'postgres') { %>      db:
         condition: service_healthy
+<% } -%>
       migrate:
         condition: service_completed_successfully
 
@@ -11292,12 +11313,15 @@ services:
       target: migrate
     environment:
       <<: *app-env
-    depends_on:
+<% if (database === 'postgres') { %>    depends_on:
       db:
         condition: service_healthy
+<% } else { %>    volumes:
+      - db_data:/data
+<% } -%>
     restart: "no"
 
-  db:
+<% if (database === 'postgres') { %>  db:
     image: postgres:17-alpine
     ports:
       - "5432:5432"
@@ -11311,6 +11335,7 @@ services:
       timeout: 5s
       retries: 5
 
+<% } -%>
 volumes:
   db_data:`
 	},
@@ -12582,6 +12607,135 @@ async function initGit(cwd) {
 	], { cwd });
 }
 //#endregion
+//#region src/telemetry.ts
+const ENDPOINT = "https://newt-telemetry.newt-app.workers.dev";
+const SEND_TIMEOUT_MS = 2e3;
+const UNREACHABLE_BACKOFF_MS = 2592e6;
+const CI_PROVIDERS = [
+	["GITHUB_ACTIONS", "github-actions"],
+	["GITLAB_CI", "gitlab-ci"],
+	["CIRCLECI", "circleci"],
+	["TRAVIS", "travis"],
+	["BUILDKITE", "buildkite"],
+	["JENKINS_URL", "jenkins"],
+	["TEAMCITY_VERSION", "teamcity"],
+	["CODEBUILD_BUILD_ID", "codebuild"],
+	["VERCEL", "vercel"],
+	["NETLIFY", "netlify"]
+];
+function detectCi(env = process.env) {
+	const named = CI_PROVIDERS.find(([key]) => env[key]);
+	if (named) return named[1];
+	return env.CI ? "unknown" : "none";
+}
+function isOptedOut(env = process.env) {
+	if (env.DO_NOT_TRACK === "1" || env.DO_NOT_TRACK?.toLowerCase() === "true") return true;
+	if (env.NEWT_TELEMETRY_DISABLED === "1") return true;
+	if (env.NEWT_TELEMETRY !== void 0) return env.NEWT_TELEMETRY !== "1";
+	return false;
+}
+function isEnabled(env = process.env) {
+	return Boolean(ENDPOINT) && !isOptedOut(env);
+}
+function statePath() {
+	const base = process.env.XDG_STATE_HOME ?? path$1.join(homedir(), ".local", "state");
+	return path$1.join(base, "create-newt-app", "telemetry.json");
+}
+async function readState() {
+	try {
+		return JSON.parse(await promises$1.readFile(statePath(), "utf8"));
+	} catch {
+		return {};
+	}
+}
+async function writeState(next) {
+	try {
+		const file = statePath();
+		await promises$1.mkdir(path$1.dirname(file), { recursive: true });
+		await promises$1.writeFile(file, JSON.stringify(next), "utf8");
+	} catch {}
+}
+function nodeMajor(version = process.version) {
+	const match = /^v?(\d+)/.exec(version);
+	return match ? `v${match[1]}` : "other";
+}
+function buildPayload(report) {
+	const { selection } = report;
+	return {
+		cliVersion: version,
+		nodeMajor: nodeMajor(),
+		platform: process.platform,
+		mode: report.mode,
+		ci: detectCi(),
+		explicitFlags: [...report.explicitFlags].sort().join(","),
+		shadcn: selection.shadcn,
+		testing: selection.testing,
+		database: selection.database,
+		linter: selection.linter,
+		deployment: selection.deployment,
+		nestDiOnly: selection.nestDiOnly,
+		todoExample: selection.todoExample,
+		antiSlop: selection.extras.includes("anti-slop")
+	};
+}
+function post(body) {
+	return new Promise((resolve) => {
+		try {
+			const req = https.request(ENDPOINT, {
+				method: "POST",
+				headers: {
+					"content-type": "application/json",
+					"content-length": Buffer.byteLength(body)
+				},
+				timeout: SEND_TIMEOUT_MS
+			});
+			req.on("response", (res) => {
+				res.resume();
+				const status = res.statusCode ?? 0;
+				res.on("end", () => resolve(status >= 200 && status < 300));
+			});
+			req.on("timeout", () => {
+				req.destroy();
+				resolve(false);
+			});
+			req.on("error", () => resolve(false));
+			req.end(body);
+		} catch {
+			resolve(false);
+		}
+	});
+}
+const NOTICE = [
+	"create-newt-app sends one anonymous event per scaffold: the options you chose,",
+	"the CLI and Node major versions, your platform, whether prompts or flags were",
+	"used, and whether this is CI. No project name, no paths, no file contents, and",
+	"no identifier of any kind.",
+	"Opt out with DO_NOT_TRACK=1 or NEWT_TELEMETRY_DISABLED=1."
+].join("\n");
+async function reportRun(report) {
+	if (!isEnabled()) return;
+	const state = await readState();
+	if (state.unreachableUntil && state.unreachableUntil > Date.now()) return;
+	if (!state.notifiedAt) {
+		console.log();
+		console.log(NOTICE);
+		console.log();
+		await writeState({
+			...state,
+			notifiedAt: Date.now()
+		});
+	}
+	if (!await post(JSON.stringify(buildPayload(report)))) await writeState({
+		...state,
+		notifiedAt: state.notifiedAt ?? Date.now(),
+		unreachableUntil: Date.now() + UNREACHABLE_BACKOFF_MS
+	});
+	else if (state.unreachableUntil) await writeState({
+		...state,
+		unreachableUntil: void 0
+	});
+}
+//#endregion
 //#region src/index.ts
 const TESTING_CHOICES = ["jest", "vitest"];
 const DATABASE_CHOICES = ["sqlite", "postgres"];
@@ -12766,6 +12920,12 @@ async function doInit(options) {
 		console.log(chalk.blue(`  cd ${name}`));
 		console.log(chalk.blue(`  pnpm dev`));
 		console.log();
+		await reportRun({
+			mode: options.nonInteractive ? "flags" : "interactive",
+			explicitFlags: options.explicitFlags,
+			selection
+		});
+		process.exit(0);
 	} catch (error) {
 		console.error(`Error: ${error instanceof Error ? error.message : "Unknown error"}`);
 		process.exit(1);
@@ -12774,16 +12934,17 @@ async function doInit(options) {
 const program = new Command();
 program.name("create-newt-app").version(version).description("Create a new newt-app monorepo").argument("[name]").option("-ni, --no-install", "Skip pnpm install", true).option("-ng, --no-git", "Skip git initialization", true).option("--shadcn", "Include shadcn/ui", false).option("--testing <framework>", "Testing framework: vitest or jest", "jest").option("--database <database>", "Database: sqlite or postgres", "sqlite").option("--linter <linter>", "Linter: eslint or oxc", "eslint").option("--deployment <strategy>", "Deployment: none, standalone, or spa", "none").option("--nest-di-only", "Use NestJS for dependency injection only", false).option("--include-example", "Include the todo example", false).option("--extras <list>", "Extras, comma-separated: anti-slop", "").action(async (name, options, command) => {
 	intro(`Create a ${chalk.blue("newt")} app.`);
-	const nonInteractive = [
-		"shadcn",
-		"testing",
-		"database",
-		"linter",
-		"deployment",
-		"nestDiOnly",
-		"includeExample",
-		"extras"
-	].some((flag) => command.getOptionValueSource(flag) === "cli");
+	const explicitFlags = Object.entries({
+		shadcn: "--shadcn",
+		testing: "--testing",
+		database: "--database",
+		linter: "--linter",
+		deployment: "--deployment",
+		nestDiOnly: "--nest-di-only",
+		includeExample: "--include-example",
+		extras: "--extras"
+	}).filter(([option]) => command.getOptionValueSource(option) === "cli").map(([, flag]) => flag);
+	const nonInteractive = explicitFlags.length > 0;
 	const extras = options.extras.split(",").map((extra) => extra.trim()).filter(Boolean);
 	const invalid = [
 		{
@@ -12828,7 +12989,8 @@ program.name("create-newt-app").version(version).description("Create a new newt-
 		deployment: options.deployment,
 		nestDiOnly: options.nestDiOnly,
 		includeExample: options.includeExample,
-		extras
+		extras,
+		explicitFlags
 	});
 });
 program.parse();