reading envFile: use dotenv for better support. (microsoft#1062)

cyrfer · jkgwm · web-flow · commit b5d9556087f8 · 2021-10-12T10:31:43.000+08:00
* reading envFile: use dotenv for better support.

Co-authored-by: Grant, John K &lt;john.k.grant@warnerbros.com&gt;
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -959,6 +959,7 @@
   },
   "dependencies": {
     "compare-versions": "^3.6.0",
+    "dotenv": "^10.0.0",
     "lodash": "^4.17.21",
     "uuid": "^8.3.1",
     "vscode-extension-telemetry-wrapper": "^0.9.0",
diff --git a/src/configurationProvider.ts b/src/configurationProvider.ts
@@ -6,6 +6,8 @@ import * as os from "os";
 import * as path from "path";
 import * as vscode from "vscode";
 
+import * as dotenv from 'dotenv';
+
 import { instrumentOperation, sendError, sendInfo, setUserError } from "vscode-extension-telemetry-wrapper";
 import * as anchor from "./anchor";
 import { buildWorkspace } from "./build";
@@ -721,20 +723,7 @@ function readEnvFile(file: string): { [key: string]: string } {
     }
 
     const buffer = stripBOM(fs.readFileSync(file, "utf8"));
-    const env: { [key: string]: string } = {};
-    for (const line of buffer.split("\n")) {
-        const r = line.match(/^\s*([\w\.\-]+)\s*=\s*(.*)?\s*$/);
-        if (!r) {
-            continue;
-        }
-
-        let value = r[2] || "";
-        // .env variables never overwrite existing variables (see #21169)
-        if (value.length > 0 && value.charAt(0) === '"' && value.charAt(value.length - 1) === '"') {
-            value = value.replace(/\\n/gm, "\n");
-        }
-        env[r[1]] = value.replace(/(^['"]|['"]$)/g, "");
-    }
+    const env = dotenv.parse(Buffer.from(buffer));
 
     return env;
 }
