astro-tractstack 2.0.0-rc.5 → 2.0.0-rc.51

package/README.md

@@ -283,7 +283,7 @@ sudo ~/t8k/src/tractstack-go/pkg/scripts/t8k-uninstall.sh
 
 ## Support & Documentation
 
-- **Documentation**: https://tractstack.org/docs
+- **Documentation**: https://tractstack.org
 - **GitHub Issues**: https://github.com/AtRiskMedia/tractstack-go/issues
 - **Email Support**: hello@tractstack.com
 - **Community**: Join discussions about adaptive web experiences

package/bin/create-tractstack.js

@@ -29,16 +29,25 @@ function detectPackageManager() {
 }
 
 // Parse existing .env file
-function parseExistingEnv() {
+function getEnvState() {
   const defaults = {
     goBackend: 'http://localhost:8080',
     tenantId: 'default',
     goBackendPath: `${homedir()}/t8k-go-server/`,
     enableMultiTenant: false,
+    enableBunny: false,
+  };
+
+  const found = {
+    goBackend: false,
+    tenantId: false,
+    goBackendPath: false,
+    enableMultiTenant: false,
+    enableBunny: false,
   };
 
   if (!existsSync('.env')) {
-    return defaults;
+    return { envDefaults: defaults, envState: found };
   }
 
   try {
@@ -50,7 +59,6 @@ function parseExistingEnv() {
       if (line && !line.startsWith('#')) {
         const [key, ...valueParts] = line.split('=');
         if (key && valueParts.length > 0) {
-          // Remove surrounding quotes and trim
           let value = valueParts.join('=').trim();
           if (
             (value.startsWith('"') && value.endsWith('"')) ||
@@ -64,18 +72,30 @@ function parseExistingEnv() {
     });
 
     return {
-      goBackend: envVars.PUBLIC_GO_BACKEND || defaults.goBackend,
-      tenantId: envVars.PUBLIC_TENANTID || defaults.tenantId,
-      goBackendPath: envVars.PRIVATE_GO_BACKEND_PATH || defaults.goBackendPath,
-      enableMultiTenant:
-        envVars.PUBLIC_ENABLE_MULTI_TENANT === 'true' ||
-        defaults.enableMultiTenant,
+      envDefaults: {
+        goBackend: envVars.PUBLIC_GO_BACKEND || defaults.goBackend,
+        tenantId: envVars.PUBLIC_TENANTID || defaults.tenantId,
+        goBackendPath:
+          envVars.PRIVATE_GO_BACKEND_PATH || defaults.goBackendPath,
+        enableMultiTenant:
+          envVars.PUBLIC_ENABLE_MULTI_TENANT === 'true' ||
+          defaults.enableMultiTenant,
+        enableBunny:
+          envVars.PUBLIC_ENABLE_BUNNY === 'true' || defaults.enableBunny,
+      },
+      envState: {
+        goBackend: !!envVars.PUBLIC_GO_BACKEND,
+        tenantId: !!envVars.PUBLIC_TENANTID,
+        goBackendPath: !!envVars.PRIVATE_GO_BACKEND_PATH,
+        enableMultiTenant: envVars.PUBLIC_ENABLE_MULTI_TENANT !== undefined,
+        enableBunny: envVars.PUBLIC_ENABLE_BUNNY !== undefined,
+      },
     };
   } catch (error) {
     console.log(
       kleur.yellow('⚠️ Found .env file but could not parse it, using defaults')
     );
-    return defaults;
+    return { envDefaults: defaults, envState: found };
   }
 }
 
@@ -141,7 +161,7 @@ ${kleur.bold('Examples:')}
   }
 
   // Parse existing .env values
-  const envDefaults = parseExistingEnv();
+  const { envDefaults, envState } = getEnvState();
   const hasExistingEnv = existsSync('.env');
 
   if (hasExistingEnv) {
@@ -152,9 +172,11 @@ ${kleur.bold('Examples:')}
     );
   }
 
-  // Prompt for configuration with existing values as defaults
-  const responses = await prompts([
-    {
+  // Build prompts array conditionally - only prompt for values not in .env
+  const promptQuestions = [];
+
+  if (!envState.goBackend) {
+    promptQuestions.push({
       type: 'text',
       name: 'goBackend',
       message: 'TractStack Go backend URL:',
@@ -167,21 +189,61 @@ ${kleur.bold('Examples:')}
           return 'Please enter a valid URL';
         }
       },
-    },
-    {
+    });
+  } else {
+    console.log(
+      kleur.green(`✓ Using Go backend URL: ${envDefaults.goBackend}`)
+    );
+  }
+
+  if (!envState.enableMultiTenant && !enableMultiTenant) {
+    promptQuestions.push({
       type: 'confirm',
       name: 'enableMultiTenant',
       message: 'Enable multi-tenant functionality?',
       initial: enableMultiTenant || envDefaults.enableMultiTenant,
-    },
-    {
-      type: (prev, values) => (values.enableMultiTenant ? 'text' : null),
+    });
+  } else {
+    const willEnable = enableMultiTenant || envDefaults.enableMultiTenant;
+    console.log(
+      kleur.green(
+        `✓ Multi-tenant functionality: ${willEnable ? 'enabled' : 'disabled'}`
+      )
+    );
+  }
+
+  if (!envState.enableBunny) {
+    promptQuestions.push({
+      type: 'confirm',
+      name: 'enableBunny',
+      message: 'Enable Bunny Video Player?',
+      initial: envDefaults.enableBunny,
+    });
+  } else {
+    console.log(
+      kleur.green(
+        `✓ Bunny Video Player: ${envDefaults.enableBunny ? 'enabled' : 'disabled'}`
+      )
+    );
+  }
+
+  // Only prompt for tenantId if multi-tenant will be enabled and tenantId not in .env
+  const willEnableMultiTenant =
+    enableMultiTenant || envDefaults.enableMultiTenant;
+  if (willEnableMultiTenant && !envState.tenantId) {
+    promptQuestions.push({
+      type: 'text',
       name: 'tenantId',
       message: 'Tenant ID:',
       initial: envDefaults.tenantId,
       validate: (value) => value.length > 0 || 'Tenant ID is required',
-    },
-    {
+    });
+  } else if (willEnableMultiTenant) {
+    console.log(kleur.green(`✓ Using Tenant ID: ${envDefaults.tenantId}`));
+  }
+
+  if (!envState.goBackendPath) {
+    promptQuestions.push({
       type: 'text',
       name: 'goBackendPath',
       message: 'TractStack Go backend path:',
@@ -192,37 +254,61 @@ ${kleur.bold('Examples:')}
         }
         return true;
       },
-    },
-    {
-      type: 'confirm',
-      name: 'includeExamples',
-      message:
-        'Include CodeHook examples? (custom components, collections route)',
-      initial: includeExamples,
-    },
-  ]);
+    });
+  } else {
+    console.log(
+      kleur.green(`✓ Using Go backend path: ${envDefaults.goBackendPath}`)
+    );
+  }
+
+  // Always ask about examples (not stored in .env)
+  promptQuestions.push({
+    type: 'confirm',
+    name: 'includeExamples',
+    message:
+      'Include CodeHook examples? (custom components, collections route)',
+    initial: includeExamples,
+  });
+
+  // Run prompts only if there are questions
+  const responses =
+    promptQuestions.length > 0 ? await prompts(promptQuestions) : {};
+
+  // Merge responses with env defaults for final values
+  const finalResponses = {
+    goBackend: responses.goBackend || envDefaults.goBackend,
+    enableMultiTenant:
+      responses.enableMultiTenant === true || // explicit true from prompt
+      enableMultiTenant || // CLI flag --multi-tenant
+      envDefaults.enableMultiTenant === true, // existing .env value was "true"
+    enableBunny: responses.enableBunny ?? envDefaults.enableBunny,
+    tenantId: responses.tenantId || envDefaults.tenantId,
+    goBackendPath: responses.goBackendPath || envDefaults.goBackendPath,
+    includeExamples: responses.includeExamples ?? includeExamples,
+  };
 
