@sandboxsonny/ace-kit 0.4.0 → 0.6.0

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @sandboxsonny/ace-kit
 
+## 0.6.0
+
+### Minor Changes
+
+- 6235a3b: Add `ace-kit create <folder> <domain>`: signs you in, makes the site in CMS Ace with starter content (a Pages type, Home, About and Contact, a main menu and example sections), and copies an Astro or React Router starter into the folder (`--framework`, `--name`). Needs a CMS Ace that lets a command-line login set up the site it just made.
+
+## 0.5.0
+
+### Minor Changes
+
+- 88e17be: CMS Ace is a hosted platform, so a site no longer has to say where it is.
+  
+  - `ACE_API_URL` now defaults to `https://api.ace-cms.co.uk` and `ACE_PREVIEW_ADMIN_ORIGIN` to `https://app.ace-cms.co.uk` (the Astro integration, the React Router adapter and the command line). **If you develop against a CMS on your own machine, set `ACE_API_URL=http://localhost:8080` and `ACE_PREVIEW_ADMIN_ORIGIN=http://localhost:5173` in `.env`**, where before they were the defaults.
+  - A site names itself with Astro's own `site` setting (`site: "https://www.example.com"`, or `astro dev --site https://www.example.com`). `ACE_SITE_DOMAIN`, when set, still wins.
+  - `ace-kit sync` and `ace-kit generate` take `--site example.com` (a domain or a web address); `--domain` still works.
+  - `ace-kit login` and `whoami` need no flags: with no address given they use the hosted CMS Ace.
+
 ## 0.4.0
 
 ### Minor Changes

package/README.md

