use LUME_ENV variable, fixed tests

lumeland · May 12, 2023 · c7864dc · c7864dc
1 parent 3591305
commit c7864dc
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@ Any BREAKING CHANGE between minor versions will be documented here in upper case
 
 ## [Unreleased]
 ### Added
+- The env variable `LUME_ENV=development` is created when `deno task lume --dev`.
 - New `site.searcher` property with a instance of `Searcher` class.
   It's used by plugins like `search`, `nav`, `sitemap` and `feed`.
   (Previouly, each plugin had it's own instance).

diff --git a/cli.ts b/cli.ts
@@ -21,7 +21,7 @@ const upgrade = new Command()
   .action(upgradeCommand);
 
 const create = new Command()
-  .description("Create a new page from a archetype.")
+  .description("Run an archetype to create more files.")
   .example(
     "lume new post 'Post title'",
     "Create a new post file using the _archetypes/post.ts archetype.",

diff --git a/cli/build.ts b/cli/build.ts
@@ -13,9 +13,14 @@ interface Options {
   config?: string;
   serve?: boolean;
   watch?: boolean;
+  dev?: boolean;
 }
 
-export default function ({ config, serve, watch }: Options) {
+export default function ({ config, serve, watch, dev }: Options) {
+  if (dev) {
+    Deno.env.set("LUME_ENV", "development");
+  }
+
   return build(config, serve, watch);
 }
 

diff --git a/core/site.ts b/core/site.ts
@@ -520,10 +520,11 @@ export default class Site {
     this.fs.init();
 
     // Get the site content
+    const isDev = Deno.env.get("LUME_ENV") === "development";
     const [_pages, _staticFiles] = await this.source.build(
       this.globalComponents,
       [
-        (_, page) => !page?.data.draft || this.options.dev,
+        (_, page) => !page?.data.draft || isDev,
       ],
     );
 
@@ -572,10 +573,11 @@ export default class Site {
     }
 
     // Get the site content
+    const isDev = Deno.env.get("LUME_ENV") === "development";
     const [_pages, _staticFiles] = await this.source.build(
       this.globalComponents,
       [
-        (_, page) => !page?.data.draft || this.options.dev,
+        (_, page) => !page?.data.draft || isDev,
         this.scopes.getFilter(files),
       ],
     );

diff --git a/mod.ts b/mod.ts
@@ -33,6 +33,12 @@ export default function lume(
     options = merge(options, getOptionsFromCli());
   }
 
+  if (options.dev) {
+    Deno.env.set("LUME_ENV", "development");
+  } else {
+    Deno.env.delete("LUME_ENV");
+  }
+
   const site = new Site(options as Partial<SiteOptions>);
 
   // Ignore the .git folder and .DS_Store (macOS) files by the watcher
@@ -83,8 +89,8 @@ function getOptionsFromCli(): DeepPartial<SiteOptions> {
     overrides.quiet = options.quiet;
   }
 
-  if (options.dev) {
-    overrides.dev = options.dev;
+  if (Deno.env.get("LUME_ENV") === "development") {
+    overrides.dev = true;
   }
 
   if (options.port) {

diff --git a/tests/config.test.ts b/tests/config.test.ts
@@ -73,9 +73,7 @@ Deno.test("event listener configuration", () => {
   const site = lume();
   const { listeners } = site.events;
 
-  equals(listeners.size, 1);
-  equals(listeners.has("beforeUpdate"), true);
-  equals(listeners.get("beforeUpdate")?.size, 1);
+  equals(listeners.size, 0);
 
   site.addEventListener("afterBuild", "afterbuild-command");
   equals(listeners.get("afterBuild")?.size, 1);