create-m5kdev 0.34.0 → 0.36.0

package/templates/minimal-app/package.json.tpl

@@ -8,13 +8,14 @@
     "lint": "turbo run lint",
     "lint:fix": "turbo run lint:fix",
     "check-types": "turbo run check-types",
-    "app:deploy": "node apps/shared/scripts/fly-deploy.mjs --config apps/shared/fly.toml --dockerfile apps/shared/Dockerfile --env apps/shared/.env.production",
-    "app:secrets": "node apps/shared/scripts/fly-secrets.mjs --config apps/shared/fly.toml --env apps/shared/.env.production",
-    "landing:deploy": "node apps/landing/scripts/fly-deploy.mjs --config apps/landing/fly.toml --dockerfile apps/landing/Dockerfile --env apps/landing/.env.production",
-    "landing:secrets": "node apps/landing/scripts/fly-secrets.mjs --config apps/landing/fly.toml --env apps/landing/.env.production"
+    "app:deploy": "m5kdev-fly-deploy --config apps/shared/fly.toml --dockerfile apps/shared/Dockerfile --env apps/shared/.env.production",
+    "app:secrets": "m5kdev-fly-secrets --config apps/shared/fly.toml --env apps/shared/.env.production",
+    "landing:deploy": "m5kdev-fly-deploy --config apps/landing/fly.toml --dockerfile apps/landing/Dockerfile --env apps/landing/.env.production",
+    "landing:secrets": "m5kdev-fly-secrets --config apps/landing/fly.toml --env apps/landing/.env.production"
   },
   "devDependencies": {
     "@biomejs/biome": "catalog:m5kdev",
+    "@m5kdev/backend": "catalog:m5kdev",
     "turbo": "catalog:m5kdev",
     "typescript": "catalog:m5kdev"
   },

package/templates/minimal-app/pnpm-workspace.yaml.tpl

@@ -7,17 +7,18 @@ catalogs:
     "@heroui/react": 3.0.3
     "@heroui/styles": 3.0.3
     "@libsql/client": 0.17.4
-    "@m5kdev/backend": 0.34.0
-    "@m5kdev/commons": 0.34.0
-    "@m5kdev/config": 0.34.0
-    "@m5kdev/email": 0.34.0
-    "@m5kdev/frontend": 0.34.0
-    "@m5kdev/module-clay": 0.34.0
-    "@m5kdev/module-docx": 0.34.0
-    "@m5kdev/module-pdf": 0.34.0
-    "@m5kdev/module-social": 0.34.0
-    "@m5kdev/module-video": 0.34.0
-    "@m5kdev/web-ui": 0.34.0
+    "@m5kdev/backend": 0.36.0
+    "@m5kdev/commons": 0.36.0
+    "@m5kdev/config": 0.36.0
+    "@m5kdev/email": 0.36.0
+    "@m5kdev/expo": 0.36.0
+    "@m5kdev/frontend": 0.36.0
+    "@m5kdev/module-clay": 0.36.0
+    "@m5kdev/module-docx": 0.36.0
+    "@m5kdev/module-pdf": 0.36.0
+    "@m5kdev/module-social": 0.36.0
+    "@m5kdev/module-video": 0.36.0
+    "@m5kdev/web-ui": 0.36.0
     "@mastra/core": 1.51.0
     "@openrouter/ai-sdk-provider": 3.0.0
     "@opentelemetry/api": 1.9.0

package/templates/minimal-app/template.manifest.json

@@ -40,6 +40,7 @@
       "paths": [
         "apps/webapp/src/modules/workflows/",
         "apps/server/src/modules/demo-workflow/",
+        "apps/shared/src/modules/demo-workflow/",
         "apps/e2e/tests/workflow.spec.ts"
       ]
     },

package/templates/minimal-app/apps/landing/scripts/fly-deploy.mjs.tpl

