one 1.2.39 → 1.2.40
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/build.cjs +18 -4
- package/dist/cjs/cli/build.js +21 -5
- package/dist/cjs/cli/build.js.map +1 -1
- package/dist/cjs/cli/build.native.js +31 -4
- package/dist/cjs/cli/build.native.js.map +1 -1
- package/dist/cjs/cli/buildPage.cjs +68 -14
- package/dist/cjs/cli/buildPage.js +65 -14
- package/dist/cjs/cli/buildPage.js.map +1 -1
- package/dist/cjs/cli/buildPage.native.js +86 -28
- package/dist/cjs/cli/buildPage.native.js.map +1 -1
- package/dist/cjs/constants.cjs +1 -0
- package/dist/cjs/constants.js +1 -0
- package/dist/cjs/constants.js.map +1 -1
- package/dist/cjs/constants.native.js +1 -0
- package/dist/cjs/constants.native.js.map +1 -1
- package/dist/cjs/createApp.cjs +2 -1
- package/dist/cjs/createApp.js +2 -1
- package/dist/cjs/createApp.js.map +1 -1
- package/dist/cjs/router/filterRootHTML.cjs +4 -4
- package/dist/cjs/router/filterRootHTML.js +4 -4
- package/dist/cjs/router/filterRootHTML.js.map +1 -1
- package/dist/cjs/router/filterRootHTML.native.js +7 -6
- package/dist/cjs/router/filterRootHTML.native.js.map +1 -1
- package/dist/cjs/server/ServerContextScript.cjs +8 -2
- package/dist/cjs/server/ServerContextScript.js +3 -2
- package/dist/cjs/server/ServerContextScript.js.map +1 -1
- package/dist/cjs/server/ServerContextScript.native.js +8 -2
- package/dist/cjs/server/ServerContextScript.native.js.map +1 -1
- package/dist/cjs/server/oneServe.cjs +3 -2
- package/dist/cjs/server/oneServe.js +4 -2
- package/dist/cjs/server/oneServe.js.map +2 -2
- package/dist/cjs/server/oneServe.native.js +3 -2
- package/dist/cjs/server/oneServe.native.js.map +1 -1
- package/dist/cjs/server-render.cjs +9 -1
- package/dist/cjs/server-render.js +9 -1
- package/dist/cjs/server-render.js.map +1 -1
- package/dist/cjs/server-render.native.js +12 -3
- package/dist/cjs/server-render.native.js.map +1 -1
- package/dist/cjs/vite/one.cjs +5 -1
- package/dist/cjs/vite/one.js +6 -3
- package/dist/cjs/vite/one.js.map +1 -1
- package/dist/cjs/vite/one.native.js +11 -2
- package/dist/cjs/vite/one.native.js.map +1 -1
- package/dist/esm/cli/build.js +21 -5
- package/dist/esm/cli/build.js.map +1 -1
- package/dist/esm/cli/build.mjs +18 -4
- package/dist/esm/cli/build.mjs.map +1 -1
- package/dist/esm/cli/build.native.js +31 -4
- package/dist/esm/cli/build.native.js.map +1 -1
- package/dist/esm/cli/buildPage.js +65 -14
- package/dist/esm/cli/buildPage.js.map +1 -1
- package/dist/esm/cli/buildPage.mjs +68 -14
- package/dist/esm/cli/buildPage.mjs.map +1 -1
- package/dist/esm/cli/buildPage.native.js +86 -28
- package/dist/esm/cli/buildPage.native.js.map +1 -1
- package/dist/esm/constants.js +1 -0
- package/dist/esm/constants.js.map +1 -1
- package/dist/esm/constants.mjs +1 -0
- package/dist/esm/constants.mjs.map +1 -1
- package/dist/esm/constants.native.js +1 -0
- package/dist/esm/constants.native.js.map +1 -1
- package/dist/esm/createApp.js +2 -1
- package/dist/esm/createApp.js.map +1 -1
- package/dist/esm/createApp.mjs +2 -1
- package/dist/esm/createApp.mjs.map +1 -1
- package/dist/esm/router/filterRootHTML.js +4 -4
- package/dist/esm/router/filterRootHTML.js.map +1 -1
- package/dist/esm/router/filterRootHTML.mjs +4 -4
- package/dist/esm/router/filterRootHTML.mjs.map +1 -1
- package/dist/esm/router/filterRootHTML.native.js +7 -6
- package/dist/esm/router/filterRootHTML.native.js.map +1 -1
- package/dist/esm/server/ServerContextScript.js +3 -2
- package/dist/esm/server/ServerContextScript.js.map +1 -1
- package/dist/esm/server/ServerContextScript.mjs +8 -2
- package/dist/esm/server/ServerContextScript.mjs.map +1 -1
- package/dist/esm/server/ServerContextScript.native.js +8 -2
- package/dist/esm/server/ServerContextScript.native.js.map +1 -1
- package/dist/esm/server/oneServe.js +4 -2
- package/dist/esm/server/oneServe.js.map +2 -2
- package/dist/esm/server/oneServe.mjs +3 -2
- package/dist/esm/server/oneServe.mjs.map +1 -1
- package/dist/esm/server/oneServe.native.js +3 -2
- package/dist/esm/server/oneServe.native.js.map +1 -1
- package/dist/esm/server-render.js +9 -1
- package/dist/esm/server-render.js.map +1 -1
- package/dist/esm/server-render.mjs +9 -1
- package/dist/esm/server-render.mjs.map +1 -1
- package/dist/esm/server-render.native.js +12 -3
- package/dist/esm/server-render.native.js.map +1 -1
- package/dist/esm/vite/one.js +6 -3
- package/dist/esm/vite/one.js.map +1 -1
- package/dist/esm/vite/one.mjs +5 -1
- package/dist/esm/vite/one.mjs.map +1 -1
- package/dist/esm/vite/one.native.js +11 -2
- package/dist/esm/vite/one.native.js.map +1 -1
- package/package.json +9 -9
- package/src/cli/build.ts +54 -6
- package/src/cli/buildPage.ts +104 -12
- package/src/constants.ts +1 -0
- package/src/createApp.tsx +1 -0
- package/src/router/filterRootHTML.ts +14 -15
- package/src/server/ServerContextScript.tsx +7 -1
- package/src/server/oneServe.ts +3 -2
- package/src/server-render.tsx +29 -2
- package/src/types.ts +9 -0
- package/src/vite/one.ts +9 -3
- package/src/vite/types.ts +25 -0
- package/types/cli/build.d.ts.map +1 -1
- package/types/cli/buildPage.d.ts +1 -1
- package/types/cli/buildPage.d.ts.map +1 -1
- package/types/constants.d.ts.map +1 -1
- package/types/createApp.d.ts.map +1 -1
- package/types/router/filterRootHTML.d.ts.map +1 -1
- package/types/server/ServerContextScript.d.ts.map +1 -1
- package/types/server/oneServe.d.ts.map +1 -1
- package/types/server-render.d.ts +14 -2
- package/types/server-render.d.ts.map +1 -1
- package/types/types.d.ts +9 -0
- package/types/types.d.ts.map +1 -1
- package/types/vite/one.d.ts.map +1 -1
- package/types/vite/types.d.ts +24 -0
- package/types/vite/types.d.ts.map +1 -1
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/cli/buildPage.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAqB,sBACrB,kBAAoB,iCACpB,YAA2B,qCAE3B,kBAAiE,8BACjE,oBAA2B,gCAC3B,uBAA8B;AAG9B,MAAM,EAAE,UAAU,WAAW,IAAI,gBAAAA;AAEjC,eAAsB,UACpB,aACA,MACA,YACA,QACA,YACA,qBACA,WACA,WACA,kBACA,cACA,UACA,QACA,eACA,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["FSExtra"]
|
|
6
6
|
}
|
|
@@ -49,7 +49,7 @@ var {
|
|
|
49
49
|
readFile,
|
|
50
50
|
outputFile
|
|
51
51
|
} = import_fs_extra.default;
|
|
52
|
-
async function buildPage(serverEntry, path, relativeId, params, foundRoute, clientManifestEntry, staticDir, clientDir, builtMiddlewares, serverJsPath, preloads, allCSS, routePreloads, allCSSContents) {
|
|
52
|
+
async function buildPage(serverEntry, path, relativeId, params, foundRoute, clientManifestEntry, staticDir, clientDir, builtMiddlewares, serverJsPath, preloads, allCSS, routePreloads, allCSSContents, criticalPreloads, deferredPreloads, useAfterLCP, useAfterLCPAggressive) {
|
|
53
53
|
var render = await getRender(serverEntry),
|
|
54
54
|
htmlPath = `${path.endsWith("/") ? `${removeTrailingSlash(path)}/index` : path}.html`,
|
|
55
55
|
clientJsPath = (0, import_path.join)("dist/client", clientManifestEntry.file),
|
|
@@ -94,13 +94,18 @@ async function buildPage(serverEntry, path, relativeId, params, foundRoute, clie
|
|
|
94
94
|
...registrationCalls].join(`
|
|
95
95
|
`);
|
|
96
96
|
await import_fs_extra.default.writeFile((0, import_path.join)(clientDir, preloadPath), preloadContent);
|
|
97
|
-
var
|
|
97
|
+
var uniqueCSS = [...new Set(allCSS)],
|
|
98
|
+
cssPreloadContent = `
|
|
98
99
|
const CSS_TIMEOUT = 1000
|
|
99
|
-
const cssUrls = ${JSON.stringify(
|
|
100
|
+
const cssUrls = ${JSON.stringify(uniqueCSS)}
|
|
101
|
+
|
|
102
|
+
// Global cache for loaded CSS - avoids DOM queries and tracks across navigations
|
|
103
|
+
const loaded = (window.__oneLoadedCSS ||= new Set())
|
|
100
104
|
|
|
101
105
|
// Prefetch CSS without applying - called on link hover
|
|
102
106
|
export function prefetchCSS() {
|
|
103
107
|
cssUrls.forEach(href => {
|
|
108
|
+
if (loaded.has(href)) return
|
|
104
109
|
if (document.querySelector(\`link[href="\${href}"]\`)) return
|
|
105
110
|
const link = document.createElement('link')
|
|
106
111
|
link.rel = 'prefetch'
|
|
@@ -113,21 +118,31 @@ export function prefetchCSS() {
|
|
|
113
118
|
// Inject CSS to apply styles - called on actual navigation
|
|
114
119
|
export function injectCSS() {
|
|
115
120
|
return Promise.all(cssUrls.map(href => {
|
|
121
|
+
// Skip if already loaded
|
|
122
|
+
if (loaded.has(href)) return Promise.resolve()
|
|
116
123
|
// Remove any prefetch link for this href
|
|
117
124
|
const prefetchLink = document.querySelector(\`link[rel="prefetch"][href="\${href}"]\`)
|
|
118
125
|
if (prefetchLink) prefetchLink.remove()
|
|
119
|
-
// Skip if stylesheet already exists
|
|
120
|
-
if (document.querySelector(\`link[rel="stylesheet"][href="\${href}"]\`))
|
|
126
|
+
// Skip if stylesheet already exists in DOM
|
|
127
|
+
if (document.querySelector(\`link[rel="stylesheet"][href="\${href}"]\`)) {
|
|
128
|
+
loaded.add(href)
|
|
129
|
+
return Promise.resolve()
|
|
130
|
+
}
|
|
121
131
|
return new Promise(resolve => {
|
|
122
132
|
const link = document.createElement('link')
|
|
123
133
|
link.rel = 'stylesheet'
|
|
124
134
|
link.href = href
|
|
125
|
-
|
|
126
|
-
document.head.appendChild(link)
|
|
127
|
-
setTimeout(() => {
|
|
135
|
+
const timeoutId = setTimeout(() => {
|
|
128
136
|
console.warn('[one] CSS load timeout:', href)
|
|
137
|
+
loaded.add(href)
|
|
129
138
|
resolve()
|
|
130
139
|
}, CSS_TIMEOUT)
|
|
140
|
+
link.onload = link.onerror = () => {
|
|
141
|
+
clearTimeout(timeoutId)
|
|
142
|
+
loaded.add(href)
|
|
143
|
+
resolve()
|
|
144
|
+
}
|
|
145
|
+
document.head.appendChild(link)
|
|
131
146
|
})
|
|
132
147
|
}))
|
|
133
148
|
}
|
|
@@ -163,24 +178,35 @@ if (typeof document === 'undefined') globalThis.document = {}
|
|
|
163
178
|
params
|
|
164
179
|
};
|
|
165
180
|
if ((_globalThis___vxrnresetState = (_globalThis = globalThis).__vxrnresetState) === null || _globalThis___vxrnresetState === void 0 || _globalThis___vxrnresetState.call(_globalThis), foundRoute.type === "ssg") {
|
|
166
|
-
var
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
181
|
+
var renderPreloads = criticalPreloads || preloads,
|
|
182
|
+
renderDeferredPreloads = useAfterLCPAggressive ? [] : deferredPreloads,
|
|
183
|
+
html = await render({
|
|
184
|
+
path,
|
|
185
|
+
preloads: renderPreloads,
|
|
186
|
+
deferredPreloads: renderDeferredPreloads,
|
|
187
|
+
loaderProps,
|
|
188
|
+
loaderData,
|
|
189
|
+
css: allCSS,
|
|
190
|
+
cssContents: allCSSContents,
|
|
191
|
+
mode: "ssg",
|
|
192
|
+
routePreloads
|
|
193
|
+
});
|
|
194
|
+
useAfterLCP && (html = applyAfterLCPScriptLoad(html, preloads)), await outputFile(htmlOutPath, html);
|
|
177
195
|
} else if (foundRoute.type === "spa") {
|
|
178
196
|
var cssOutput = allCSSContents ? allCSSContents.filter(Boolean).map(function (content) {
|
|
179
|
-
|
|
180
|
-
|
|
197
|
+
return ` <style>${content}</style>`;
|
|
198
|
+
}).join(`
|
|
181
199
|
`) : allCSS.map(function (file) {
|
|
182
|
-
|
|
183
|
-
|
|
200
|
+
return ` <link rel="stylesheet" href=${file} />`;
|
|
201
|
+
}).join(`
|
|
202
|
+
`),
|
|
203
|
+
criticalScripts = (criticalPreloads || preloads).map(function (preload) {
|
|
204
|
+
return ` <script type="module" src="${preload}"></script>`;
|
|
205
|
+
}).join(`
|
|
206
|
+
`),
|
|
207
|
+
deferredLinks = (deferredPreloads || []).map(function (preload) {
|
|
208
|
+
return ` <link rel="modulepreload" fetchPriority="low" href="${preload}"/>`;
|
|
209
|
+
}).join(`
|
|
184
210
|
`);
|
|
185
211
|
await outputFile(htmlOutPath, `<html><head>
|
|
186
212
|
${constants.getSpaHeaderElements({
|
|
@@ -189,10 +215,8 @@ if (typeof document === 'undefined') globalThis.document = {}
|
|
|
189
215
|
loaderData
|
|
190
216
|
}
|
|
191
217
|
})}
|
|
192
|
-
${
|
|
193
|
-
|
|
194
|
-
}).join(`
|
|
195
|
-
`)}
|
|
218
|
+
${criticalScripts}
|
|
219
|
+
${deferredLinks}
|
|
196
220
|
${cssOutput}
|
|
197
221
|
</head></html>`);
|
|
198
222
|
}
|
|
@@ -231,7 +255,9 @@ ${JSON.stringify(params || null, null, 2)}`), console.error(err), process.exit(1
|
|
|
231
255
|
loaderData,
|
|
232
256
|
params,
|
|
233
257
|
path,
|
|
234
|
-
preloads
|
|
258
|
+
preloads,
|
|
259
|
+
criticalPreloads,
|
|
260
|
+
deferredPreloads
|
|
235
261
|
};
|
|
236
262
|
}
|
|
237
263
|
async function getRender(serverEntry) {
|
|
@@ -248,4 +274,36 @@ async function getRender(serverEntry) {
|
|
|
248
274
|
function removeTrailingSlash(path) {
|
|
249
275
|
return path.endsWith("/") ? path.slice(0, path.length - 1) : path;
|
|
250
276
|
}
|
|
277
|
+
function applyAfterLCPScriptLoad(html, preloads) {
|
|
278
|
+
html = html.replace(/<script\s+type="module"[^>]*async[^>]*><\/script>/gi, "");
|
|
279
|
+
var loaderScript = `
|
|
280
|
+
<script>
|
|
281
|
+
(function() {
|
|
282
|
+
var scripts = ${JSON.stringify(preloads)};
|
|
283
|
+
function loadScripts() {
|
|
284
|
+
scripts.forEach(function(src) {
|
|
285
|
+
var script = document.createElement('script');
|
|
286
|
+
script.type = 'module';
|
|
287
|
+
script.src = src;
|
|
288
|
+
document.head.appendChild(script);
|
|
289
|
+
});
|
|
290
|
+
}
|
|
291
|
+
function waitIdle(n) {
|
|
292
|
+
if (n <= 0) {
|
|
293
|
+
requestAnimationFrame(function() {
|
|
294
|
+
requestAnimationFrame(loadScripts);
|
|
295
|
+
});
|
|
296
|
+
return;
|
|
297
|
+
}
|
|
298
|
+
setTimeout(function() {
|
|
299
|
+
setTimeout(function() {
|
|
300
|
+
waitIdle(n - 1);
|
|
301
|
+
}, 0);
|
|
302
|
+
}, 0);
|
|
303
|
+
}
|
|
304
|
+
waitIdle(5);
|
|
305
|
+
})();
|
|
306
|
+
</script>`;
|
|
307
|
+
return html = html.replace("</head>", `${loaderScript}</head>`), html;
|
|
308
|
+
}
|
|
251
309
|
//# sourceMappingURL=buildPage.native.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","buildPage_exports","__export","buildPage","module","exports","import_path","require","import_fs_extra","__toESM","constants","import_cleanUrl","import_toAbsolute","import_replaceLoader","_instanceof","left","right","Symbol","hasInstance","readFile","outputFile","default","serverEntry","path","relativeId","params","foundRoute","clientManifestEntry","staticDir","clientDir","builtMiddlewares","serverJsPath","preloads","allCSS","routePreloads","allCSSContents","render","getRender","htmlPath","endsWith","removeTrailingSlash","clientJsPath","join","file","htmlOutPath","toAbsolute","preloadPath","getPreloadPath","cssPreloadPath","getPreloadCSSPath","loaderPath","loaderData","routeImports","routeRegistrations","routeIndex","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Object","entries","iterator","_step","next","done","routeKey","bundlePath","varName","push","err","return","registrationCalls","map","call","replace","preloadContent","preload","writeFile","cssPreloadContent","JSON","stringify","exported","loader","_exported_loader","_ref","code","withLoader","replaceLoader","loaderPartialPath","getLoaderPath","type","_globalThis___vxrnresetState","_globalThis","loaderProps","globalThis","__vxrnresetState","html","css","cssContents","mode","cssOutput","filter","Boolean","content","getSpaHeaderElements","serverContext","errMsg","Error","message","stack","console","error","process","exit","middlewares","x","contextKey","cleanPath"],"sources":["../../../src/cli/buildPage.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAAA;EAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;IAAAC,KAAA;EAAA,IAAAH,GAAA;AAAA,IAAAI,iBAAA;AAAAC,QAAA,CAAAD,iBAAA;EAAAE,SAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAT,YAAqB,CAAAK,iBACrB;AAQA,IAAAK,WAAQ,GAAUC,OAAA,OAAW,CAAI;EAAAC,eAAA,GAAAC,OAAA,CAAAF,OAAA;EAAAG,SAAA,GAAAD,OAAA,CAAAF,OAAA;EAAAI,eAAA,GAAAJ,OAAA;EAAAK,iBAAA,GAAAL,OAAA;EAAAM,oBAAA,GAAAN,OAAA;AAEjC,SAAAO,WAAsBA,CAAAC,IACpB,EAAAC,KAAA;
|
|
1
|
+
{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","buildPage_exports","__export","buildPage","module","exports","import_path","require","import_fs_extra","__toESM","constants","import_cleanUrl","import_toAbsolute","import_replaceLoader","_instanceof","left","right","Symbol","hasInstance","readFile","outputFile","default","serverEntry","path","relativeId","params","foundRoute","clientManifestEntry","staticDir","clientDir","builtMiddlewares","serverJsPath","preloads","allCSS","routePreloads","allCSSContents","criticalPreloads","deferredPreloads","useAfterLCP","useAfterLCPAggressive","render","getRender","htmlPath","endsWith","removeTrailingSlash","clientJsPath","join","file","htmlOutPath","toAbsolute","preloadPath","getPreloadPath","cssPreloadPath","getPreloadCSSPath","loaderPath","loaderData","routeImports","routeRegistrations","routeIndex","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Object","entries","iterator","_step","next","done","routeKey","bundlePath","varName","push","err","return","registrationCalls","map","call","replace","preloadContent","preload","writeFile","uniqueCSS","Set","cssPreloadContent","JSON","stringify","exported","loader","_exported_loader","_ref","code","withLoader","replaceLoader","loaderPartialPath","getLoaderPath","type","_globalThis___vxrnresetState","_globalThis","loaderProps","globalThis","__vxrnresetState","renderPreloads","renderDeferredPreloads","html","css","cssContents","mode","applyAfterLCPScriptLoad","cssOutput","filter","Boolean","content","criticalScripts","deferredLinks","getSpaHeaderElements","serverContext","errMsg","Error","message","stack","console","error","process","exit","middlewares","x","contextKey","cleanPath","routeFile","_serverImport_default_default","serverImport","slice","length"],"sources":["../../../src/cli/buildPage.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAAA;EAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;IAAAC,KAAA;EAAA,IAAAH,GAAA;AAAA,IAAAI,iBAAA;AAAAC,QAAA,CAAAD,iBAAA;EAAAE,SAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAT,YAAqB,CAAAK,iBACrB;AAQA,IAAAK,WAAQ,GAAUC,OAAA,OAAW,CAAI;EAAAC,eAAA,GAAAC,OAAA,CAAAF,OAAA;EAAAG,SAAA,GAAAD,OAAA,CAAAF,OAAA;EAAAI,eAAA,GAAAJ,OAAA;EAAAK,iBAAA,GAAAL,OAAA;EAAAM,oBAAA,GAAAN,OAAA;AAEjC,SAAAO,WAAsBA,CAAAC,IACpB,EAAAC,KAAA;EAmBA,OAAMA,KAAA,IAAS,QAAM,OAAUC,MAAA,MAAW,IACpCD,KAAA,CAAAC,MAAc,CAAAC,WAAK,IAAS,CAAG,CAAAF,KAAI,CAAGC,MAAA,CAAAC,WAAA,EAAoBH,IAAI,CAAC,GAAAA,IAAA,YAAeC,KAC9E;AAKN;AAIA;EAAIG,QAAA;EAAAC;AAAA,IAAAZ,eAAA,CAAAa,OAAA;AAEF,eAAMlB,UAAyBmB,WACzB,EAAAC,IAAA,EAAAC,UAAgC,EAAAC,MAAA,EAAAC,UAAA,EAAAC,mBAAA,EAAAC,SAAA,EAAAC,SAAA,EAAAC,gBAAA,EAAAC,YAAA,EAAAC,QAAA,EAAAC,MAAA,EAAAC,aAAA,EAAAC,cAAA,EAAAC,gBAAA,EAAAC,gBAAA,EAAAC,WAAA,EAAAC,qBAAA;EACtC,IAAAC,MAAI,SAAaC,SAAA,CAAAnB,WAAA;IAAAoB,QAAA,MAAAnB,IAAA,CAAAoB,QAAA,WAAAC,mBAAA,CAAArB,IAAA,YAAAA,IAAA;IAAAsB,YAAA,OAAAvC,WAAA,CAAAwC,IAAA,iBAAAnB,mBAAA,CAAAoB,IAAA;IAAAC,WAAA,OAAApC,iBAAA,CAAAqC,UAAA,MAAA3C,WAAA,CAAAwC,IAAA,EAAAlB,SAAA,EAAAc,QAAA;IAAAQ,WAAA,OAAAvC,eAAA,CAAAwC,cAAA,EAAA5B,IAAA;IAAA6B,cAAA,OAAAzC,eAAA,CAAA0C,iBAAA,EAAA9B,IAAA;IAAA+B,UAAA;IAAAC,UAAA;EAEjB;IACE,IAAAC,YAAM,GAAU;MAAKC,kBAAY;MAAAC,UAAA;MAAAC,yBAAA;MAAAC,iBAAA;MAAAC,cAAA;IACjC;MAEF,SAAAC,SAAA,GAAAC,MAAA,CAAAC,OAAA,CAAA9B,aAAA,EAAAjB,MAAA,CAAAgD,QAAA,KAAAC,KAAA,IAAAP,yBAAA,IAAAO,KAAA,GAAAJ,SAAA,CAAAK,IAAA,IAAAC,IAAA,GAAAT,yBAAA;QAGA,IAAM,CAAAU,QAAA,EAAAC,UAAoB,IAAAJ,KAAA,CAAAlE,KAAA;UAAmBuE,OAAA,QAAAb,UAAA;QAAKF,YAChD,CAAKgB,IAAA,gBAAQD,OAAA,UAA2BD,UAAA,MAAAb,kBAAA,CAAqCe,IAAA,4BAAAH,QAAA,MAAAE,OAAA;MAC/E;IAEuB,SAAAE,GAAA;MAErBb,iBAAG,OAAAC,cAAA,GAAAY,GAAA;IAAA;MAEH,IAAG;QAA+C,CAAAd,yBAAA,IAAAG,SAAA,CAAAY,MAAA,YAAAZ,SAAA,CAAAY,MAAA;MAElD,UAAG;QACH,IAAKd,iBAAA,EAAI,MAAAC,cAAA;MAEX;IAIA;IAC0B,IAAAc,iBAAA,GAAAlB,kBAAA,CAAAmB,GAAA,WAAAC,IAAA;QAAA,OAAAA,IAAA,CAEZC,OAAK,0BAAoB;MAAA;MAAAC,cAAA;MAAA;MAAA,GAAAvB,YAAA;MAAA;MAAA,GAAAxB,QAAA,CAAA4C,GAAA,WAAAI,OAAA;QAAA,kBAAAA,OAAA;MAAA;MAAA;MAAA,GAAAL,iBAAA,EAAA7B,IAAA;AAAA;IAAA,MAAAtC,eAAA,CAAAa,OAAA,CAAA4D,SAAA,KAAA3E,WAAA,CAAAwC,IAAA,EAAAjB,SAAA,EAAAqB,WAAA,GAAA6B,cAAA;IAAA,IAAAG,SAAA,WAAAC,GAAA,CAAAlD,MAAA;MAAAmD,iBAAA;AAAA;AAAA,kBAAAC,IAAA,CAAAC,SAAA,CAAAJ,SAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAqDvC;AAEA;AAEA;AACE;AACA;AACM;AAAA;AAEJ;AAAA;AAGc;AACZ;AACA;AACD;AAEH;AAC+B;AAIjC;AACE;IAIA,MAFA1E,eAAW,CAAAa,OAAA,CAAA4D,SAEP,KAAA3E,WAAW,CAAAwC,IAAS,EAAAjB,SAAO,EAAAuB,cAAA,GAAAgC,iBAAA;IAO7B,IAAAG,QAAI,GAAO,MAAM,OAAO,IAAA3E,iBAAA,CAAAqC,UAAA,EAAAlB,YAAA;IAAA,IAAAwD,QACtB,CAAAC,MAAA;MAAA,IACAC,gBALqB,EAAAC,IAAA;MAAoBnC,UAMzC,IAAAmC,IAAA,UAL6B,CAAAD,gBAAA,GAAyBF,QAAI,CAAAC,MAAA,cAAAC,gBAAA,uBAAAA,gBAAA,CAAAZ,IAAA,CAAAU,QAAA;QAAAhE,IAM1D;QAAAE;MACA,SACK,QAAAiE,IAAA,cAAAA,IAAA;MAAA,IACLC,IAAA,SAAaxE,QAAA,CAAA0B,YAAA;QAAA+C,UAAA;QAAA;QACP;AACN;AAKF,QAAI/E,oBACF,CAAAgF,aAAO;UAIXF,IAAA;UAEEpC;QAKI,EAGE;QAAAuC,iBAAmB,OAAAxF,WAAoB,CAAAwC,IAAA,EAAAjB,SACrC,MAAAlB,eAAY,CAAAoF,aAAA,EAAAxE,IAAA,EAAiC;MAI/C,MAAAH,UAAiB,CAAA0E,iBAAA,EAAqBF,UACpC,GAAAtC,UAAY,OAAA3C,eAAA,CAAAoF,aAAA,EAAAxE,IAAA;IACR;IAEZ,IAAAG,UAAM,CAAAsE,IAAA;MAAA,IACJC,4BAAA;QAAAC,WAAA;QAAAC,WAAA;UAAA5E,IACA;UAAAE;QACgF;MAC/D,KAAAwE,4BACF,IAAAC,WAAA,GAAAE,UAAA,EAAAC,gBAAA,cAAAJ,4BAAA,eAAAA,4BAAA,CAAApB,IAAA,CAAAqB,WAAA,GAAAxE,UAAA,CAAAsE,IAAA;QAAA,IACbM,cAAS,GAAAlE,gBAAA,IAAAJ,QAAA;UAAAuE,sBAAA,GAAAhE,qBAAA,QAAAF,gBAAA;UAAAmE,IAAA,SAAAhE,MAAA;YAAAjB,IAAA;YAEbS,QAAA,EAAAsE,cAAA;YACFjE,gBAAA,EAAAkE,sBAAA;YACFJ,WAAA;YACF5C,UAAc;YACNkD,GAAA,EAAAxE,MAAS;YAA8CyE,WAAa,EAAGvE,cAAA;YAE7EwE,IAAQ;YACNzE;UAA2D;QAEzDI,WAAA,KAAAkE,IAAA,GAAAI,uBAAA,CAAAJ,IAAA,EAAAxE,QAAA,UAAAZ,UAAA,CAAA4B,WAAA,EAAAwD,IAAA;MAAA,WAAA9E,UAAA,CAAAsE,IAAA;QAAA,IAAAa,SAAA,GAAA1E,cAAA,GAAAA,cAAA,CAAA2E,MAAA,CAAAC,OAAA,EAAAnC,GAAA,WAAAoC,OAAA;YAAA,qBAAAA,OAAA;UAEc,GAAAlE,IAAA;AAAsC,KAAAb,MAAA,CAAA2C,GAAA,WAAA7B,IAAA;YAAA,0CAAAA,IAAA;UAC1C,GAAAD,IAAA;AAAkC;UAChDmE,eACQ,GAAM,CAAA7E,gBACN,IAAMJ,QAAA,EAAA4C,GAAA,WAAAI,OAAA;YAChB,wCAAAA,OAAA;UAEM,GAAAlC,IAAA;AAIN;UAAAoE,aAAO,IAAA7E,gBAAA,QAAAuC,GAAA,WAAAI,OAAA;YACC,iEAAWA,OAAA;UACjB,CAAK,EAAAlC,IAAA;AAAA;QAEL,MAAA1B,UAAW,CAAA4B,WAAW;AAAA,YACtBtC,SAAA,CAAAyG,oBAAA;UACAC,aAAA;YACAjB,WAAA;YACA5C;UACA;QACA;AAAA,YACA0D,eAAA;AAAA,YACAC,aAAA;AAAA,YACAL,SAAA;AAAA,uBACA;MACA;IACA;EAAA,EACA,OAAApC,GAAA;IACA,IAAA4C,MAAA,GAAAvG,WAAA,CAAA2D,GAAA,EAAA6C,KAAA,OAAA7C,GAAA,CAAA8C,OAAA;AAAA,EACF9C,GAAA,CAAA+C,KAAA,QAAA/C,GAAA;IACFgD,OAAA,CAAAC,KAAA,kCAAAnG,IAAA,YAAAC,UAAA;AAEA;AACE,EAAA6F,MAAI;AAEJ;AACE;AAEA;AACuB,EAAAhC,IAErB,CAAAC,SAAA,CAAa/B,UAAQ,QAAS,QAE5B;AAEY;AAGhB;AAIc,EAChB8B,IAAA,CAAAC,SAAA,CAAA7D,MAAA,uBAAAgG,OAAA,CAAAC,KAAA,CAAAjD,GAAA,GAAAkD,OAAA,CAAAC,IAAA;EAEA;EACF,IAAAC,WAAA,IAAAnG,UAAA,CAAAmG,WAAA,QAAAjD,GAAA,WAAAkD,CAAA;MAEA,OAAShG,gBAAA,CAAAgG,CAAoB,CAAAC,UAAc;IACzC;IAAAC,SAAY,GAAAzG,IAAA,KAAY,GAAI,GAAAA,IAAK,GAAAqB,mBAAwB,CAAArB,IAAI;EAC/D;IAOAyE,IAAA,EAAStE,UAAA,CAAAsE,IAAA;IAGPS,GAAA,EAAOxE,MAAK;IAIZyE,WAAM,EAAAvE,cAAe;IAAA8F,SAAA,EAAAvG,UAAA,CAAAqB,IAAA;IAAA8E,WAAA;IAAAG,SAAA;IAGmB9E,WAAA;IAAAE,cAAA;IAAAE,UAAA;IAAAT,YAAA;IAAAd,YAAA;IAAAW,QAAA;IAAAa,UAAA;IAAA9B,MAAA;IAAAF,IAAA;IAAAS,QAAA;IAAAI,gBAAA;IAAAC;EAAA;AAAA;AAAA,eAAAI,UAAAnB,WAAA;EAAA,IAAAkB,MAAA;EAAA;IAAA,IAAA0F,6BAAA;MAAAC,YAAA,gBAAA7G,WAAA;IAAAkB,MAAA,GAAA2F,YAAA,CAAA9G,OAAA,CAAAmB,MAAA,MAAA0F,6BAAA,GAAAC,YAAA,CAAA9G,OAAA,CAAAA,OAAA,cAAA6G,6BAAA,uBAAAA,6BAAA,CAAA1F,MAAA,UAAAA,MAAA,mBAAAiF,OAAA,CAAAC,KAAA,uDAAAS,YAAA,GAAAR,OAAA,CAAAC,IAAA;EAAA,SAAAnD,GAAA;IAAAgD,OAAA,CAAAC,KAAA,4CAAAD,OAAA,CAAAC,KAAA,6CAAApG,WAAA,KAAAmG,OAAA,CAAAC,KAAA,CAAAjD,GAAA,CAAA+C,KAAA,GAAAG,OAAA,CAAAC,IAAA;EAAA;EAAA,OAAApF,MAAA;AAAA;AA2BxC,SAAAI,mBAAYA,CAAQrB,IAAA;EAGtB,OAAAA,IAAA,CAAAoB,QAAA,QAAApB,IAAA,CAAA6G,KAAA,IAAA7G,IAAA,CAAA8G,MAAA,QAAA9G,IAAA","ignoreList":[]}
|
package/dist/cjs/constants.cjs
CHANGED
|
@@ -55,4 +55,5 @@ const isWebClient = typeof window < "u",
|
|
|
55
55
|
<script>globalThis['global'] = globalThis</script>
|
|
56
56
|
<script>globalThis['__vxrnIsSPA'] = true</script>
|
|
57
57
|
<script>globalThis["${SERVER_CONTEXT_KEY}"] = ${JSON.stringify(serverContext)}</script>
|
|
58
|
+
<script>globalThis.__oneLoadedCSS = new Set(${JSON.stringify(serverContext.css || [])})</script>
|
|
58
59
|
`;
|
package/dist/cjs/constants.js
CHANGED
|
@@ -36,5 +36,6 @@ const isWebClient = typeof window < "u", isWebServer = typeof window > "u", isNa
|
|
|
36
36
|
<script>globalThis['global'] = globalThis</script>
|
|
37
37
|
<script>globalThis['__vxrnIsSPA'] = true</script>
|
|
38
38
|
<script>globalThis["${SERVER_CONTEXT_KEY}"] = ${JSON.stringify(serverContext)}</script>
|
|
39
|
+
<script>globalThis.__oneLoadedCSS = new Set(${JSON.stringify(serverContext.css || [])})</script>
|
|
39
40
|
`;
|
|
40
41
|
//# sourceMappingURL=constants.js.map
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/constants.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAEO,MAAM,cAAyD,OAAO,SAAW,KAC3E,cAAyD,OAAO,SAAW,KAC3E,WAAW,IAEX,YAAY,GAAG,QAAQ,IAAI,iBAAiB,KAAK,MAAM,KAAK,OAAO,IAAI,GAAW,CAAC,IAEnF,6BAA6B,mBAC7B,iCAAiC,QAAQ,0BAA0B,KACnE,0BAA0B,IAAI,OAAO,8BAA8B,GACnE,oBAAoB,IAAI,SAAS,GAAG,0BAA0B,IAE9D,qBAAqB,IAAI,SAAS,eAClC,yBAAyB,IAAI,SAAS,mBAGtC,wBAAwB,uBACxB,uBAAuB,eAAe,qBAAqB,IAE3D,qBAAqB,0BAErB,uBAAuB,CAAC;AAAA,EACnC,gBAAgB,CAAC;AACnB,IAEI,CAAC,MAAM;AAAA;AAAA;AAAA,wBAGa,kBAAkB,QAAQ,KAAK,UAAU,aAAa,CAAC;AAAA;",
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAEO,MAAM,cAAyD,OAAO,SAAW,KAC3E,cAAyD,OAAO,SAAW,KAC3E,WAAW,IAEX,YAAY,GAAG,QAAQ,IAAI,iBAAiB,KAAK,MAAM,KAAK,OAAO,IAAI,GAAW,CAAC,IAEnF,6BAA6B,mBAC7B,iCAAiC,QAAQ,0BAA0B,KACnE,0BAA0B,IAAI,OAAO,8BAA8B,GACnE,oBAAoB,IAAI,SAAS,GAAG,0BAA0B,IAE9D,qBAAqB,IAAI,SAAS,eAClC,yBAAyB,IAAI,SAAS,mBAGtC,wBAAwB,uBACxB,uBAAuB,eAAe,qBAAqB,IAE3D,qBAAqB,0BAErB,uBAAuB,CAAC;AAAA,EACnC,gBAAgB,CAAC;AACnB,IAEI,CAAC,MAAM;AAAA;AAAA;AAAA,wBAGa,kBAAkB,QAAQ,KAAK,UAAU,aAAa,CAAC;AAAA,gDAC/B,KAAK,UAAU,cAAc,OAAO,CAAC,CAAC,CAAC;AAAA;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -60,6 +60,7 @@ var isWebClient = !1,
|
|
|
60
60
|
<script>globalThis['global'] = globalThis</script>
|
|
61
61
|
<script>globalThis['__vxrnIsSPA'] = true</script>
|
|
62
62
|
<script>globalThis["${SERVER_CONTEXT_KEY}"] = ${JSON.stringify(serverContext)}</script>
|
|
63
|
+
<script>globalThis.__oneLoadedCSS = new Set(${JSON.stringify(serverContext.css || [])})</script>
|
|
63
64
|
`;
|
|
64
65
|
};
|
|
65
66
|
//# sourceMappingURL=constants.native.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","constants_exports","__export","CACHE_KEY","CSS_PRELOAD_JS_POSTFIX","LOADER_JS_POSTFIX","LOADER_JS_POSTFIX_REGEX","LOADER_JS_POSTFIX_REGEX_STRING","LOADER_JS_POSTFIX_UNCACHED","PRELOAD_JS_POSTFIX","SERVER_CONTEXT_KEY","VIRTUAL_SSR_CSS_ENTRY","VIRTUAL_SSR_CSS_HREF","getSpaHeaderElements","isNative","isWebClient","isWebServer","module","exports","_process_env_ONE_CACHE_KEY","process","env","ONE_CACHE_KEY","Math","round","random","RegExp","serverContext","arguments","length","JSON","stringify"],"sources":["../../src/constants.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,iBAAA;AAAAC,QAAA,CAAAD,iBAAA;EAAAE,SAAA,EAAAA,CAAA,KAAAA,SAAA;EAAAC,sBAAA,EAAAA,CAAA,KAAAA,sBAAA;EAAAC,iBAAA,EAAAA,CAAA,KAAAA,iBAAA;EAAAC,uBAAA,EAAAA,CAAA,KAAAA,uBAAA;EAAAC,8BAAA,EAAAA,CAAA,KAAAA,8BAAA;EAAAC,0BAAA,EAAAA,CAAA,KAAAA,0BAAA;EAAAC,kBAAA,EAAAA,CAAA,KAAAA,kBAAA;EAAAC,kBAAA,EAAAA,CAAA,KAAAA,kBAAA;EAAAC,qBAAA,EAAAA,CAAA,KAAAA,qBAAA;EAAAC,oBAAA,EAAAA,CAAA,KAAAA,oBAAA;EAAAC,oBAAA,EAAAA,CAAA,KAAAA,oBAAA;EAAAC,QAAA,EAAAA,CAAA,KAAAA,QAAA;EAAAC,WAAA,EAAAA,CAAA,KAAAA,WAAA;EAAAC,WAAA,EAAAA,CAAA,KAAAA;AAAA;AAEOC,MAAM,CAAAC,OAAA,GAAAtB,YAAgE,CAAAK,iBAChE;AAmBwB,IACnCc,WAAA,GAAgB,CAAC;EAAAC,WAAA;EAAAF,QAAA;EAAAK,0BAAA;EAAAhB,SAAA,OAAAgB,0BAAA,GAAAC,OAAA,CAAAC,GAAA,CAAAC,aAAA,cAAAH,0BAAA,cAAAA,0BAAA,GAAAI,IAAA,CAAAC,KAAA,CAAAD,IAAA,CAAAE,MAAA;EAAAjB,0BAAA;EAAAD,8BAAA,WAAAC,0BAAA;EAAAF,uBAAA,OAAAoB,MAAA,CAAAnB,8BAAA;EAAAF,iBAAA,OAAAF,SAAA,GAAAK,0BAAA;EAAAC,kBAAA,OAAAN,SAAA;EAAAC,sBAAA,OAAAD,SAAA;EAAAQ,qBAAA;EAAAC,oBAAA,kBAAAD,qBAAA;EAAAD,kBAAA;EAAAG,oBAAA,YAAAA,CAAA;IACnB,IAEK;MAAAc,aAAM;IAAA,IAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,iBAAAA,SAAA;IAAA;AAAA;AAAA;AAGoE,wBAAAlB,kBAAA,
|
|
1
|
+
{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","constants_exports","__export","CACHE_KEY","CSS_PRELOAD_JS_POSTFIX","LOADER_JS_POSTFIX","LOADER_JS_POSTFIX_REGEX","LOADER_JS_POSTFIX_REGEX_STRING","LOADER_JS_POSTFIX_UNCACHED","PRELOAD_JS_POSTFIX","SERVER_CONTEXT_KEY","VIRTUAL_SSR_CSS_ENTRY","VIRTUAL_SSR_CSS_HREF","getSpaHeaderElements","isNative","isWebClient","isWebServer","module","exports","_process_env_ONE_CACHE_KEY","process","env","ONE_CACHE_KEY","Math","round","random","RegExp","serverContext","arguments","length","JSON","stringify","css"],"sources":["../../src/constants.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,iBAAA;AAAAC,QAAA,CAAAD,iBAAA;EAAAE,SAAA,EAAAA,CAAA,KAAAA,SAAA;EAAAC,sBAAA,EAAAA,CAAA,KAAAA,sBAAA;EAAAC,iBAAA,EAAAA,CAAA,KAAAA,iBAAA;EAAAC,uBAAA,EAAAA,CAAA,KAAAA,uBAAA;EAAAC,8BAAA,EAAAA,CAAA,KAAAA,8BAAA;EAAAC,0BAAA,EAAAA,CAAA,KAAAA,0BAAA;EAAAC,kBAAA,EAAAA,CAAA,KAAAA,kBAAA;EAAAC,kBAAA,EAAAA,CAAA,KAAAA,kBAAA;EAAAC,qBAAA,EAAAA,CAAA,KAAAA,qBAAA;EAAAC,oBAAA,EAAAA,CAAA,KAAAA,oBAAA;EAAAC,oBAAA,EAAAA,CAAA,KAAAA,oBAAA;EAAAC,QAAA,EAAAA,CAAA,KAAAA,QAAA;EAAAC,WAAA,EAAAA,CAAA,KAAAA,WAAA;EAAAC,WAAA,EAAAA,CAAA,KAAAA;AAAA;AAEOC,MAAM,CAAAC,OAAA,GAAAtB,YAAgE,CAAAK,iBAChE;AAmBwB,IACnCc,WAAA,GAAgB,CAAC;EAAAC,WAAA;EAAAF,QAAA;EAAAK,0BAAA;EAAAhB,SAAA,OAAAgB,0BAAA,GAAAC,OAAA,CAAAC,GAAA,CAAAC,aAAA,cAAAH,0BAAA,cAAAA,0BAAA,GAAAI,IAAA,CAAAC,KAAA,CAAAD,IAAA,CAAAE,MAAA;EAAAjB,0BAAA;EAAAD,8BAAA,WAAAC,0BAAA;EAAAF,uBAAA,OAAAoB,MAAA,CAAAnB,8BAAA;EAAAF,iBAAA,OAAAF,SAAA,GAAAK,0BAAA;EAAAC,kBAAA,OAAAN,SAAA;EAAAC,sBAAA,OAAAD,SAAA;EAAAQ,qBAAA;EAAAC,oBAAA,kBAAAD,qBAAA;EAAAD,kBAAA;EAAAG,oBAAA,YAAAA,CAAA;IACnB,IAEK;MAAAc,aAAM;IAAA,IAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,iBAAAA,SAAA;IAAA;AAAA;AAAA;AAGoE,wBAAAlB,kBAAA,QAC/BoB,IAAK,CAAAC,SAAU,CAAAJ,aAAc;AAAU,gDAAAG,IAAA,CAAAC,SAAA,CAAAJ,aAAA,CAAAK,GAAA","ignoreList":[]}
|
package/dist/cjs/createApp.cjs
CHANGED
|
@@ -86,7 +86,8 @@ function createApp(options) {
|
|
|
86
86
|
const Application = import_react_native.AppRegistry.getApplication("App", {}),
|
|
87
87
|
rootElement = Application.element.props.children;
|
|
88
88
|
let html = await renderToString(rootElement, {
|
|
89
|
-
preloads: props.preloads
|
|
89
|
+
preloads: props.preloads,
|
|
90
|
+
deferredPreloads: props.deferredPreloads
|
|
90
91
|
});
|
|
91
92
|
try {
|
|
92
93
|
const extraHeadElements = [],
|
package/dist/cjs/createApp.js
CHANGED
|
@@ -62,7 +62,8 @@ function createApp(options) {
|
|
|
62
62
|
import_react_native.AppRegistry.registerComponent("App", () => App);
|
|
63
63
|
const Application = import_react_native.AppRegistry.getApplication("App", {}), rootElement = Application.element.props.children;
|
|
64
64
|
let html = await renderToString(rootElement, {
|
|
65
|
-
preloads: props.preloads
|
|
65
|
+
preloads: props.preloads,
|
|
66
|
+
deferredPreloads: props.deferredPreloads
|
|
66
67
|
});
|
|
67
68
|
try {
|
|
68
69
|
const extraHeadElements = [], styleTag = Application.getStyleElement({ nonce: process.env.ONE_NONCE });
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/createApp.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAO,oBAEP,eAA6B,kBAC7B,sBAA4B,yBAC5B,8BAAoC,mCACpC,gBAAuB,qBACvB,cAAqB,mBACrB,uBAAuC,mCAEvC,gCAAwC,qCACxC,sBAA6B,iCAC7B,mBAAkD,6BAClD,yBAAmD,mCAyCvC;AArDZ;AAqBO,SAAS,UAAU,SAAyB;AACjD,MAAI,YAAY,IAAI;AAClB,WAAO;AAAA,MACL;AAAA,MACA,QAAQ,OAAO,UAA0B;AAEvC,cAAM,CAAC,gBAAgB,YAAY,IAAI,MAAM,QAAQ,IAAI;AAAA,UACvD,OAAO,0BAA0B;AAAA,UACjC,OAAO,iBAAiB;AAAA,QAC1B,CAAC,GAEK,uBACJ,eAAe,wBAAwB,eAAe,SAAS,sBAC3D,iBAAiB,aAAa;AAEpC,YAAI,EAAE,YAAY,aAAa,KAAK,aAAa,MAAM,kBAAkB,eAAAA,eAAc,IACrF;AAEF,qDAAiB;AAAA,UACf,gBAAgB;AAAA,UAChB;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA,eAAAA;AAAA,QACF,CAAC;AAED,YAAI;AAEJ,cAAM,MAAM,MAER;AAAA,UAAC;AAAA;AAAA,YACC,OAAO,QAAQ;AAAA,YACf,YAAY,CAAC,OAAO;AAClB,yBAAW;AAAA,YACb;AAAA,YACA,QAAQ,QAAQ;AAAA,YAChB,YAAY,QAAQ;AAAA,YACnB,GAAG;AAAA;AAAA,QACN;AAIJ,wCAAY,kBAAkB,OAAO,MAAM,GAAG;AAG9C,cAAM,cAAc,gCAAY,eAAe,OAAO,CAAC,CAAC,GAGlD,cAAc,YAAY,QAAQ,MAAM;AAE9C,YAAI,OAAO,MAAM,eAAe,aAAa;AAAA,UAC3C,UAAU,MAAM;AAAA,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["routePreloads"]
|
|
6
6
|
}
|
|
@@ -35,22 +35,22 @@ function filterRootHTML(el) {
|
|
|
35
35
|
props
|
|
36
36
|
} = reactElement;
|
|
37
37
|
if (type === "html") {
|
|
38
|
-
if (
|
|
38
|
+
if (props && typeof props == "object" && "children" in props) {
|
|
39
39
|
const {
|
|
40
40
|
children: children2,
|
|
41
41
|
...restProps
|
|
42
|
-
} =
|
|
42
|
+
} = props;
|
|
43
43
|
return htmlProps = restProps, traverse(children2);
|
|
44
44
|
}
|
|
45
45
|
return null;
|
|
46
46
|
}
|
|
47
47
|
if (type === "head") return head = reactElement, null;
|
|
48
48
|
if (type === "body") {
|
|
49
|
-
if (
|
|
49
|
+
if (props && typeof props == "object" && "children" in props) {
|
|
50
50
|
const {
|
|
51
51
|
children: children2,
|
|
52
52
|
...restProps
|
|
53
|
-
} =
|
|
53
|
+
} = props;
|
|
54
54
|
return bodyProps = restProps, children2;
|
|
55
55
|
}
|
|
56
56
|
return null;
|
|
@@ -27,8 +27,8 @@ function filterRootHTML(el) {
|
|
|
27
27
|
return element.map(traverse);
|
|
28
28
|
const reactElement = element, { type, props } = reactElement;
|
|
29
29
|
if (type === "html") {
|
|
30
|
-
if (
|
|
31
|
-
const { children: children2, ...restProps } =
|
|
30
|
+
if (props && typeof props == "object" && "children" in props) {
|
|
31
|
+
const { children: children2, ...restProps } = props;
|
|
32
32
|
return htmlProps = restProps, traverse(children2);
|
|
33
33
|
}
|
|
34
34
|
return null;
|
|
@@ -36,8 +36,8 @@ function filterRootHTML(el) {
|
|
|
36
36
|
if (type === "head")
|
|
37
37
|
return head = reactElement, null;
|
|
38
38
|
if (type === "body") {
|
|
39
|
-
if (
|
|
40
|
-
const { children: children2, ...restProps } =
|
|
39
|
+
if (props && typeof props == "object" && "children" in props) {
|
|
40
|
+
const { children: children2, ...restProps } = props;
|
|
41
41
|
return bodyProps = restProps, children2;
|
|
42
42
|
}
|
|
43
43
|
return null;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/router/filterRootHTML.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA+B;AAqBxB,SAAS,eAAe,IAAoC;AACjE,MAAI,WACA,WACA;AAEJ,WAAS,SAAS,SAA0B;AAC1C,QAAI,CAAC,WAAW,OAAO,WAAY;AACjC,aAAO;AAET,QAAI,MAAM,QAAQ,OAAO;AACvB,aAAO,QAAQ,IAAI,QAAQ;AAG7B,UAAM,eAAe,SACf,EAAE,MAAM,MAAM,IAAI;AAExB,QAAI,SAAS,QAAQ;AACnB,UAAI,SAAS,OAAO,SAAU,YAAY,cAAc,OAAO;AAC7D,cAAM,EAAE,UAAAA,WAAU,GAAG,UAAU,IAAI;AACnC,2BAAY,WACL,SAASA,SAA2B;AAAA,MAC7C;AACA,aAAO;AAAA,IACT;AAEA,QAAI,SAAS;AACX,oBAAO,cACA;AAGT,QAAI,SAAS,QAAQ;AACnB,UAAI,SAAS,OAAO,SAAU,YAAY,cAAc,OAAO;AAC7D,cAAM,EAAE,UAAAA,WAAU,GAAG,UAAU,IAAI;AACnC,2BAAY,WAKLA;AAAA,MACT;AACA,aAAO;AAAA,IACT;AAiBA,WAAO;AAAA,EACT;AAOA,SAAO;AAAA,IACL,UALA,SAAS,EAAE;AAAA,IAEX;AAAA,IAIA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AACF;",
|
|
5
5
|
"names": ["children"]
|
|
6
6
|
}
|
|
@@ -42,27 +42,28 @@ function filterRootHTML(el) {
|
|
|
42
42
|
props
|
|
43
43
|
} = reactElement;
|
|
44
44
|
if (type === "html") {
|
|
45
|
-
if (
|
|
45
|
+
if (props && (typeof props > "u" ? "undefined" : _type_of(props)) === "object" && "children" in props) {
|
|
46
46
|
var {
|
|
47
47
|
children: children2,
|
|
48
48
|
...restProps
|
|
49
|
-
} =
|
|
49
|
+
} = props;
|
|
50
50
|
return htmlProps = restProps, traverse(children2);
|
|
51
51
|
}
|
|
52
52
|
return null;
|
|
53
53
|
}
|
|
54
54
|
if (type === "head") return head = reactElement, null;
|
|
55
55
|
if (type === "body") {
|
|
56
|
-
if (
|
|
56
|
+
if (props && (typeof props > "u" ? "undefined" : _type_of(props)) === "object" && "children" in props) {
|
|
57
57
|
var {
|
|
58
58
|
children: children1,
|
|
59
59
|
...restProps1
|
|
60
|
-
} =
|
|
61
|
-
return bodyProps = restProps1, children1;
|
|
60
|
+
} = props;
|
|
61
|
+
return bodyProps = restProps1, traverse(children1);
|
|
62
|
+
return children1;
|
|
62
63
|
}
|
|
63
64
|
return null;
|
|
64
65
|
}
|
|
65
|
-
return (0, import_react.isValidElement)(element) && typeof element.type == "string" && element.type.toLowerCase() === element.type ? null : element;
|
|
66
|
+
return (0, import_react.isValidElement)(element) && typeof element.type == "string" && element.type.toLowerCase() === element.type ? element.props && _type_of(element.props) === "object" && "children" in element.props ? traverse(element.props.children) : null : element;
|
|
66
67
|
}
|
|
67
68
|
var children = traverse(el) ||
|
|
68
69
|
// if none found, we assume they aren't returning any html so just pass it on
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","filterRootHTML_exports","__export","filterRootHTML","module","exports","import_react","require","_type_of","obj","Symbol","constructor","el","htmlProps","bodyProps","head","traverse","element","Array","isArray","map","reactElement","type","props","children","children2","restProps","children1","restProps1","isValidElement","toLowerCase"],"sources":["../../../src/router/filterRootHTML.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,sBAAA;AAAAC,QAAA,CAAAD,sBAAA;EAAAE,cAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAT,
|
|
1
|
+
{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","filterRootHTML_exports","__export","filterRootHTML","module","exports","import_react","require","_type_of","obj","Symbol","constructor","el","htmlProps","bodyProps","head","traverse","element","Array","isArray","map","reactElement","type","props","children","children2","restProps","children1","restProps1","isValidElement","toLowerCase"],"sources":["../../../src/router/filterRootHTML.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,sBAAA;AAAAC,QAAA,CAAAD,sBAAA;EAAAE,cAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAT,YAA+B,CAAAK,sBAAA;AAqBxB,IAAAK,YAAS,GAAAC,OAAe,QAAoC;AACjE,SAAIC,QACAA,CAAAC,GAAA;EAGJ,uBAAkB;;EAChB,OAAKA,GAAA,WAAWC,MAAO,UAAYD,GAAA,CAAAE,WAAA,KAAAD,MAAA,qBAAAD,GAAA;AACjC;AAEF,SAAIN,cAAcA,CAAAS,EAAA;EAChB,IAAAC,SAAO,EAAAC,SAAY,EAAAC,IAAA;EAGrB,SAAMC,SAAAC,OAAe;IAGrB,IAAI,CAAAA,OAAA,IAAS,QAAQA,OAAA,uBAAAT,QAAA,CAAAS,OAAA,iBACnB,OAAIA,OAAS;IACX,IAAAC,KAAA,CAAMC,OAAE,CAAAF,OAAA,GACR,OAAAA,OAAA,CAAAG,GAAA,CAAAJ,QAAY;IAC+B,IAC7CK,YAAA,GAAAJ,OAAA;MAAA;QAAAK,IAAA;QAAAC;MAAA,IAAAF,YAAA;IACA,IAAAC,IAAA,KAAO;MACT,IAAAC,KAAA,YAAAA,KAAA,uBAAAf,QAAA,CAAAe,KAAA,iCAAAA,KAAA;QAEI;UAAAC,QAAS,EAAAC,SAAA;UAAA,GAAAC;QAAA,IAAAH,KAAA;QACX,OAAAV,SAAO,GAAAa,SACA,EAAAV,QAAA,CAAAS,SAAA;MAGT;MACE,OAAI;IACF;IACA,IAAAH,IAAA,aAMF,OAAAP,IAAA,GAAAM,YAAA;IACA,IAAAC,IAAA,KAAO;MACT,IAAAC,KAAA,YAAAA,KAAA,uBAAAf,QAAA,CAAAe,KAAA,iCAAAA,KAAA;QAiBA,IAAO;UAAAC,QAAA,EAAAG,SAAA;UAAA,GAAAC;QAAA,IAAAL,KAAA;QACT,OAAAT,SAAA,GAAAc,UAAA,EAAAZ,QAAA,CAAAW,SAAA;QAOA,OAAOA,SAAA;MACL;MAHA;IAIA;IACA,WAAArB,YAAA,CAAAuB,cAAA,EAAAZ,OAAA,YAAAA,OAAA,CAAAK,IAAA,gBAAAL,OAAA,CAAAK,IAAA,CAAAQ,WAAA,OAAAb,OAAA,CAAAK,IAAA,GAAAL,OAAA,CAAAM,KAAA,IAAAf,QAAA,CAAAS,OAAA,CAAAM,KAAA,gCAAAN,OAAA,CAAAM,KAAA,GAAAP,QAAA,CAAAC,OAAA,CAAAM,KAAA,CAAAC,QAAA,WAAAP,OAAA;EAAA;EAEF,IAAAO,QAAA,GAAAR,QAAA,CAAAJ,EAAA;EAAA;EACFA,EAAA","ignoreList":[]}
|
|
@@ -37,7 +37,12 @@ function ServerContextScript() {
|
|
|
37
37
|
}
|
|
38
38
|
});
|
|
39
39
|
if (process.env.VITE_ENVIRONMENT === "ssr") {
|
|
40
|
-
const context = (0, import_one_server_only.useServerContext)()
|
|
40
|
+
const context = (0, import_one_server_only.useServerContext)(),
|
|
41
|
+
cssUrls = context?.css || [],
|
|
42
|
+
{
|
|
43
|
+
cssContents: _,
|
|
44
|
+
...clientContext
|
|
45
|
+
} = context || {};
|
|
41
46
|
return /* @__PURE__ */(0, import_jsx_runtime.jsx)("script", {
|
|
42
47
|
async: !0,
|
|
43
48
|
href: import_constants.SERVER_CONTEXT_KEY,
|
|
@@ -45,9 +50,10 @@ function ServerContextScript() {
|
|
|
45
50
|
dangerouslySetInnerHTML: {
|
|
46
51
|
__html: `
|
|
47
52
|
globalThis["${import_constants.SERVER_CONTEXT_KEY}"] = ${JSON.stringify({
|
|
48
|
-
...
|
|
53
|
+
...clientContext,
|
|
49
54
|
postRenderData: import_constants2.SERVER_CONTEXT_POST_RENDER_STRING
|
|
50
55
|
})};
|
|
56
|
+
globalThis.__oneLoadedCSS = new Set(${JSON.stringify(cssUrls)});
|
|
51
57
|
`
|
|
52
58
|
}
|
|
53
59
|
});
|
|
@@ -32,7 +32,7 @@ function ServerContextScript() {
|
|
|
32
32
|
}
|
|
33
33
|
);
|
|
34
34
|
if (process.env.VITE_ENVIRONMENT === "ssr") {
|
|
35
|
-
const context = (0, import_one_server_only.useServerContext)();
|
|
35
|
+
const context = (0, import_one_server_only.useServerContext)(), cssUrls = context?.css || [], { cssContents: _, ...clientContext } = context || {};
|
|
36
36
|
return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
|
|
37
37
|
"script",
|
|
38
38
|
{
|
|
@@ -42,9 +42,10 @@ function ServerContextScript() {
|
|
|
42
42
|
dangerouslySetInnerHTML: {
|
|
43
43
|
__html: `
|
|
44
44
|
globalThis["${import_constants.SERVER_CONTEXT_KEY}"] = ${JSON.stringify({
|
|
45
|
-
...
|
|
45
|
+
...clientContext,
|
|
46
46
|
postRenderData: import_constants2.SERVER_CONTEXT_POST_RENDER_STRING
|
|
47
47
|
})};
|
|
48
|
+
globalThis.__oneLoadedCSS = new Set(${JSON.stringify(cssUrls)});
|
|
48
49
|
`
|
|
49
50
|
}
|
|
50
51
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/server/ServerContextScript.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAmC,yBACnCA,oBAAkD,8BAClD,yBAAiC,oCAK3B;AAHC,SAAS,sBAAsB;AACpC,MAAI,QAAQ,IAAI,qBAAqB;AACnC,WACE;AAAA,MAAC;AAAA;AAAA,QACC,OAAK;AAAA,QAEL,MAAM;AAAA,QACN,0BAAwB;AAAA,QACxB,yBAAyB;AAAA,UACvB,QAAQ;AAAA,QACV;AAAA;AAAA,IACF;AAIJ,MAAI,QAAQ,IAAI,qBAAqB,OAAO;AAC1C,UAAM,cAAU,yCAAiB;
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAmC,yBACnCA,oBAAkD,8BAClD,yBAAiC,oCAK3B;AAHC,SAAS,sBAAsB;AACpC,MAAI,QAAQ,IAAI,qBAAqB;AACnC,WACE;AAAA,MAAC;AAAA;AAAA,QACC,OAAK;AAAA,QAEL,MAAM;AAAA,QACN,0BAAwB;AAAA,QACxB,yBAAyB;AAAA,UACvB,QAAQ;AAAA,QACV;AAAA;AAAA,IACF;AAIJ,MAAI,QAAQ,IAAI,qBAAqB,OAAO;AAC1C,UAAM,cAAU,yCAAiB,GAC3B,UAAU,SAAS,OAAO,CAAC,GAI3B,EAAE,aAAa,GAAG,GAAG,cAAc,IAAI,WAAW,CAAC;AAEzD,WACE;AAAA,MAAC;AAAA;AAAA,QACC,OAAK;AAAA,QAEL,MAAM;AAAA,QACN,0BAAwB;AAAA,QACxB,yBAAyB;AAAA,UACvB,QAAQ;AAAA,4BACU,mCAAkB,QAAQ,KAAK,UAAU;AAAA,YACrD,GAAG;AAAA,YACH,gBAAgB;AAAA,UAClB,CAAC,CAAC;AAAA,oDACoC,KAAK,UAAU,OAAO,CAAC;AAAA;AAAA,QAEnE;AAAA;AAAA,IACF;AAAA,EAEJ;AAEA,SAAO;AACT;",
|
|
5
5
|
"names": ["import_constants"]
|
|
6
6
|
}
|
|
@@ -40,7 +40,12 @@ function ServerContextScript() {
|
|
|
40
40
|
}
|
|
41
41
|
});
|
|
42
42
|
if (process.env.VITE_ENVIRONMENT === "ssr") {
|
|
43
|
-
var context = (0, import_one_server_only.useServerContext)()
|
|
43
|
+
var context = (0, import_one_server_only.useServerContext)(),
|
|
44
|
+
cssUrls = context?.css || [],
|
|
45
|
+
{
|
|
46
|
+
cssContents: _,
|
|
47
|
+
...clientContext
|
|
48
|
+
} = context || {};
|
|
44
49
|
return /* @__PURE__ */(0, import_jsx_runtime.jsx)("script", {
|
|
45
50
|
async: !0,
|
|
46
51
|
// @ts-expect-error
|
|
@@ -49,9 +54,10 @@ function ServerContextScript() {
|
|
|
49
54
|
dangerouslySetInnerHTML: {
|
|
50
55
|
__html: `
|
|
51
56
|
globalThis["${import_constants.SERVER_CONTEXT_KEY}"] = ${JSON.stringify({
|
|
52
|
-
...
|
|
57
|
+
...clientContext,
|
|
53
58
|
postRenderData: import_constants2.SERVER_CONTEXT_POST_RENDER_STRING
|
|
54
59
|
})};
|
|
60
|
+
globalThis.__oneLoadedCSS = new Set(${JSON.stringify(cssUrls)});
|
|
55
61
|
`
|
|
56
62
|
}
|
|
57
63
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","ServerContextScript_exports","__export","ServerContextScript","module","exports","import_jsx_runtime","require","import_constants","import_constants2","import_one_server_only","process","env","VITE_ENVIRONMENT","jsx","async","href","SERVER_CONTEXT_KEY","suppressHydrationWarning","dangerouslySetInnerHTML","__html","context","useServerContext","JSON","stringify","postRenderData","SERVER_CONTEXT_POST_RENDER_STRING"],"sources":["../../../src/server/ServerContextScript.tsx"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,2BAAA;AAAAC,QAAA,CAAAD,2BAAA;EAAAE,mBAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAT,YAAmC,CAAAK,2BACnC;AAGO,IAAAK,kBAAS,GAAAC,OAAsB;EAAAC,gBAAA,GAAAD,OAAA;EAAAE,iBAAA,GAAAF,OAAA;EAAAG,sBAAA,GAAAH,OAAA;AACpC,SAAIJ,mBAAYA,CAAA;EACd,IAAAQ,OACE,CAAAC,GAAA,CAAAC,gBAAA,sBAAC,mBAAAP,kBAAA,CAAAQ,GAAA;IAAAC,KAAA;IAAA;IACMC,IAEL,EAAAR,gBAAM,CAAAS,kBAAA;IAAAC,wBACN,IAAwB;IAAAC,uBACxB;MAAyBC,MACvB;IAAQ;EACV;EAAA,IACFT,OAAA,CAAAC,GAAA,CAAAC,gBAAA;IAIJ,IAAIQ,OAAQ,GAAI,IAAAX,sBAAqB,CAAAY,gBAAO;IAC1C,OAAM,eAAU,
|
|
1
|
+
{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","ServerContextScript_exports","__export","ServerContextScript","module","exports","import_jsx_runtime","require","import_constants","import_constants2","import_one_server_only","process","env","VITE_ENVIRONMENT","jsx","async","href","SERVER_CONTEXT_KEY","suppressHydrationWarning","dangerouslySetInnerHTML","__html","context","useServerContext","cssUrls","css","cssContents","_","clientContext","JSON","stringify","postRenderData","SERVER_CONTEXT_POST_RENDER_STRING"],"sources":["../../../src/server/ServerContextScript.tsx"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,2BAAA;AAAAC,QAAA,CAAAD,2BAAA;EAAAE,mBAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAT,YAAmC,CAAAK,2BACnC;AAGO,IAAAK,kBAAS,GAAAC,OAAsB;EAAAC,gBAAA,GAAAD,OAAA;EAAAE,iBAAA,GAAAF,OAAA;EAAAG,sBAAA,GAAAH,OAAA;AACpC,SAAIJ,mBAAYA,CAAA;EACd,IAAAQ,OACE,CAAAC,GAAA,CAAAC,gBAAA,sBAAC,mBAAAP,kBAAA,CAAAQ,GAAA;IAAAC,KAAA;IAAA;IACMC,IAEL,EAAAR,gBAAM,CAAAS,kBAAA;IAAAC,wBACN,IAAwB;IAAAC,uBACxB;MAAyBC,MACvB;IAAQ;EACV;EAAA,IACFT,OAAA,CAAAC,GAAA,CAAAC,gBAAA;IAIJ,IAAIQ,OAAQ,GAAI,IAAAX,sBAAqB,CAAAY,gBAAO;MAAAC,OAAA,GAAAF,OAAA,EAAAG,GAAA;MAAA;QAAAC,WAAA,EAAAC,CAAA;QAAA,GAAAC;MAAA,IAAAN,OAAA;IAC1C,OAAM,eAAU,IAAAf,kBAAA,CAAAQ,GAAA,YAAiB;MAOjCC,KACE;MAAC;MAAAC,IAAA,EAAAR,gBAAA,CAAAS,kBAAA;MAAAC,wBACM;MAAAC,uBAEC;QACNC,MAAA;AAAwB,4BACxBZ,gBAAyB,CAAAS,kBAAA,QAAAW,IAAA,CAAAC,SAAA;UACvB,GAAAF,aAAQ;UAAAG,cAAA,EAAArB,iBACU,CAAAsB;QAAyC;AAClD,oDACaH,IAAA,CAAAC,SAAA,CAAAN,OAAA;AAAA;MAChB;IAC2D;EAAA;EAEnE;AAAA","ignoreList":[]}
|
|
@@ -113,7 +113,6 @@ async function oneServe(oneOptions, buildInfo, app) {
|
|
|
113
113
|
`)}`);
|
|
114
114
|
try {
|
|
115
115
|
const loaderData = await (await import((0, import_toAbsolute.toAbsolute)(buildInfo2.serverJsPath))).loader?.(loaderProps),
|
|
116
|
-
preloads2 = buildInfo2.preloads,
|
|
117
116
|
headers = new Headers();
|
|
118
117
|
headers.set("content-type", "text/html");
|
|
119
118
|
const rendered = await render({
|
|
@@ -121,7 +120,9 @@ async function oneServe(oneOptions, buildInfo, app) {
|
|
|
121
120
|
loaderData,
|
|
122
121
|
loaderProps,
|
|
123
122
|
path: loaderProps?.path || "/",
|
|
124
|
-
preloads
|
|
123
|
+
// Use separated preloads for optimal loading
|
|
124
|
+
preloads: buildInfo2.criticalPreloads || buildInfo2.preloads,
|
|
125
|
+
deferredPreloads: buildInfo2.deferredPreloads,
|
|
125
126
|
css: buildInfo2.css,
|
|
126
127
|
cssContents: buildInfo2.cssContents
|
|
127
128
|
});
|
|
@@ -68,14 +68,16 @@ async function oneServe(oneOptions, buildInfo, app) {
|
|
|
68
68
|
`)}`
|
|
69
69
|
);
|
|
70
70
|
try {
|
|
71
|
-
const loaderData = await (await import((0, import_toAbsolute.toAbsolute)(buildInfo2.serverJsPath))).loader?.(loaderProps),
|
|
71
|
+
const loaderData = await (await import((0, import_toAbsolute.toAbsolute)(buildInfo2.serverJsPath))).loader?.(loaderProps), headers = new Headers();
|
|
72
72
|
headers.set("content-type", "text/html");
|
|
73
73
|
const rendered = await render({
|
|
74
74
|
mode: route.type,
|
|
75
75
|
loaderData,
|
|
76
76
|
loaderProps,
|
|
77
77
|
path: loaderProps?.path || "/",
|
|
78
|
-
preloads
|
|
78
|
+
// Use separated preloads for optimal loading
|
|
79
|
+
preloads: buildInfo2.criticalPreloads || buildInfo2.preloads,
|
|
80
|
+
deferredPreloads: buildInfo2.deferredPreloads,
|
|
79
81
|
css: buildInfo2.css,
|
|
80
82
|
cssContents: buildInfo2.cssContents
|
|
81
83
|
});
|