vxrn 0.1.46 → 0.1.48
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/cli.js +12 -2
- package/dist/cjs/cli.js.map +1 -1
- package/dist/cjs/cli.native.js +47 -35
- package/dist/cjs/cli.native.js.map +2 -2
- package/dist/cjs/constants.js +2 -70
- package/dist/cjs/constants.js.map +1 -1
- package/dist/cjs/constants.native.js +2 -105
- package/dist/cjs/constants.native.js.map +2 -2
- package/dist/cjs/exports/build.js +50 -62
- package/dist/cjs/exports/build.js.map +1 -1
- package/dist/cjs/exports/build.native.js +224 -205
- package/dist/cjs/exports/build.native.js.map +2 -2
- package/dist/cjs/exports/dev.js +39 -24
- package/dist/cjs/exports/dev.js.map +1 -1
- package/dist/cjs/exports/dev.native.js +48 -50
- package/dist/cjs/exports/dev.native.js.map +2 -2
- package/dist/cjs/utils/getHtml.js +9 -6
- package/dist/cjs/utils/getHtml.js.map +1 -1
- package/dist/cjs/utils/getHtml.native.js +9 -5
- package/dist/cjs/utils/getHtml.native.js.map +2 -2
- package/dist/cjs/utils/getOptimizeDeps.js +132 -0
- package/dist/cjs/utils/getOptimizeDeps.js.map +6 -0
- package/dist/cjs/utils/getOptimizeDeps.native.js +171 -0
- package/dist/cjs/utils/getOptimizeDeps.native.js.map +6 -0
- package/dist/cjs/utils/getVitePath.js +3 -1
- package/dist/cjs/utils/getVitePath.js.map +1 -1
- package/dist/cjs/utils/getVitePath.native.js +1 -1
- package/dist/cjs/utils/getVitePath.native.js.map +1 -1
- package/dist/cjs/utils/readVXRNConfig.js +5 -3
- package/dist/cjs/utils/readVXRNConfig.js.map +1 -1
- package/dist/cjs/utils/readVXRNConfig.native.js +5 -1
- package/dist/cjs/utils/readVXRNConfig.native.js.map +2 -2
- package/dist/esm/cli.js +12 -2
- package/dist/esm/cli.js.map +1 -1
- package/dist/esm/cli.mjs +12 -2
- package/dist/esm/cli.native.js +47 -35
- package/dist/esm/cli.native.js.map +2 -2
- package/dist/esm/constants.js +2 -70
- package/dist/esm/constants.js.map +1 -1
- package/dist/esm/constants.mjs +2 -13
- package/dist/esm/constants.native.js +2 -102
- package/dist/esm/constants.native.js.map +2 -2
- package/dist/esm/exports/build.js +47 -60
- package/dist/esm/exports/build.js.map +1 -1
- package/dist/esm/exports/build.mjs +64 -63
- package/dist/esm/exports/build.native.js +223 -204
- package/dist/esm/exports/build.native.js.map +2 -2
- package/dist/esm/exports/dev.js +37 -21
- package/dist/esm/exports/dev.js.map +1 -1
- package/dist/esm/exports/dev.mjs +39 -30
- package/dist/esm/exports/dev.native.js +46 -47
- package/dist/esm/exports/dev.native.js.map +2 -2
- package/dist/esm/utils/getHtml.js +9 -6
- package/dist/esm/utils/getHtml.js.map +1 -1
- package/dist/esm/utils/getHtml.mjs +11 -4
- package/dist/esm/utils/getHtml.native.js +9 -5
- package/dist/esm/utils/getHtml.native.js.map +2 -2
- package/dist/esm/utils/getOptimizeDeps.js +116 -0
- package/dist/esm/utils/getOptimizeDeps.js.map +6 -0
- package/dist/esm/utils/getOptimizeDeps.mjs +18 -0
- package/dist/esm/utils/getOptimizeDeps.native.js +150 -0
- package/dist/esm/utils/getOptimizeDeps.native.js.map +6 -0
- package/dist/esm/utils/getVitePath.js +3 -1
- package/dist/esm/utils/getVitePath.js.map +1 -1
- package/dist/esm/utils/getVitePath.mjs +1 -1
- package/dist/esm/utils/getVitePath.native.js +1 -1
- package/dist/esm/utils/getVitePath.native.js.map +1 -1
- package/dist/esm/utils/readVXRNConfig.js +5 -3
- package/dist/esm/utils/readVXRNConfig.js.map +1 -1
- package/dist/esm/utils/readVXRNConfig.mjs +5 -1
- package/dist/esm/utils/readVXRNConfig.native.js +5 -1
- package/dist/esm/utils/readVXRNConfig.native.js.map +2 -2
- package/package.json +10 -10
- package/src/cli.ts +12 -2
- package/src/constants.ts +0 -77
- package/src/exports/build.ts +96 -100
- package/src/exports/dev.ts +49 -39
- package/src/utils/getHtml.ts +21 -6
- package/src/utils/getOptimizeDeps.ts +122 -0
- package/src/utils/getVitePath.ts +3 -1
- package/src/utils/readVXRNConfig.ts +6 -4
- package/types/constants.d.ts +0 -10
- package/types/exports/build.d.ts +6 -1
- package/types/utils/getHtml.d.ts +2 -1
- package/types/utils/getOptimizeDeps.d.ts +13 -0
|
@@ -27,27 +27,27 @@ __export(build_exports, {
|
|
|
27
27
|
resolveFile: () => resolveFile
|
|
28
28
|
});
|
|
29
29
|
module.exports = __toCommonJS(build_exports);
|
|
30
|
-
var import_esbuild = require("esbuild"), import_import_meta_resolve = require("import-meta-resolve"), import_node_fs = __toESM(require("node:fs"), 1), import_node_os = require("node:os"), import_node_path = __toESM(require("node:path"), 1), import_vite = require("vite"), import_fs_extra = __toESM(require("fs-extra"), 1), import_getBaseViteConfig = require("../utils/getBaseViteConfig"), import_getHtml = require("../utils/getHtml"),
|
|
30
|
+
var import_esbuild = require("esbuild"), import_import_meta_resolve = require("import-meta-resolve"), import_node_fs = __toESM(require("node:fs"), 1), import_node_os = require("node:os"), import_node_path = __toESM(require("node:path"), 1), import_vite = require("vite"), import_fs_extra = __toESM(require("fs-extra"), 1), import_getBaseViteConfig = require("../utils/getBaseViteConfig"), import_getHtml = require("../utils/getHtml"), import_getOptimizeDeps = require("../utils/getOptimizeDeps"), import_getOptionsFilled = require("../utils/getOptionsFilled");
|
|
31
31
|
const import_meta = {};
|
|
32
|
-
function asyncGeneratorStep(gen,
|
|
32
|
+
function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
|
|
33
33
|
try {
|
|
34
34
|
var info = gen[key](arg), value = info.value;
|
|
35
35
|
} catch (error) {
|
|
36
36
|
reject(error);
|
|
37
37
|
return;
|
|
38
38
|
}
|
|
39
|
-
info.done ?
|
|
39
|
+
info.done ? resolve(value) : Promise.resolve(value).then(_next, _throw);
|
|
40
40
|
}
|
|
41
41
|
function _async_to_generator(fn) {
|
|
42
42
|
return function() {
|
|
43
43
|
var self = this, args = arguments;
|
|
44
|
-
return new Promise(function(
|
|
44
|
+
return new Promise(function(resolve, reject) {
|
|
45
45
|
var gen = fn.apply(self, args);
|
|
46
46
|
function _next(value) {
|
|
47
|
-
asyncGeneratorStep(gen,
|
|
47
|
+
asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
|
|
48
48
|
}
|
|
49
49
|
function _throw(err) {
|
|
50
|
-
asyncGeneratorStep(gen,
|
|
50
|
+
asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
|
|
51
51
|
}
|
|
52
52
|
_next(void 0);
|
|
53
53
|
});
|
|
@@ -144,6 +144,22 @@ function _ts_generator(thisArg, body) {
|
|
|
144
144
|
};
|
|
145
145
|
}
|
|
146
146
|
}
|
|
147
|
+
function _ts_values(o) {
|
|
148
|
+
var s = typeof Symbol == "function" && Symbol.iterator, m = s && o[s], i = 0;
|
|
149
|
+
if (m)
|
|
150
|
+
return m.call(o);
|
|
151
|
+
if (o && typeof o.length == "number")
|
|
152
|
+
return {
|
|
153
|
+
next: function() {
|
|
154
|
+
return o && i >= o.length && (o = void 0), {
|
|
155
|
+
value: o && o[i++],
|
|
156
|
+
done: !o
|
|
157
|
+
};
|
|
158
|
+
}
|
|
159
|
+
};
|
|
160
|
+
throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
|
|
161
|
+
}
|
|
162
|
+
Error.stackTraceLimit = 1 / 0;
|
|
147
163
|
var resolveFile = function(path2) {
|
|
148
164
|
try {
|
|
149
165
|
return (0, import_import_meta_resolve.resolve)(path2, import_meta.url).replace("file://", "");
|
|
@@ -152,22 +168,25 @@ var resolveFile = function(path2) {
|
|
|
152
168
|
}
|
|
153
169
|
}, ensureDir = import_fs_extra.default.ensureDir, existsSync = import_fs_extra.default.existsSync, readFile = import_fs_extra.default.readFile, pathExists = import_fs_extra.default.pathExists, build = function() {
|
|
154
170
|
var _ref = _async_to_generator(function(optionsIn) {
|
|
155
|
-
var options, webBuildConfig, output;
|
|
171
|
+
var buildOptions, options, optimizeDeps, webBuildConfig, output, _arguments = arguments;
|
|
156
172
|
return _ts_generator(this, function(_state) {
|
|
157
173
|
switch (_state.label) {
|
|
158
174
|
case 0:
|
|
159
|
-
return [
|
|
175
|
+
return buildOptions = _arguments.length > 1 && _arguments[1] !== void 0 ? _arguments[1] : {}, [
|
|
160
176
|
4,
|
|
161
177
|
(0, import_getOptionsFilled.getOptionsFilled)(optionsIn)
|
|
162
178
|
];
|
|
163
179
|
case 1:
|
|
164
|
-
return options = _state.sent(), process.env.NODE_ENV = "production", webBuildConfig = (0, import_vite.mergeConfig)((0, import_getBaseViteConfig.getBaseViteConfig)({
|
|
180
|
+
return options = _state.sent(), process.env.NODE_ENV = "production", optimizeDeps = (0, import_getOptimizeDeps.getOptimizeDeps)("build").optimizeDeps, webBuildConfig = (0, import_vite.mergeConfig)((0, import_getBaseViteConfig.getBaseViteConfig)({
|
|
165
181
|
mode: "production"
|
|
166
182
|
}), {
|
|
167
183
|
root: options.root,
|
|
168
184
|
clearScreen: !1,
|
|
169
|
-
optimizeDeps
|
|
170
|
-
}), options.webConfig && (webBuildConfig = (0, import_vite.mergeConfig)(webBuildConfig, options.webConfig)),
|
|
185
|
+
optimizeDeps
|
|
186
|
+
}), options.webConfig && (webBuildConfig = (0, import_vite.mergeConfig)(webBuildConfig, options.webConfig)), buildOptions.step === "generate" ? [
|
|
187
|
+
3,
|
|
188
|
+
3
|
|
189
|
+
] : (console.info("build client"), [
|
|
171
190
|
4,
|
|
172
191
|
(0, import_vite.build)((0, import_vite.mergeConfig)(webBuildConfig, {
|
|
173
192
|
build: {
|
|
@@ -175,81 +194,21 @@ var resolveFile = function(path2) {
|
|
|
175
194
|
outDir: "dist/client"
|
|
176
195
|
}
|
|
177
196
|
}))
|
|
178
|
-
];
|
|
197
|
+
]);
|
|
179
198
|
case 2:
|
|
180
|
-
|
|
199
|
+
_state.sent(), _state.label = 3;
|
|
200
|
+
case 3:
|
|
201
|
+
return console.info("build server"), [
|
|
181
202
|
4,
|
|
182
203
|
(0, import_vite.build)((0, import_vite.mergeConfig)(webBuildConfig, {
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
var importer = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "";
|
|
189
|
-
return _async_to_generator(function() {
|
|
190
|
-
var absolutePath, webPath, directoryPath, err;
|
|
191
|
-
return _ts_generator(this, function(_state2) {
|
|
192
|
-
switch (_state2.label) {
|
|
193
|
-
case 0:
|
|
194
|
-
if (id[0] !== ".")
|
|
195
|
-
return [
|
|
196
|
-
3,
|
|
197
|
-
5
|
|
198
|
-
];
|
|
199
|
-
if (absolutePath = (0, import_node_path.resolve)((0, import_node_path.dirname)(importer), id), webPath = absolutePath.replace(/(.m?js)/, "") + ".web.js", webPath === id)
|
|
200
|
-
return [
|
|
201
|
-
2
|
|
202
|
-
];
|
|
203
|
-
_state2.label = 1;
|
|
204
|
-
case 1:
|
|
205
|
-
return _state2.trys.push([
|
|
206
|
-
1,
|
|
207
|
-
4,
|
|
208
|
-
,
|
|
209
|
-
5
|
|
210
|
-
]), directoryPath = absolutePath + "/index.web.js", [
|
|
211
|
-
4,
|
|
212
|
-
pathExists(directoryPath)
|
|
213
|
-
];
|
|
214
|
-
case 2:
|
|
215
|
-
return _state2.sent() ? (console.info("temp fix found ".concat(directoryPath)), [
|
|
216
|
-
2,
|
|
217
|
-
directoryPath
|
|
218
|
-
]) : [
|
|
219
|
-
4,
|
|
220
|
-
pathExists(webPath)
|
|
221
|
-
];
|
|
222
|
-
case 3:
|
|
223
|
-
return _state2.sent() ? (console.info("temp fix found ".concat(webPath)), [
|
|
224
|
-
2,
|
|
225
|
-
webPath
|
|
226
|
-
]) : [
|
|
227
|
-
3,
|
|
228
|
-
5
|
|
229
|
-
];
|
|
230
|
-
case 4:
|
|
231
|
-
return err = _state2.sent(), console.warn("error probably fine", err), [
|
|
232
|
-
3,
|
|
233
|
-
5
|
|
234
|
-
];
|
|
235
|
-
case 5:
|
|
236
|
-
return [
|
|
237
|
-
2
|
|
238
|
-
];
|
|
239
|
-
}
|
|
240
|
-
});
|
|
241
|
-
})();
|
|
242
|
-
}
|
|
243
|
-
}
|
|
244
|
-
],
|
|
245
|
-
optimizeDeps: {
|
|
246
|
-
esbuildOptions: {
|
|
247
|
-
format: "cjs"
|
|
248
|
-
}
|
|
249
|
-
},
|
|
204
|
+
// optimizeDeps: {
|
|
205
|
+
// esbuildOptions: {
|
|
206
|
+
// format: 'cjs',
|
|
207
|
+
// },
|
|
208
|
+
// },
|
|
250
209
|
ssr: {
|
|
251
|
-
noExternal:
|
|
252
|
-
optimizeDeps
|
|
210
|
+
noExternal: optimizeDeps.include,
|
|
211
|
+
optimizeDeps
|
|
253
212
|
},
|
|
254
213
|
build: {
|
|
255
214
|
// we want one big file of css
|
|
@@ -262,12 +221,12 @@ var resolveFile = function(path2) {
|
|
|
262
221
|
}
|
|
263
222
|
}))
|
|
264
223
|
];
|
|
265
|
-
case
|
|
224
|
+
case 4:
|
|
266
225
|
return output = _state.sent().output, console.info("generating static pages"), [
|
|
267
226
|
4,
|
|
268
227
|
generateStaticPages(options, output)
|
|
269
228
|
];
|
|
270
|
-
case
|
|
229
|
+
case 5:
|
|
271
230
|
return _state.sent(), [
|
|
272
231
|
2
|
|
273
232
|
];
|
|
@@ -283,7 +242,7 @@ function generateStaticPages(options, serverOutput) {
|
|
|
283
242
|
}
|
|
284
243
|
function _generateStaticPages() {
|
|
285
244
|
return _generateStaticPages = _async_to_generator(function(options, serverOutput) {
|
|
286
|
-
var toAbsolute, staticDir, template, render, assets, allRoutes, cssStringRaw, tmpCssFile, cssString,
|
|
245
|
+
var toAbsolute, staticDir, template, render, assets, allRoutes, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _loop, _iterator, _step, err, cssStringRaw, tmpCssFile, cssString, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, _step_value, _$path, loaderData, params, loaderProps, _ref, appHtml, headHtml, slashFileName, clientHtmlPath, clientHtml, _tmp, html, filePath, err;
|
|
287
246
|
return _ts_generator(this, function(_state) {
|
|
288
247
|
switch (_state.label) {
|
|
289
248
|
case 0:
|
|
@@ -299,94 +258,151 @@ function _generateStaticPages() {
|
|
|
299
258
|
import("".concat(options.root, "/dist/server/entry-server.js"))
|
|
300
259
|
];
|
|
301
260
|
case 2:
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
261
|
+
render = _state.sent().render, assets = [], allRoutes = [], _iteratorNormalCompletion = !0, _didIteratorError = !1, _iteratorError = void 0, _state.label = 3;
|
|
262
|
+
case 3:
|
|
263
|
+
_state.trys.push([
|
|
264
|
+
3,
|
|
265
|
+
8,
|
|
266
|
+
9,
|
|
267
|
+
10
|
|
268
|
+
]), _loop = function() {
|
|
269
|
+
var output, getUrl, _exported_generateStaticParams, id, file, name, endpointPath, exported, _ref2, paramsList, _iteratorNormalCompletion2, _didIteratorError2, _iteratorError2, _iterator2, _step12, params2, _exported_loader, _$path2, _ref1, loaderData2, err2;
|
|
270
|
+
return _ts_generator(this, function(_state2) {
|
|
271
|
+
switch (_state2.label) {
|
|
272
|
+
case 0:
|
|
273
|
+
return output = _step.value, getUrl = function() {
|
|
274
|
+
var _params = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
|
|
275
|
+
if (name === "index")
|
|
276
|
+
return "/";
|
|
277
|
+
if (name.startsWith("[...")) {
|
|
278
|
+
var part = name.replace("[...", "").replace("]", "");
|
|
279
|
+
return "/".concat(_params[part]);
|
|
316
280
|
}
|
|
317
|
-
return
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
|
|
374
|
-
|
|
375
|
-
|
|
376
|
-
|
|
377
|
-
|
|
378
|
-
|
|
379
|
-
|
|
281
|
+
return "/".concat(name.split("/").map(function(part2) {
|
|
282
|
+
if (part2[0] === "[") {
|
|
283
|
+
var found = _params[part2.slice(1, part2.length - 1)];
|
|
284
|
+
return found || console.warn("not found", {
|
|
285
|
+
_params,
|
|
286
|
+
part: part2
|
|
287
|
+
}), found;
|
|
288
|
+
}
|
|
289
|
+
return part2;
|
|
290
|
+
}).join("/"));
|
|
291
|
+
}, output.type === "asset" ? (assets.push(output), [
|
|
292
|
+
2,
|
|
293
|
+
"continue"
|
|
294
|
+
]) : (id = output.facadeModuleId || "", file = import_node_path.default.basename(id), name = file.replace(/\.[^/.]+$/, ""), !id || file[0] === "_" || file.includes("entry-server") ? [
|
|
295
|
+
2,
|
|
296
|
+
"continue"
|
|
297
|
+
] : id.includes("+api") ? [
|
|
298
|
+
2,
|
|
299
|
+
"continue"
|
|
300
|
+
] : (endpointPath = import_node_path.default.join(options.root, "dist/server", output.fileName), [
|
|
301
|
+
4,
|
|
302
|
+
import(endpointPath)
|
|
303
|
+
]));
|
|
304
|
+
case 1:
|
|
305
|
+
return exported = _state2.sent(), [
|
|
306
|
+
4,
|
|
307
|
+
(_exported_generateStaticParams = exported.generateStaticParams) === null || _exported_generateStaticParams === void 0 ? void 0 : _exported_generateStaticParams.call(exported)
|
|
308
|
+
];
|
|
309
|
+
case 2:
|
|
310
|
+
paramsList = (_ref2 = _state2.sent()) !== null && _ref2 !== void 0 ? _ref2 : [
|
|
311
|
+
{}
|
|
312
|
+
], _iteratorNormalCompletion2 = !0, _didIteratorError2 = !1, _iteratorError2 = void 0, _state2.label = 3;
|
|
313
|
+
case 3:
|
|
314
|
+
_state2.trys.push([
|
|
315
|
+
3,
|
|
316
|
+
8,
|
|
317
|
+
9,
|
|
318
|
+
10
|
|
319
|
+
]), _iterator2 = paramsList[Symbol.iterator](), _state2.label = 4;
|
|
320
|
+
case 4:
|
|
321
|
+
return (_iteratorNormalCompletion2 = (_step12 = _iterator2.next()).done) ? [
|
|
322
|
+
3,
|
|
323
|
+
7
|
|
324
|
+
] : (params2 = _step12.value, _$path2 = getUrl(params2), [
|
|
325
|
+
4,
|
|
326
|
+
(_exported_loader = exported.loader) === null || _exported_loader === void 0 ? void 0 : _exported_loader.call(exported, {
|
|
327
|
+
path: _$path2,
|
|
328
|
+
params: params2
|
|
329
|
+
})
|
|
330
|
+
]);
|
|
331
|
+
case 5:
|
|
332
|
+
loaderData2 = (_ref1 = _state2.sent()) !== null && _ref1 !== void 0 ? _ref1 : {}, allRoutes.push({
|
|
333
|
+
path: _$path2,
|
|
334
|
+
params: params2,
|
|
335
|
+
loaderData: loaderData2
|
|
336
|
+
}), _state2.label = 6;
|
|
337
|
+
case 6:
|
|
338
|
+
return _iteratorNormalCompletion2 = !0, [
|
|
339
|
+
3,
|
|
340
|
+
4
|
|
341
|
+
];
|
|
342
|
+
case 7:
|
|
343
|
+
return [
|
|
344
|
+
3,
|
|
345
|
+
10
|
|
346
|
+
];
|
|
347
|
+
case 8:
|
|
348
|
+
return err2 = _state2.sent(), _didIteratorError2 = !0, _iteratorError2 = err2, [
|
|
349
|
+
3,
|
|
350
|
+
10
|
|
351
|
+
];
|
|
352
|
+
case 9:
|
|
353
|
+
try {
|
|
354
|
+
!_iteratorNormalCompletion2 && _iterator2.return != null && _iterator2.return();
|
|
355
|
+
} finally {
|
|
356
|
+
if (_didIteratorError2)
|
|
357
|
+
throw _iteratorError2;
|
|
380
358
|
}
|
|
381
|
-
|
|
382
|
-
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
|
|
359
|
+
return [
|
|
360
|
+
7
|
|
361
|
+
];
|
|
362
|
+
case 10:
|
|
363
|
+
return [
|
|
364
|
+
2
|
|
365
|
+
];
|
|
366
|
+
}
|
|
367
|
+
});
|
|
368
|
+
}, _iterator = serverOutput[Symbol.iterator](), _state.label = 4;
|
|
369
|
+
case 4:
|
|
370
|
+
return (_iteratorNormalCompletion = (_step = _iterator.next()).done) ? [
|
|
371
|
+
3,
|
|
372
|
+
7
|
|
373
|
+
] : [
|
|
374
|
+
5,
|
|
375
|
+
_ts_values(_loop())
|
|
387
376
|
];
|
|
388
|
-
case
|
|
389
|
-
|
|
377
|
+
case 5:
|
|
378
|
+
_state.sent(), _state.label = 6;
|
|
379
|
+
case 6:
|
|
380
|
+
return _iteratorNormalCompletion = !0, [
|
|
381
|
+
3,
|
|
382
|
+
4
|
|
383
|
+
];
|
|
384
|
+
case 7:
|
|
385
|
+
return [
|
|
386
|
+
3,
|
|
387
|
+
10
|
|
388
|
+
];
|
|
389
|
+
case 8:
|
|
390
|
+
return err = _state.sent(), _didIteratorError = !0, _iteratorError = err, [
|
|
391
|
+
3,
|
|
392
|
+
10
|
|
393
|
+
];
|
|
394
|
+
case 9:
|
|
395
|
+
try {
|
|
396
|
+
!_iteratorNormalCompletion && _iterator.return != null && _iterator.return();
|
|
397
|
+
} finally {
|
|
398
|
+
if (_didIteratorError)
|
|
399
|
+
throw _iteratorError;
|
|
400
|
+
}
|
|
401
|
+
return [
|
|
402
|
+
7
|
|
403
|
+
];
|
|
404
|
+
case 10:
|
|
405
|
+
return cssStringRaw = assets.filter(function(x) {
|
|
390
406
|
var _x_name;
|
|
391
407
|
return (_x_name = x.name) === null || _x_name === void 0 ? void 0 : _x_name.endsWith(".css");
|
|
392
408
|
}).map(function(x) {
|
|
@@ -397,7 +413,7 @@ function _generateStaticPages() {
|
|
|
397
413
|
4,
|
|
398
414
|
import_fs_extra.default.writeFile(tmpCssFile, cssStringRaw, "utf-8")
|
|
399
415
|
];
|
|
400
|
-
case
|
|
416
|
+
case 11:
|
|
401
417
|
return _state.sent(), [
|
|
402
418
|
4,
|
|
403
419
|
(0, import_esbuild.build)({
|
|
@@ -414,79 +430,82 @@ function _generateStaticPages() {
|
|
|
414
430
|
}
|
|
415
431
|
})
|
|
416
432
|
];
|
|
417
|
-
case
|
|
433
|
+
case 12:
|
|
418
434
|
return _state.sent(), [
|
|
419
435
|
4,
|
|
420
436
|
import_fs_extra.default.readFile(tmpCssFile, "utf-8")
|
|
421
437
|
];
|
|
422
|
-
case
|
|
423
|
-
cssString = _state.sent(),
|
|
424
|
-
case
|
|
438
|
+
case 13:
|
|
439
|
+
cssString = _state.sent(), _iteratorNormalCompletion1 = !0, _didIteratorError1 = !1, _iteratorError1 = void 0, _state.label = 14;
|
|
440
|
+
case 14:
|
|
425
441
|
_state.trys.push([
|
|
426
|
-
|
|
427
|
-
|
|
428
|
-
|
|
429
|
-
|
|
430
|
-
]),
|
|
431
|
-
case
|
|
432
|
-
return (
|
|
442
|
+
14,
|
|
443
|
+
22,
|
|
444
|
+
23,
|
|
445
|
+
24
|
|
446
|
+
]), _iterator1 = allRoutes[Symbol.iterator](), _state.label = 15;
|
|
447
|
+
case 15:
|
|
448
|
+
return (_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done) ? [
|
|
433
449
|
3,
|
|
434
|
-
|
|
435
|
-
] : (_step_value =
|
|
450
|
+
21
|
|
451
|
+
] : (_step_value = _step1.value, _$path = _step_value.path, loaderData = _step_value.loaderData, params = _step_value.params, loaderProps = {
|
|
452
|
+
params
|
|
453
|
+
}, globalThis.__vxrnLoaderProps__ = loaderProps, console.info("render", _$path), [
|
|
436
454
|
4,
|
|
437
455
|
render({
|
|
438
456
|
path: _$path
|
|
439
457
|
})
|
|
440
458
|
]);
|
|
441
|
-
case
|
|
459
|
+
case 16:
|
|
442
460
|
return _ref = _state.sent(), appHtml = _ref.appHtml, headHtml = _ref.headHtml, slashFileName = "".concat(_$path === "/" ? "/index" : _$path, ".html"), clientHtmlPath = toAbsolute("dist/client".concat(slashFileName)), existsSync(clientHtmlPath) ? [
|
|
443
461
|
4,
|
|
444
462
|
readFile(clientHtmlPath, "utf-8")
|
|
445
463
|
] : [
|
|
446
464
|
3,
|
|
447
|
-
|
|
465
|
+
18
|
|
448
466
|
];
|
|
449
|
-
case
|
|
467
|
+
case 17:
|
|
450
468
|
return _tmp = _state.sent(), [
|
|
451
469
|
3,
|
|
452
|
-
|
|
470
|
+
19
|
|
453
471
|
];
|
|
454
|
-
case
|
|
455
|
-
_tmp = null, _state.label =
|
|
456
|
-
case
|
|
472
|
+
case 18:
|
|
473
|
+
_tmp = null, _state.label = 19;
|
|
474
|
+
case 19:
|
|
457
475
|
clientHtml = _tmp, html = (0, import_getHtml.getHtml)({
|
|
458
476
|
template: clientHtml || template,
|
|
459
477
|
appHtml,
|
|
460
478
|
headHtml,
|
|
461
479
|
loaderData,
|
|
480
|
+
loaderProps,
|
|
462
481
|
css: cssString
|
|
463
|
-
}), filePath = toAbsolute("dist/static".concat(slashFileName)), import_node_fs.default.writeFileSync(toAbsolute(filePath), html), _state.label =
|
|
464
|
-
case
|
|
465
|
-
return
|
|
482
|
+
}), filePath = toAbsolute("dist/static".concat(slashFileName)), import_node_fs.default.writeFileSync(toAbsolute(filePath), html), _state.label = 20;
|
|
483
|
+
case 20:
|
|
484
|
+
return _iteratorNormalCompletion1 = !0, [
|
|
466
485
|
3,
|
|
467
|
-
|
|
486
|
+
15
|
|
468
487
|
];
|
|
469
|
-
case
|
|
488
|
+
case 21:
|
|
470
489
|
return [
|
|
471
490
|
3,
|
|
472
|
-
|
|
491
|
+
24
|
|
473
492
|
];
|
|
474
|
-
case
|
|
475
|
-
return err = _state.sent(),
|
|
493
|
+
case 22:
|
|
494
|
+
return err = _state.sent(), _didIteratorError1 = !0, _iteratorError1 = err, [
|
|
476
495
|
3,
|
|
477
|
-
|
|
496
|
+
24
|
|
478
497
|
];
|
|
479
|
-
case
|
|
498
|
+
case 23:
|
|
480
499
|
try {
|
|
481
|
-
!
|
|
500
|
+
!_iteratorNormalCompletion1 && _iterator1.return != null && _iterator1.return();
|
|
482
501
|
} finally {
|
|
483
|
-
if (
|
|
484
|
-
throw
|
|
502
|
+
if (_didIteratorError1)
|
|
503
|
+
throw _iteratorError1;
|
|
485
504
|
}
|
|
486
505
|
return [
|
|
487
506
|
7
|
|
488
507
|
];
|
|
489
|
-
case
|
|
508
|
+
case 24:
|
|
490
509
|
return [
|
|
491
510
|
2
|
|
492
511
|
];
|
|
@@ -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,qBAAiC,oBACjC,6BAA6C,gCAC7C,iBAAe,gCACf,iBAAuB,oBACvB,
|
|
5
|
-
"names": ["resolveFile", "path", "importMetaResolve", "url", "replace", "require", "resolve", "ensureDir", "FSExtra", "existsSync", "readFile", "pathExists", "build", "optionsIn", "options", "webBuildConfig", "output", "getOptionsFilled", "process", "env", "NODE_ENV", "mergeConfig", "getBaseViteConfig", "mode", "root", "clearScreen", "
|
|
4
|
+
"mappings": "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",
|
|
5
|
+
"names": ["Error", "stackTraceLimit", "Infinity", "resolveFile", "path", "importMetaResolve", "url", "replace", "require", "resolve", "ensureDir", "FSExtra", "existsSync", "readFile", "pathExists", "build", "optionsIn", "buildOptions", "options", "optimizeDeps", "webBuildConfig", "output", "getOptionsFilled", "process", "env", "NODE_ENV", "getOptimizeDeps", "mergeConfig", "getBaseViteConfig", "mode", "root", "clearScreen", "webConfig", "step", "console", "info", "viteBuild", "ssrManifest", "outDir", "ssr", "noExternal", "include", "cssCodeSplit", "rollupOptions", "external", "generateStaticPages", "serverOutput", "toAbsolute", "staticDir", "template", "render", "assets", "allRoutes", "cssStringRaw", "tmpCssFile", "cssString", "loaderData", "params", "loaderProps", "appHtml", "headHtml", "slashFileName", "clientHtmlPath", "clientHtml", "html", "filePath", "p", "fs", "readFileSync", "getUrl", "exported", "id", "file", "name", "endpointPath", "_ref", "paramsList", "_iteratorNormalCompletion", "_didIteratorError", "_iteratorError", "_iterator", "_step1", "_params", "startsWith", "part", "split", "map", "found", "slice", "length", "warn", "join", "type", "push", "facadeModuleId", "basename", "includes", "fileName", "_state", "generateStaticParams", "loader", "err", "filter", "x", "endsWith", "source", "tmpdir", "writeFile", "esbuild", "entryPoints", "target", "bundle", "minifyWhitespace", "sourcemap", "outfile", "globalThis", "getHtml", "css", "writeFileSync"]
|
|
6
6
|
}
|