@@ -1,75 +0,0 @@
-#!/usr/bin/env node
-import { spawnSync } from "node:child_process";
-import { existsSync, readFileSync } from "node:fs";
-import { parseArgs } from "node:util";
-
-function missingEnvMessage(envPath) {
-  return `Missing ${envPath}. Copy the .env.production.example next to it, fill in values, then retry.`;
-}
-
-function parseDotenv(source) {
-  const vars = {};
-  for (const rawLine of source.split(/\r?\n/)) {
-    const line = rawLine.trim();
-    if (!line || line.startsWith("#")) continue;
-    const eq = line.indexOf("=");
-    if (eq === -1) continue;
-    const key = line.slice(0, eq).trim();
-    let value = line.slice(eq + 1);
-    if (
-      (value.startsWith('"') && value.endsWith('"')) ||
-      (value.startsWith("'") && value.endsWith("'"))
-    ) {
-      value = value.slice(1, -1);
-    }
-    vars[key] = value;
-  }
-  return vars;
-}
-
-function shellSingleQuote(value) {
-  return `'${value.replaceAll("'", `'\\''`)}'`;
-}
-
-function toExportScript(vars) {
-  return Object.entries(vars)
-    .map(([key, value]) => `export ${key}=${shellSingleQuote(value)}`)
-    .join("\n");
-}
-
-const { values } = parseArgs({
-  options: {
-    config: { type: "string" },
-    dockerfile: { type: "string" },
-    env: { type: "string" },
-  },
-});
-
-if (!values.config || !values.dockerfile || !values.env) {
-  console.error(
-    "Usage: fly-deploy.mjs --config <fly.toml> --dockerfile <Dockerfile> --env <.env.production>"
-  );
-  process.exit(1);
-}
-
-if (!existsSync(values.env)) {
-  console.error(missingEnvMessage(values.env));
-  process.exit(1);
-}
-
-const vars = parseDotenv(readFileSync(values.env, "utf8"));
-const args = [
-  "deploy",
-  "-c",
-  values.config,
-  "--dockerfile",
-  values.dockerfile,
-  "--build-secret",
-  `ALL_SECRETS=${toExportScript(vars)}`,
-];
-for (const [key, value] of Object.entries(vars)) {
-  args.push("--build-secret", `${key}=${value}`);
-}
-
-const result = spawnSync("fly", args, { stdio: "inherit" });
-process.exit(result.status ?? 1);

package/templates/minimal-app/apps/landing/scripts/fly-secrets.mjs.tpl

@@ -1,31 +0,0 @@
-#!/usr/bin/env node
-import { spawnSync } from "node:child_process";
-import { existsSync, readFileSync } from "node:fs";
-import { parseArgs } from "node:util";
-
-function missingEnvMessage(envPath) {
-  return `Missing ${envPath}. Copy the .env.production.example next to it, fill in values, then retry.`;
-}
-
-const { values } = parseArgs({
-  options: {
-    config: { type: "string" },
-    env: { type: "string" },
-  },
-});
-
-if (!values.config || !values.env) {
-  console.error("Usage: fly-secrets.mjs --config <fly.toml> --env <.env.production>");
-  process.exit(1);
-}
-
-if (!existsSync(values.env)) {
-  console.error(missingEnvMessage(values.env));
-  process.exit(1);
-}
-
-const result = spawnSync("fly", ["secrets", "import", "-c", values.config], {
-  input: readFileSync(values.env),
-  stdio: ["pipe", "inherit", "inherit"],
-});
-process.exit(result.status ?? 1);

package/templates/minimal-app/apps/server/drizzle/0001_third_ink.sql

@@ -1 +0,0 @@
-ALTER TABLE `posts` ADD `member_id` text REFERENCES members(id);

package/templates/minimal-app/apps/server/drizzle/0002_concerned_proudstar.sql

@@ -1,3 +0,0 @@
-ALTER TABLE `members` ADD `name` text DEFAULT '' NOT NULL;--> statement-breakpoint
-ALTER TABLE `members` ADD `image` text;--> statement-breakpoint
-ALTER TABLE `members` ADD `deleted_at` integer;

package/templates/minimal-app/apps/server/drizzle/0003_silly_the_liberteens.sql

@@ -1,27 +0,0 @@
-CREATE TABLE `files` (
-	`id` text PRIMARY KEY NOT NULL,
-	`created_at` integer NOT NULL,
-	`updated_at` integer,
-	`deleted_at` integer,
-	`user_id` text,
-	`member_id` text,
-	`organization_id` text,
-	`team_id` text,
-	`bucket` text NOT NULL,
-	`key` text NOT NULL,
-	`original_name` text NOT NULL,
-	`original_extension` text,
-	`content_type` text NOT NULL,
-	`size_bytes` integer,
-	`etag` text,
-	`checksum_sha256` text,
-	`metadata` text,
-	`status` text NOT NULL,
-	`uploaded_at` integer,
-	FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON UPDATE no action ON DELETE set null,
-	FOREIGN KEY (`member_id`) REFERENCES `members`(`id`) ON UPDATE no action ON DELETE set null,
-	FOREIGN KEY (`organization_id`) REFERENCES `organizations`(`id`) ON UPDATE no action ON DELETE set null,
-	FOREIGN KEY (`team_id`) REFERENCES `teams`(`id`) ON UPDATE no action ON DELETE set null
-);
---> statement-breakpoint
-CREATE UNIQUE INDEX `files_bucket_key_unique` ON `files` (`bucket`,`key`);

package/templates/minimal-app/apps/shared/scripts/fly-deploy.mjs.tpl

@@ -1,75 +0,0 @@
-#!/usr/bin/env node
-import { spawnSync } from "node:child_process";
-import { existsSync, readFileSync } from "node:fs";
-import { parseArgs } from "node:util";
-
-function missingEnvMessage(envPath) {
-  return `Missing ${envPath}. Copy the .env.production.example next to it, fill in values, then retry.`;
-}
-
-function parseDotenv(source) {
-  const vars = {};
-  for (const rawLine of source.split(/\r?\n/)) {
-    const line = rawLine.trim();
-    if (!line || line.startsWith("#")) continue;
-    const eq = line.indexOf("=");
-    if (eq === -1) continue;
-    const key = line.slice(0, eq).trim();
-    let value = line.slice(eq + 1);
-    if (
-      (value.startsWith('"') && value.endsWith('"')) ||
-      (value.startsWith("'") && value.endsWith("'"))
-    ) {
-      value = value.slice(1, -1);
-    }
-    vars[key] = value;
-  }
-  return vars;
-}
-
-function shellSingleQuote(value) {
-  return `'${value.replaceAll("'", `'\\''`)}'`;
-}
-
-function toExportScript(vars) {
-  return Object.entries(vars)
-    .map(([key, value]) => `export ${key}=${shellSingleQuote(value)}`)
-    .join("\n");
-}
-
-const { values } = parseArgs({
-  options: {
-    config: { type: "string" },
-    dockerfile: { type: "string" },
-    env: { type: "string" },
-  },
-});
-
-if (!values.config || !values.dockerfile || !values.env) {
-  console.error(
-    "Usage: fly-deploy.mjs --config <fly.toml> --dockerfile <Dockerfile> --env <.env.production>"
-  );
-  process.exit(1);
-}
-
-if (!existsSync(values.env)) {
-  console.error(missingEnvMessage(values.env));
-  process.exit(1);
-}
-
-const vars = parseDotenv(readFileSync(values.env, "utf8"));
-const args = [
-  "deploy",
-  "-c",
-  values.config,
-  "--dockerfile",
-  values.dockerfile,
-  "--build-secret",
-  `ALL_SECRETS=${toExportScript(vars)}`,
-];
-for (const [key, value] of Object.entries(vars)) {
-  args.push("--build-secret", `${key}=${value}`);
-}
-
-const result = spawnSync("fly", args, { stdio: "inherit" });
-process.exit(result.status ?? 1);

package/templates/minimal-app/apps/shared/scripts/fly-secrets.mjs.tpl

@@ -1,31 +0,0 @@
-#!/usr/bin/env node
-import { spawnSync } from "node:child_process";
-import { existsSync, readFileSync } from "node:fs";
-import { parseArgs } from "node:util";
-
-function missingEnvMessage(envPath) {
-  return `Missing ${envPath}. Copy the .env.production.example next to it, fill in values, then retry.`;
-}
-
-const { values } = parseArgs({
-  options: {
-    config: { type: "string" },
-    env: { type: "string" },
-  },
-});
-
-if (!values.config || !values.env) {
-  console.error("Usage: fly-secrets.mjs --config <fly.toml> --env <.env.production>");
-  process.exit(1);
-}
-
-if (!existsSync(values.env)) {
-  console.error(missingEnvMessage(values.env));
-  process.exit(1);
-}
-
-const result = spawnSync("fly", ["secrets", "import", "-c", values.config], {
-  input: readFileSync(values.env),
-  stdio: ["pipe", "inherit", "inherit"],
-});
-process.exit(result.status ?? 1);