@maker-or/opencms 0.1.5 → 0.1.7

package/README.md

@@ -25,4 +25,11 @@ The generated `cms/schema.json` file defines the project's content types and all
 
 The CLI stores its local login configuration in `~/.config/opencms/config.json` (or `$XDG_CONFIG_HOME/opencms/config.json` when configured).
 
-The CLI defaults to the hosted OpenCMS dashboard and API. Use `OPENCMS_DASHBOARD_URL` and `OPENCMS_API_URL` to target a local or self-hosted instance.
+The CLI uses the OpenCMS control-plane origin from `OPENCMS_URL`. Set it to the dashboard/API origin for your hosted, local, or self-hosted instance. `OPENCMS_API_URL` and `OPENCMS_DASHBOARD_URL` remain supported as separate legacy overrides, but there is no baked-in deployment URL.
+
+For example:
+
+```bash
+export OPENCMS_URL=https://your-opencms-domain.example
+npx @maker-or/opencms login
+```

package/dist/index.js

@@ -67,10 +67,7 @@ class OpenCmsApiError extends Error {
 function createSdk(options = {}) {
   const defaultBaseUrl = typeof window === "undefined" ? undefined : window.location.origin;
   const configuredBaseUrl = options.baseUrl ?? defaultBaseUrl;
-  if (!configuredBaseUrl) {
-    throw new Error("baseUrl is required when using the OpenCMS SDK outside a browser.");
-  }
-  const baseUrl = configuredBaseUrl.replace(/\/$/, "");
+  const baseUrl = configuredBaseUrl?.replace(/\/$/, "") ?? "";
   const fetcher = options.fetch ?? globalThis.fetch;
   const projectId = options.projectId;
   const environment = options.environment ?? "development";
@@ -81,6 +78,9 @@ function createSdk(options = {}) {
     if (token) {
       headers.set("Authorization", `Bearer ${token}`);
     }
+    if (!baseUrl && typeof window === "undefined") {
+      throw new Error("baseUrl is required when making OpenCMS SDK requests outside a browser.");
+    }
     const response = await fetcher(`${baseUrl}${path}`, {
       ...init,
       headers
@@ -206,9 +206,6 @@ function createSdk(options = {}) {
 }
 
 // src/index.ts
-var hostedUrl = "https://web-eta-ten-16.vercel.app";
-var dashboardUrl = process.env.OPENCMS_DASHBOARD_URL ?? hostedUrl;
-var apiUrl = process.env.OPENCMS_API_URL ?? hostedUrl;
 var configRoot = process.env.XDG_CONFIG_HOME ?? join(homedir(), ".config");
 var configPath = join(configRoot, "opencms", "config.json");
 async function readConfig() {
@@ -228,9 +225,22 @@ async function writeConfig(config) {
 function tokenFor(config) {
   return process.env.OPENCMS_CLERK_TOKEN ?? config.token ?? null;
 }
+function requireEndpoint(endpoint) {
+  const normalized = endpoint?.trim().replace(/\/$/, "");
+  if (!normalized) {
+    throw new Error("OpenCMS endpoint is not configured. Set OPENCMS_URL to your OpenCMS dashboard/API origin and try again.");
+  }
+  return normalized;
+}
+function apiUrlFor(config) {
+  return requireEndpoint(process.env.OPENCMS_URL ?? process.env.OPENCMS_API_URL ?? config?.apiUrl ?? process.env.OPENCMS_DASHBOARD_URL);
+}
+function dashboardUrlFor(config) {
+  return requireEndpoint(process.env.OPENCMS_URL ?? process.env.OPENCMS_DASHBOARD_URL ?? process.env.OPENCMS_API_URL ?? config?.apiUrl);
+}
 function sdk(config, projectId) {
   return createSdk({
-    baseUrl: process.env.OPENCMS_API_URL ?? config.apiUrl ?? apiUrl,
+    baseUrl: apiUrlFor(config),
     projectId,
     getToken: () => tokenFor(config)
   });
@@ -261,7 +271,7 @@ async function openBrowser(url) {
   const command = process.platform === "darwin" ? ["open", url] : process.platform === "win32" ? ["cmd", "/c", "start", "", url] : ["xdg-open", url];
   await runCommand(command[0], command.slice(1));
 }
-async function browserLogin() {
+async function browserLogin(config) {
   let resolveToken = () => {
     return;
   };
@@ -297,7 +307,7 @@ async function browserLogin() {
   if (!address || typeof address === "string")
     throw new Error("Unable to start the login callback server.");
   const callback = `http://127.0.0.1:${address.port}/callback`;
-  const loginUrl = `${dashboardUrl.replace(/\/$/, "")}/cli/login?redirect_uri=${encodeURIComponent(callback)}`;
+  const loginUrl = `${dashboardUrlFor(config)}/cli/login?redirect_uri=${encodeURIComponent(callback)}`;
   console.log(`Opening ${loginUrl}`);
   try {
     await openBrowser(loginUrl);
@@ -316,8 +326,8 @@ async function ensureToken(config) {
   const token = tokenFor(config);
   if (token)
     return token;
-  const loggedInToken = await browserLogin();
-  await writeConfig({ ...config, token: loggedInToken, apiUrl: config.apiUrl ?? apiUrl });
+  const loggedInToken = await browserLogin(config);
+  await writeConfig({ ...config, token: loggedInToken, apiUrl: apiUrlFor(config) });
   return loggedInToken;
 }
 async function reauthenticate(config) {
@@ -325,19 +335,19 @@ async function reauthenticate(config) {
     throw new Error("OPENCMS_CLERK_TOKEN was rejected or expired. Provide a fresh token or unset the variable to use browser login.");
   }
   console.log("Your OpenCMS session has expired. Opening browser login…");
-  const loggedInToken = await browserLogin();
-  await writeConfig({ ...config, token: loggedInToken, apiUrl: config.apiUrl ?? apiUrl });
+  const loggedInToken = await browserLogin(config);
+  await writeConfig({ ...config, token: loggedInToken, apiUrl: apiUrlFor(config) });
   return loggedInToken;
 }
 async function login() {
   const config = await readConfig();
   if (process.env.OPENCMS_CLERK_TOKEN) {
-    await writeConfig({ ...config, token: process.env.OPENCMS_CLERK_TOKEN, apiUrl: config.apiUrl ?? apiUrl });
+    await writeConfig({ ...config, token: process.env.OPENCMS_CLERK_TOKEN, apiUrl: apiUrlFor(config) });
     console.log("Saved OPENCMS_CLERK_TOKEN for local CLI use.");
     return;
   }
-  const loggedInToken = await browserLogin();
-  await writeConfig({ ...config, token: loggedInToken, apiUrl: config.apiUrl ?? apiUrl });
+  const loggedInToken = await browserLogin(config);
+  await writeConfig({ ...config, token: loggedInToken, apiUrl: apiUrlFor(config) });
   console.log("Logged in to OpenCMS.");
 }
 async function logout() {
@@ -373,8 +383,8 @@ async function ensureCmsDirectory(destination, project, baseUrl) {
   const configFile = join(cmsDirectory, "opencms.ts");
   if (!await fileExists(configFile)) {
     await writeFile(configFile, `export const opencms = {
-  projectId: process.env.NEXT_PUBLIC_OPENCMS_PROJECT_ID ?? "${project.id}",
-  apiUrl: process.env.OPENCMS_API_URL ?? "${baseUrl}",
+  projectId: process.env.NEXT_PUBLIC_OPENCMS_PROJECT_ID ?? "",
+  apiUrl: process.env.OPENCMS_API_URL ?? "",
   environment: process.env.OPENCMS_ENVIRONMENT ?? "development",
 } as const;
 `, "utf8");
@@ -435,7 +445,7 @@ async function createProject() {
   }
   const destination = resolve(process.cwd(), slugify(project.name));
   await pullTemplate(destination);
-  const baseUrl = process.env.OPENCMS_API_URL ?? config.apiUrl ?? apiUrl;
+  const baseUrl = apiUrlFor(config);
   await writeProjectEnv(destination, project, baseUrl);
   await ensureCmsDirectory(destination, project, baseUrl);
   await installDependencies(destination);
@@ -443,7 +453,7 @@ async function createProject() {
   console.log(`
 Created ${project.name}.`);
   console.log(`Project ID: ${project.id}`);
-  console.log(`Dashboard: ${dashboardUrl.replace(/\/$/, "")}/dashboard/${project.id}`);
+  console.log(`Dashboard: ${dashboardUrlFor(await readConfig())}/dashboard/${project.id}`);
   console.log(`
 Next steps:
   cd ${slugify(project.name)}
@@ -462,8 +472,35 @@ async function runDev() {
     await syncLocalSchema(await projectIdFromEnv(), await readConfig());
   }
   const manager = await packageManager(process.cwd());
-  const command = manager[0] === "npm" ? ["npm", "run", "dev"] : manager[0] === "pnpm" ? ["pnpm", "dev"] : manager[0] === "yarn" ? ["yarn", "dev"] : ["bun", "run", "dev"];
-  process.exit(await runCommand(command[0], command.slice(1), { cwd: process.cwd(), env: { ...process.env, OPENCMS_ENVIRONMENT: "development" }, inherit: true }));
+  const script = await nextDevScript(process.cwd());
+  const command = manager[0] === "npm" ? ["npm", "run", script] : manager[0] === "pnpm" ? ["pnpm", script] : manager[0] === "yarn" ? ["yarn", script] : ["bun", "run", script];
+  process.exit(await runCommand(command[0], command.slice(1), {
+    cwd: process.cwd(),
+    env: {
+      ...process.env,
+      OPENCMS_API_URL: apiUrlFor(await readConfig()),
+      OPENCMS_ENVIRONMENT: "development"
+    },
+    inherit: true
+  }));
+}
+async function nextDevScript(destination) {
+  const packagePath = join(destination, "package.json");
+  if (!await fileExists(packagePath))
+    return "dev";
+  try {
+    const packageJson = JSON.parse(await readFile(packagePath, "utf8"));
+    if (typeof packageJson.scripts?.["dev:next"] === "string")
+      return "dev:next";
+    if (typeof packageJson.scripts?.dev === "string" && /opencms(?:@[^\s]+)?\s+dev/.test(packageJson.scripts.dev)) {
+      throw new Error("This OpenCMS template is missing its dev:next script. Update the template before running opencms dev.");
+    }
+  } catch (error) {
+    if (error instanceof SyntaxError)
+      throw new Error("package.json is not valid JSON.");
+    throw error;
+  }
+  return "dev";
 }
 async function syncLocalSchema(projectId, config) {
   if (!projectId)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maker-or/opencms",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "The developer-first CLI for OpenCMS",
   "type": "module",
   "repository": {