@@ -24,7 +24,7 @@ const page = await loadPage(cms, { slug: "pages/about", url: new URL(request.url
 if (page.kind === "entry") console.log(page.entry.title, page.entry.values);
 ```
 
-On Astro there is nothing to wire up by hand: add the integration to `astro.config.mjs` (`integrations: [ace()]`), set `ACE_API_URL` and `ACE_SITE_DOMAIN`, and read the CMS straight from a page:
+On Astro there is nothing to wire up by hand: add the integration to `astro.config.mjs` (`integrations: [ace()]`), set your site's domain (`site: "https://www.example.com"` in the Astro config, or `ACE_SITE_DOMAIN`), and read the CMS straight from a page:
 
 ```astro
 ---

package/dist/astro-integration.d.ts

@@ -13,9 +13,9 @@ import { AstroIntegration } from 'astro';
  *
  * | Setting                    | Default                 | Meaning                                                  |
  * | -------------------------- | ----------------------- | -------------------------------------------------------- |
- * | `ACE_API_URL`              | `http://localhost:8080` | where the CMS Ace API lives                              |
- * | `ACE_SITE_DOMAIN`          | `localhost`             | the domain this site has in the CMS                      |
- * | `ACE_PREVIEW_ADMIN_ORIGIN` | `http://localhost:5173` | where the CMS admin app runs (may frame the site)        |
+ * | `ACE_API_URL`              | `https://api.ace-cms.co.uk` | where the CMS Ace API lives (set it for a CMS on your machine) |
+ * | `ACE_SITE_DOMAIN`          | the host of Astro's `site` setting, else `localhost` | the domain this site has in the CMS |
+ * | `ACE_PREVIEW_ADMIN_ORIGIN` | `https://app.ace-cms.co.uk` | where the CMS admin app runs (may frame the site)  |
  */
 declare function ace(): AstroIntegration;
 

package/dist/astro-integration.js

@@ -1,4 +1,5 @@
-import { startDevSite, sectionSync } from './chunk-O3NAJNUN.js';
+import { startDevSite, sectionSync } from './chunk-G5FGBOFT.js';
+import { domainFromSite, hostedAdminOrigin, hostedApiUrl } from './chunk-N5DIMG3X.js';
 import { envField } from 'astro/config';
 import { fileURLToPath } from 'url';
 
@@ -8,10 +9,12 @@ function ace() {
     name: "ace-kit",
     hooks: {
       "astro:config:setup": async ({ command, config, logger, updateConfig, addMiddleware }) => {
+        const siteDomain = config.site ? domainFromSite(config.site) : "localhost";
         if (command === "dev") {
           devSite = await startDevSite({
             root: fileURLToPath(config.root),
             mode: "development",
+            siteDomain,
             log: { info: (text) => logger.info(text), warn: (text) => logger.warn(text) }
           });
         }
@@ -19,12 +22,12 @@ function ace() {
           env: {
             schema: {
               // "secret" only because Astro reads secrets when the server starts, while "public" values are baked into the build.
-              ACE_API_URL: envField.string({ context: "server", access: "secret", default: "http://localhost:8080" }),
-              ACE_SITE_DOMAIN: envField.string({ context: "server", access: "secret", default: "localhost" }),
+              ACE_API_URL: envField.string({ context: "server", access: "secret", default: hostedApiUrl }),
+              ACE_SITE_DOMAIN: envField.string({ context: "server", access: "secret", default: siteDomain }),
               ACE_PREVIEW_ADMIN_ORIGIN: envField.string({
                 context: "server",
                 access: "secret",
-                default: "http://localhost:5173"
+                default: hostedAdminOrigin
               })
             }
           },

package/dist/chunk-7M26C36M.js

@@ -0,0 +1,35 @@
+#!/usr/bin/env node
+
+// src/auth/login-store.ts
+function normaliseApiUrl(address) {
+  let parsed;
+  try {
+    parsed = new URL(address.trim());
+  } catch {
+    throw new Error(`"${address}" is not a web address. Write the API address like http://localhost:8080.`);
+  }
+  if (parsed.protocol !== "http:" && parsed.protocol !== "https:") {
+    throw new Error(`The API address must start with http:// or https:// (it was "${address}").`);
+  }
+  if (parsed.username || parsed.password) {
+    throw new Error("The API address must not contain a username or password.");
+  }
+  return `${parsed.origin}${parsed.pathname.replace(/\/+$/, "")}`;
+}
+function hasExpired(login, now) {
+  const endsAt = Date.parse(login.expiresAt);
+  return Number.isNaN(endsAt) || endsAt <= now;
+}
+function parseStoredLogin(value) {
+  if (typeof value !== "object" || value === null) return null;
+  const { token, expiresAt, email } = value;
+  if (typeof token !== "string" || token === "" || typeof expiresAt !== "string" || typeof email !== "string")
+    return null;
+  return { token, expiresAt, email };
+}
+
+export {
+  normaliseApiUrl,
+  hasExpired,
+  parseStoredLogin
+};

package/dist/{chunk-O3NAJNUN.js → chunk-G5FGBOFT.js}

@@ -1,3 +1,4 @@
+import { hostedApiUrl } from './chunk-N5DIMG3X.js';
 import { loadEnv } from 'vite';
 import { readdir, readFile, mkdir, writeFile, rename } from 'fs/promises';
 import { homedir } from 'os';
@@ -5,8 +6,6 @@ import { join, relative, dirname } from 'path';
 import { spawn } from 'child_process';
 import { fileURLToPath } from 'url';
 
-// src/dev-site/start-dev-site.ts
-
 // src/auth/login-store.ts
 function normaliseApiUrl(address) {
   let parsed;
@@ -282,18 +281,19 @@ async function prepareDevSite(options) {
 }
 
 // src/dev-site/start-dev-site.ts
-var defaultApiUrl = "http://localhost:8080";
 async function startDevSite(options) {
   const { root, mode, log } = options;
   if (mode === "test" || process.env.VITEST) return null;
-  const variables = options.environment?.variables ?? { ...loadEnv(mode, root, "ACE_"), ...process.env };
+  const base = options.environment?.variables ?? { ...loadEnv(mode, root, "ACE_"), ...process.env };
+  const realDomain = base.ACE_SITE_DOMAIN?.trim() || options.siteDomain?.trim() || "localhost";
+  const variables = { ...base, ACE_SITE_DOMAIN: realDomain };
   let apiUrl;
   try {
-    apiUrl = normaliseApiUrl(variables.ACE_API_URL ?? defaultApiUrl);
+    apiUrl = normaliseApiUrl(variables.ACE_API_URL ?? hostedApiUrl);
   } catch {
     return null;
   }
-  const environment = options.environment ?? {
+  const environment = options.environment ? { ...options.environment, variables } : {
     variables,
     store: await chooseLoginStore({ platform: process.platform, variables, run: runCommand }),
     now: Date.now,
@@ -317,7 +317,7 @@ async function startDevSite(options) {
       log.info(
         outcome.created ? `Made you a dev site, "${outcome.site.name}", as a copy of the live site (${outcome.site.domain}). This dev server reads and syncs to it; the live site is not touched.` : `Using your dev site, "${outcome.site.name}" (${outcome.site.domain}). The live site is not touched.`
       );
-      const siteDomain = variables.ACE_SITE_DOMAIN?.trim() || "localhost";
+      const siteDomain = realDomain;
       return {
         domain: outcome.site.domain,
         setPreviewUrl: async (previewUrl) => {

package/dist/chunk-N5DIMG3X.js

@@ -0,0 +1,16 @@
+// src/helpers/platform.ts
+var hostedApiUrl = "https://api.ace-cms.co.uk";
+var hostedAdminOrigin = "https://app.ace-cms.co.uk";
+function domainFromSite(site) {
+  const trimmed = site.trim();
+  if (trimmed.includes("://")) {
+    try {
+      return new URL(trimmed).hostname.toLowerCase();
+    } catch {
+      return trimmed.toLowerCase();
+    }
+  }
+  return trimmed.replace(/\/.*$/, "").replace(/:\d+$/, "").toLowerCase();
+}
+
+export { domainFromSite, hostedAdminOrigin, hostedApiUrl };