@smi-digital/create-smi-app 2.7.4 → 2.7.6

package/dist/index.js

@@ -156,6 +156,9 @@ var smiTheme = {
     cursor: primary12("\u276F")
   }
 };
+function toSlug(value) {
+  return value.toLowerCase().replace(/[^a-z0-9]+/gv, "-").replace(/^-+|-+$/gv, "");
+}
 async function askIntegrationInputs(inputConfig, index = 0, answers = {}) {
   const current = inputConfig[index];
   if (!current) {
@@ -178,9 +181,17 @@ async function askIntegrationInputs(inputConfig, index = 0, answers = {}) {
   const inputConfigData = {
     message: current.message,
     validate(value) {
-      if (current.required && value.trim().length === 0) {
+      const trimmed = value.trim();
+      if (current.required && trimmed.length === 0) {
         return "This value is required.";
       }
+      if (current.validate === "slug" && trimmed.length > 0) {
+        const isSlug = /^[a-z0-9]+(?:-[a-z0-9]+)*$/v.test(trimmed);
+        if (!isSlug) {
+          const suggestion = toSlug(trimmed);
+          return `Must be a lowercase slug \u2014 letters, digits and single hyphens only (no dots, uppercase or spaces).${suggestion ? ` Try: ${suggestion}` : ""}`;
+        }
+      }
       return true;
     },
     theme: smiTheme
@@ -458,7 +469,7 @@ ${stderrTail}` : "";
 
 // src/modules/scaffoldActions/createApps.ts
 import { join as join4 } from "path";
-import { readFile as readFile3, writeFile as writeFile2 } from "fs/promises";
+import { writeFile as writeFile2 } from "fs/promises";
 async function createFrameworkApp(projectRoot, target) {
   const generator = FRAMEWORK_GENERATORS[target.framework];
   if (!generator) {
@@ -487,14 +498,20 @@ async function createApps(projectRoot, targets) {
           target.directory,
           "config/plugins.ts"
         );
-        let pluginsContent = await readFile3(pluginsPath, "utf8");
-        pluginsContent = pluginsContent.replace(
-          "export default ({ env }) => ({",
-          "export default () => ({"
+        await writeFile2(pluginsPath, "export default () => ({});\n");
+      } catch (error) {
+        console.warn(
+          `Could not normalize config/plugins.ts: ${error instanceof Error ? error.message : String(error)}`
         );
-        await writeFile2(pluginsPath, pluginsContent);
-      } catch {
       }
+      await runStep(
+        "Adding Postgres driver (pg) for production",
+        async () => runCommandQuiet(
+          "npm",
+          ["install", "pg"],
+          join4(projectRoot, target.directory)
+        )
+      );
     }
     await runSequentially(index + 1);
   };
@@ -502,7 +519,7 @@ async function createApps(projectRoot, targets) {
 }
 
 // src/modules/scaffoldActions/createIntegrations.ts
-import { mkdir, readFile as readFile4, writeFile as writeFile3 } from "fs/promises";
+import { mkdir, readFile as readFile3, writeFile as writeFile3 } from "fs/promises";
 import { dirname as dirname2, join as join5 } from "path";
 import { randomBytes } from "crypto";
 function toTemplateToken(key) {
@@ -517,7 +534,7 @@ function applyTemplateVariables(content, values) {
   return result;
 }
 async function copyTemplateFile(sourcePath, targetPath, values) {
-  const rawContent = await readFile4(sourcePath, "utf8");
+  const rawContent = await readFile3(sourcePath, "utf8");
   const content = applyTemplateVariables(rawContent, values);
   await mkdir(dirname2(targetPath), { recursive: true });
   await writeFile3(targetPath, content, "utf8");
@@ -581,7 +598,14 @@ async function createIntegrations(options, projectRoot, templatesDir) {
       api_token_salt: generateSecret(),
       admin_jwt_secret: generateSecret(),
       transfer_token_salt: generateSecret(),
-      jwt_secret: generateSecret()
+      jwt_secret: generateSecret(),
+      // Postgres identifier derived from app_name (hyphens -> underscores), so
+      // the role/database name needs no quoting.
+      db_name: String(options.integrationInputs?.app_name ?? "").replaceAll(
+        "-",
+        "_"
+      ),
+      db_password: generateSecret()
       /* eslint-enable camelcase */
     };
     return copyTemplateFile(
@@ -604,7 +628,7 @@ async function createIntegrations(options, projectRoot, templatesDir) {
       const frontendDir = join5(projectRoot, "frontend");
       await runCommandQuiet("npx", ["astro", "add", "node", "-y"], frontendDir);
       const astroConfigPath = join5(frontendDir, "astro.config.mjs");
-      let astroConfig = await readFile4(astroConfigPath, "utf8");
+      let astroConfig = await readFile3(astroConfigPath, "utf8");
       astroConfig = astroConfig.replace(
         /export default defineConfig\s*\(\s*\{/v,
         "export default defineConfig({\n  output: 'server',"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smi-digital/create-smi-app",
-  "version": "2.7.4",
+  "version": "2.7.6",
   "description": "",
   "main": "dist/index.js",
   "bin": {

package/templates/integrations/strapi-astro/databases.yml.template

@@ -0,0 +1,15 @@
+# Databases this project needs on the shared Postgres instance.
+# The deploy provisions each one (login role + database) automatically — no
+# manual step, no SSH. This file is the GitOps source of truth for the project's
+# databases; passwords live (encrypted) in production.backend.env.
+#
+#   - name:         the database AND login-role name (Postgres-safe identifier)
+#   - password_env: the variable in production.backend.env holding its password
+#
+# To add an app-managed database (e.g. a separate dataset the site reads), add an
+# entry here and its connection vars to production.backend.env:
+#   - name: my_dataset
+#     password_env: MY_DATASET_DATABASE_PASSWORD
+databases:
+  - name: __DB_NAME__
+    password_env: DATABASE_PASSWORD

package/templates/integrations/strapi-astro/docker-compose.yml.template

@@ -6,9 +6,9 @@ services:
     restart: unless-stopped
     env_file:
       - ./backend.env
-    volumes: 
+    volumes:
+      # Uploads stay on local disk for now; DB lives in Postgres (no sqlite volume).
       - ./data/uploads:/opt/app/public/uploads
-      - ./data/database:/opt/app/.tmp
     networks:
       - agency_shared_network
     healthcheck:
@@ -27,7 +27,10 @@ services:
       - "traefik.http.services.__APP_NAME__-strapi.loadbalancer.server.port=1337"
       # Strapi requires larger body sizes for media uploads (25MB)
       - "traefik.http.middlewares.__APP_NAME__-strapi-limit.buffering.maxRequestBodyBytes=25000000"
-      - "traefik.http.routers.__APP_NAME__-strapi.middlewares=__APP_NAME__-strapi-limit"
+      # Global middlewares (defined in webhosting-infra/traefik/dynamic) + the local
+      # body-size limit. rate-limit first so abusive traffic is dropped early; this
+      # matters most on the public Strapi admin/API.
+      - "traefik.http.routers.__APP_NAME__-strapi.middlewares=rate-limit@file,secure-headers@file,__APP_NAME__-strapi-limit"
 
   __APP_NAME__-astro:
     container_name: __APP_NAME__-astro
@@ -75,6 +78,8 @@ services:
       # Listen on both www and non-www
       - "traefik.http.routers.__APP_NAME__-astro.rule=Host(`__PROJECT_DOMAIN__`) || Host(`www.__PROJECT_DOMAIN__`)"
       - "traefik.http.routers.__APP_NAME__-astro.tls.certresolver=letsencrypt"
+      # Global middlewares (defined in webhosting-infra/traefik/dynamic)
+      - "traefik.http.routers.__APP_NAME__-astro.middlewares=secure-headers@file,rate-limit@file"
       # Route traffic to the Nginx Cache (Port 80) instead of Astro directly
       - "traefik.http.services.__APP_NAME__-astro.loadbalancer.server.port=80"
 

package/templates/integrations/strapi-astro/integration.config.json

@@ -24,10 +24,11 @@
       },
       {
         "key": "app_name",
-        "message": "What is the app name?",
+        "message": "What is the app name? (lowercase slug, e.g. my-new-client)",
         "type": "input",
         "default": "my-new-client",
-        "required": true
+        "required": true,
+        "validate": "slug"
       },
       {
         "key": "include_www",
@@ -89,6 +90,10 @@
     {
       "template": "production.backend.env.template",
       "target": "production.backend.env"
+    },
+    {
+      "template": "databases.yml.template",
+      "target": "databases.yml"
     }
   ]
 }

package/templates/integrations/strapi-astro/production.backend.env.template

@@ -17,6 +17,17 @@ ADMIN_JWT_SECRET=__ADMIN_JWT_SECRET__
 TRANSFER_TOKEN_SALT=__TRANSFER_TOKEN_SALT__
 JWT_SECRET=__JWT_SECRET__
 
+# Database — production uses Postgres (local dev defaults to SQLite).
+# A matching role + database must exist on the shared Postgres instance,
+# reachable as DATABASE_HOST on the agency_shared_network.
+DATABASE_CLIENT=postgres
+DATABASE_HOST=postgres
+DATABASE_PORT=5432
+DATABASE_NAME=__DB_NAME__
+DATABASE_USERNAME=__DB_NAME__
+DATABASE_PASSWORD=__DB_PASSWORD__
+DATABASE_SSL=false
+
 # Production Settings
 HOST=0.0.0.0
 PORT=1337