envlock-next 0.1.0 → 0.3.0

package/README.md

@@ -96,39 +96,6 @@ In CI, set `DOTENV_PRIVATE_KEY_<ENV>` directly. envlock detects this and skips `
     DOTENV_PRIVATE_KEY_PRODUCTION: ${{ secrets.DOTENV_PRIVATE_KEY_PRODUCTION }}
 ```
 
-## `createEnv` wrapper
-
-envlock re-exports a `createEnv` wrapper around [`@t3-oss/env-nextjs`](https://env.t3.gg) with sensible defaults:
-
-```js
-// src/env.js
-import { createEnv } from 'envlock-next';
-import { z } from 'zod';
-
-export const env = createEnv({
-  server: {
-    DATABASE_URL: z.string().url(),
-    API_SECRET: z.string().min(1),
-  },
-  client: {
-    NEXT_PUBLIC_APP_URL: z.string().url(),
-  },
-  runtimeEnv: {
-    DATABASE_URL: process.env.DATABASE_URL,
-    API_SECRET: process.env.API_SECRET,
-    NEXT_PUBLIC_APP_URL: process.env.NEXT_PUBLIC_APP_URL,
-  },
-});
-```
-
-Defaults applied: `emptyStringAsUndefined: true`, `skipValidation` reads from `SKIP_ENV_VALIDATION` env var.
-
-Requires `@t3-oss/env-nextjs` and `zod` as peer dependencies:
-
-```bash
-pnpm add @t3-oss/env-nextjs zod
-```
-
 ## License
 
 MIT — [Benjamin Davies](https://github.com/BenDavies1218)

package/dist/cli/index.js

@@ -2,7 +2,7 @@
 
 // src/cli/index.ts
 import { Command } from "commander";
-import { runWithSecrets, validateEnvFilePath } from "envlock-core";
+import { ENVIRONMENTS, runWithSecrets, validateEnvFilePath } from "envlock-core";
 
 // src/cli/resolve-config.ts
 import { existsSync } from "fs";
@@ -37,11 +37,25 @@ async function resolveConfig(cwd) {
 }
 
 // src/cli/index.ts
+var SUPPORTED_SUBCOMMANDS = {
+  dev: "development",
+  build: "production",
+  start: "production"
+};
+var SUBCOMMAND_DESCRIPTIONS = {
+  dev: "Start Next.js development server",
+  build: "Build Next.js application",
+  start: "Start Next.js production server"
+};
 var DEFAULT_ENV_FILES = {
   development: ".env.development",
   staging: ".env.staging",
   production: ".env.production"
 };
+var ARGUMENT_FLAGS = {
+  staging: "--staging",
+  production: "--production"
+};
 async function runNextCommand(subcommand, environment, passthroughArgs) {
   const config = await resolveConfig(process.cwd());
   const envFile = config.envFiles?.[environment] ?? DEFAULT_ENV_FILES[environment];
@@ -55,37 +69,24 @@ async function runNextCommand(subcommand, environment, passthroughArgs) {
   });
 }
 function addEnvFlags(cmd) {
-  return cmd.option("--staging", "use staging environment").option("--production", "use production environment").allowUnknownOption(true);
+  return cmd.option(ARGUMENT_FLAGS.staging, "use staging environment").option(ARGUMENT_FLAGS.production, "use production environment").allowUnknownOption(true);
 }
-function getEnvironment(opts) {
-  if (opts.production) return "production";
-  if (opts.staging) return "staging";
-  return "development";
+function getEnvironment(opts, defaultEnv) {
+  if (opts.production) return ENVIRONMENTS.production;
+  if (opts.staging) return ENVIRONMENTS.staging;
+  return defaultEnv;
 }
 var program = new Command("envlock");
 program.name("envlock").description("Run Next.js commands with 1Password + dotenvx secret injection").version("0.1.0");
-var devCmd = new Command("dev").description("Start Next.js development server").allowUnknownOption(true);
-addEnvFlags(devCmd).action(async (opts) => {
-  const passthrough = devCmd.args.filter(
-    (a) => a !== "--staging" && a !== "--production"
-  );
-  await runNextCommand("dev", getEnvironment(opts), passthrough);
-});
-var buildCmd = new Command("build").description("Build Next.js application").allowUnknownOption(true);
-addEnvFlags(buildCmd).action(async (opts) => {
-  const passthrough = buildCmd.args.filter(
-    (a) => a !== "--staging" && a !== "--production"
-  );
-  await runNextCommand("build", getEnvironment(opts), passthrough);
-});
-var startCmd = new Command("start").description("Start Next.js production server").allowUnknownOption(true);
-addEnvFlags(startCmd).action(async (opts) => {
-  const passthrough = startCmd.args.filter(
-    (a) => a !== "--staging" && a !== "--production"
+for (const [subcommand, defaultEnv] of Object.entries(
+  SUPPORTED_SUBCOMMANDS
+)) {
+  const cmd = new Command(subcommand).description(SUBCOMMAND_DESCRIPTIONS[subcommand]).allowUnknownOption(true);
+  addEnvFlags(cmd).action(
+    async (opts) => {
+      await runNextCommand(subcommand, getEnvironment(opts, defaultEnv), cmd.args);
+    }
   );
-  await runNextCommand("start", getEnvironment(opts), passthrough);
-});
-program.addCommand(devCmd);
-program.addCommand(buildCmd);
-program.addCommand(startCmd);
+  program.addCommand(cmd);
+}
 program.parse(process.argv);

package/dist/index.d.ts

@@ -1,14 +1,10 @@
 import { NextConfig } from 'next';
 import { EnvlockOptions } from 'envlock-core';
 export { EnvlockOptions } from 'envlock-core';
-import { createEnv as createEnv$1 } from '@t3-oss/env-nextjs';
 
 type EnvlockNextConfig = NextConfig & {
     __envlock: EnvlockOptions;
 };
 declare function withEnvlock(nextConfig: NextConfig, options?: EnvlockOptions): EnvlockNextConfig;
 
-type CreateEnvArgs = Parameters<typeof createEnv$1>[0];
-declare function createEnv(options: CreateEnvArgs): never;
-
-export { type EnvlockNextConfig, createEnv, withEnvlock };
+export { type EnvlockNextConfig, withEnvlock };

package/dist/index.js

@@ -13,17 +13,6 @@ function withEnvlock(nextConfig, options) {
     __envlock: options ?? { onePasswordEnvId: "" }
   };
 }
-
-// src/env/index.ts
-import { createEnv as t3CreateEnv } from "@t3-oss/env-nextjs";
-function createEnv(options) {
-  return t3CreateEnv({
-    skipValidation: !!process.env["SKIP_ENV_VALIDATION"],
-    emptyStringAsUndefined: true,
-    ...options
-  });
-}
 export {
-  createEnv,
   withEnvlock
 };

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "envlock-next",
-  "version": "0.1.0",
+  "version": "0.3.0",
   "type": "module",
-  "description": "Next.js plugin, createEnv wrapper, and CLI for envlock",
+  "description": "Next.js plugin and CLI for envlock",
   "license": "MIT",
   "author": "Benjamin Davies",
   "homepage": "https://github.com/BenDavies1218/envlock#readme",
@@ -31,30 +31,18 @@
   ],
   "dependencies": {
     "commander": "^12.0.0",
-    "envlock-core": "0.1.0"
+    "envlock-core": "0.3.0"
   },
   "peerDependencies": {
-    "@t3-oss/env-nextjs": ">=0.12.0",
-    "next": ">=14.0.0",
-    "zod": ">=3.0.0"
-  },
-  "peerDependenciesMeta": {
-    "@t3-oss/env-nextjs": {
-      "optional": true
-    },
-    "zod": {
-      "optional": true
-    }
+    "next": ">=14.0.0"
   },
   "devDependencies": {
-    "@t3-oss/env-nextjs": "^0.12.0",
     "@types/node": "^20.14.10",
     "next": "^15.2.3",
     "tsup": "^8.0.0",
     "typescript": "^5.8.2",
     "vitest": "^3.0.0",
-    "zod": "^3.24.2",
-    "envlock-core": "0.1.0"
+    "envlock-core": "0.3.0"
   },
   "scripts": {
     "build": "tsup",