LumeCMS is automatically initialized

Author: oscarotero

CHANGELOG.md

@@ -6,6 +6,10 @@ and this project try to adheres to [Semantic Versioning](https://semver.org/).
 Go to the `v2` branch to see the changelog of Lume 2.
 Go to the `v1` branch to see the changelog of Lume 1.
 
+## [3.1.0] - Unreleased
+### Removed
+- `cms` command. LumeCMS is automatically initialized if the file `_cms.ts` or `_cms.js` is detected. Use `--no-cms` option to disable it.
+
 ## [3.0.12] - Unreleased
 ### Fixed
 - `feed` plugin: revert changes introduced in 3.0.7 (Use `textContent` instead of `innerHTML` to get values using CSS selectors).
@@ -264,6 +268,7 @@ Go to the `v1` branch to see the changelog of Lume 1.
 [#785]: https://github.com/lumeland/lume/issues/785
 
 [3.0.12]: https://github.com/lumeland/lume/compare/v3.0.11...HEAD
+[3.1.0]: https://github.com/lumeland/lume/compare/v3.0.11...HEAD
 [3.0.11]: https://github.com/lumeland/lume/compare/v3.0.10...v3.0.11
 [3.0.10]: https://github.com/lumeland/lume/compare/v3.0.9...v3.0.10
 [3.0.9]: https://github.com/lumeland/lume/compare/v3.0.8...v3.0.9

cli.ts

@@ -68,46 +68,6 @@ const run = new Command()
     await run(config, scripts);
   });
 
-const cms = new Command()
-  .description("Run Lume CMS.")
-  .option(
-    "--config <config:string>",
-    "The config file path.",
-  )
-  .option(
-    "--src <src:string>",
-    "The source directory for your site.",
-    { default: "./" },
-  )
-  .option(
-    "--dest <dest:string>",
-    "The build destination.",
-    { default: "_site" },
-  )
-  .option(
-    "--location <location>",
-    "The URL location of the site.",
-    { default: "http://localhost" },
-  )
-  .option(
-    "-p, --port <port:number>",
-    "The port where the server runs.",
-    { default: 3000 },
-  )
-  .option(
-    "--hostname <hostname>",
-    "The hostname where the server runs.",
-    { default: "localhost" },
-  )
-  .option(
-    "-o, --open",
-    "Open the CMS in a browser.",
-  )
-  .action(async ({ config }) => {
-    const { runCms } = await import("./cli/cms.ts");
-    runCms(config);
-  });
-
 const lume = new Command()
   .name("🔥lume")
   .version(() => getCurrentVersion())
@@ -143,19 +103,19 @@ const lume = new Command()
     "Start a live-reloading web server and watch changes.",
   )
   .option(
-    "--cms",
-    "Run LumeCMS.",
+    "--no-cms",
+    "Don't start LumeCMS if _cms.ts file is detected.",
     { depends: ["serve"] },
   )
   .option(
     "-p, --port <port:number>",
     "The port where the server runs.",
-    { default: 3000 },
+    { default: 3000, depends: ["serve"] },
   )
   .option(
     "--hostname <hostname>",
     "The hostname where the server runs.",
-    { default: "localhost" },
+    { default: "localhost", depends: ["serve"] },
   )
   .option(
     "-o, --open",
@@ -178,7 +138,6 @@ const lume = new Command()
   .command("new <archetype> [arguments...]", create)
   .command("upgrade", upgrade)
   .command("run <script...>", run)
-  .command("cms", cms)
   .command("completions", new CompletionsCommand());
 
 try {

cli/build_worker.ts

@@ -32,7 +32,7 @@ interface BuildOptions {
   cms?: boolean;
 }
 
-async function build({ type, config, serve, cms }: BuildOptions) {
+async function build({ type, config, serve, cms: loadCms }: BuildOptions) {
   // Set the live reload environment variable to add hash to the URLs in the module loader
   setEnv("LUME_LIVE_RELOAD", "true");
 
@@ -41,15 +41,17 @@ async function build({ type, config, serve, cms }: BuildOptions) {
 
   // Setup LumeCMS
   let _cms: URL | undefined;
-  if (cms) {
+  // deno-lint-ignore no-explicit-any
+  let cms: any;
+
+  if (loadCms) {
     _cms = await resolveConfigFile(["_cms.ts", "_cms.js"]);
 
-    if (!_cms) {
-      throw new Error("CMS config file not found");
+    if (_cms) {
+      const mod = await import(_cms.toString());
+      cms = mod.default;
+      site.use(lumeCMS({ cms }));
     }
-
-    const mod = await import(_cms.toString());
-    site.use(lumeCMS({ cms: mod.default }));
   }
 
   // Include the config files to the watcher
@@ -108,13 +110,27 @@ async function build({ type, config, serve, cms }: BuildOptions) {
     if (type === "build") {
       const ipAddr = localIp();
 
-      log.info("  Server started at:");
+      log.info("\n  Server started at:");
       log.info(`  <green>http://${hostname}:${port}/</green> (local)`);
 
       if (ipAddr) {
         log.info(`  <green>http://${ipAddr}:${port}/</green> (network)`);
       }
 
+      if (cms) {
+        log.info("\n  LumeCMS started at:");
+        const { basePath } = cms.options;
+        log.info(
+          `  <green>http://${hostname}:${port}${basePath}</green> (local)`,
+        );
+
+        if (ipAddr) {
+          log.info(
+            `  <green>http://${ipAddr}:${port}${basePath}</green> (network)`,
+          );
+        }
+      }
+
       if (open) {
         openBrowser(`http://${hostname}:${port}/`);
       }
@@ -137,7 +153,7 @@ async function build({ type, config, serve, cms }: BuildOptions) {
         log.info("Reloading the site...");
         const url = response.headers.get("Location") || request.url;
         postMessage({ type: "reload" });
-        return getWaitResponse(url);
+        return createWaitResponse(url);
       }
 
       return response;
@@ -157,7 +173,7 @@ async function build({ type, config, serve, cms }: BuildOptions) {
   server.start();
 }
 
-function getWaitResponse(url: string): Response {
+function createWaitResponse(url: string): Response {
   return new Response(
     `<html>
     <head>

cli/cms.ts

@@ -128,7 +128,6 @@ export function getServeHandler(): Deno.ServeHandler {
         "task",
         "lume",
         "--serve",
-        "--cms",
         `--port=${port}`,
         `--hostname=${hostname}`,
         `--location=${location.origin}`,