-  if (!responses.goBackend) {
-    console.log(kleur.red('\n❌ Setup cancelled.'));
+  if (!finalResponses.goBackend) {
+    console.log(kleur.red('\n✗ Setup cancelled.'));
     process.exit(1);
   }
 
   // Use existing tenantId if multi-tenant is disabled
-  const finalTenantId = responses.enableMultiTenant
-    ? responses.tenantId
+  const finalTenantId = finalResponses.enableMultiTenant
+    ? finalResponses.tenantId
     : envDefaults.tenantId;
 
   if (!finalTenantId) {
-    console.log(kleur.red('\n❌ Setup cancelled - Tenant ID is required.'));
+    console.log(kleur.red('\n✗ Setup cancelled - Tenant ID is required.'));
     process.exit(1);
   }
 
   // Create .env file
   const envContent = `# TractStack Configuration
-PUBLIC_GO_BACKEND="${responses.goBackend}"
+PUBLIC_GO_BACKEND="${finalResponses.goBackend}"
 PUBLIC_TENANTID="${finalTenantId}"
-PRIVATE_GO_BACKEND_PATH="${responses.goBackendPath.endsWith('/') ? responses.goBackendPath : responses.goBackendPath + '/'}"
-${responses.enableMultiTenant ? 'PUBLIC_ENABLE_MULTI_TENANT="true"' : ''}
+PRIVATE_GO_BACKEND_PATH="${finalResponses.goBackendPath.endsWith('/') ? finalResponses.goBackendPath : finalResponses.goBackendPath + '/'}"
+PUBLIC_ENABLE_MULTI_TENANT="${finalResponses.enableMultiTenant ? 'true' : 'false'}"
+PUBLIC_ENABLE_BUNNY="${finalResponses.enableBunny ? 'true' : 'false'}"
 `;
 
   try {

package/dist/index.js

@@ -30,7 +30,15 @@ async function w(t, e, c) {
       dest: "env.example"
     },
     {
-      src: t("../templates/.gitignore"),
+      src: t("../templates/prettierrc"),
+      dest: ".prettierrc"
+    },
+    {
+      src: t("../templates/prettierignore"),
+      dest: ".prettierignore"
+    },
+    {
+      src: t("../templates/gitignore"),
       dest: ".gitignore"
     },
     {
@@ -470,10 +478,6 @@ async function w(t, e, c) {
       src: t("../templates/src/components/edit/pane/PanePanel_path.tsx"),
       dest: "src/components/edit/pane/PanePanel_path.tsx"
     },
-    {
-      src: t("../templates/src/components/edit/pane/PanePanel_slug.tsx"),
-      dest: "src/components/edit/pane/PanePanel_slug.tsx"
-    },
     {
       src: t("../templates/src/components/edit/pane/PanePanel_title.tsx"),
       dest: "src/components/edit/pane/PanePanel_title.tsx"
@@ -889,6 +893,23 @@ async function w(t, e, c) {
       src: t("../templates/src/components/Fragment.astro"),
       dest: "src/components/Fragment.astro"
     },
+    // Search Components
+    {
+      src: t("../templates/src/components/search/SearchWrapper.tsx"),
+      dest: "src/components/search/SearchWrapper.tsx"
+    },
+    {
+      src: t("../templates/src/components/search/SearchModal.tsx"),
+      dest: "src/components/search/SearchModal.tsx"
+    },
+    {
+      src: t("../templates/src/components/search/SearchResults.tsx"),
+      dest: "src/components/search/SearchResults.tsx"
+    },
+    {
+      src: t("../templates/src/hooks/useSearch.ts"),
+      dest: "src/hooks/useSearch.ts"
+    },
     // Profile Components
     {
       src: t("../templates/src/components/profile/ProfileConsent.tsx"),
@@ -1020,6 +1041,12 @@ async function w(t, e, c) {
       dest: "src/components/form/advanced/APIConfigSection.tsx"
     },
     // StoryKeep Dashboard Components
+    {
+      src: t(
+        "../templates/src/components/storykeep/StoryKeepBackdrop.astro"
+      ),
+      dest: "src/components/storykeep/StoryKeepBackdrop.astro"
+    },
     {
       src: t("../templates/src/components/storykeep/Dashboard.tsx"),
       dest: "src/components/storykeep/Dashboard.tsx"
@@ -1244,6 +1271,10 @@ async function w(t, e, c) {
       dest: "src/lib/session.ts"
     },
     // Client Scripts
+    {
+      src: t("../templates/src/client/htmx.min.js"),
+      dest: "public/client/htmx.min.js"
+    },
     {
       src: t("../templates/src/client/sse.js"),
       dest: "public/client/sse.js"
@@ -2001,6 +2032,11 @@ async function w(t, e, c) {
       dest: "src/custom/CustomRoutes.astro",
       protected: !0
     },
+    {
+      src: t("../templates/src/utils/customHelpers.ts"),
+      dest: "src/utils/customHelpers.ts",
+      protected: !0
+    },
     // Example Components (Conditional)
     ...c?.includeExamples ? [
       {
@@ -2026,7 +2062,7 @@ async function w(t, e, c) {
     try {
       const p = i(s.dest);
       r(p) || x(p, { recursive: !0 });
-      const o = !s.protected && (s.dest === "tailwind.config.cjs" || s.dest.startsWith("src/components/codehooks/") || s.dest.startsWith("src/components/widgets/") || s.dest.startsWith("src/") || s.dest === ".gitignore");
+      const o = !s.protected && (s.dest === "tailwind.config.cjs" || s.dest.startsWith("src/components/codehooks/") || s.dest.startsWith("src/components/widgets/") || s.dest.startsWith("src/") || s.dest.startsWith("public/client/") || s.dest === ".gitignore");
       if (!r(s.dest) || o)
         if (r(s.src))
           k(s.src, s.dest), e.info(`Updated ${s.dest}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro-tractstack",
-  "version": "2.0.0-rc.5",
+  "version": "2.0.0-rc.51",
   "description": "Astro integration for TractStack - redeeming the web from boring experiences",
   "type": "module",
   "main": "dist/index.js",
@@ -85,5 +85,10 @@
   "engines": {
     "node": ">=18.14.1"
   },
-  "packageManager": "pnpm@9.15.4+sha512.b2dc20e2fc72b3e18848459b37359a32064663e5627a51e4c74b2c29dd8e8e0491483c3abb40789cfd578bf362fb6ba8261b05f0387d76792ed6e23ea3b1b6a0"
+  "packageManager": "pnpm@9.15.4+sha512.b2dc20e2fc72b3e18848459b37359a32064663e5627a51e4c74b2c29dd8e8e0491483c3abb40789cfd578bf362fb6ba8261b05f0387d76792ed6e23ea3b1b6a0",
+  "pnpm": {
+    "overrides": {
+      "esbuild@<=0.24.2": ">=0.25.0"
+    }
+  }
 }