Merge pull request #21 from saiichihashimoto/load-dot-env

feat(env): load env vars using @next/env
saiichihashimoto · Jan 16, 2024 · f2b2968 · f2b2968
2 parents a13efb5 + c347d63
commit f2b2968
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 16 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -26,6 +26,7 @@
     "test": "jest --color --cache"
   },
   "dependencies": {
+    "@next/env": "14.0.4",
     "boxen": "5.1.2",
     "chalk": "4.1.2",
     "commander": "11.1.0",

diff --git a/src/index.test.ts b/src/index.test.ts
@@ -116,6 +116,12 @@ describe("main", () => {
 
     expect(winner).toBe("timeout");
     expect(destination.logs).toStrictEqual([
+      {
+        level: 20,
+        loadedEnvFiles: [],
+        msg: "Loaded Env Files",
+        time: 1696486441293,
+      },
       {
         config: "./vercel.json",
         level: 20,
@@ -146,6 +152,12 @@ describe("main", () => {
 
     expect(winner).not.toBe("timeout");
     expect(destination.logs).toStrictEqual([
+      {
+        level: 20,
+        loadedEnvFiles: [],
+        msg: "Loaded Env Files",
+        time: 1696486441293,
+      },
       {
         config: "./vercel.json",
         level: 20,
@@ -172,6 +184,12 @@ describe("main", () => {
 
     expect(fetchSpy).not.toHaveBeenCalled();
     expect(destination.logs).toStrictEqual([
+      {
+        level: 20,
+        loadedEnvFiles: [],
+        msg: "Loaded Env Files",
+        time: 1696486441293,
+      },
       {
         config: "./vercel.json",
         level: 20,
@@ -257,6 +275,12 @@ describe("main", () => {
 
     expect(fetchSpy).not.toHaveBeenCalled();
     expect(destination.logs).toStrictEqual([
+      {
+        level: 20,
+        loadedEnvFiles: [],
+        msg: "Loaded Env Files",
+        time: 1696486441293,
+      },
       {
         config: "./vercel.json",
         level: 20,
@@ -365,6 +389,12 @@ describe("main", () => {
 
     expect(fetchSpy).not.toHaveBeenCalled();
     expect(destination.logs).toStrictEqual([
+      {
+        level: 20,
+        loadedEnvFiles: [],
+        msg: "Loaded Env Files",
+        time: 1696486441293,
+      },
       {
         config: "./vercel.json",
         level: 20,
@@ -411,6 +441,12 @@ describe("main", () => {
 
     expect(fetchSpy).not.toHaveBeenCalled();
     expect(destination.logs).toStrictEqual([
+      {
+        level: 20,
+        loadedEnvFiles: [],
+        msg: "Loaded Env Files",
+        time: 1696486441293,
+      },
       {
         config: "./vercel.json",
         level: 20,

diff --git a/src/index.ts b/src/index.ts
@@ -1,6 +1,7 @@
 import fsNative from "node:fs";
 import { promisify } from "node:util";
 
+import { loadEnvConfig } from "@next/env";
 import boxen from "boxen";
 import chalk from "chalk";
 import { Cron } from "croner";
@@ -19,7 +20,7 @@ export const zOpts = z
     dry: z.boolean(),
     ignoreTimestamp: z.boolean(),
     pretty: z.boolean(),
-    secret: z.nullable(z.string()),
+    secret: z.optional(z.nullable(z.string())),
     url: z.string(),
     level: z.union([
       z.literal("trace"),
@@ -35,7 +36,6 @@ export const zOpts = z
 
 export const defaults = {
   config: "./vercel.json",
-  secret: process.env.CRON_SECRET ?? null,
   url: "http://localhost:3000",
 } satisfies z.infer<typeof zOpts>;
 
@@ -49,19 +49,7 @@ export const main = async ({
   fs?: typeof fsNative;
   signal?: AbortSignal;
 }) => {
-  const {
-    color,
-    config,
-    dry,
-    ignoreTimestamp,
-    pretty,
-    secret,
-    url,
-    level = "debug",
-  } = {
-    ...defaults,
-    ...opts,
-  };
+  const { color, dry, ignoreTimestamp, pretty, level = "debug" } = opts;
 
   if (chalk.supportsColor && !color) {
     chalk.level = 0;
@@ -95,6 +83,19 @@ export const main = async ({
     ? pino(loggerOptions)
     : pino(loggerOptions, destination);
 
+  const { loadedEnvFiles } = loadEnvConfig(process.cwd(), false, logger);
+
+  const {
+    config,
+    url,
+    secret: secretNullable,
+  } = {
+    ...defaults,
+    ...opts,
+  };
+
+  const secret = secretNullable ?? process.env.CRON_SECRET;
+
   if (logger.isLevelEnabled("info") && pretty) {
     /* eslint-disable no-console -- boxen! */
     console.log(
@@ -109,6 +110,7 @@ export const main = async ({
   }
 
   logger.trace({ opts }, "Parsed Options");
+  logger.debug({ loadedEnvFiles }, "Loaded Env Files");
 
   const readFile = promisify(fs.readFile.bind(fs));
 

diff --git a/src/vercel-cron.ts b/src/vercel-cron.ts
@@ -17,7 +17,7 @@ import pkg from "../package.json";
         .option("-p --config <config>", "Vercel Config", defaults.config)
         .addOption(
           new Option("-s --secret <secret>", "Cron Secret").default(
-            defaults.secret,
+            null,
             "`process.env.CRON_SECRET`"
           )
         )