@dotenvx/dotenvx 1.11.0 → 1.11.1

package/CHANGELOG.md

@@ -2,7 +2,13 @@
 
 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.11.0...main)
+## [Unreleased](https://github.com/dotenvx/dotenvx/compare/v1.11.1...main)
+
+## 1.11.1
+
+### Changed
+
+* support encryption of `export KEY` variables and preserve `#!shebangs` ([#357](https://github.com/dotenvx/dotenvx/pull/357))
 
 ## 1.11.0
 

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.11.0",
+  "version": "1.11.1",
   "name": "@dotenvx/dotenvx",
   "description": "a better dotenv–from the creator of `dotenv`",
   "author": "@motdotla",

package/src/lib/helpers/findOrCreatePublicKey.js

@@ -39,6 +39,14 @@ function findOrCreatePublicKey (envFilepath, envKeysFilepath) {
     }
   }
 
+  // preserve shebang
+  const [firstLine, ...remainingLines] = envSrc.split('\n')
+  let firstLinePreserved = ''
+  if (firstLine.startsWith('#!')) {
+    firstLinePreserved = firstLine + '\n'
+    envSrc = remainingLines.join('\n')
+  }
+
   // generate key pair
   const { publicKey, privateKey } = keyPair(existingPrivateKey)
 
@@ -66,7 +74,7 @@ function findOrCreatePublicKey (envFilepath, envKeysFilepath) {
     ''
   ].join('\n')
 
-  envSrc = `${prependPublicKey}\n${envSrc}`
+  envSrc = `${firstLinePreserved}${prependPublicKey}\n${envSrc}`
   keysSrc = keysSrc.length > 1 ? keysSrc : `${firstTimeKeysSrc}\n`
 
   let privateKeyAdded = false

package/src/lib/helpers/replace.js

@@ -7,13 +7,15 @@ function replace (src, key, value) {
   const parsed = dotenv.parse(src)
   if (Object.prototype.hasOwnProperty.call(parsed, key)) {
     const regex = new RegExp(
-      // Match the key at the start of a line or following a newline
-      `(^|\\n)${key}\\s*=\\s*` +
+      // Match the key at the start of a line, following a newline, or prefaced by export
+      `(^|\\n)\\s*(export\\s+)?${key}\\s*=\\s*` +
+      // `(^|\\n)${key}\\s*=\\s*` +
       // Non-capturing group to handle different types of quotations and unquoted values
       '(?:' +
         '(["\'`])' + // Match an opening quote
         '.*?' + // Non-greedy match for any characters within quotes
-        '\\2' + // Match the corresponding closing quote
+        // '\\2' + // Match the corresponding closing quote
+        '\\3' + // Match the corresponding closing quote
       '|' +
         // Match unquoted values; account for escaped newlines
         '(?:[^#\\n\\\\]|\\\\.)*' + // Use non-capturing group for any character except #, newline, or backslash, or any escaped character
@@ -21,7 +23,7 @@ function replace (src, key, value) {
       'gs' // Global and dotAll mode to treat string as single line
     )
 
-    output = src.replace(regex, `$1${formatted}`)
+    output = src.replace(regex, `$1$2${formatted}`)
   } else {
     // append
     if (src.endsWith('\n')) {