@dotenvx/dotenvx 1.38.0 → 1.38.1

package/CHANGELOG.md

@@ -2,7 +2,15 @@
 
 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.38.0...main)
+[Unreleased](https://github.com/dotenvx/dotenvx/compare/v1.38.1...main)
+
+## [1.38.1](https://github.com/dotenvx/dotenvx/compare/v1.38.0...v1.38.1)
+
+### Changed
+
+* Support `encrypt` when mutliline contains windows `CRLF` (`\\r\\n`) ([#534](https://github.com/dotenvx/dotenvx/pull/534))
+
+Note: dotenvx will convert these `\\r\\n` newlines to `\\n`. Our recommendation is to stop using CRLF - its origin is from typewriter days. Instead, set your editor or gitattributes to use LF.
 
 ## [1.38.0](https://github.com/dotenvx/dotenvx/compare/v1.37.0...v1.38.0)
 

package/package.json

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

package/src/lib/helpers/append.js

@@ -7,7 +7,7 @@ function append (src, key, appendValue) {
   let output
   let newPart = ''
 
-  const parsed = dotenvParse(src, true) // skip expanding \n
+  const parsed = dotenvParse(src, true, true) // skip expanding \n and skip converting \r\n
   const _quotes = quotes(src)
   if (Object.prototype.hasOwnProperty.call(parsed, key)) {
     const quote = _quotes[key]

package/src/lib/helpers/dotenvParse.js

@@ -1,14 +1,16 @@
 // historical dotenv.parse - https://github.com/motdotla/dotenv)
 const LINE = /(?:^|^)\s*(?:export\s+)?([\w.-]+)(?:\s*=\s*?|:\s+?)(\s*'(?:\\'|[^'])*'|\s*"(?:\\"|[^"])*"|\s*`(?:\\`|[^`])*`|[^#\r\n]+)?\s*(?:#.*)?(?:$|$)/mg
 
-function dotenvParse (src, skipExpandForDoubleQuotes = false) {
+function dotenvParse (src, skipExpandForDoubleQuotes = false, skipConvertingWindowsNewlines = false) {
   const obj = {}
 
   // Convert buffer to string
   let lines = src.toString()
 
   // Convert line breaks to same format
-  lines = lines.replace(/\r\n?/mg, '\n')
+  if (!skipConvertingWindowsNewlines) {
+    lines = lines.replace(/\r\n?/mg, '\n')
+  }
 
   let match
   while ((match = LINE.exec(lines)) != null) {

package/src/lib/helpers/replace.js

@@ -7,7 +7,7 @@ function replace (src, key, replaceValue) {
   let output
   let newPart = ''
 
-  const parsed = dotenvParse(src, true) // skip expanding \n
+  const parsed = dotenvParse(src, true, true) // skip expanding \n and skip converting \r\n
   const _quotes = quotes(src)
   if (Object.prototype.hasOwnProperty.call(parsed, key)) {
     const quote = _quotes[key]