vxrn 0.1.45 → 0.1.46
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/cjs/constants.js +2 -1
- package/dist/cjs/constants.js.map +1 -1
- package/dist/cjs/constants.native.js +3 -1
- package/dist/cjs/constants.native.js.map +2 -2
- package/dist/cjs/exports/build.js +5 -5
- package/dist/cjs/exports/build.js.map +1 -1
- package/dist/cjs/exports/build.native.js +8 -9
- package/dist/cjs/exports/build.native.js.map +2 -2
- package/dist/cjs/utils/getHtml.js +10 -4
- package/dist/cjs/utils/getHtml.js.map +1 -1
- package/dist/cjs/utils/getHtml.native.js +8 -3
- package/dist/cjs/utils/getHtml.native.js.map +2 -2
- package/dist/cjs/utils/getOptionsFilled.js +1 -1
- package/dist/cjs/utils/getOptionsFilled.js.map +1 -1
- package/dist/cjs/utils/getOptionsFilled.native.js +1 -1
- package/dist/cjs/utils/getOptionsFilled.native.js.map +1 -1
- package/dist/cjs/utils/readVXRNConfig.js +13 -4
- package/dist/cjs/utils/readVXRNConfig.js.map +1 -1
- package/dist/cjs/utils/readVXRNConfig.native.js +40 -9
- package/dist/cjs/utils/readVXRNConfig.native.js.map +2 -2
- package/dist/esm/constants.js +2 -1
- package/dist/esm/constants.js.map +1 -1
- package/dist/esm/constants.mjs +2 -1
- package/dist/esm/constants.native.js +2 -1
- package/dist/esm/constants.native.js.map +2 -2
- package/dist/esm/exports/build.js +5 -5
- package/dist/esm/exports/build.js.map +1 -1
- package/dist/esm/exports/build.mjs +5 -6
- package/dist/esm/exports/build.native.js +8 -9
- package/dist/esm/exports/build.native.js.map +2 -2
- package/dist/esm/utils/getHtml.js +10 -4
- package/dist/esm/utils/getHtml.js.map +1 -1
- package/dist/esm/utils/getHtml.mjs +6 -4
- package/dist/esm/utils/getHtml.native.js +8 -3
- package/dist/esm/utils/getHtml.native.js.map +2 -2
- package/dist/esm/utils/getOptionsFilled.js +1 -1
- package/dist/esm/utils/getOptionsFilled.js.map +1 -1
- package/dist/esm/utils/getOptionsFilled.mjs +1 -1
- package/dist/esm/utils/getOptionsFilled.native.js +1 -1
- package/dist/esm/utils/getOptionsFilled.native.js.map +1 -1
- package/dist/esm/utils/readVXRNConfig.js +13 -4
- package/dist/esm/utils/readVXRNConfig.js.map +1 -1
- package/dist/esm/utils/readVXRNConfig.mjs +11 -4
- package/dist/esm/utils/readVXRNConfig.native.js +40 -9
- package/dist/esm/utils/readVXRNConfig.native.js.map +2 -2
- package/package.json +8 -9
- package/src/constants.ts +4 -1
- package/src/exports/build.ts +10 -6
- package/src/utils/getHtml.ts +12 -4
- package/src/utils/getOptionsFilled.ts +1 -1
- package/src/utils/readVXRNConfig.ts +22 -10
- package/types/constants.d.ts +1 -0
- package/types/utils/getHtml.d.ts +2 -2
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/exports/build.ts"],
|
|
4
|
-
"mappings": "AAAA,SAAS,SAAS,eAAe;AACjC,SAAS,WAAW,yBAAyB;AAC7C,OAAO,QAAQ;AACf,SAAS,cAAc;AACvB,OAAO,QAAQ,SAAS,eAAe;AACvC,SAAS,aAAa,SAAS,iBAAkC;AAEjE,OAAO,aAAa;AAGpB,SAAS,yBAAyB;AAClC,SAAS,eAAe;AACxB,SAAS,wBAA+C;AACxD,SAAS,oBAAoB;AAEtB,MAAM,cAAc,CAACA,UAAiB;AAC3C,MAAI;AACF,WAAO,kBAAkBA,OAAM,YAAY,GAAG,EAAE,QAAQ,WAAW,EAAE;AAAA,EACvE,QAAQ;AACN,WAAO,QAAQ,QAAQA,KAAI;AAAA,EAC7B;AACF,GAEM,EAAE,WAAW,YAAY,UAAU,WAAW,IAAI,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["path"]
|
|
6
6
|
}
|
|
@@ -98,13 +98,13 @@ async function generateStaticPages(options, serverOutput) {
|
|
|
98
98
|
paramsList = (await exported.generateStaticParams?.()) ?? [{}];
|
|
99
99
|
return await Promise.all(paramsList.map(async params => {
|
|
100
100
|
const path2 = getUrl(params),
|
|
101
|
-
|
|
101
|
+
loaderData = (await exported.loader?.({
|
|
102
102
|
path: getUrl(params),
|
|
103
103
|
params
|
|
104
104
|
})) ?? {};
|
|
105
105
|
return {
|
|
106
106
|
path: path2,
|
|
107
|
-
|
|
107
|
+
loaderData
|
|
108
108
|
};
|
|
109
109
|
}));
|
|
110
110
|
function getUrl(_params = {}) {
|
|
@@ -138,14 +138,13 @@ async function generateStaticPages(options, serverOutput) {
|
|
|
138
138
|
const cssString = await FSExtra.readFile(tmpCssFile, "utf-8");
|
|
139
139
|
for (const {
|
|
140
140
|
path: path2,
|
|
141
|
-
|
|
141
|
+
loaderData
|
|
142
142
|
} of allRoutes) {
|
|
143
143
|
const {
|
|
144
144
|
appHtml,
|
|
145
145
|
headHtml
|
|
146
146
|
} = await render({
|
|
147
|
-
path: path2
|
|
148
|
-
props
|
|
147
|
+
path: path2
|
|
149
148
|
}),
|
|
150
149
|
slashFileName = `${path2 === "/" ? "/index" : path2}.html`,
|
|
151
150
|
clientHtmlPath = toAbsolute(`dist/client${slashFileName}`),
|
|
@@ -154,7 +153,7 @@ async function generateStaticPages(options, serverOutput) {
|
|
|
154
153
|
template: clientHtml || template,
|
|
155
154
|
appHtml,
|
|
156
155
|
headHtml,
|
|
157
|
-
|
|
156
|
+
loaderData,
|
|
158
157
|
css: cssString
|
|
159
158
|
}),
|
|
160
159
|
filePath = toAbsolute(`dist/static${slashFileName}`);
|
|
@@ -263,7 +263,7 @@ function generateStaticPages(options, serverOutput) {
|
|
|
263
263
|
}
|
|
264
264
|
function _generateStaticPages() {
|
|
265
265
|
return _generateStaticPages = _async_to_generator(function(options, serverOutput) {
|
|
266
|
-
var toAbsolute, staticDir, template, render, assets, allRoutes, cssStringRaw, tmpCssFile, cssString, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, _step_value, _$path,
|
|
266
|
+
var toAbsolute, staticDir, template, render, assets, allRoutes, cssStringRaw, tmpCssFile, cssString, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, _step_value, _$path, loaderData, _ref, appHtml, headHtml, slashFileName, clientHtmlPath, clientHtml, _tmp, html, filePath, err;
|
|
267
267
|
return _ts_generator(this, function(_state) {
|
|
268
268
|
switch (_state.label) {
|
|
269
269
|
case 0:
|
|
@@ -325,23 +325,23 @@ function _generateStaticPages() {
|
|
|
325
325
|
4,
|
|
326
326
|
Promise.all(paramsList.map(function() {
|
|
327
327
|
var _ref4 = _async_to_generator(function(params) {
|
|
328
|
-
var
|
|
328
|
+
var _exported_loader, _$path2, _ref5, loaderData2;
|
|
329
329
|
return _ts_generator(this, function(_state3) {
|
|
330
330
|
switch (_state3.label) {
|
|
331
331
|
case 0:
|
|
332
332
|
return _$path2 = getUrl(params), [
|
|
333
333
|
4,
|
|
334
|
-
(
|
|
334
|
+
(_exported_loader = exported.loader) === null || _exported_loader === void 0 ? void 0 : _exported_loader.call(exported, {
|
|
335
335
|
path: getUrl(params),
|
|
336
336
|
params
|
|
337
337
|
})
|
|
338
338
|
];
|
|
339
339
|
case 1:
|
|
340
|
-
return
|
|
340
|
+
return loaderData2 = (_ref5 = _state3.sent()) !== null && _ref5 !== void 0 ? _ref5 : {}, [
|
|
341
341
|
2,
|
|
342
342
|
{
|
|
343
343
|
path: _$path2,
|
|
344
|
-
|
|
344
|
+
loaderData: loaderData2
|
|
345
345
|
}
|
|
346
346
|
];
|
|
347
347
|
}
|
|
@@ -412,11 +412,10 @@ function _generateStaticPages() {
|
|
|
412
412
|
return (_iteratorNormalCompletion = (_step = _iterator.next()).done) ? [
|
|
413
413
|
3,
|
|
414
414
|
14
|
|
415
|
-
] : (_step_value = _step.value, _$path = _step_value.path,
|
|
415
|
+
] : (_step_value = _step.value, _$path = _step_value.path, loaderData = _step_value.loaderData, [
|
|
416
416
|
4,
|
|
417
417
|
render({
|
|
418
|
-
path: _$path
|
|
419
|
-
props
|
|
418
|
+
path: _$path
|
|
420
419
|
})
|
|
421
420
|
]);
|
|
422
421
|
case 9:
|
|
@@ -439,7 +438,7 @@ function _generateStaticPages() {
|
|
|
439
438
|
template: clientHtml || template,
|
|
440
439
|
appHtml,
|
|
441
440
|
headHtml,
|
|
442
|
-
|
|
441
|
+
loaderData,
|
|
443
442
|
css: cssString
|
|
444
443
|
}), filePath = toAbsolute("dist/static".concat(slashFileName)), fs.writeFileSync(toAbsolute(filePath), html), _state.label = 13;
|
|
445
444
|
case 13:
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/exports/Users/n8/vxrn/packages/vxrn/src/exports/build.ts"],
|
|
4
|
-
"mappings": "AAAA,SAASA,SAASC,eAAe;AACjC,SAASC,WAAWC,yBAAyB;AAC7C,OAAOC,QAAQ;AACf,SAASC,cAAc;AACvB,OAAOC,QAAQC,SAASL,eAAe;AACvC,SAASM,aAAaR,SAASS,iBAAkC;AAEjE,OAAOC,aAAa;AAGpB,SAASC,yBAAyB;AAClC,SAASC,eAAe;AACxB,SAASC,wBAA+C;AACxD,SAASC,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEtB,IAAMC,cAAc,SAACT,OAAAA;AAC1B,MAAI;AACF,WAAOH,kBAAkBG,OAAM,YAAYU,GAAG,EAAEC,QAAQ,WAAW,EAAA;EACrE,QAAQ;AACN,WAAOC,QAAQhB,QAAQI,KAAAA;EACzB;AACF,GAEQa,YAAgDT,QAAhDS,WAAWC,aAAqCV,QAArCU,YAAYC,WAAyBX,QAAzBW,UAAUC,aAAeZ,QAAfY,
|
|
5
|
-
"names": ["build", "esbuild", "resolve", "importMetaResolve", "fs", "tmpdir", "path", "dirname", "mergeConfig", "viteBuild", "FSExtra", "getBaseViteConfig", "getHtml", "getOptionsFilled", "optimizeDeps", "resolveFile", "url", "replace", "require", "ensureDir", "existsSync", "readFile", "pathExists", "optionsIn", "options", "webBuildConfig", "output", "process", "env", "NODE_ENV", "mode", "root", "clearScreen", "webConfig", "console", "info", "ssrManifest", "outDir", "plugins", "name", "enforce", "resolveId", "id", "importer", "absolutePath", "webPath", "directoryPath", "err", "_state", "warn", "esbuildOptions", "format", "ssr", "noExternal", "cssCodeSplit", "rollupOptions", "external", "generateStaticPages", "serverOutput", "toAbsolute", "staticDir", "template", "render", "assets", "allRoutes", "cssStringRaw", "tmpCssFile", "cssString", "
|
|
4
|
+
"mappings": "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",
|
|
5
|
+
"names": ["build", "esbuild", "resolve", "importMetaResolve", "fs", "tmpdir", "path", "dirname", "mergeConfig", "viteBuild", "FSExtra", "getBaseViteConfig", "getHtml", "getOptionsFilled", "optimizeDeps", "resolveFile", "url", "replace", "require", "ensureDir", "existsSync", "readFile", "pathExists", "optionsIn", "options", "webBuildConfig", "output", "process", "env", "NODE_ENV", "mode", "root", "clearScreen", "webConfig", "console", "info", "ssrManifest", "outDir", "plugins", "name", "enforce", "resolveId", "id", "importer", "absolutePath", "webPath", "directoryPath", "err", "_state", "warn", "esbuildOptions", "format", "ssr", "noExternal", "cssCodeSplit", "rollupOptions", "external", "generateStaticPages", "serverOutput", "toAbsolute", "staticDir", "template", "render", "assets", "allRoutes", "cssStringRaw", "tmpCssFile", "cssString", "loaderData", "appHtml", "headHtml", "slashFileName", "clientHtmlPath", "clientHtml", "html", "filePath", "p", "readFileSync", "Promise", "all", "flatMap", "exported", "file", "endpointPath", "_ref", "paramsList", "getUrl", "_params", "split", "map", "part", "found", "slice", "length", "join", "type", "push", "facadeModuleId", "basename", "includes", "fileName", "generateStaticParams", "params", "loader", "flat", "filter", "x", "endsWith", "source", "writeFile", "entryPoints", "target", "bundle", "minifyWhitespace", "sourcemap", "outfile", "css", "writeFileSync"]
|
|
6
6
|
}
|
|
@@ -1,13 +1,19 @@
|
|
|
1
1
|
function getHtml({
|
|
2
2
|
template,
|
|
3
|
-
|
|
3
|
+
loaderData,
|
|
4
4
|
appHtml,
|
|
5
5
|
headHtml,
|
|
6
6
|
css
|
|
7
7
|
}) {
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
8
|
+
if (!template.includes("<!--ssr-outlet-->"))
|
|
9
|
+
throw new Error("No <!--ssr-outlet--> found in html to inject SSR contents");
|
|
10
|
+
if (!template.includes("<!--head-outlet-->"))
|
|
11
|
+
throw new Error("No <!--head-outlet--> found in html to inject SSR contents");
|
|
12
|
+
const loaderDataString = `
|
|
13
|
+
<script>globalThis['__vxrnLoaderData__']=${JSON.stringify(
|
|
14
|
+
loaderData
|
|
15
|
+
)}</script>`;
|
|
16
|
+
return template.replace("<!--ssr-outlet-->", appHtml + loaderDataString).replace("<!--head-outlet-->", `${headHtml}
|
|
11
17
|
${css ? `<style>${css}</style>` : ""}`);
|
|
12
18
|
}
|
|
13
19
|
export {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/utils/getHtml.ts"],
|
|
4
|
-
"mappings": "AAAO,SAAS,QAAQ;AAAA,EACtB;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,
|
|
4
|
+
"mappings": "AAAO,SAAS,QAAQ;AAAA,EACtB;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,GAA8F;AAC5F,MAAI,CAAC,SAAS,SAAS,mBAAmB;AACxC,UAAM,IAAI,MAAM,2DAA2D;AAE7E,MAAI,CAAC,SAAS,SAAS,oBAAoB;AACzC,UAAM,IAAI,MAAM,4DAA4D;AAE9E,QAAM,mBAAmB;AAAA,2CAA8C,KAAK;AAAA,IAC1E;AAAA,EACF,CAAC;AACD,SAAO,SACJ,QAAQ,qBAAqB,UAAU,gBAAgB,EACvD,QAAQ,sBAAsB,GAAG,QAAQ;AAAA,EAAK,MAAM,UAAU,GAAG,aAAa,EAAE,EAAE;AACvF;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -1,13 +1,15 @@
|
|
|
1
1
|
function getHtml({
|
|
2
2
|
template,
|
|
3
|
-
|
|
3
|
+
loaderData,
|
|
4
4
|
appHtml,
|
|
5
5
|
headHtml,
|
|
6
6
|
css
|
|
7
7
|
}) {
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
8
|
+
if (!template.includes("<!--ssr-outlet-->")) throw new Error("No <!--ssr-outlet--> found in html to inject SSR contents");
|
|
9
|
+
if (!template.includes("<!--head-outlet-->")) throw new Error("No <!--head-outlet--> found in html to inject SSR contents");
|
|
10
|
+
const loaderDataString = `
|
|
11
|
+
<script>globalThis['__vxrnLoaderData__']=${JSON.stringify(loaderData)}</script>`;
|
|
12
|
+
return template.replace("<!--ssr-outlet-->", appHtml + loaderDataString).replace("<!--head-outlet-->", `${headHtml}
|
|
11
13
|
${css ? `<style>${css}</style>` : ""}`);
|
|
12
14
|
}
|
|
13
15
|
export { getHtml };
|
|
@@ -1,7 +1,12 @@
|
|
|
1
1
|
function getHtml(param) {
|
|
2
|
-
var template = param.template,
|
|
3
|
-
|
|
4
|
-
|
|
2
|
+
var template = param.template, loaderData = param.loaderData, appHtml = param.appHtml, headHtml = param.headHtml, css = param.css;
|
|
3
|
+
if (!template.includes("<!--ssr-outlet-->"))
|
|
4
|
+
throw new Error("No <!--ssr-outlet--> found in html to inject SSR contents");
|
|
5
|
+
if (!template.includes("<!--head-outlet-->"))
|
|
6
|
+
throw new Error("No <!--head-outlet--> found in html to inject SSR contents");
|
|
7
|
+
var loaderDataString = `
|
|
8
|
+
<script>globalThis['__vxrnLoaderData__']=`.concat(JSON.stringify(loaderData), "</script>");
|
|
9
|
+
return template.replace("<!--ssr-outlet-->", appHtml + loaderDataString).replace("<!--head-outlet-->", "".concat(headHtml, `
|
|
5
10
|
`).concat(css ? "<style>".concat(css, "</style>") : ""));
|
|
6
11
|
}
|
|
7
12
|
export {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/utils/Users/n8/vxrn/packages/vxrn/src/utils/getHtml.ts"],
|
|
4
|
-
"mappings": "AAAO,SAASA,QAAQ,
|
|
5
|
-
"names": ["getHtml", "template", "
|
|
4
|
+
"mappings": "AAAO,SAASA,QAAQ,OAMoE;MAL1FC,WADsB,MACtBA,UACAC,aAFsB,MAEtBA,YACAC,UAHsB,MAGtBA,SACAC,WAJsB,MAItBA,UACAC,MALsB,MAKtBA;AAEA,MAAI,CAACJ,SAASK,SAAU,mBAAA;AACtB,UAAM,IAAIC,MAAO,2DAAA;AAEnB,MAAI,CAACN,SAASK,SAAU,oBAAA;AACtB,UAAM,IAAIC,MAAO,4DAAA;AAEnB,MAAMC,mBAAoB;2CAExB,OAFqEC,KAAKC,UAC1ER,UAAAA,GACA,WAAA;AACF,SAAOD,SACJU,QAAS,qBAAoBR,UAAUK,gBAAAA,EACvCG,QAAS,sBAAsB,GAAeN,OAAbD,UAAS;CAAA,EAAuC,OAAnCC,MAAO,UAAa,OAAJA,KAAI,UAAA,IAAa,EAAA,CAAA;AACpF;",
|
|
5
|
+
"names": ["getHtml", "template", "loaderData", "appHtml", "headHtml", "css", "includes", "Error", "loaderDataString", "JSON", "stringify", "replace"]
|
|
6
6
|
}
|
|
@@ -8,7 +8,7 @@ async function getOptionsFilled(options) {
|
|
|
8
8
|
const { host = "127.0.0.1", root = process.cwd(), entries } = options, defaultPort = options.port || 8081, port = await getPort({
|
|
9
9
|
port: defaultPort,
|
|
10
10
|
portRange: [defaultPort, defaultPort + 1e3]
|
|
11
|
-
}), packageRootDir = join(require2.resolve("vxrn"), "../../.."), cacheDir = join(root, "node_modules", ".
|
|
11
|
+
}), packageRootDir = join(require2.resolve("vxrn"), "../../.."), cacheDir = join(root, "node_modules", ".vxrn"), internalPatchesDir = join(packageRootDir, "patches"), userPatchesDir = join(root, "patches"), [state, packageJSON] = await Promise.all([
|
|
12
12
|
//
|
|
13
13
|
readState(cacheDir),
|
|
14
14
|
readPackageJSON()
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/utils/getOptionsFilled.ts"],
|
|
4
|
-
"mappings": "AAAA,SAAS,YAAY;AACrB,SAAS,uBAAuB;AAChC,SAAS,qBAAqB;AAC9B,OAAO,aAAa;AAEpB,SAAS,eAAe;AAExB,MAAMA,WAAU,cAAc,YAAY,GAAG;AAI7C,eAAsB,iBAAiB,SAAqB;AAC1D,QAAM,EAAE,OAAO,aAAa,OAAO,QAAQ,IAAI,GAAG,QAAQ,IAAI,SAExD,cAAc,QAAQ,QAAQ,MAC9B,OAAO,MAAM,QAAQ;AAAA,IACzB,MAAM;AAAA,IACN,WAAW,CAAC,aAAa,cAAc,GAAI;AAAA,EAC7C,CAAC,GAEK,iBAAiB,KAAKA,SAAQ,QAAQ,MAAM,GAAG,UAAU,GAEzD,WAAW,KAAK,MAAM,gBAAgB,
|
|
4
|
+
"mappings": "AAAA,SAAS,YAAY;AACrB,SAAS,uBAAuB;AAChC,SAAS,qBAAqB;AAC9B,OAAO,aAAa;AAEpB,SAAS,eAAe;AAExB,MAAMA,WAAU,cAAc,YAAY,GAAG;AAI7C,eAAsB,iBAAiB,SAAqB;AAC1D,QAAM,EAAE,OAAO,aAAa,OAAO,QAAQ,IAAI,GAAG,QAAQ,IAAI,SAExD,cAAc,QAAQ,QAAQ,MAC9B,OAAO,MAAM,QAAQ;AAAA,IACzB,MAAM;AAAA,IACN,WAAW,CAAC,aAAa,cAAc,GAAI;AAAA,EAC7C,CAAC,GAEK,iBAAiB,KAAKA,SAAQ,QAAQ,MAAM,GAAG,UAAU,GAEzD,WAAW,KAAK,MAAM,gBAAgB,OAAO,GAC7C,qBAAqB,KAAK,gBAAgB,SAAS,GACnD,iBAAiB,KAAK,MAAM,SAAS,GACrC,CAAC,OAAO,WAAW,IAAI,MAAM,QAAQ,IAAI;AAAA;AAAA,IAE7C,UAAU,QAAQ;AAAA,IAClB,gBAAgB;AAAA,EAClB,CAAC;AACD,SAAO;AAAA,IACL,GAAG;AAAA,IACH,SAAS;AAAA,MACP,QAAQ;AAAA,MACR,QAAQ;AAAA,MACR,GAAG;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AACF;AAMA,eAAe,UAAU,UAAkB;AACzC,QAAM,YAAY,KAAK,UAAU,YAAY;AAI7C,SAHsB,MAAM,QAAQ,WAAW,SAAS,IACpD,MAAM,QAAQ,SAAS,SAAS,IAChC,CAAC;AAEP;",
|
|
5
5
|
"names": ["require"]
|
|
6
6
|
}
|
|
@@ -16,7 +16,7 @@ async function getOptionsFilled(options) {
|
|
|
16
16
|
portRange: [defaultPort, defaultPort + 1e3]
|
|
17
17
|
}),
|
|
18
18
|
packageRootDir = join(require2.resolve("vxrn"), "../../.."),
|
|
19
|
-
cacheDir = join(root, "node_modules", ".
|
|
19
|
+
cacheDir = join(root, "node_modules", ".vxrn"),
|
|
20
20
|
internalPatchesDir = join(packageRootDir, "patches"),
|
|
21
21
|
userPatchesDir = join(root, "patches"),
|
|
22
22
|
[state, packageJSON] = await Promise.all([
|
|
@@ -220,7 +220,7 @@ function _getOptionsFilled() {
|
|
|
220
220
|
})
|
|
221
221
|
];
|
|
222
222
|
case 1:
|
|
223
|
-
return port = _state.sent(), packageRootDir = join(require2.resolve("vxrn"), "../../.."), cacheDir = join(root, "node_modules", ".
|
|
223
|
+
return port = _state.sent(), packageRootDir = join(require2.resolve("vxrn"), "../../.."), cacheDir = join(root, "node_modules", ".vxrn"), internalPatchesDir = join(packageRootDir, "patches"), userPatchesDir = join(root, "patches"), [
|
|
224
224
|
4,
|
|
225
225
|
Promise.all([
|
|
226
226
|
//
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/utils/Users/n8/vxrn/packages/vxrn/src/utils/getOptionsFilled.ts"],
|
|
4
|
-
"mappings": "AAAA,SAASA,YAAY;AACrB,SAASC,uBAAuB;AAChC,SAASC,qBAAqB;AAC9B,OAAOC,aAAa;AAEpB,SAASC,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAExB,IAAMC,WAAUH,cAAc,YAAYI,GAAG;AAI7C,SAAsBC,iBAAiBC,SAAmB;SAApCD,kBAAAA,MAAAA,MAAAA,SAAAA;;SAAAA,oBAAAA;AAAAA,6BAAf,oBAAA,SAAgCC,SAAmB;uBAChDC,MAAAA,eAAoBC,MAAsBC,SAE5CC,aACAC,MAKAC,gBAEAC,UACAC,oBACAC,gBACuB,MAAtBC,OAAOC;;;;iCAbgDX,QAAtDC,MAAAA,OAAAA,kBAAAA,SAAO,cAAA,eAAA,gBAA+CD,QAAlCE,MAAAA,OAAAA,kBAAAA,SAAOU,QAAQC,IAAG,IAAA,eAAIV,UAAYH,QAAZG,SAE5CC,cAAcJ,QAAQK,QAAQ,MACvB;;YAAMT,QAAQ;cACzBS,MAAMD;cACNU,WAAS;gBAAGV;gBAAaA,cAAc;;YACzC,CAAA;;;AAHMC,wBAAO,OAAA,KAAA,GAKPC,iBAAiBd,KAAKK,SAAQkB,QAAQ,MAAA,GAAS,UAAA,GAE/CR,WAAWf,KAAKU,MAAM,gBAAgB,
|
|
4
|
+
"mappings": "AAAA,SAASA,YAAY;AACrB,SAASC,uBAAuB;AAChC,SAASC,qBAAqB;AAC9B,OAAOC,aAAa;AAEpB,SAASC,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAExB,IAAMC,WAAUH,cAAc,YAAYI,GAAG;AAI7C,SAAsBC,iBAAiBC,SAAmB;SAApCD,kBAAAA,MAAAA,MAAAA,SAAAA;;SAAAA,oBAAAA;AAAAA,6BAAf,oBAAA,SAAgCC,SAAmB;uBAChDC,MAAAA,eAAoBC,MAAsBC,SAE5CC,aACAC,MAKAC,gBAEAC,UACAC,oBACAC,gBACuB,MAAtBC,OAAOC;;;;iCAbgDX,QAAtDC,MAAAA,OAAAA,kBAAAA,SAAO,cAAA,eAAA,gBAA+CD,QAAlCE,MAAAA,OAAAA,kBAAAA,SAAOU,QAAQC,IAAG,IAAA,eAAIV,UAAYH,QAAZG,SAE5CC,cAAcJ,QAAQK,QAAQ,MACvB;;YAAMT,QAAQ;cACzBS,MAAMD;cACNU,WAAS;gBAAGV;gBAAaA,cAAc;;YACzC,CAAA;;;AAHMC,wBAAO,OAAA,KAAA,GAKPC,iBAAiBd,KAAKK,SAAQkB,QAAQ,MAAA,GAAS,UAAA,GAE/CR,WAAWf,KAAKU,MAAM,gBAAgB,OAAA,GACtCM,qBAAqBhB,KAAKc,gBAAgB,SAAA,GAC1CG,iBAAiBjB,KAAKU,MAAM,SAAA,GACL;;YAAMc,QAAQC,IAAG;;cAE5CC,UAAUX,QAAAA;cACVd,gBAAAA;;;;AAH2B,wBAAA,iBAAA,MAAA,QAAA;YAAA,OAAA,KAAA;;cAAtBiB,QAAsB,KAAA,CAAA,GAAfC,cAAe,KAAA,CAAA,GAK7B;;YAAO,qBAAA,eAAA,CAAA,GACFX,OAAAA,GAAAA;cACHG,SAAS,eAAA;gBACPgB,QAAQ;gBACRC,QAAQ;iBACLjB,OAAAA;cAELQ;cACAD;cACAJ;cACAC;cACAE;cACAD;cACAP;cACAC;cACAG;;;;;EAEJ,CAAA,GApCsBN,kBAAAA,MAAAA,MAAAA,SAAAA;;SA0CPmB,UAAUX,UAAgB;SAA1BW,WAAAA,MAAAA,MAAAA,SAAAA;;SAAAA,aAAAA;AAAAA,sBAAf,oBAAA,SAAyBX,UAAgB;QACjCc,WACAX,OAAAA;;;;AADAW,6BAAY7B,KAAKe,UAAU,YAAA,GACX;;YAAMZ,QAAQ2B,WAAWD,SAAAA;;;iBAAzB,OAAA,KAAA,IAClB;;YAAM1B,QAAQ4B,SAASF,SAAAA;cADL;;;;;wBAClB,OAAA,KAAA;;;;;iBACA,CAAC;;AAFCX,yBAAAA,MAGN;;YAAOA;;;;EACT,CAAA,GANeQ,WAAAA,MAAAA,MAAAA,SAAAA;;",
|
|
5
5
|
"names": ["join", "readPackageJSON", "createRequire", "FSExtra", "getPort", "require", "url", "getOptionsFilled", "options", "host", "root", "entries", "defaultPort", "port", "packageRootDir", "cacheDir", "internalPatchesDir", "userPatchesDir", "state", "packageJSON", "process", "cwd", "portRange", "resolve", "Promise", "all", "readState", "native", "server", "statePath", "pathExists", "readJSON"]
|
|
6
6
|
}
|
|
@@ -4,6 +4,12 @@ import jiti from "jiti";
|
|
|
4
4
|
async function readVXRNConfig() {
|
|
5
5
|
if (!await FSExtra.pathExists("vxrn.config.ts"))
|
|
6
6
|
return {};
|
|
7
|
+
if (process.env.VXRN_CJS) {
|
|
8
|
+
const userConfig = jiti(process.cwd(), {
|
|
9
|
+
esmResolve: !0
|
|
10
|
+
})("./vxrn.config.ts");
|
|
11
|
+
return resolveOptionalAsyncFunction(userConfig?.default ?? {});
|
|
12
|
+
}
|
|
7
13
|
try {
|
|
8
14
|
const vite = await createServer({
|
|
9
15
|
logLevel: "silent",
|
|
@@ -11,13 +17,16 @@ async function readVXRNConfig() {
|
|
|
11
17
|
}), userConfig = await vite.ssrLoadModule("./vxrn.config.ts", {
|
|
12
18
|
fixStacktrace: !0
|
|
13
19
|
});
|
|
14
|
-
return await vite.close(), userConfig?.default ?? {};
|
|
20
|
+
return await vite.close(), resolveOptionalAsyncFunction(userConfig?.default ?? {});
|
|
15
21
|
} catch (err) {
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
22
|
+
throw console.info(
|
|
23
|
+
" [vxrn] Error loading config via ESM, attempting CJS, set VXRN_CJS=1 to run in cjs mode"
|
|
24
|
+
), err;
|
|
19
25
|
}
|
|
20
26
|
}
|
|
27
|
+
async function resolveOptionalAsyncFunction(value) {
|
|
28
|
+
return typeof value == "function" && (value = value()), value instanceof Promise && (value = await value), value;
|
|
29
|
+
}
|
|
21
30
|
export {
|
|
22
31
|
readVXRNConfig
|
|
23
32
|
};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/utils/readVXRNConfig.ts"],
|
|
4
|
-
"mappings": "AAAA,OAAO,aAAa;AAEpB,SAAS,oBAAoB;AAC7B,OAAO,UAAU;AAEjB,eAAsB,iBAAsC;AAC1D,MAAI,CAAE,MAAM,QAAQ,WAAW,gBAAgB;AAC7C,WAAO,CAAC;
|
|
4
|
+
"mappings": "AAAA,OAAO,aAAa;AAEpB,SAAS,oBAAoB;AAC7B,OAAO,UAAU;AAEjB,eAAsB,iBAAsC;AAC1D,MAAI,CAAE,MAAM,QAAQ,WAAW,gBAAgB;AAC7C,WAAO,CAAC;AAGV,MAAI,QAAQ,IAAI,UAAU;AAIxB,UAAM,aAHc,KAAK,QAAQ,IAAI,GAAG;AAAA,MACtC,YAAY;AAAA,IACd,CAAC,EAC8B,kBAAkB;AACjD,WAAO,6BAA6B,YAAY,WAAW,CAAC,CAAC;AAAA,EAC/D;AAGA,MAAI;AAEF,UAAM,OAAO,MAAM,aAAa;AAAA,MAC9B,UAAU;AAAA,MACV,SAAS;AAAA,IACX,CAAC,GAEK,aAAa,MAAM,KAAK,cAAc,oBAAoB;AAAA,MAC9D,eAAe;AAAA,IACjB,CAAC;AAED,iBAAM,KAAK,MAAM,GACV,6BAA6B,YAAY,WAAW,CAAC,CAAC;AAAA,EAC/D,SAAS,KAAK;AACZ,kBAAQ;AAAA,MACN;AAAA,IACF,GACM;AAAA,EACR;AACF;AAEA,eAAe,6BAA6B,OAAY;AACtD,SAAI,OAAO,SAAU,eACnB,QAAQ,MAAM,IAEZ,iBAAiB,YACnB,QAAQ,MAAM,QAET;AACT;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -3,6 +3,12 @@ import { createServer } from "vite";
|
|
|
3
3
|
import jiti from "jiti";
|
|
4
4
|
async function readVXRNConfig() {
|
|
5
5
|
if (!(await FSExtra.pathExists("vxrn.config.ts"))) return {};
|
|
6
|
+
if (process.env.VXRN_CJS) {
|
|
7
|
+
const userConfig = jiti(process.cwd(), {
|
|
8
|
+
esmResolve: !0
|
|
9
|
+
})("./vxrn.config.ts");
|
|
10
|
+
return resolveOptionalAsyncFunction(userConfig?.default ?? {});
|
|
11
|
+
}
|
|
6
12
|
try {
|
|
7
13
|
const vite = await createServer({
|
|
8
14
|
logLevel: "silent",
|
|
@@ -11,11 +17,12 @@ async function readVXRNConfig() {
|
|
|
11
17
|
userConfig = await vite.ssrLoadModule("./vxrn.config.ts", {
|
|
12
18
|
fixStacktrace: !0
|
|
13
19
|
});
|
|
14
|
-
return await vite.close(), userConfig?.default ?? {};
|
|
20
|
+
return await vite.close(), resolveOptionalAsyncFunction(userConfig?.default ?? {});
|
|
15
21
|
} catch (err) {
|
|
16
|
-
|
|
17
|
-
esmResolve: !0
|
|
18
|
-
})("./vxrn.config.ts")?.default ?? {};
|
|
22
|
+
throw console.info(" [vxrn] Error loading config via ESM, attempting CJS, set VXRN_CJS=1 to run in cjs mode"), err;
|
|
19
23
|
}
|
|
20
24
|
}
|
|
25
|
+
async function resolveOptionalAsyncFunction(value) {
|
|
26
|
+
return typeof value == "function" && (value = value()), value instanceof Promise && (value = await value), value;
|
|
27
|
+
}
|
|
21
28
|
export { readVXRNConfig };
|
|
@@ -25,6 +25,9 @@ function _async_to_generator(fn) {
|
|
|
25
25
|
});
|
|
26
26
|
};
|
|
27
27
|
}
|
|
28
|
+
function _instanceof(left, right) {
|
|
29
|
+
return right != null && typeof Symbol < "u" && right[Symbol.hasInstance] ? !!right[Symbol.hasInstance](left) : left instanceof right;
|
|
30
|
+
}
|
|
28
31
|
function _ts_generator(thisArg, body) {
|
|
29
32
|
var f, y, t, g, _ = {
|
|
30
33
|
label: 0,
|
|
@@ -121,7 +124,7 @@ function readVXRNConfig() {
|
|
|
121
124
|
}
|
|
122
125
|
function _readVXRNConfig() {
|
|
123
126
|
return _readVXRNConfig = _async_to_generator(function() {
|
|
124
|
-
var
|
|
127
|
+
var requireFile, userConfig, _userConfig_default, vite, userConfig1, _userConfig_default1, err;
|
|
125
128
|
return _ts_generator(this, function(_state) {
|
|
126
129
|
switch (_state.label) {
|
|
127
130
|
case 0:
|
|
@@ -135,6 +138,13 @@ function _readVXRNConfig() {
|
|
|
135
138
|
2,
|
|
136
139
|
{}
|
|
137
140
|
];
|
|
141
|
+
if (process.env.VXRN_CJS)
|
|
142
|
+
return requireFile = jiti(process.cwd(), {
|
|
143
|
+
esmResolve: !0
|
|
144
|
+
}), userConfig = requireFile("./vxrn.config.ts"), [
|
|
145
|
+
2,
|
|
146
|
+
resolveOptionalAsyncFunction((_userConfig_default = userConfig == null ? void 0 : userConfig.default) !== null && _userConfig_default !== void 0 ? _userConfig_default : {})
|
|
147
|
+
];
|
|
138
148
|
_state.label = 2;
|
|
139
149
|
case 2:
|
|
140
150
|
return _state.trys.push([
|
|
@@ -157,22 +167,17 @@ function _readVXRNConfig() {
|
|
|
157
167
|
})
|
|
158
168
|
];
|
|
159
169
|
case 4:
|
|
160
|
-
return
|
|
170
|
+
return userConfig1 = _state.sent(), [
|
|
161
171
|
4,
|
|
162
172
|
vite.close()
|
|
163
173
|
];
|
|
164
174
|
case 5:
|
|
165
175
|
return _state.sent(), [
|
|
166
176
|
2,
|
|
167
|
-
(
|
|
177
|
+
resolveOptionalAsyncFunction((_userConfig_default1 = userConfig1 == null ? void 0 : userConfig1.default) !== null && _userConfig_default1 !== void 0 ? _userConfig_default1 : {})
|
|
168
178
|
];
|
|
169
179
|
case 6:
|
|
170
|
-
|
|
171
|
-
esmResolve: !0
|
|
172
|
-
}), userConfig1 = requireFile("./vxrn.config.ts"), [
|
|
173
|
-
2,
|
|
174
|
-
(_userConfig_default1 = userConfig1 == null ? void 0 : userConfig1.default) !== null && _userConfig_default1 !== void 0 ? _userConfig_default1 : {}
|
|
175
|
-
];
|
|
180
|
+
throw err = _state.sent(), console.info(" [vxrn] Error loading config via ESM, attempting CJS, set VXRN_CJS=1 to run in cjs mode"), err;
|
|
176
181
|
case 7:
|
|
177
182
|
return [
|
|
178
183
|
2
|
|
@@ -181,6 +186,32 @@ function _readVXRNConfig() {
|
|
|
181
186
|
});
|
|
182
187
|
}), _readVXRNConfig.apply(this, arguments);
|
|
183
188
|
}
|
|
189
|
+
function resolveOptionalAsyncFunction(value) {
|
|
190
|
+
return _resolveOptionalAsyncFunction.apply(this, arguments);
|
|
191
|
+
}
|
|
192
|
+
function _resolveOptionalAsyncFunction() {
|
|
193
|
+
return _resolveOptionalAsyncFunction = _async_to_generator(function(value) {
|
|
194
|
+
return _ts_generator(this, function(_state) {
|
|
195
|
+
switch (_state.label) {
|
|
196
|
+
case 0:
|
|
197
|
+
return typeof value == "function" && (value = value()), _instanceof(value, Promise) ? [
|
|
198
|
+
4,
|
|
199
|
+
value
|
|
200
|
+
] : [
|
|
201
|
+
3,
|
|
202
|
+
2
|
|
203
|
+
];
|
|
204
|
+
case 1:
|
|
205
|
+
value = _state.sent(), _state.label = 2;
|
|
206
|
+
case 2:
|
|
207
|
+
return [
|
|
208
|
+
2,
|
|
209
|
+
value
|
|
210
|
+
];
|
|
211
|
+
}
|
|
212
|
+
});
|
|
213
|
+
}), _resolveOptionalAsyncFunction.apply(this, arguments);
|
|
214
|
+
}
|
|
184
215
|
export {
|
|
185
216
|
readVXRNConfig
|
|
186
217
|
};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/utils/Users/n8/vxrn/packages/vxrn/src/utils/readVXRNConfig.ts"],
|
|
4
|
-
"mappings": "AAAA,OAAOA,aAAa;AAEpB,SAASC,oBAAoB;AAC7B,OAAOC,UAAU
|
|
5
|
-
"names": ["FSExtra", "createServer", "jiti", "readVXRNConfig", "
|
|
4
|
+
"mappings": "AAAA,OAAOA,aAAa;AAEpB,SAASC,oBAAoB;AAC7B,OAAOC,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEjB,SAAsBC,iBAAAA;SAAAA,gBAAAA,MAAAA,MAAAA,SAAAA;;SAAAA,kBAAAA;AAAAA,2BAAf,oBAAA,WAAA;QAMGC,aAGAC,YAC8BA,qBAM9BC,MAKAD,aAK8BA,sBAC7BE;;;;AA1BH,iBAAA;;YAAMP,QAAQQ,WAAW,gBAAA;;;AAA/B,cAAI,CAAE,OAAA,KAAA;AACJ,mBAAA;;cAAO,CAAC;;AAGV,cAAIC,QAAQC,IAAIC;AACRP,iCAAcF,KAAKO,QAAQG,IAAG,GAAI;cACtCC,YAAY;YACd,CAAA,GACMR,aAAaD,YAAY,kBAAA,GAC/B;;cAAOU,8BAA6BT,sBAAAA,cAAAA,OAAAA,SAAAA,WAAYU,aAAO,QAAnBV,wBAAAA,SAAAA,sBAAuB,CAAC,CAAA;;;;;;;;;cAM/C;;YAAMJ,aAAa;cAC9Be,UAAU;cACVC,SAAS;YACX,CAAA;;;AAHMX,wBAAO,OAAA,KAAA,GAKM;;YAAMA,KAAKY,cAAc,oBAAoB;cAC9DC,eAAe;YACjB,CAAA;;;AAFMd,+BAAa,OAAA,KAAA,GAInB;;YAAMC,KAAKc,MAAK;;;AAAhB,wBAAA,KAAA,GACA;;YAAON,8BAA6BT,uBAAAA,eAAAA,OAAAA,SAAAA,YAAYU,aAAO,QAAnBV,yBAAAA,SAAAA,uBAAuB,CAAC,CAAA;;;AACrDE,sBAAAA,OAAAA,KAAAA,GACPc,QAAQC,KACL,yFAAA,GAEGf;;;;;;;EAEV,CAAA,GAjCsBJ,gBAAAA,MAAAA,MAAAA,SAAAA;;SAmCPW,6BAA6BS,OAAU;SAAvCT,8BAAAA,MAAAA,MAAAA,SAAAA;;SAAAA,gCAAAA;AAAAA,yCAAf,oBAAA,SAA4CS,OAAU;;;;iBAChD,OAAOA,SAAU,eACnBA,QAAQA,MAAAA,IAED,YAALA,OAAiBC,OAAAA,IACX;;YAAMD;cADZA;;;;;AACFA,kBAAQ,OAAA,KAAA;;AAEV,iBAAA;;YAAOA;;;;EACT,CAAA,GAReT,8BAAAA,MAAAA,MAAAA,SAAAA;;",
|
|
5
|
+
"names": ["FSExtra", "createServer", "jiti", "readVXRNConfig", "requireFile", "userConfig", "vite", "err", "pathExists", "process", "env", "VXRN_CJS", "cwd", "esmResolve", "resolveOptionalAsyncFunction", "default", "logLevel", "appType", "ssrLoadModule", "fixStacktrace", "close", "console", "info", "value", "Promise"]
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "vxrn",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.46",
|
|
4
4
|
"source": "src/index.ts",
|
|
5
5
|
"types": "./types/index.d.ts",
|
|
6
6
|
"type": "module",
|
|
@@ -29,19 +29,18 @@
|
|
|
29
29
|
"@babel/code-frame": "^7.21.4",
|
|
30
30
|
"@vitejs/plugin-react": "^4.2.1",
|
|
31
31
|
"@vitejs/plugin-react-swc": "^3.6.0",
|
|
32
|
-
"@vxrn/react-native-prebuilt": "0.1.
|
|
33
|
-
"@vxrn/router": "0.1.
|
|
34
|
-
"@vxrn/safe-area": "0.1.
|
|
35
|
-
"@vxrn/vite-flow": "0.1.
|
|
36
|
-
"@vxrn/vite-native-client": "0.1.
|
|
37
|
-
"@vxrn/vite-native-hmr": "0.1.
|
|
38
|
-
"@vxrn/vite-native-swc": "0.1.
|
|
32
|
+
"@vxrn/react-native-prebuilt": "0.1.46",
|
|
33
|
+
"@vxrn/router": "0.1.46",
|
|
34
|
+
"@vxrn/safe-area": "0.1.46",
|
|
35
|
+
"@vxrn/vite-flow": "0.1.46",
|
|
36
|
+
"@vxrn/vite-native-client": "0.1.46",
|
|
37
|
+
"@vxrn/vite-native-hmr": "0.1.46",
|
|
38
|
+
"@vxrn/vite-native-swc": "0.1.46",
|
|
39
39
|
"citty": "^0.1.6",
|
|
40
40
|
"crossws": "^0.2.4",
|
|
41
41
|
"es-module-lexer": "^1.3.0",
|
|
42
42
|
"esbuild": "~0.19.3",
|
|
43
43
|
"esm-resolve": "^1.0.8",
|
|
44
|
-
"execa": "^5.0.0",
|
|
45
44
|
"fast-glob": "^3.2.11",
|
|
46
45
|
"find-node-modules": "^2.1.3",
|
|
47
46
|
"fs-extra": "^11.2.0",
|
package/src/constants.ts
CHANGED
|
@@ -1,7 +1,10 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { UserConfig } from 'vite'
|
|
2
2
|
|
|
3
3
|
export const DEFAULT_PORT = 8081
|
|
4
4
|
|
|
5
|
+
// TODO move to router
|
|
6
|
+
export const EMPTY_LOADER_STRING = `function loader() {/* ✷✷✷ */};`
|
|
7
|
+
|
|
5
8
|
export const nativeExtensions = [
|
|
6
9
|
'.native.tsx',
|
|
7
10
|
'.native.jsx',
|
package/src/exports/build.ts
CHANGED
|
@@ -25,6 +25,11 @@ const { ensureDir, existsSync, readFile, pathExists } = FSExtra
|
|
|
25
25
|
|
|
26
26
|
// web only for now
|
|
27
27
|
|
|
28
|
+
// TODO:
|
|
29
|
+
// - make this only build native or web bundles
|
|
30
|
+
// - move router stuff into router package
|
|
31
|
+
// - generateStaticPages becomes a vite 'post' postbuild callback in router plugin
|
|
32
|
+
|
|
28
33
|
export const build = async (optionsIn: VXRNConfig) => {
|
|
29
34
|
const options = await getOptionsFilled(optionsIn)
|
|
30
35
|
|
|
@@ -159,9 +164,8 @@ async function generateStaticPages(
|
|
|
159
164
|
return await Promise.all(
|
|
160
165
|
paramsList.map(async (params) => {
|
|
161
166
|
const path = getUrl(params)
|
|
162
|
-
const
|
|
163
|
-
|
|
164
|
-
return { path, props }
|
|
167
|
+
const loaderData = (await exported.loader?.({ path: getUrl(params), params })) ?? {}
|
|
168
|
+
return { path, loaderData }
|
|
165
169
|
})
|
|
166
170
|
)
|
|
167
171
|
|
|
@@ -207,8 +211,8 @@ async function generateStaticPages(
|
|
|
207
211
|
const cssString = await FSExtra.readFile(tmpCssFile, 'utf-8')
|
|
208
212
|
|
|
209
213
|
// pre-render each route...
|
|
210
|
-
for (const { path,
|
|
211
|
-
const { appHtml, headHtml } = await render({ path
|
|
214
|
+
for (const { path, loaderData } of allRoutes) {
|
|
215
|
+
const { appHtml, headHtml } = await render({ path })
|
|
212
216
|
const slashFileName = `${path === '/' ? '/index' : path}.html`
|
|
213
217
|
const clientHtmlPath = toAbsolute(`dist/client${slashFileName}`)
|
|
214
218
|
const clientHtml = existsSync(clientHtmlPath) ? await readFile(clientHtmlPath, 'utf-8') : null
|
|
@@ -216,7 +220,7 @@ async function generateStaticPages(
|
|
|
216
220
|
template: clientHtml || template,
|
|
217
221
|
appHtml,
|
|
218
222
|
headHtml,
|
|
219
|
-
|
|
223
|
+
loaderData,
|
|
220
224
|
css: cssString,
|
|
221
225
|
})
|
|
222
226
|
const filePath = toAbsolute(`dist/static${slashFileName}`)
|
package/src/utils/getHtml.ts
CHANGED
|
@@ -1,12 +1,20 @@
|
|
|
1
1
|
export function getHtml({
|
|
2
2
|
template,
|
|
3
|
-
|
|
3
|
+
loaderData,
|
|
4
4
|
appHtml,
|
|
5
5
|
headHtml,
|
|
6
6
|
css,
|
|
7
|
-
}: { css?: string; template: string;
|
|
8
|
-
|
|
7
|
+
}: { css?: string; template: string; loaderData: Object; appHtml: string; headHtml: string }) {
|
|
8
|
+
if (!template.includes(`<!--ssr-outlet-->`)) {
|
|
9
|
+
throw new Error(`No <!--ssr-outlet--> found in html to inject SSR contents`)
|
|
10
|
+
}
|
|
11
|
+
if (!template.includes(`<!--head-outlet-->`)) {
|
|
12
|
+
throw new Error(`No <!--head-outlet--> found in html to inject SSR contents`)
|
|
13
|
+
}
|
|
14
|
+
const loaderDataString = `\n<script>globalThis['__vxrnLoaderData__']=${JSON.stringify(
|
|
15
|
+
loaderData
|
|
16
|
+
)}</script>`
|
|
9
17
|
return template
|
|
10
|
-
.replace(`<!--ssr-outlet-->`, appHtml +
|
|
18
|
+
.replace(`<!--ssr-outlet-->`, appHtml + loaderDataString)
|
|
11
19
|
.replace(`<!--head-outlet-->`, `${headHtml}\n${css ? `<style>${css}</style>` : ``}`)
|
|
12
20
|
}
|