vxrn 1.1.522 → 1.1.524

package/dist/exports/loadEnv.js

@@ -1,6 +1,8 @@
 import { statSync } from "node:fs";
 import { readFile } from "node:fs/promises";
 import { join } from "node:path";
+import { parse } from "dotenv";
+import { expand } from "dotenv-expand";
 import { normalizePath } from "vite";
 const DEFAULT_PREFIX = /^(ONE|VITE|TAMAGUI)_/;
 async function loadEnv(mode, root = process.cwd(), userPrefix) {
@@ -35,14 +37,16 @@ function getEnvFilesForMode(mode) {
   );
 }
 async function loadJustEnvFiles(mode) {
-  const envFiles = getEnvFilesForMode(mode), loadedEnvs = (await Promise.all(
-    envFiles.map(async (filePath) => {
-      if (!tryStatSync(filePath)?.isFile()) return [];
-      const contents = await readFile(filePath, "utf-8"), parsed = parse(contents);
-      return Object.entries(parsed);
-    })
-  )).flat();
-  return Object.fromEntries(loadedEnvs);
+  const envFiles = getEnvFilesForMode(mode), parsed = Object.fromEntries(
+    (await Promise.all(
+      envFiles.map(async (filePath) => {
+        if (!tryStatSync(filePath)?.isFile()) return [];
+        const contents = await readFile(filePath, "utf-8");
+        return Object.entries(parse(contents));
+      })
+    )).flat()
+  ), processEnv = { ...process.env };
+  return expand({ parsed, processEnv }), parsed;
 }
 function tryStatSync(file) {
   try {
@@ -50,23 +54,6 @@ function tryStatSync(file) {
   } catch {
   }
 }
-const LINE = /(?:^|^)\s*(?:export\s+)?([\w.-]+)(?:\s*=\s*?|:\s+?)(\s*'(?:\\'|[^'])*'|\s*"(?:\\"|[^"])*"|\s*`(?:\\`|[^`])*`|[^#\r\n]+)?\s*(?:#.*)?(?:$|$)/gm;
-function parse(src) {
-  const obj = {};
-  let lines = src.toString();
-  lines = lines.replace(/\r\n?/gm, `
-`);
-  let match;
-  for (; (match = LINE.exec(lines)) != null; ) {
-    const key = match[1];
-    let value = match[2] || "";
-    value = value.trim();
-    const maybeQuote = value[0];
-    value = value.replace(/^(['"`])([\s\S]*)\1$/gm, "$2"), maybeQuote === '"' && (value = value.replace(/\\n/g, `
-`), value = value.replace(/\\r/g, "\r")), obj[key] = value;
-  }
-  return obj;
-}
 export {
   loadEnv
 };

package/dist/exports/loadEnv.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/exports/loadEnv.ts"],
-  "mappings": "AAAA,SAAS,gBAAgB;AACzB,SAAS,gBAAgB;AACzB,SAAS,YAAY;AACrB,SAAS,qBAAqB;AAI9B,MAAM,iBAAiB;AAEvB,eAAsB,QAAQ,MAAY,OAAO,QAAQ,IAAI,GAAG,YAAgC;AAC9F,QAAM,YAAY,MAAM,iBAAiB,IAAI,GACvC,SAAS,aAAc,MAAM,QAAQ,UAAU,IAAI,aAAa,CAAC,UAAU,IAAK,CAAC,GACjF,cAAc,CAAC,QACZ,OAAO,KAAK,CAAC,MAAM,IAAI,WAAW,CAAC,CAAC,KAAK,eAAe,KAAK,GAAG,GAGnE,SAA6C,CAAC;AAGpD,aAAW,OAAO,WAAW;AAC3B,UAAM,MAAM,QAAQ,IAAI,GAAG,KAAK,UAAU,GAAG;AAC7C,WAAO,GAAG,IAAI,KACd,QAAQ,IAAI,GAAG,IAAI;AAAA,EACrB;AAEA,QAAM,YAAY,OAAO;AAAA,IACvB,OAAO,QAAQ;AAAA,MACb,GAAG,QAAQ;AAAA,MACX,GAAG;AAAA,IACL,CAAC,EAAE,QAAQ,CAAC,CAAC,KAAK,KAAK,MACjB,YAAY,GAAG,IACV,CAAC,CAAC,KAAK,KAAK,CAAC,IAEf,CAAC,CACT;AAAA,EACH;AAEA,SAAO;AAAA,IACL,WAAW;AAAA,IACX;AAAA,IACA,iBAAiB,OAAO;AAAA,MACtB,OAAO,QAAQ,SAAS,EAAE,QAAQ,CAAC,CAAC,KAAK,GAAG,MAAM;AAChD,cAAM,cAAc,KAAK,UAAU,GAAG;AACtC,eAAO;AAAA,UACL,CAAC,eAAe,GAAG,IAAI,WAAW;AAAA,UAClC,CAAC,mBAAmB,GAAG,IAAI,WAAW;AAAA,QACxC;AAAA,MACF,CAAC;AAAA,IACH;AAAA,EACF;AACF;AAWA,SAAS,mBAAmB,MAAY;AACtC,SAAO,CAAC,QAAQ,cAAc,QAAQ,IAAI,IAAI,QAAQ,IAAI,QAAQ,EAAE;AAAA,IAAI,CAAC,SACvE,cAAc,KAAK,KAAK,IAAI,CAAC;AAAA,EAC/B;AACF;AAEA,eAAe,iBAAiB,MAAY;AAC1C,QAAM,WAAW,mBAAmB,IAAI,GAClC,cACJ,MAAM,QAAQ;AAAA,IACZ,SAAS,IAAI,OAAO,aAAa;AAC/B,UAAI,CAAC,YAAY,QAAQ,GAAG,OAAO,EAAG,QAAO,CAAC;AAC9C,YAAM,WAAW,MAAM,SAAS,UAAU,OAAO,GAC3C,SAAS,MAAM,QAAQ;AAC7B,aAAO,OAAO,QAAQ,MAAM;AAAA,IAC9B,CAAC;AAAA,EACH,GACA,KAAK;AACP,SAAO,OAAO,YAAY,UAAU;AACtC;AAEA,SAAS,YAAY,MAAc;AACjC,MAAI;AACF,WAAO,SAAS,MAAM,EAAE,gBAAgB,GAAM,CAAC;AAAA,EACjD,QAAQ;AAAA,EAAC;AACX;AAGA,MAAM,OACJ;AAEF,SAAS,MAAM,KAAa;AAC1B,QAAM,MAA8B,CAAC;AAGrC,MAAI,QAAQ,IAAI,SAAS;AAGzB,UAAQ,MAAM,QAAQ,WAAW;AAAA,CAAI;AAErC,MAAI;AACJ,UAAQ,QAAQ,KAAK,KAAK,KAAK,MAAM,QAAM;AACzC,UAAM,MAAM,MAAM,CAAC;AAGnB,QAAI,QAAQ,MAAM,CAAC,KAAK;AAGxB,YAAQ,MAAM,KAAK;AAGnB,UAAM,aAAa,MAAM,CAAC;AAG1B,YAAQ,MAAM,QAAQ,0BAA0B,IAAI,GAGhD,eAAe,QACjB,QAAQ,MAAM,QAAQ,QAAQ;AAAA,CAAI,GAClC,QAAQ,MAAM,QAAQ,QAAQ,IAAI,IAIpC,IAAI,GAAG,IAAI;AAAA,EACb;AAEA,SAAO;AACT;",
+  "mappings": "AAAA,SAAS,gBAAgB;AACzB,SAAS,gBAAgB;AACzB,SAAS,YAAY;AACrB,SAAS,aAAa;AACtB,SAAmC,cAAc;AACjD,SAAS,qBAAqB;AAI9B,MAAM,iBAAiB;AAEvB,eAAsB,QAAQ,MAAY,OAAO,QAAQ,IAAI,GAAG,YAAgC;AAC9F,QAAM,YAAY,MAAM,iBAAiB,IAAI,GACvC,SAAS,aAAc,MAAM,QAAQ,UAAU,IAAI,aAAa,CAAC,UAAU,IAAK,CAAC,GACjF,cAAc,CAAC,QACZ,OAAO,KAAK,CAAC,MAAM,IAAI,WAAW,CAAC,CAAC,KAAK,eAAe,KAAK,GAAG,GAGnE,SAA6C,CAAC;AAGpD,aAAW,OAAO,WAAW;AAC3B,UAAM,MAAM,QAAQ,IAAI,GAAG,KAAK,UAAU,GAAG;AAC7C,WAAO,GAAG,IAAI,KACd,QAAQ,IAAI,GAAG,IAAI;AAAA,EACrB;AAEA,QAAM,YAAY,OAAO;AAAA,IACvB,OAAO,QAAQ;AAAA,MACb,GAAG,QAAQ;AAAA,MACX,GAAG;AAAA,IACL,CAAC,EAAE,QAAQ,CAAC,CAAC,KAAK,KAAK,MACjB,YAAY,GAAG,IACV,CAAC,CAAC,KAAK,KAAK,CAAC,IAEf,CAAC,CACT;AAAA,EACH;AAEA,SAAO;AAAA,IACL,WAAW;AAAA,IACX;AAAA,IACA,iBAAiB,OAAO;AAAA,MACtB,OAAO,QAAQ,SAAS,EAAE,QAAQ,CAAC,CAAC,KAAK,GAAG,MAAM;AAChD,cAAM,cAAc,KAAK,UAAU,GAAG;AACtC,eAAO;AAAA,UACL,CAAC,eAAe,GAAG,IAAI,WAAW;AAAA,UAClC,CAAC,mBAAmB,GAAG,IAAI,WAAW;AAAA,QACxC;AAAA,MACF,CAAC;AAAA,IACH;AAAA,EACF;AACF;AAWA,SAAS,mBAAmB,MAAY;AACtC,SAAO,CAAC,QAAQ,cAAc,QAAQ,IAAI,IAAI,QAAQ,IAAI,QAAQ,EAAE;AAAA,IAAI,CAAC,SACvE,cAAc,KAAK,KAAK,IAAI,CAAC;AAAA,EAC/B;AACF;AAEA,eAAe,iBAAiB,MAAY;AAC1C,QAAM,WAAW,mBAAmB,IAAI,GAGlC,SAAS,OAAO;AAAA,KACnB,MAAM,QAAQ;AAAA,MACb,SAAS,IAAI,OAAO,aAAa;AAC/B,YAAI,CAAC,YAAY,QAAQ,GAAG,OAAO,EAAG,QAAO,CAAC;AAC9C,cAAM,WAAW,MAAM,SAAS,UAAU,OAAO;AACjD,eAAO,OAAO,QAAQ,MAAM,QAAQ,CAAC;AAAA,MACvC,CAAC;AAAA,IACH,GAAG,KAAK;AAAA,EACV,GAGM,aAAa,EAAE,GAAG,QAAQ,IAAI;AACpC,gBAAO,EAAE,QAAQ,WAAW,CAAC,GAEtB;AACT;AAEA,SAAS,YAAY,MAAc;AACjC,MAAI;AACF,WAAO,SAAS,MAAM,EAAE,gBAAgB,GAAM,CAAC;AAAA,EACjD,QAAQ;AAAA,EAAC;AACX;",
   "names": []
 }

package/dist/exports/loadEnv.mjs

@@ -1,6 +1,8 @@
 import { statSync } from "node:fs";
 import { readFile } from "node:fs/promises";
 import { join } from "node:path";
+import { parse } from "dotenv";
+import { expand } from "dotenv-expand";
 import { normalizePath } from "vite";
 const DEFAULT_PREFIX = /^(ONE|VITE|TAMAGUI)_/;
 async function loadEnv(mode, root = process.cwd(), userPrefix) {
@@ -30,13 +32,18 @@ function getEnvFilesForMode(mode) {
 }
 async function loadJustEnvFiles(mode) {
   const envFiles = getEnvFilesForMode(mode),
-    loadedEnvs = (await Promise.all(envFiles.map(async filePath => {
+    parsed = Object.fromEntries((await Promise.all(envFiles.map(async filePath => {
       if (!tryStatSync(filePath)?.isFile()) return [];
-      const contents = await readFile(filePath, "utf-8"),
-        parsed = parse(contents);
-      return Object.entries(parsed);
-    }))).flat();
-  return Object.fromEntries(loadedEnvs);
+      const contents = await readFile(filePath, "utf-8");
+      return Object.entries(parse(contents));
+    }))).flat()),
+    processEnv = {
+      ...process.env
+    };
+  return expand({
+    parsed,
+    processEnv
+  }), parsed;
 }
 function tryStatSync(file) {
   try {
@@ -45,22 +52,5 @@ function tryStatSync(file) {
     });
   } catch {}
 }
-const LINE = /(?:^|^)\s*(?:export\s+)?([\w.-]+)(?:\s*=\s*?|:\s+?)(\s*'(?:\\'|[^'])*'|\s*"(?:\\"|[^"])*"|\s*`(?:\\`|[^`])*`|[^#\r\n]+)?\s*(?:#.*)?(?:$|$)/gm;
-function parse(src) {
-  const obj = {};
-  let lines = src.toString();
-  lines = lines.replace(/\r\n?/gm, `
-`);
-  let match;
-  for (; (match = LINE.exec(lines)) != null;) {
-    const key = match[1];
-    let value = match[2] || "";
-    value = value.trim();
-    const maybeQuote = value[0];
-    value = value.replace(/^(['"`])([\s\S]*)\1$/gm, "$2"), maybeQuote === '"' && (value = value.replace(/\\n/g, `
-`), value = value.replace(/\\r/g, "\r")), obj[key] = value;
-  }
-  return obj;
-}
 export { loadEnv };
 //# sourceMappingURL=loadEnv.mjs.map

package/dist/exports/loadEnv.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["statSync","readFile","join","normalizePath","DEFAULT_PREFIX","loadEnv","mode","root","process","cwd","userPrefix","loadedEnv","loadJustEnvFiles","prefix","Array","isArray","isPublicKey","key","some","p","startsWith","test","loaded","val","env","clientEnv","Object","fromEntries","entries","flatMap","value","serverEnv","clientEnvDefine","stringified","JSON","stringify","getEnvFilesForMode","map","file","envFiles","loadedEnvs","Promise","all","filePath","tryStatSync","isFile","contents","parsed","parse","flat","throwIfNoEntry","LINE","src","obj","lines","toString","replace","match","exec","trim","maybeQuote"],"sources":["../../src/exports/loadEnv.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["statSync","readFile","join","parse","expand","normalizePath","DEFAULT_PREFIX","loadEnv","mode","root","process","cwd","userPrefix","loadedEnv","loadJustEnvFiles","prefix","Array","isArray","isPublicKey","key","some","p","startsWith","test","loaded","val","env","clientEnv","Object","fromEntries","entries","flatMap","value","serverEnv","clientEnvDefine","stringified","JSON","stringify","getEnvFilesForMode","map","file","envFiles","parsed","Promise","all","filePath","tryStatSync","isFile","contents","flat","processEnv","throwIfNoEntry"],"sources":["../../src/exports/loadEnv.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/exports/loadEnv.native.js

@@ -1,6 +1,8 @@
 import { statSync } from "node:fs";
 import { readFile } from "node:fs/promises";
 import { join } from "node:path";
+import { parse } from "dotenv";
+import { expand } from "dotenv-expand";
 import { normalizePath } from "vite";
 var DEFAULT_PREFIX = /^(ONE|VITE|TAMAGUI)_/;
 async function loadEnv(mode) {
@@ -42,14 +44,19 @@ function getEnvFilesForMode(mode) {
 }
 async function loadJustEnvFiles(mode) {
   var envFiles = getEnvFilesForMode(mode),
-    loadedEnvs = (await Promise.all(envFiles.map(async function (filePath) {
+    parsed = Object.fromEntries((await Promise.all(envFiles.map(async function (filePath) {
       var _tryStatSync;
       if (!(!((_tryStatSync = tryStatSync(filePath)) === null || _tryStatSync === void 0) && _tryStatSync.isFile())) return [];
-      var contents = await readFile(filePath, "utf-8"),
-        parsed = parse(contents);
-      return Object.entries(parsed);
-    }))).flat();
-  return Object.fromEntries(loadedEnvs);
+      var contents = await readFile(filePath, "utf-8");
+      return Object.entries(parse(contents));
+    }))).flat()),
+    processEnv = {
+      ...process.env
+    };
+  return expand({
+    parsed,
+    processEnv
+  }), parsed;
 }
 function tryStatSync(file) {
   try {
@@ -58,21 +65,5 @@ function tryStatSync(file) {
     });
   } catch {}
 }
-var LINE = /(?:^|^)\s*(?:export\s+)?([\w.-]+)(?:\s*=\s*?|:\s+?)(\s*'(?:\\'|[^'])*'|\s*"(?:\\"|[^"])*"|\s*`(?:\\`|[^`])*`|[^#\r\n]+)?\s*(?:#.*)?(?:$|$)/gm;
-function parse(src) {
-  var obj = {},
-    lines = src.toString();
-  lines = lines.replace(/\r\n?/gm, `
-`);
-  for (var match; (match = LINE.exec(lines)) != null;) {
-    var key = match[1],
-      value = match[2] || "";
-    value = value.trim();
-    var maybeQuote = value[0];
-    value = value.replace(/^(['"`])([\s\S]*)\1$/gm, "$2"), maybeQuote === '"' && (value = value.replace(/\\n/g, `
-`), value = value.replace(/\\r/g, "\r")), obj[key] = value;
-  }
-  return obj;
-}
 export { loadEnv };
 //# sourceMappingURL=loadEnv.native.js.map

package/dist/exports/loadEnv.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["statSync","readFile","join","normalizePath","DEFAULT_PREFIX","loadEnv","mode","root","arguments","length","process","cwd","userPrefix","loadedEnv","loadJustEnvFiles","prefix","Array","isArray","isPublicKey","key2","some","p","startsWith","test","loaded","key","val","env","clientEnv","Object","fromEntries","entries","flatMap","param","value","serverEnv","clientEnvDefine","val2","stringified","JSON","stringify","getEnvFilesForMode","map","file","envFiles","loadedEnvs","Promise","all","filePath","_tryStatSync","tryStatSync","isFile","contents","parsed","parse","flat"],"sources":["../../src/exports/loadEnv.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["statSync","readFile","join","parse","expand","normalizePath","DEFAULT_PREFIX","loadEnv","mode","root","arguments","length","process","cwd","userPrefix","loadedEnv","loadJustEnvFiles","prefix","Array","isArray","isPublicKey","key2","some","p","startsWith","test","loaded","key","val","env","clientEnv","Object","fromEntries","entries","flatMap","param","value","serverEnv","clientEnvDefine","val2","stringified","JSON","stringify","getEnvFilesForMode","map","file"],"sources":["../../src/exports/loadEnv.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,QAAA,QAAgB;AACzB,SAASC,QAAA,QAAgB;AACzB,SAASC,IAAA,QAAY;AACrB,SAASC,KAAA,QAAa;AACtB,SAAmCC,MAAA,QAAc;AACjD,SAASC,aAAA,QAAqB;AAI9B,IAAAC,cAAM,yBAAiB;AAEvB,eAAsBC,QAAQC,IAAA,EAAY;EACxC,IAAAC,IAAM,GAAAC,SAAY,CAAAC,MAAM,QAAAD,SAAiB,CAAI,OACvC,KAAS,IAAAA,SAAc,MAAME,OAAA,CAAQC,GAAA;IAAAC,UAAc,GAAAJ,SAAc,CAAAC,MAAA,GAAU,IAAMD,SACjF,WAAe;IAAAK,SACZ,GAAO,MAAMC,gBAAU,CAAAR,IAAa;IAAAS,MAAK,GAAAH,UAAe,GAAKI,KAAG,CAGnEC,OAAA,CAAAL,UAA8C,IAAAA,UAAA,IAGpDA,UAAW,CACT;IAAMM,WAAM,GAAQ,SAAAA,CAAOC,IAAK;MAChC,OAAOJ,MAAG,CAAIK,IAAA,CACd,UAAQC,CAAA,EAAI;QACd,OAAAF,IAAA,CAAAG,UAAA,CAAAD,CAAA;MAEA,MAAMjB,cAAY,CAAAmB,IAAO,CAAAJ,IAAA;IAAA;IACvBK,MAAO;EAAQ,KACb,IAAGC,GAAA,IAAQZ,SAAA;IAAA,IACXa,GAAG,GAAAhB,OAAA,CAAAiB,GAAA,CAAAF,GAAA,KAAAZ,SAAA,CAAAY,GAAA;IACLD,MAAG,CAAAC,GAAA,CAAQ,GAAEC,GAAA,EAAKhB,OAAK,CAAAiB,GACjB,CAAAF,GAAA,IAAAC,GAAY;EAKpB;EAEA,IAAAE,SAAO,GAAAC,MAAA,CAAAC,WAAA,CAAAD,MAAA,CAAAE,OAAA;IACL,GAAArB,OAAA,CAAWiB,GAAA;IACX,GAAAH;EAAA,EACA,CAAAQ,OAAA,WAAiBC,KAAA,EAAO;IAAA,IACtB,CAAAd,IAAO,EAAAe,KAAA,CAAQ,GAAAD,KAAA;IACb,OAAAf,WAAM,CAAAC,IAAA,CAAc,IACpB,CAAOA,IACJ,EAAiCe,KACjC,CAAqC,CACxC,GACD;EAAA,EACH;EACF;IACFC,SAAA,EAAAtB,SAAA;IAWAe,SAAS;IACPQ,eAAgB,EAAAP,MAAA,CAAAC,WAAc,CAAQD,MAAI,CAAAE,OAAI,CAAAH,SAAY,EAAAI,OAAU,WAAAC,KAAA;MAAK,KAAAd,IACvE,EAAAkB,IAAA,IAAAJ,KAAc;QAAAK,WAAe,GAAAC,IAAA,CAAAC,SAAA,CAAAH,IAAA;MAC/B,QACF,CAEA,eAAelB,IAAA,IACPmB,WAAW,CAId,EACC,CACE,mBAAiBnB,IAAQ,IACzBmB,WAAM,CACN,CACD;IACH;EACF;AAIA;AAGF,SAAAG,mBAAAnC,IAAA;EAEA,OAAS,CACP,MAAI,EACF,YAAO,EACT,QAAQA,IAAA,IAAC,QAAAA,IAAA,SACX,CAAAoC,GAAA,WAAAC,IAAA","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxrn",
-  "version": "1.1.522",
+  "version": "1.1.524",
   "sideEffects": false,
   "type": "module",
   "exports": {
@@ -65,25 +65,27 @@
     "@hono/node-server": "^1.13.7",
     "@react-native/dev-middleware": "^0.76.5",
     "@rollup/plugin-node-resolve": "^15.2.3",
-    "@vxrn/compiler": "1.1.522",
-    "@vxrn/debug": "1.1.522",
-    "@vxrn/query-string": "1.1.522",
-    "@vxrn/react-native-prebuilt": "1.1.522",
-    "@vxrn/resolve": "1.1.522",
-    "@vxrn/safe-area": "1.1.522",
-    "@vxrn/url-parse": "1.1.522",
-    "@vxrn/utils": "1.1.522",
-    "@vxrn/vendor": "1.1.522",
-    "@vxrn/vite-flow": "1.1.522",
-    "@vxrn/vite-plugin-metro": "1.1.522",
+    "@vxrn/compiler": "1.1.524",
+    "@vxrn/debug": "1.1.524",
+    "@vxrn/query-string": "1.1.524",
+    "@vxrn/react-native-prebuilt": "1.1.524",
+    "@vxrn/resolve": "1.1.524",
+    "@vxrn/safe-area": "1.1.524",
+    "@vxrn/url-parse": "1.1.524",
+    "@vxrn/utils": "1.1.524",
+    "@vxrn/vendor": "1.1.524",
+    "@vxrn/vite-flow": "1.1.524",
+    "@vxrn/vite-plugin-metro": "1.1.524",
     "citty": "^0.1.6",
+    "dotenv": "^17.2.1",
+    "dotenv-expand": "^12.0.2",
     "env-editor": "^1.1.0",
     "es-module-lexer": "^1.3.0",
     "fast-glob": "^3.3.3",
     "find-node-modules": "^2.1.3",
     "fs-extra": "^11.2.0",
     "get-port-please": "^3.1.2",
-    "hono": "^4.6.16",
+    "hono": "^4.9.2",
     "ip": "^2.0.1",
     "lightningcss": "^1.30.1",
     "metro-react-native-babel-preset": "^0.77.0",

package/src/exports/loadEnv.ts

@@ -1,6 +1,8 @@
 import { statSync } from 'node:fs'
 import { readFile } from 'node:fs/promises'
 import { join } from 'node:path'
+import { parse } from 'dotenv'
+import { type DotenvPopulateInput, expand } from 'dotenv-expand'
 import { normalizePath } from 'vite'
 
 type Mode = 'development' | 'production' | string
@@ -67,17 +69,23 @@ function getEnvFilesForMode(mode: Mode) {
 
 async function loadJustEnvFiles(mode: Mode) {
   const envFiles = getEnvFilesForMode(mode)
-  const loadedEnvs = (
-    await Promise.all(
+  
+  // load all env files and merge them
+  const parsed = Object.fromEntries(
+    (await Promise.all(
       envFiles.map(async (filePath) => {
         if (!tryStatSync(filePath)?.isFile()) return []
         const contents = await readFile(filePath, 'utf-8')
-        const parsed = parse(contents)
-        return Object.entries(parsed)
+        return Object.entries(parse(contents))
       })
-    )
-  ).flat()
-  return Object.fromEntries(loadedEnvs)
+    )).flat()
+  )
+  
+  // support dotenv-expand for variable expansion
+  const processEnv = { ...process.env } as DotenvPopulateInput
+  expand({ parsed, processEnv })
+  
+  return parsed
 }
 
 function tryStatSync(file: string) {
@@ -85,45 +93,3 @@ function tryStatSync(file: string) {
     return statSync(file, { throwIfNoEntry: false })
   } catch {}
 }
-
-// Parse src into an Object
-const LINE =
-  /(?:^|^)\s*(?:export\s+)?([\w.-]+)(?:\s*=\s*?|:\s+?)(\s*'(?:\\'|[^'])*'|\s*"(?:\\"|[^"])*"|\s*`(?:\\`|[^`])*`|[^#\r\n]+)?\s*(?:#.*)?(?:$|$)/gm
-
-function parse(src: string) {
-  const obj: Record<string, string> = {}
-
-  // Convert buffer to string
-  let lines = src.toString()
-
-  // Convert line breaks to same format
-  lines = lines.replace(/\r\n?/gm, '\n')
-
-  let match
-  while ((match = LINE.exec(lines)) != null) {
-    const key = match[1]
-
-    // Default undefined or null to empty string
-    let value = match[2] || ''
-
-    // Remove whitespace
-    value = value.trim()
-
-    // Check if double quoted
-    const maybeQuote = value[0]
-
-    // Remove surrounding quotes
-    value = value.replace(/^(['"`])([\s\S]*)\1$/gm, '$2')
-
-    // Expand newlines if double quoted
-    if (maybeQuote === '"') {
-      value = value.replace(/\\n/g, '\n')
-      value = value.replace(/\\r/g, '\r')
-    }
-
-    // Add to object
-    obj[key] = value
-  }
-
-  return obj
-}

package/types/exports/loadEnv.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loadEnv.d.ts","sourceRoot":"","sources":["../../src/exports/loadEnv.ts"],"names":[],"mappings":"AAKA,KAAK,IAAI,GAAG,aAAa,GAAG,YAAY,GAAG,MAAM,CAAA;AAIjD,wBAAsB,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,SAAgB,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE;;;;;;;;;;GAyC7F"}
+{"version":3,"file":"loadEnv.d.ts","sourceRoot":"","sources":["../../src/exports/loadEnv.ts"],"names":[],"mappings":"AAOA,KAAK,IAAI,GAAG,aAAa,GAAG,YAAY,GAAG,MAAM,CAAA;AAIjD,wBAAsB,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,SAAgB,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE;;;;;;;;;;GAyC7F"}