@dotenvx/dotenvx 1.10.0 → 1.10.2

package/CHANGELOG.md

@@ -2,7 +2,19 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
-## [Unreleased](https://github.com/dotenvx/dotenvx/compare/v1.10.0...main)
+## [Unreleased](https://github.com/dotenvx/dotenvx/compare/v1.10.2...main)
+
+## 1.10.2
+
+### Changed
+
+* default `config` to empty `[]` array so that `DOTENV_KEY_${environment}` looks up correctly ([#352](https://github.com/dotenvx/dotenvx/pull/352))
+
+## 1.10.1
+
+### Changed
+
+* check subfolders on `dotenvx ext precommit` hook ([#350](https://github.com/dotenvx/dotenvx/pull/350))
 
 ## 1.10.0
 

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.10.0",
+  "version": "1.10.2",
   "name": "@dotenvx/dotenvx",
   "description": "a better dotenv–from the creator of `dotenv`",
   "author": "@motdotla",
@@ -37,7 +37,6 @@
   "funding": "https://dotenvx.com",
   "dependencies": {
     "commander": "^11.1.0",
-    "diff": "^5.2.0",
     "dotenv": "^16.4.5",
     "eciesjs": "^0.4.6",
     "fdir": "^6.2.0",

package/src/lib/helpers/dotenvOptionPaths.js

@@ -1,7 +1,7 @@
 const resolveHome = require('./resolveHome')
 
 function dotenvOptionPaths (options) {
-  let optionPaths = ['.env']
+  let optionPaths = []
 
   if (options && options.path) {
     if (!Array.isArray(options.path)) {

package/src/lib/main.d.ts

@@ -1,5 +1,4 @@
 import type { URL } from 'url';
-import type { Change } from 'diff';
 
 export interface DotenvParseOutput {
   [name: string]: string;
@@ -66,7 +65,7 @@ export interface DotenvConfigOptions {
   DOTENV_KEY?: string;
 
   /**
-   * Do not warn for missing .env files
+   * Load a .env convention (available conventions: 'nextjs')
    */
   convention?: string;
 
@@ -235,28 +234,6 @@ export function set(
   encrypt?: boolean
 ): EncryptOutput;
 
-type StatusRow = {
-  filename: string;
-  filepath: string;
-  environment: string;
-  raw: string;
-  decrypted: any;
-  differences: Change[];
-};
-
-export type StatusOutput = {
-  changes: StatusRow[];
-  nochanges: StatusRow[];
-  untracked: StatusRow[];
-};
-
-/**
- * Check the differences between the .env file and the decrypted values
- *
- * @param directory - current working directory
- */
-export function status(directory: string): StatusOutput;
-
 export type GenExampleOutput = {
   envExampleFile: string;
   envFile: string | string[];

package/src/lib/main.js

@@ -13,6 +13,7 @@ const Decrypt = require('./services/decrypt')
 const Genexample = require('./services/genexample')
 
 // helpers
+const conventions = require('./helpers/conventions')
 const dotenvOptionPaths = require('./helpers/dotenvOptionPaths')
 const { setLogLevel } = require('../shared/logger')
 
@@ -41,7 +42,18 @@ const config = function (options = {}) {
   const optionPaths = dotenvOptionPaths(options) // [ '.env' ]
 
   try {
-    const envs = []
+    let envs = []
+    // handle shorthand conventions - like --convention=nextjs
+    if (options.convention) {
+      envs = conventions(options.convention).concat(envs)
+    }
+
+    if (process.env.DOTENV_KEY) {
+      logger.warn('DEPRECATION NOTICE: Setting DOTENV_KEY with .env.vault is deprecated.')
+      logger.warn('DEPRECATION NOTICE: Run [dotenvx ext vault migrate] for instructions on converting your .env.vault file to encrypted .env files (using public key encryption algorithm secp256k1)')
+      logger.warn('DEPRECATION NOTICE: Read more at [https://github.com/dotenvx/dotenvx/blob/main/CHANGELOG.md#0380]')
+    }
+
     for (const optionPath of optionPaths) {
       // if DOTENV_KEY is set then assume we are checking envVaultFile
       if (DOTENV_KEY) {

package/src/lib/services/precommit.js

@@ -2,6 +2,8 @@
 const fs = require('fs')
 const ignore = require('ignore')
 
+const Ls = require('../services/ls')
+
 const pluralize = require('./../helpers/pluralize')
 const isFullyEncrypted = require('./../helpers/isFullyEncrypted')
 const InstallPrecommitHook = require('./../helpers/installPrecommitHook')
@@ -38,8 +40,8 @@ class Precommit {
 
       // 2. check .env* files against .gitignore file
       const ig = ignore().add(gitignore)
-      const files = fs.readdirSync(process.cwd())
-      const dotenvFiles = files.filter(file => file.match(/^\.env(\..+)?$/))
+      const lsService = new Ls(process.cwd())
+      const dotenvFiles = lsService.run()
       dotenvFiles.forEach(file => {
         // check if that file is being ignored
         if (ig.ignores(file)) {