vxrn 1.1.505 → 1.1.506

package/dist/exports/loadEnv.js

@@ -4,16 +4,19 @@ import { join } from "node:path";
 import { normalizePath } from "vite";
 const DEFAULT_PREFIX = /^(ONE|VITE|TAMAGUI)_/;
 async function loadEnv(mode, root = process.cwd(), userPrefix) {
-  const serverEnv = await loadJustEnvFiles(mode), prefix = userPrefix ? Array.isArray(userPrefix) ? userPrefix : [userPrefix] : [], isPublicKey = (key) => prefix.some((p) => key.startsWith(p)) || DEFAULT_PREFIX.test(key), clientEnv = Object.fromEntries(
+  const loadedEnv = await loadJustEnvFiles(mode), prefix = userPrefix ? Array.isArray(userPrefix) ? userPrefix : [userPrefix] : [], isPublicKey = (key) => prefix.some((p) => key.startsWith(p)) || DEFAULT_PREFIX.test(key), loaded = {};
+  for (const key in loadedEnv) {
+    const val = process.env[key] || loadedEnv[key];
+    loaded[key] = val, process.env[key] = val;
+  }
+  const clientEnv = Object.fromEntries(
     Object.entries({
       ...process.env,
-      ...serverEnv
+      ...loaded
     }).flatMap(([key, value]) => isPublicKey(key) ? [[key, value]] : [])
   );
-  for (const key in serverEnv)
-    typeof process.env[key] > "u" && (process.env[key] = serverEnv[key]);
   return {
-    serverEnv,
+    serverEnv: loadedEnv,
     clientEnv,
     clientEnvDefine: Object.fromEntries(
       Object.entries(clientEnv).flatMap(([key, val]) => {

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,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;AAGA,aAAW,OAAO;AAChB,IAAI,OAAO,QAAQ,IAAI,GAAG,IAAM,QAC9B,QAAQ,IAAI,GAAG,IAAI,UAAU,GAAG;AAIpC,SAAO;AAAA,IACL;AAAA,IACA;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,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;",
   "names": []
 }

package/dist/exports/loadEnv.mjs

@@ -4,16 +4,20 @@ import { join } from "node:path";
 import { normalizePath } from "vite";
 const DEFAULT_PREFIX = /^(ONE|VITE|TAMAGUI)_/;
 async function loadEnv(mode, root = process.cwd(), userPrefix) {
-  const serverEnv = await loadJustEnvFiles(mode),
+  const loadedEnv = await loadJustEnvFiles(mode),
     prefix = userPrefix ? Array.isArray(userPrefix) ? userPrefix : [userPrefix] : [],
     isPublicKey = key => prefix.some(p => key.startsWith(p)) || DEFAULT_PREFIX.test(key),
-    clientEnv = Object.fromEntries(Object.entries({
-      ...process.env,
-      ...serverEnv
-    }).flatMap(([key, value]) => isPublicKey(key) ? [[key, value]] : []));
-  for (const key in serverEnv) typeof process.env[key] > "u" && (process.env[key] = serverEnv[key]);
+    loaded = {};
+  for (const key in loadedEnv) {
+    const val = process.env[key] || loadedEnv[key];
+    loaded[key] = val, process.env[key] = val;
+  }
+  const clientEnv = Object.fromEntries(Object.entries({
+    ...process.env,
+    ...loaded
+  }).flatMap(([key, value]) => isPublicKey(key) ? [[key, value]] : []));
   return {
-    serverEnv,
+    serverEnv: loadedEnv,
     clientEnv,
     clientEnvDefine: Object.fromEntries(Object.entries(clientEnv).flatMap(([key, val]) => {
       const stringified = JSON.stringify(val);

package/dist/exports/loadEnv.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["statSync","readFile","join","normalizePath","DEFAULT_PREFIX","loadEnv","mode","root","process","cwd","userPrefix","serverEnv","loadJustEnvFiles","prefix","Array","isArray","isPublicKey","key","some","p","startsWith","test","clientEnv","Object","fromEntries","entries","env","flatMap","value","clientEnvDefine","val","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","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":"AAAA,SAASA,QAAA,QAAgB;AACzB,SAASC,QAAA,QAAgB;AACzB,SAASC,IAAA,QAAY;AACrB,SAASC,aAAA,QAAqB;AAI9B,MAAMC,cAAA,GAAiB;AAEvB,eAAsBC,QAAQC,IAAA,EAAYC,IAAA,GAAOC,OAAA,CAAQC,GAAA,CAAI,GAAGC,UAAA,EAAgC;EAC9F,MAAMC,SAAA,GAAY,MAAMC,gBAAA,CAAiBN,IAAI;IACvCO,MAAA,GAASH,UAAA,GAAcI,KAAA,CAAMC,OAAA,CAAQL,UAAU,IAAIA,UAAA,GAAa,CAACA,UAAU,IAAK,EAAC;IACjFM,WAAA,GAAeC,GAAA,IACZJ,MAAA,CAAOK,IAAA,CAAMC,CAAA,IAAMF,GAAA,CAAIG,UAAA,CAAWD,CAAC,CAAC,KAAKf,cAAA,CAAeiB,IAAA,CAAKJ,GAAG;IAGnEK,MAAA,GAA6C,CAAC;EAGpD,WAAWL,GAAA,IAAON,SAAA,EAAW;IAC3B,MAAMY,GAAA,GAAMf,OAAA,CAAQgB,GAAA,CAAIP,GAAG,KAAKN,SAAA,CAAUM,GAAG;IAC7CK,MAAA,CAAOL,GAAG,IAAIM,GAAA,EACdf,OAAA,CAAQgB,GAAA,CAAIP,GAAG,IAAIM,GAAA;EACrB;EAEA,MAAME,SAAA,GAAYC,MAAA,CAAOC,WAAA,CACvBD,MAAA,CAAOE,OAAA,CAAQ;IACb,GAAGpB,OAAA,CAAQgB,GAAA;IACX,GAAGF;EACL,CAAC,EAAEO,OAAA,CAAQ,CAAC,CAACZ,GAAA,EAAKa,KAAK,MACjBd,WAAA,CAAYC,GAAG,IACV,CAAC,CAACA,GAAA,EAAKa,KAAK,CAAC,IAEf,EACR,CACH;EAEA,OAAO;IACLC,SAAA,EAAWpB,SAAA;IACXc,SAAA;IACAO,eAAA,EAAiBN,MAAA,CAAOC,WAAA,CACtBD,MAAA,CAAOE,OAAA,CAAQH,SAAS,EAAEI,OAAA,CAAQ,CAAC,CAACZ,GAAA,EAAKM,GAAG,MAAM;MAChD,MAAMU,WAAA,GAAcC,IAAA,CAAKC,SAAA,CAAUZ,GAAG;MACtC,OAAO,CACL,CAAC,eAAeN,GAAG,IAAIgB,WAAW,GAClC,CAAC,mBAAmBhB,GAAG,IAAIgB,WAAW,EACxC;IACF,CAAC,CACH;EACF;AACF;AAWA,SAASG,mBAAmB9B,IAAA,EAAY;EACtC,OAAO,CAAC,QAAQ,cAAc,QAAQA,IAAI,IAAI,QAAQA,IAAI,QAAQ,EAAE+B,GAAA,CAAKC,IAAA,IACvEnC,aAAA,CAAcD,IAAA,CAAK,KAAKoC,IAAI,CAAC,CAC/B;AACF;AAEA,eAAe1B,iBAAiBN,IAAA,EAAY;EAC1C,MAAMiC,QAAA,GAAWH,kBAAA,CAAmB9B,IAAI;IAClCkC,UAAA,IACJ,MAAMC,OAAA,CAAQC,GAAA,CACZH,QAAA,CAASF,GAAA,CAAI,MAAOM,QAAA,IAAa;MAC/B,IAAI,CAACC,WAAA,CAAYD,QAAQ,GAAGE,MAAA,CAAO,GAAG,OAAO,EAAC;MAC9C,MAAMC,QAAA,GAAW,MAAM7C,QAAA,CAAS0C,QAAA,EAAU,OAAO;QAC3CI,MAAA,GAASC,KAAA,CAAMF,QAAQ;MAC7B,OAAOpB,MAAA,CAAOE,OAAA,CAAQmB,MAAM;IAC9B,CAAC,CACH,GACAE,IAAA,CAAK;EACP,OAAOvB,MAAA,CAAOC,WAAA,CAAYa,UAAU;AACtC;AAEA,SAASI,YAAYN,IAAA,EAAc;EACjC,IAAI;IACF,OAAOtC,QAAA,CAASsC,IAAA,EAAM;MAAEY,cAAA,EAAgB;IAAM,CAAC;EACjD,QAAQ,CAAC;AACX;AAGA,MAAMC,IAAA,GACJ;AAEF,SAASH,MAAMI,GAAA,EAAa;EAC1B,MAAMC,GAAA,GAA8B,CAAC;EAGrC,IAAIC,KAAA,GAAQF,GAAA,CAAIG,QAAA,CAAS;EAGzBD,KAAA,GAAQA,KAAA,CAAME,OAAA,CAAQ,WAAW;AAAA,CAAI;EAErC,IAAIC,KAAA;EACJ,QAAQA,KAAA,GAAQN,IAAA,CAAKO,IAAA,CAAKJ,KAAK,MAAM,OAAM;IACzC,MAAMrC,GAAA,GAAMwC,KAAA,CAAM,CAAC;IAGnB,IAAI3B,KAAA,GAAQ2B,KAAA,CAAM,CAAC,KAAK;IAGxB3B,KAAA,GAAQA,KAAA,CAAM6B,IAAA,CAAK;IAGnB,MAAMC,UAAA,GAAa9B,KAAA,CAAM,CAAC;IAG1BA,KAAA,GAAQA,KAAA,CAAM0B,OAAA,CAAQ,0BAA0B,IAAI,GAGhDI,UAAA,KAAe,QACjB9B,KAAA,GAAQA,KAAA,CAAM0B,OAAA,CAAQ,QAAQ;AAAA,CAAI,GAClC1B,KAAA,GAAQA,KAAA,CAAM0B,OAAA,CAAQ,QAAQ,IAAI,IAIpCH,GAAA,CAAIpC,GAAG,IAAIa,KAAA;EACb;EAEA,OAAOuB,GAAA;AACT","ignoreList":[]}

package/dist/exports/loadEnv.native.js

@@ -6,27 +6,31 @@ var DEFAULT_PREFIX = /^(ONE|VITE|TAMAGUI)_/;
 async function loadEnv(mode) {
   var root = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : process.cwd(),
     userPrefix = arguments.length > 2 ? arguments[2] : void 0,
-    serverEnv = await loadJustEnvFiles(mode),
+    loadedEnv = await loadJustEnvFiles(mode),
     prefix = userPrefix ? Array.isArray(userPrefix) ? userPrefix : [userPrefix] : [],
     isPublicKey = function (key2) {
       return prefix.some(function (p) {
         return key2.startsWith(p);
       }) || DEFAULT_PREFIX.test(key2);
     },
-    clientEnv = Object.fromEntries(Object.entries({
-      ...process.env,
-      ...serverEnv
-    }).flatMap(function (param) {
-      var [key2, value] = param;
-      return isPublicKey(key2) ? [[key2, value]] : [];
-    }));
-  for (var key in serverEnv) typeof process.env[key] > "u" && (process.env[key] = serverEnv[key]);
+    loaded = {};
+  for (var key in loadedEnv) {
+    var val = process.env[key] || loadedEnv[key];
+    loaded[key] = val, process.env[key] = val;
+  }
+  var clientEnv = Object.fromEntries(Object.entries({
+    ...process.env,
+    ...loaded
+  }).flatMap(function (param) {
+    var [key2, value] = param;
+    return isPublicKey(key2) ? [[key2, value]] : [];
+  }));
   return {
-    serverEnv,
+    serverEnv: loadedEnv,
     clientEnv,
     clientEnvDefine: Object.fromEntries(Object.entries(clientEnv).flatMap(function (param) {
-      var [key2, val] = param,
-        stringified = JSON.stringify(val);
+      var [key2, val2] = param,
+        stringified = JSON.stringify(val2);
       return [[`process.env.${key2}`, stringified], [`import.meta.env.${key2}`, stringified]];
     }))
   };

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","serverEnv","loadJustEnvFiles","prefix","Array","isArray","isPublicKey","key2","some","p","startsWith","test","clientEnv","Object","fromEntries","entries","env","flatMap","param","value","key","clientEnvDefine","val","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":"AAAA,SAASA,QAAA,QAAgB;AACzB,SAASC,QAAA,QAAgB;AACzB,SAASC,IAAA,QAAY;AACrB,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,UAAY,CAAO,GAAAA,UAAA,IACvBA,UAAO,CAAQ,GACb;IAAGM,WAAQ,YAAAA,CAAAC,IAAA;MAAA,OACRJ,MAAA,CAAAK,IAAA,WAAAC,CAAA;QACJ,OAAEF,IAAU,CAAAG,UAAU,CAAAD,CAAA;MAMzB,MAAAjB,cAAA,CAAAmB,IAAA,CAAAJ,IAAA;IAGA;IAAAK,SAAW,GAAAC,MAAO,CAAAC,WAAA,CAAAD,MAAA,CAAAE,OAAA;MACZ,GAAAjB,OAAO,CAAAkB,GAAA;MAKb,GAAAf;IAAO,EACL,CAAAgB,OAAA,WAAAC,KAAA;MACA,KAAAX,IAAA,EAAAY,KAAA,IAAAD,KAAA;MACA,OAAAZ,WAAiB,CAAAC,IAAA,CAAO,IACtB,CACEA,IAAA,EACAY,KAAA,CAAO,CAC6B,KAClC;IAAsC;EACxC,KACD,IAAAC,GAAA,IAAAnB,SAAA,EACH,OAAAH,OAAA,CAAAkB,GAAA,CAAAI,GAAA,YAAAtB,OAAA,CAAAkB,GAAA,CAAAI,GAAA,IAAAnB,SAAA,CAAAmB,GAAA;EACF;IACFnB,SAAA;IAWAW,SAAS;IACPS,eAAgB,EAAAR,MAAA,CAAAC,WAAc,CAAQD,MAAI,CAAAE,OAAI,CAAAH,SAAY,EAAAK,OAAU,WAAAC,KAAA;MAAK,KAAAX,IACvE,EAAAe,GAAA,IAAAJ,KAAc;QAAAK,WAAc,GAACC,IAAA,CAAAC,SAAA,CAAAH,GAAA;MAC/B,QACF,CAEA,eAAef,IAAA,IACPgB,WAAW,CAGb,EACE,CACA,mBAAuBhB,IAAA,IAEvBgB,WAAc,CACf,CAEH;IACF;EACF;AAEA;AACE,SAAIG,mBAAAhC,IAAA;EACF,QACF,MAAQ,EAAC,cACX,QAAAA,IAAA,IAGA,QAAMA,IACJ,SAEF,CAAAiC,GAAA,WAAeC,IAAa;IAC1B,OAAMrC,aAA+B,CAAAD,IAAA,MAAAsC,IAAA;EAGrC;AAGA;AAAiC,eAAI1B,iBAAAR,IAAA;EAErC,IAAImC,QAAA,GAAAH,kBAAA,CAAAhC,IAAA;IAAAoC,UAAA,UAAAC,OAAA,CAAAC,GAAA,CAAAH,QAAA,CAAAF,GAAA,iBAAAM,QAAA;MACJ,IAAAC,YAAgB;MACd,MAAM,GAAAA,YAAa,GAAAC,WAAA,CAAAF,QAAA,eAAAC,YAAA,gBAAAA,YAAA,CAAAE,MAAA;MAGnB,IAAIC,QAAQ,SAAOhD,QAAK,CAAA4C,QAAA;QAAAK,MAAA,GAAAC,KAAA,CAAAF,QAAA;MAGxB,OAAAxB,MAAQ,CAAME,OAAK,CAAAuB,MAAA;IAGnB,KAAAE,IAAM;EAGN,OAAA3B,MAAQ,CAAAC,WAAc,CAAAgB,UAAA;AAIU;AAKrB,SACbK,YAAAP,IAAA;EAEA;IACF,OAAAxC,QAAA,CAAAwC,IAAA","ignoreList":[]}
+{"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":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxrn",
-  "version": "1.1.505",
+  "version": "1.1.506",
   "sideEffects": false,
   "type": "module",
   "exports": {
@@ -65,17 +65,17 @@
     "@hono/node-server": "^1.13.7",
     "@react-native/dev-middleware": "^0.76.5",
     "@rollup/plugin-node-resolve": "^15.2.3",
-    "@vxrn/compiler": "1.1.505",
-    "@vxrn/debug": "1.1.505",
-    "@vxrn/query-string": "1.1.505",
-    "@vxrn/react-native-prebuilt": "1.1.505",
-    "@vxrn/resolve": "1.1.505",
-    "@vxrn/safe-area": "1.1.505",
-    "@vxrn/url-parse": "1.1.505",
-    "@vxrn/utils": "1.1.505",
-    "@vxrn/vendor": "1.1.505",
-    "@vxrn/vite-flow": "1.1.505",
-    "@vxrn/vite-plugin-metro": "1.1.505",
+    "@vxrn/compiler": "1.1.506",
+    "@vxrn/debug": "1.1.506",
+    "@vxrn/query-string": "1.1.506",
+    "@vxrn/react-native-prebuilt": "1.1.506",
+    "@vxrn/resolve": "1.1.506",
+    "@vxrn/safe-area": "1.1.506",
+    "@vxrn/url-parse": "1.1.506",
+    "@vxrn/utils": "1.1.506",
+    "@vxrn/vendor": "1.1.506",
+    "@vxrn/vite-flow": "1.1.506",
+    "@vxrn/vite-plugin-metro": "1.1.506",
     "citty": "^0.1.6",
     "env-editor": "^1.1.0",
     "es-module-lexer": "^1.3.0",
@@ -99,7 +99,7 @@
   "devDependencies": {
     "@biomejs/biome": "1.9.4",
     "@react-native-community/cli": "19.0.0",
-    "@tamagui/build": "^1.131.3",
+    "@tamagui/build": "^1.132.7",
     "@types/find-node-modules": "^2.1.2",
     "@types/node": "^22.1.0",
     "@types/qrcode-terminal": "^0",

package/src/exports/loadEnv.ts

@@ -3,21 +3,30 @@ import { readFile } from 'node:fs/promises'
 import { join } from 'node:path'
 import { normalizePath } from 'vite'
 
-type Mode = 'development' | 'production'
+type Mode = 'development' | 'production' | string
 
 const DEFAULT_PREFIX = /^(ONE|VITE|TAMAGUI)_/
 
 export async function loadEnv(mode: Mode, root = process.cwd(), userPrefix?: string | string[]) {
-  const serverEnv = await loadJustEnvFiles(mode)
+  const loadedEnv = await loadJustEnvFiles(mode)
   const prefix = userPrefix ? (Array.isArray(userPrefix) ? userPrefix : [userPrefix]) : []
   const isPublicKey = (key: string) => {
     return prefix.some((p) => key.startsWith(p)) || DEFAULT_PREFIX.test(key)
   }
 
+  const loaded: Record<string, string | undefined> = {}
+
+  // defer to process.env
+  for (const key in loadedEnv) {
+    const val = process.env[key] || loadedEnv[key]
+    loaded[key] = val
+    process.env[key] = val
+  }
+
   const clientEnv = Object.fromEntries(
     Object.entries({
       ...process.env,
-      ...serverEnv,
+      ...loaded,
     }).flatMap(([key, value]) => {
       if (isPublicKey(key)) {
         return [[key, value]]
@@ -26,15 +35,8 @@ export async function loadEnv(mode: Mode, root = process.cwd(), userPrefix?: str
     })
   )
 
-  // define into process.env
-  for (const key in serverEnv) {
-    if (typeof process.env[key] === 'undefined') {
-      process.env[key] = serverEnv[key]
-    }
-  }
-
   return {
-    serverEnv,
+    serverEnv: loadedEnv,
     clientEnv,
     clientEnvDefine: Object.fromEntries(
       Object.entries(clientEnv).flatMap(([key, val]) => {

package/types/exports/loadEnv.d.ts

@@ -1,4 +1,4 @@
-type Mode = 'development' | 'production';
+type Mode = 'development' | 'production' | string;
 export declare function loadEnv(mode: Mode, root?: string, userPrefix?: string | string[]): Promise<{
     serverEnv: {
         [k: string]: string;

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,CAAA;AAIxC,wBAAsB,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,SAAgB,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE;;;;;;;;;;GAuC7F"}
+{"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"}