vxrn 1.1.505 → 1.1.507
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/exports/build.js +12 -7
- package/dist/exports/build.js.map +1 -1
- package/dist/exports/build.mjs +12 -12
- package/dist/exports/build.mjs.map +1 -1
- package/dist/exports/build.native.js +20 -12
- package/dist/exports/build.native.js.map +1 -1
- package/dist/exports/loadEnv.js +8 -5
- package/dist/exports/loadEnv.js.map +1 -1
- package/dist/exports/loadEnv.mjs +11 -7
- package/dist/exports/loadEnv.mjs.map +1 -1
- package/dist/exports/loadEnv.native.js +16 -12
- package/dist/exports/loadEnv.native.js.map +1 -1
- package/package.json +13 -13
- package/src/exports/build.ts +19 -5
- package/src/exports/loadEnv.ts +13 -11
- package/types/exports/loadEnv.d.ts +1 -1
- package/types/exports/loadEnv.d.ts.map +1 -1
package/dist/exports/build.js
CHANGED
|
@@ -109,7 +109,7 @@ const disableOptimizationConfig = {
|
|
|
109
109
|
}
|
|
110
110
|
}
|
|
111
111
|
};
|
|
112
|
-
let clientOutput;
|
|
112
|
+
let clientOutput, clientBuildPromise;
|
|
113
113
|
if (buildArgs.step !== "generate") {
|
|
114
114
|
let clientBuildConfig = mergeConfig(webBuildConfig, {
|
|
115
115
|
plugins: [
|
|
@@ -144,9 +144,7 @@ const disableOptimizationConfig = {
|
|
|
144
144
|
});
|
|
145
145
|
process.env.VXRN_DISABLE_PROD_OPTIMIZATION && (clientBuildConfig = mergeConfig(clientBuildConfig, disableOptimizationConfig)), console.info(`
|
|
146
146
|
\u{1F528} build client
|
|
147
|
-
`);
|
|
148
|
-
const { output } = await viteBuild(clientBuildConfig);
|
|
149
|
-
clientOutput = output;
|
|
147
|
+
`), clientBuildPromise = viteBuild(clientBuildConfig);
|
|
150
148
|
}
|
|
151
149
|
const serverOptions = options.build?.server, shouldOutputCJS = getServerCJSSetting(options);
|
|
152
150
|
let serverBuildConfig = mergeConfig(webBuildConfig, {
|
|
@@ -192,15 +190,22 @@ const disableOptimizationConfig = {
|
|
|
192
190
|
});
|
|
193
191
|
rerouteNoExternalConfig && (serverBuildConfig.ssr.noExternal = !0);
|
|
194
192
|
const serverEntry = getServerEntry(options);
|
|
195
|
-
let serverOutput, clientManifest;
|
|
193
|
+
let serverOutput, clientManifest, serverBuildPromise;
|
|
196
194
|
if (serverOptions !== !1) {
|
|
197
195
|
console.info(`
|
|
198
196
|
\u{1F528} build server
|
|
199
197
|
`);
|
|
200
|
-
const userServerConf = optionsIn.build?.server, userServerBuildConf = typeof userServerConf == "boolean" ? null : userServerConf?.config
|
|
198
|
+
const userServerConf = optionsIn.build?.server, userServerBuildConf = typeof userServerConf == "boolean" ? null : userServerConf?.config;
|
|
199
|
+
serverBuildPromise = viteBuild(
|
|
201
200
|
userServerBuildConf ? mergeConfig(serverBuildConfig, userServerBuildConf) : serverBuildConfig
|
|
202
201
|
);
|
|
203
|
-
|
|
202
|
+
}
|
|
203
|
+
if (clientBuildPromise && serverBuildPromise) {
|
|
204
|
+
const [clientResult, serverResult] = await Promise.all([clientBuildPromise, serverBuildPromise]);
|
|
205
|
+
clientOutput = clientResult.output, serverOutput = serverResult.output;
|
|
206
|
+
} else clientBuildPromise ? clientOutput = (await clientBuildPromise).output : serverBuildPromise && (serverOutput = (await serverBuildPromise).output);
|
|
207
|
+
if (serverOptions !== !1) {
|
|
208
|
+
clientManifest = await FSExtra.readJSON("dist/client/.vite/manifest.json");
|
|
204
209
|
const old = await FSExtra.readFile(serverEntry, "utf-8");
|
|
205
210
|
await FSExtra.writeFile(
|
|
206
211
|
serverEntry,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/exports/build.ts"],
|
|
4
|
-
"mappings": "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
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/dist/exports/build.mjs
CHANGED
|
@@ -103,7 +103,7 @@ const disableOptimizationConfig = {
|
|
|
103
103
|
}
|
|
104
104
|
}
|
|
105
105
|
};
|
|
106
|
-
let clientOutput;
|
|
106
|
+
let clientOutput, clientBuildPromise;
|
|
107
107
|
if (buildArgs.step !== "generate") {
|
|
108
108
|
let clientBuildConfig = mergeConfig(webBuildConfig, {
|
|
109
109
|
plugins: [excludeAPIAndMiddlewareRoutesPlugin,
|
|
@@ -136,11 +136,7 @@ const disableOptimizationConfig = {
|
|
|
136
136
|
});
|
|
137
137
|
process.env.VXRN_DISABLE_PROD_OPTIMIZATION && (clientBuildConfig = mergeConfig(clientBuildConfig, disableOptimizationConfig)), console.info(`
|
|
138
138
|
\u{1F528} build client
|
|
139
|
-
`);
|
|
140
|
-
const {
|
|
141
|
-
output
|
|
142
|
-
} = await viteBuild(clientBuildConfig);
|
|
143
|
-
clientOutput = output;
|
|
139
|
+
`), clientBuildPromise = viteBuild(clientBuildConfig);
|
|
144
140
|
}
|
|
145
141
|
const serverOptions = options.build?.server,
|
|
146
142
|
shouldOutputCJS = getServerCJSSetting(options);
|
|
@@ -187,17 +183,21 @@ const disableOptimizationConfig = {
|
|
|
187
183
|
});
|
|
188
184
|
rerouteNoExternalConfig && (serverBuildConfig.ssr.noExternal = !0);
|
|
189
185
|
const serverEntry = getServerEntry(options);
|
|
190
|
-
let serverOutput, clientManifest;
|
|
186
|
+
let serverOutput, clientManifest, serverBuildPromise;
|
|
191
187
|
if (serverOptions !== !1) {
|
|
192
188
|
console.info(`
|
|
193
189
|
\u{1F528} build server
|
|
194
190
|
`);
|
|
195
191
|
const userServerConf = optionsIn.build?.server,
|
|
196
|
-
userServerBuildConf = typeof userServerConf == "boolean" ? null : userServerConf?.config
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
192
|
+
userServerBuildConf = typeof userServerConf == "boolean" ? null : userServerConf?.config;
|
|
193
|
+
serverBuildPromise = viteBuild(userServerBuildConf ? mergeConfig(serverBuildConfig, userServerBuildConf) : serverBuildConfig);
|
|
194
|
+
}
|
|
195
|
+
if (clientBuildPromise && serverBuildPromise) {
|
|
196
|
+
const [clientResult, serverResult] = await Promise.all([clientBuildPromise, serverBuildPromise]);
|
|
197
|
+
clientOutput = clientResult.output, serverOutput = serverResult.output;
|
|
198
|
+
} else clientBuildPromise ? clientOutput = (await clientBuildPromise).output : serverBuildPromise && (serverOutput = (await serverBuildPromise).output);
|
|
199
|
+
if (serverOptions !== !1) {
|
|
200
|
+
clientManifest = await FSExtra.readJSON("dist/client/.vite/manifest.json");
|
|
201
201
|
const old = await FSExtra.readFile(serverEntry, "utf-8");
|
|
202
202
|
await FSExtra.writeFile(serverEntry, old.replace('import { hydrate as hydrate$1, unmountComponentAtNode, render as render$1 } from "react-dom";', "").replace('import ReactDOM__default, { render as render$2, unmountComponentAtNode as unmountComponentAtNode$1, hydrate as hydrate$1 } from "react-dom";', 'import ReactDOM__default from "react-dom";'));
|
|
203
203
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["FSExtra","rm","sep","loadConfigFromFile","mergeConfig","build","viteBuild","analyzer","getBaseViteConfigWithPlugins","getOptimizeDeps","fillOptions","getServerCJSSetting","getServerEntry","mergeUserConfig","applyBuiltInPatches","loadEnv","existsSync","Error","stackTraceLimit","Number","POSITIVE_INFINITY","disableOptimizationConfig","optimizeDeps","esbuildOptions","minify","rollupOptions","treeshake","output","minifyInternalExports","optionsIn","buildArgs","process","env","IS_VXRN_CLI","NODE_ENV","ONE_ENABLE_REACT_SCAN","serverEnv","options","userViteConfig","Promise","all","command","mode","then","_","config","ONE_SERVER_URL","console","warn","processEnvDefines","Object","fromEntries","entries","map","key","value","JSON","stringify","catch","err","error","recursive","force","platform","buildBundle","root","bundleOutput","dev","entryFile","resetCache","resetGlobalCache","sourcemapUseAbsolutePath","verbose","unstableTransformProfile","webBuildConfig","plugins","globalThis","__vxrnAddWebPluginsProd","clearScreen","configFile","logLevel","onwarn","warning","defaultHandler","code","message","includes","replace","rerouteNoExternalConfig","ssr","noExternal","excludeAPIAndMiddlewareRoutesPlugin","enforce","name","transform","order","handler","id","test","clientOutput","step","clientBuildConfig","VXRN_ANALYZE_BUNDLE","analyzerMode","fileName","define","ssrManifest","outDir","sourcemap","manifest","input","VXRN_DISABLE_PROD_OPTIMIZATION","info","serverOptions","server","shouldOutputCJS","serverBuildConfig","cssCodeSplit","format","entryFileNames","serverEntry","serverOutput","clientManifest","userServerConf","userServerBuildConf","readJSON","old","readFile","writeFile"],"sources":["../../src/exports/build.ts"],"sourcesContent":[null],"mappings":"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
|
|
1
|
+
{"version":3,"names":["FSExtra","rm","sep","loadConfigFromFile","mergeConfig","build","viteBuild","analyzer","getBaseViteConfigWithPlugins","getOptimizeDeps","fillOptions","getServerCJSSetting","getServerEntry","mergeUserConfig","applyBuiltInPatches","loadEnv","existsSync","Error","stackTraceLimit","Number","POSITIVE_INFINITY","disableOptimizationConfig","optimizeDeps","esbuildOptions","minify","rollupOptions","treeshake","output","minifyInternalExports","optionsIn","buildArgs","process","env","IS_VXRN_CLI","NODE_ENV","ONE_ENABLE_REACT_SCAN","serverEnv","options","userViteConfig","Promise","all","command","mode","then","_","config","ONE_SERVER_URL","console","warn","processEnvDefines","Object","fromEntries","entries","map","key","value","JSON","stringify","catch","err","error","recursive","force","platform","buildBundle","root","bundleOutput","dev","entryFile","resetCache","resetGlobalCache","sourcemapUseAbsolutePath","verbose","unstableTransformProfile","webBuildConfig","plugins","globalThis","__vxrnAddWebPluginsProd","clearScreen","configFile","logLevel","onwarn","warning","defaultHandler","code","message","includes","replace","rerouteNoExternalConfig","ssr","noExternal","excludeAPIAndMiddlewareRoutesPlugin","enforce","name","transform","order","handler","id","test","clientOutput","clientBuildPromise","step","clientBuildConfig","VXRN_ANALYZE_BUNDLE","analyzerMode","fileName","define","ssrManifest","outDir","sourcemap","manifest","input","VXRN_DISABLE_PROD_OPTIMIZATION","info","serverOptions","server","shouldOutputCJS","serverBuildConfig","cssCodeSplit","format","entryFileNames","serverEntry","serverOutput","clientManifest","serverBuildPromise","userServerConf","userServerBuildConf","clientResult","serverResult","readJSON","old","readFile","writeFile"],"sources":["../../src/exports/build.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -111,7 +111,8 @@ var disableOptimizationConfig = {
|
|
|
111
111
|
}
|
|
112
112
|
}
|
|
113
113
|
},
|
|
114
|
-
clientOutput
|
|
114
|
+
clientOutput,
|
|
115
|
+
clientBuildPromise;
|
|
115
116
|
if (buildArgs.step !== "generate") {
|
|
116
117
|
var clientBuildConfig = mergeConfig(webBuildConfig, {
|
|
117
118
|
plugins: [excludeAPIAndMiddlewareRoutesPlugin,
|
|
@@ -139,11 +140,7 @@ var disableOptimizationConfig = {
|
|
|
139
140
|
});
|
|
140
141
|
process.env.VXRN_DISABLE_PROD_OPTIMIZATION && (clientBuildConfig = mergeConfig(clientBuildConfig, disableOptimizationConfig)), console.info(`
|
|
141
142
|
\u{1F528} build client
|
|
142
|
-
`);
|
|
143
|
-
var {
|
|
144
|
-
output
|
|
145
|
-
} = await viteBuild(clientBuildConfig);
|
|
146
|
-
clientOutput = output;
|
|
143
|
+
`), clientBuildPromise = viteBuild(clientBuildConfig);
|
|
147
144
|
}
|
|
148
145
|
var serverOptions = (_options_build = options.build) === null || _options_build === void 0 ? void 0 : _options_build.server,
|
|
149
146
|
shouldOutputCJS = getServerCJSSetting(options),
|
|
@@ -190,18 +187,29 @@ var disableOptimizationConfig = {
|
|
|
190
187
|
rerouteNoExternalConfig && (serverBuildConfig.ssr.noExternal = !0);
|
|
191
188
|
var serverEntry = getServerEntry(options),
|
|
192
189
|
serverOutput,
|
|
193
|
-
clientManifest
|
|
190
|
+
clientManifest,
|
|
191
|
+
serverBuildPromise;
|
|
194
192
|
if (serverOptions !== !1) {
|
|
195
193
|
var _optionsIn_build;
|
|
196
194
|
console.info(`
|
|
197
195
|
\u{1F528} build server
|
|
198
196
|
`);
|
|
199
197
|
var userServerConf = (_optionsIn_build = optionsIn.build) === null || _optionsIn_build === void 0 ? void 0 : _optionsIn_build.server,
|
|
200
|
-
userServerBuildConf = typeof userServerConf == "boolean" ? null : userServerConf?.config
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
198
|
+
userServerBuildConf = typeof userServerConf == "boolean" ? null : userServerConf?.config;
|
|
199
|
+
serverBuildPromise = viteBuild(userServerBuildConf ? mergeConfig(serverBuildConfig, userServerBuildConf) : serverBuildConfig);
|
|
200
|
+
}
|
|
201
|
+
if (clientBuildPromise && serverBuildPromise) {
|
|
202
|
+
var [clientResult, serverResult] = await Promise.all([clientBuildPromise, serverBuildPromise]);
|
|
203
|
+
clientOutput = clientResult.output, serverOutput = serverResult.output;
|
|
204
|
+
} else if (clientBuildPromise) {
|
|
205
|
+
var clientResult1 = await clientBuildPromise;
|
|
206
|
+
clientOutput = clientResult1.output;
|
|
207
|
+
} else if (serverBuildPromise) {
|
|
208
|
+
var serverResult1 = await serverBuildPromise;
|
|
209
|
+
serverOutput = serverResult1.output;
|
|
210
|
+
}
|
|
211
|
+
if (serverOptions !== !1) {
|
|
212
|
+
clientManifest = await FSExtra.readJSON("dist/client/.vite/manifest.json");
|
|
205
213
|
var old = await FSExtra.readFile(serverEntry, "utf-8");
|
|
206
214
|
await FSExtra.writeFile(serverEntry, old.replace('import { hydrate as hydrate$1, unmountComponentAtNode, render as render$1 } from "react-dom";', "").replace('import ReactDOM__default, { render as render$2, unmountComponentAtNode as unmountComponentAtNode$1, hydrate as hydrate$1 } from "react-dom";', 'import ReactDOM__default from "react-dom";'));
|
|
207
215
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["FSExtra","rm","sep","loadConfigFromFile","mergeConfig","build","viteBuild","analyzer","getBaseViteConfigWithPlugins","getOptimizeDeps","fillOptions","getServerCJSSetting","getServerEntry","mergeUserConfig","applyBuiltInPatches","loadEnv","existsSync","Error","stackTraceLimit","Number","POSITIVE_INFINITY","disableOptimizationConfig","optimizeDeps","esbuildOptions","minify","rollupOptions","treeshake","output","minifyInternalExports","optionsIn","buildArgs","arguments","length","_userViteConfig_ssr","_options_build","process","env","IS_VXRN_CLI","NODE_ENV","ONE_ENABLE_REACT_SCAN","serverEnv","options","userViteConfig","Promise","all","command","mode","then","_","config","ONE_SERVER_URL","console","warn","processEnvDefines","Object","fromEntries","entries","map","param","key","value","JSON","stringify","catch","err","error","recursive","force","platform","buildBundle","root","bundleOutput","dev","entryFile","resetCache","resetGlobalCache","sourcemapUseAbsolutePath","verbose","unstableTransformProfile","webBuildConfig","plugins","globalThis","__vxrnAddWebPluginsProd","clearScreen","configFile","logLevel","onwarn","warning","defaultHandler","code","message","includes","replace","rerouteNoExternalConfig","ssr","noExternal","excludeAPIAndMiddlewareRoutesPlugin","enforce","name","transform","order","handler","id","test","clientOutput","step","clientBuildConfig","VXRN_ANALYZE_BUNDLE","analyzerMode","fileName","define","ssrManifest","outDir","sourcemap","manifest","input","VXRN_DISABLE_PROD_OPTIMIZATION","info","serverOptions","server","shouldOutputCJS","serverBuildConfig","cssCodeSplit","format","entryFileNames","serverEntry","serverOutput","clientManifest","_optionsIn_build","userServerConf","userServerBuildConf","
|
|
1
|
+
{"version":3,"names":["FSExtra","rm","sep","loadConfigFromFile","mergeConfig","build","viteBuild","analyzer","getBaseViteConfigWithPlugins","getOptimizeDeps","fillOptions","getServerCJSSetting","getServerEntry","mergeUserConfig","applyBuiltInPatches","loadEnv","existsSync","Error","stackTraceLimit","Number","POSITIVE_INFINITY","disableOptimizationConfig","optimizeDeps","esbuildOptions","minify","rollupOptions","treeshake","output","minifyInternalExports","optionsIn","buildArgs","arguments","length","_userViteConfig_ssr","_options_build","process","env","IS_VXRN_CLI","NODE_ENV","ONE_ENABLE_REACT_SCAN","serverEnv","options","userViteConfig","Promise","all","command","mode","then","_","config","ONE_SERVER_URL","console","warn","processEnvDefines","Object","fromEntries","entries","map","param","key","value","JSON","stringify","catch","err","error","recursive","force","platform","buildBundle","root","bundleOutput","dev","entryFile","resetCache","resetGlobalCache","sourcemapUseAbsolutePath","verbose","unstableTransformProfile","webBuildConfig","plugins","globalThis","__vxrnAddWebPluginsProd","clearScreen","configFile","logLevel","onwarn","warning","defaultHandler","code","message","includes","replace","rerouteNoExternalConfig","ssr","noExternal","excludeAPIAndMiddlewareRoutesPlugin","enforce","name","transform","order","handler","id","test","clientOutput","clientBuildPromise","step","clientBuildConfig","VXRN_ANALYZE_BUNDLE","analyzerMode","fileName","define","ssrManifest","outDir","sourcemap","manifest","input","VXRN_DISABLE_PROD_OPTIMIZATION","info","serverOptions","server","shouldOutputCJS","serverBuildConfig","cssCodeSplit","format","entryFileNames","serverEntry","serverOutput","clientManifest","serverBuildPromise","_optionsIn_build","userServerConf","userServerBuildConf","clientResult","serverResult","clientResult1","serverResult1","readJSON","old","readFile","writeFile"],"sources":["../../src/exports/build.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
package/dist/exports/loadEnv.js
CHANGED
|
@@ -4,16 +4,19 @@ import { join } from "node:path";
|
|
|
4
4
|
import { normalizePath } from "vite";
|
|
5
5
|
const DEFAULT_PREFIX = /^(ONE|VITE|TAMAGUI)_/;
|
|
6
6
|
async function loadEnv(mode, root = process.cwd(), userPrefix) {
|
|
7
|
-
const
|
|
7
|
+
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 = {};
|
|
8
|
+
for (const key in loadedEnv) {
|
|
9
|
+
const val = process.env[key] || loadedEnv[key];
|
|
10
|
+
loaded[key] = val, process.env[key] = val;
|
|
11
|
+
}
|
|
12
|
+
const clientEnv = Object.fromEntries(
|
|
8
13
|
Object.entries({
|
|
9
14
|
...process.env,
|
|
10
|
-
...
|
|
15
|
+
...loaded
|
|
11
16
|
}).flatMap(([key, value]) => isPublicKey(key) ? [[key, value]] : [])
|
|
12
17
|
);
|
|
13
|
-
for (const key in serverEnv)
|
|
14
|
-
typeof process.env[key] > "u" && (process.env[key] = serverEnv[key]);
|
|
15
18
|
return {
|
|
16
|
-
serverEnv,
|
|
19
|
+
serverEnv: loadedEnv,
|
|
17
20
|
clientEnv,
|
|
18
21
|
clientEnvDefine: Object.fromEntries(
|
|
19
22
|
Object.entries(clientEnv).flatMap(([key, val]) => {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/exports/loadEnv.ts"],
|
|
4
|
-
"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;
|
|
4
|
+
"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;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/dist/exports/loadEnv.mjs
CHANGED
|
@@ -4,16 +4,20 @@ import { join } from "node:path";
|
|
|
4
4
|
import { normalizePath } from "vite";
|
|
5
5
|
const DEFAULT_PREFIX = /^(ONE|VITE|TAMAGUI)_/;
|
|
6
6
|
async function loadEnv(mode, root = process.cwd(), userPrefix) {
|
|
7
|
-
const
|
|
7
|
+
const loadedEnv = await loadJustEnvFiles(mode),
|
|
8
8
|
prefix = userPrefix ? Array.isArray(userPrefix) ? userPrefix : [userPrefix] : [],
|
|
9
9
|
isPublicKey = key => prefix.some(p => key.startsWith(p)) || DEFAULT_PREFIX.test(key),
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
10
|
+
loaded = {};
|
|
11
|
+
for (const key in loadedEnv) {
|
|
12
|
+
const val = process.env[key] || loadedEnv[key];
|
|
13
|
+
loaded[key] = val, process.env[key] = val;
|
|
14
|
+
}
|
|
15
|
+
const clientEnv = Object.fromEntries(Object.entries({
|
|
16
|
+
...process.env,
|
|
17
|
+
...loaded
|
|
18
|
+
}).flatMap(([key, value]) => isPublicKey(key) ? [[key, value]] : []));
|
|
15
19
|
return {
|
|
16
|
-
serverEnv,
|
|
20
|
+
serverEnv: loadedEnv,
|
|
17
21
|
clientEnv,
|
|
18
22
|
clientEnvDefine: Object.fromEntries(Object.entries(clientEnv).flatMap(([key, val]) => {
|
|
19
23
|
const stringified = JSON.stringify(val);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["statSync","readFile","join","normalizePath","DEFAULT_PREFIX","loadEnv","mode","root","process","cwd","userPrefix","
|
|
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":[]}
|
|
@@ -6,27 +6,31 @@ var DEFAULT_PREFIX = /^(ONE|VITE|TAMAGUI)_/;
|
|
|
6
6
|
async function loadEnv(mode) {
|
|
7
7
|
var root = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : process.cwd(),
|
|
8
8
|
userPrefix = arguments.length > 2 ? arguments[2] : void 0,
|
|
9
|
-
|
|
9
|
+
loadedEnv = await loadJustEnvFiles(mode),
|
|
10
10
|
prefix = userPrefix ? Array.isArray(userPrefix) ? userPrefix : [userPrefix] : [],
|
|
11
11
|
isPublicKey = function (key2) {
|
|
12
12
|
return prefix.some(function (p) {
|
|
13
13
|
return key2.startsWith(p);
|
|
14
14
|
}) || DEFAULT_PREFIX.test(key2);
|
|
15
15
|
},
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
16
|
+
loaded = {};
|
|
17
|
+
for (var key in loadedEnv) {
|
|
18
|
+
var val = process.env[key] || loadedEnv[key];
|
|
19
|
+
loaded[key] = val, process.env[key] = val;
|
|
20
|
+
}
|
|
21
|
+
var clientEnv = Object.fromEntries(Object.entries({
|
|
22
|
+
...process.env,
|
|
23
|
+
...loaded
|
|
24
|
+
}).flatMap(function (param) {
|
|
25
|
+
var [key2, value] = param;
|
|
26
|
+
return isPublicKey(key2) ? [[key2, value]] : [];
|
|
27
|
+
}));
|
|
24
28
|
return {
|
|
25
|
-
serverEnv,
|
|
29
|
+
serverEnv: loadedEnv,
|
|
26
30
|
clientEnv,
|
|
27
31
|
clientEnvDefine: Object.fromEntries(Object.entries(clientEnv).flatMap(function (param) {
|
|
28
|
-
var [key2,
|
|
29
|
-
stringified = JSON.stringify(
|
|
32
|
+
var [key2, val2] = param,
|
|
33
|
+
stringified = JSON.stringify(val2);
|
|
30
34
|
return [[`process.env.${key2}`, stringified], [`import.meta.env.${key2}`, stringified]];
|
|
31
35
|
}))
|
|
32
36
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["statSync","readFile","join","normalizePath","DEFAULT_PREFIX","loadEnv","mode","root","arguments","length","process","cwd","userPrefix","
|
|
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":[]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "vxrn",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.507",
|
|
4
4
|
"sideEffects": false,
|
|
5
5
|
"type": "module",
|
|
6
6
|
"exports": {
|
|
@@ -65,17 +65,17 @@
|
|
|
65
65
|
"@hono/node-server": "^1.13.7",
|
|
66
66
|
"@react-native/dev-middleware": "^0.76.5",
|
|
67
67
|
"@rollup/plugin-node-resolve": "^15.2.3",
|
|
68
|
-
"@vxrn/compiler": "1.1.
|
|
69
|
-
"@vxrn/debug": "1.1.
|
|
70
|
-
"@vxrn/query-string": "1.1.
|
|
71
|
-
"@vxrn/react-native-prebuilt": "1.1.
|
|
72
|
-
"@vxrn/resolve": "1.1.
|
|
73
|
-
"@vxrn/safe-area": "1.1.
|
|
74
|
-
"@vxrn/url-parse": "1.1.
|
|
75
|
-
"@vxrn/utils": "1.1.
|
|
76
|
-
"@vxrn/vendor": "1.1.
|
|
77
|
-
"@vxrn/vite-flow": "1.1.
|
|
78
|
-
"@vxrn/vite-plugin-metro": "1.1.
|
|
68
|
+
"@vxrn/compiler": "1.1.507",
|
|
69
|
+
"@vxrn/debug": "1.1.507",
|
|
70
|
+
"@vxrn/query-string": "1.1.507",
|
|
71
|
+
"@vxrn/react-native-prebuilt": "1.1.507",
|
|
72
|
+
"@vxrn/resolve": "1.1.507",
|
|
73
|
+
"@vxrn/safe-area": "1.1.507",
|
|
74
|
+
"@vxrn/url-parse": "1.1.507",
|
|
75
|
+
"@vxrn/utils": "1.1.507",
|
|
76
|
+
"@vxrn/vendor": "1.1.507",
|
|
77
|
+
"@vxrn/vite-flow": "1.1.507",
|
|
78
|
+
"@vxrn/vite-plugin-metro": "1.1.507",
|
|
79
79
|
"citty": "^0.1.6",
|
|
80
80
|
"env-editor": "^1.1.0",
|
|
81
81
|
"es-module-lexer": "^1.3.0",
|
|
@@ -99,7 +99,7 @@
|
|
|
99
99
|
"devDependencies": {
|
|
100
100
|
"@biomejs/biome": "1.9.4",
|
|
101
101
|
"@react-native-community/cli": "19.0.0",
|
|
102
|
-
"@tamagui/build": "^1.
|
|
102
|
+
"@tamagui/build": "^1.132.9",
|
|
103
103
|
"@types/find-node-modules": "^2.1.2",
|
|
104
104
|
"@types/node": "^22.1.0",
|
|
105
105
|
"@types/qrcode-terminal": "^0",
|
package/src/exports/build.ts
CHANGED
|
@@ -184,6 +184,7 @@ export const build = async (optionsIn: VXRNOptions, buildArgs: BuildArgs = {}) =
|
|
|
184
184
|
} satisfies Plugin
|
|
185
185
|
|
|
186
186
|
let clientOutput
|
|
187
|
+
let clientBuildPromise: Promise<RollupOutput> | undefined
|
|
187
188
|
|
|
188
189
|
if (buildArgs.step !== 'generate') {
|
|
189
190
|
let clientBuildConfig = mergeConfig(webBuildConfig, {
|
|
@@ -229,8 +230,7 @@ export const build = async (optionsIn: VXRNOptions, buildArgs: BuildArgs = {}) =
|
|
|
229
230
|
|
|
230
231
|
console.info(`\n 🔨 build client\n`)
|
|
231
232
|
|
|
232
|
-
|
|
233
|
-
clientOutput = output
|
|
233
|
+
clientBuildPromise = viteBuild(clientBuildConfig) as Promise<RollupOutput>
|
|
234
234
|
}
|
|
235
235
|
|
|
236
236
|
const serverOptions = options.build?.server
|
|
@@ -291,6 +291,7 @@ export const build = async (optionsIn: VXRNOptions, buildArgs: BuildArgs = {}) =
|
|
|
291
291
|
|
|
292
292
|
let serverOutput: [OutputChunk, ...(OutputChunk | OutputAsset)[]] | undefined
|
|
293
293
|
let clientManifest
|
|
294
|
+
let serverBuildPromise: Promise<RollupOutput> | undefined
|
|
294
295
|
|
|
295
296
|
if (serverOptions !== false) {
|
|
296
297
|
console.info(`\n 🔨 build server\n`)
|
|
@@ -298,12 +299,25 @@ export const build = async (optionsIn: VXRNOptions, buildArgs: BuildArgs = {}) =
|
|
|
298
299
|
const userServerConf = optionsIn.build?.server
|
|
299
300
|
const userServerBuildConf = typeof userServerConf === 'boolean' ? null : userServerConf?.config
|
|
300
301
|
|
|
301
|
-
|
|
302
|
+
serverBuildPromise = viteBuild(
|
|
302
303
|
userServerBuildConf ? mergeConfig(serverBuildConfig, userServerBuildConf) : serverBuildConfig
|
|
303
|
-
)
|
|
304
|
+
) as Promise<RollupOutput>
|
|
305
|
+
}
|
|
304
306
|
|
|
305
|
-
|
|
307
|
+
// Wait for both builds to complete in parallel
|
|
308
|
+
if (clientBuildPromise && serverBuildPromise) {
|
|
309
|
+
const [clientResult, serverResult] = await Promise.all([clientBuildPromise, serverBuildPromise])
|
|
310
|
+
clientOutput = clientResult.output
|
|
311
|
+
serverOutput = serverResult.output
|
|
312
|
+
} else if (clientBuildPromise) {
|
|
313
|
+
const clientResult = await clientBuildPromise
|
|
314
|
+
clientOutput = clientResult.output
|
|
315
|
+
} else if (serverBuildPromise) {
|
|
316
|
+
const serverResult = await serverBuildPromise
|
|
317
|
+
serverOutput = serverResult.output
|
|
318
|
+
}
|
|
306
319
|
|
|
320
|
+
if (serverOptions !== false) {
|
|
307
321
|
clientManifest = await FSExtra.readJSON('dist/client/.vite/manifest.json')
|
|
308
322
|
|
|
309
323
|
// temp fix - react native web is importing non-existent react 19 apis
|
package/src/exports/loadEnv.ts
CHANGED
|
@@ -3,21 +3,30 @@ import { readFile } from 'node:fs/promises'
|
|
|
3
3
|
import { join } from 'node:path'
|
|
4
4
|
import { normalizePath } from 'vite'
|
|
5
5
|
|
|
6
|
-
type Mode = 'development' | 'production'
|
|
6
|
+
type Mode = 'development' | 'production' | string
|
|
7
7
|
|
|
8
8
|
const DEFAULT_PREFIX = /^(ONE|VITE|TAMAGUI)_/
|
|
9
9
|
|
|
10
10
|
export async function loadEnv(mode: Mode, root = process.cwd(), userPrefix?: string | string[]) {
|
|
11
|
-
const
|
|
11
|
+
const loadedEnv = await loadJustEnvFiles(mode)
|
|
12
12
|
const prefix = userPrefix ? (Array.isArray(userPrefix) ? userPrefix : [userPrefix]) : []
|
|
13
13
|
const isPublicKey = (key: string) => {
|
|
14
14
|
return prefix.some((p) => key.startsWith(p)) || DEFAULT_PREFIX.test(key)
|
|
15
15
|
}
|
|
16
16
|
|
|
17
|
+
const loaded: Record<string, string | undefined> = {}
|
|
18
|
+
|
|
19
|
+
// defer to process.env
|
|
20
|
+
for (const key in loadedEnv) {
|
|
21
|
+
const val = process.env[key] || loadedEnv[key]
|
|
22
|
+
loaded[key] = val
|
|
23
|
+
process.env[key] = val
|
|
24
|
+
}
|
|
25
|
+
|
|
17
26
|
const clientEnv = Object.fromEntries(
|
|
18
27
|
Object.entries({
|
|
19
28
|
...process.env,
|
|
20
|
-
...
|
|
29
|
+
...loaded,
|
|
21
30
|
}).flatMap(([key, value]) => {
|
|
22
31
|
if (isPublicKey(key)) {
|
|
23
32
|
return [[key, value]]
|
|
@@ -26,15 +35,8 @@ export async function loadEnv(mode: Mode, root = process.cwd(), userPrefix?: str
|
|
|
26
35
|
})
|
|
27
36
|
)
|
|
28
37
|
|
|
29
|
-
// define into process.env
|
|
30
|
-
for (const key in serverEnv) {
|
|
31
|
-
if (typeof process.env[key] === 'undefined') {
|
|
32
|
-
process.env[key] = serverEnv[key]
|
|
33
|
-
}
|
|
34
|
-
}
|
|
35
|
-
|
|
36
38
|
return {
|
|
37
|
-
serverEnv,
|
|
39
|
+
serverEnv: loadedEnv,
|
|
38
40
|
clientEnv,
|
|
39
41
|
clientEnvDefine: Object.fromEntries(
|
|
40
42
|
Object.entries(clientEnv).flatMap(([key, val]) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loadEnv.d.ts","sourceRoot":"","sources":["../../src/exports/loadEnv.ts"],"names":[],"mappings":"AAKA,KAAK,IAAI,GAAG,aAAa,GAAG,YAAY,CAAA;
|
|
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"}
|