vorzelajs 0.0.6 → 0.0.8
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../src/runtime/runtime.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAa,GAAG,EAAE,MAAM,UAAU,CAAA;AAYxD,OAAO,KAAK,EACV,gBAAgB,EAChB,iBAAiB,EAEjB,kBAAkB,EAIlB,cAAc,EAId,mBAAmB,EAEnB,WAAW,EACX,iBAAiB,EAElB,MAAM,YAAY,CAAA;AAEnB,KAAK,iBAAiB,GAAG;IACvB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,MAAM,CAAC,EAAE,OAAO,CAAA;CACjB,CAAA;AAaD,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAChC,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IACzB,QAAQ,EAAE,CAAC,EAAE,EAAE,MAAM,GAAG,iBAAiB,EAAE,OAAO,CAAC,EAAE,iBAAiB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IACxF,QAAQ,EAAE,CAAC,EAAE,EAAE,MAAM,GAAG,iBAAiB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IAC3D,SAAS,EAAE,iBAAiB,CAAA;IAC5B,KAAK,EAAE,QAAQ,CAAC,kBAAkB,CAAC,CAAA;CACpC;AAsUD,wBAAgB,YAAY,CAC1B,cAAc,EAAE,gBAAgB,EAChC,OAAO,GAAE,mBAAwB,GAChC,aAAa,
|
|
1
|
+
{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../src/runtime/runtime.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAa,GAAG,EAAE,MAAM,UAAU,CAAA;AAYxD,OAAO,KAAK,EACV,gBAAgB,EAChB,iBAAiB,EAEjB,kBAAkB,EAIlB,cAAc,EAId,mBAAmB,EAEnB,WAAW,EACX,iBAAiB,EAElB,MAAM,YAAY,CAAA;AAEnB,KAAK,iBAAiB,GAAG;IACvB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,MAAM,CAAC,EAAE,OAAO,CAAA;CACjB,CAAA;AAaD,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAChC,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IACzB,QAAQ,EAAE,CAAC,EAAE,EAAE,MAAM,GAAG,iBAAiB,EAAE,OAAO,CAAC,EAAE,iBAAiB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IACxF,QAAQ,EAAE,CAAC,EAAE,EAAE,MAAM,GAAG,iBAAiB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IAC3D,SAAS,EAAE,iBAAiB,CAAA;IAC5B,KAAK,EAAE,QAAQ,CAAC,kBAAkB,CAAC,CAAA;CACpC;AAsUD,wBAAgB,YAAY,CAC1B,cAAc,EAAE,gBAAgB,EAChC,OAAO,GAAE,mBAAwB,GAChC,aAAa,CAqXf;AAMD,KAAK,4BAA4B,GAAG;IAClC,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,CAAA;IAC/C,KAAK,CAAC,EAAE,MAAM,IAAI,CAAA;IAClB,uBAAuB,CAAC,EAAE,OAAO,CAAA;CAClC,CAAA;AAED,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,IAAI,CAAC,kBAAkB,EAAE,SAAS,GAAG,UAAU,GAAG,aAAa,GAAG,cAAc,GAAG,YAAY,CAAC,EACvG,OAAO,GAAE,4BAAiC,GACzC,GAAG,CAAC,OAAO,CA8Gb;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE;IAAE,MAAM,EAAE,aAAa,CAAA;CAAE,eA2D9D;AAED,wBAAgB,MAAM,sEAErB;AAED,wBAAgB,SAAS,kBAQxB;AAED,wBAAgB,WAAW,KAGjB,IAAI,MAAM,GAAG,iBAAiB,EAAE,UAAU,iBAAiB,mBAOpE;AAED,wBAAgB,SAAS,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAO1D,CAAC,CACzB;AAED,wBAAgB,aAAa,CAAC,CAAC,GAAG,OAAO,KAOZ,CAAC,CAC7B;AAED,wBAAgB,SAAS,CAAC,CAAC,SAAS,WAAW,GAAG,WAAW,aAgB5D;AAED,wBAAgB,YAAY,CAAC,CAAC,SAAS,WAAW,GAAG,WAAW,KAAK,iBAAiB,CAAC,CAAC,CAAC,CAuBxF;AAED,wBAAgB,oBAAoB,IAAI,gBAAgB,CAQvD;AAED,KAAK,SAAS,GAAG,GAAG,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,GAAG;IAC7D,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,EAAE,EAAE,MAAM,CAAA;CACX,CAAA;AAED,wBAAgB,IAAI,CAAC,KAAK,EAAE,SAAS,eAqFpC"}
|
package/dist/runtime/runtime.jsx
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { createContext, createEffect, createSignal, ErrorBoundary, onCleanup, sharedConfig, splitProps, useContext } from 'solid-js';
|
|
2
|
-
import { hydrate } from 'solid-js/web';
|
|
2
|
+
import { hydrate, render } from 'solid-js/web';
|
|
3
3
|
import { formatParsedStack, parseErrorStack } from '../debug/error-stack.js';
|
|
4
4
|
import { syncHead } from './head.js';
|
|
5
5
|
import { normalizeHref } from './path.js';
|
|
@@ -313,6 +313,7 @@ export function createRouter(initialPayload, options = {}) {
|
|
|
313
313
|
}
|
|
314
314
|
const mountPoints = Array.from(app.querySelectorAll(`[${ISLAND_ROOT_ATTRIBUTE}]`));
|
|
315
315
|
const hydrationRoots = getHydrationRoots(nextState);
|
|
316
|
+
const isPayloadNavigation = nextState.renderSource === 'payload';
|
|
316
317
|
for (const root of hydrationRoots) {
|
|
317
318
|
const mount = mountPoints.find((candidate) => candidate.getAttribute(ISLAND_ROOT_ATTRIBUTE) === root.id);
|
|
318
319
|
if (!mount) {
|
|
@@ -326,15 +327,23 @@ export function createRouter(initialPayload, options = {}) {
|
|
|
326
327
|
scroll: false,
|
|
327
328
|
});
|
|
328
329
|
};
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
}
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
|
|
330
|
+
if (isPayloadNavigation) {
|
|
331
|
+
mount.textContent = '';
|
|
332
|
+
islandDisposers.push(render(() => {
|
|
333
|
+
return renderResolvedMatches(subtreeState, { retry });
|
|
334
|
+
}, mount));
|
|
335
|
+
}
|
|
336
|
+
else {
|
|
337
|
+
const hctx = readIslandHydrationContext(mount);
|
|
338
|
+
islandDisposers.push(hydrate(() => {
|
|
339
|
+
if (hctx && sharedConfig.context) {
|
|
340
|
+
sharedConfig.context.count = hctx.count;
|
|
341
|
+
}
|
|
342
|
+
return renderResolvedMatches(subtreeState, { retry });
|
|
343
|
+
}, mount, {
|
|
344
|
+
renderId: hctx?.id,
|
|
345
|
+
}));
|
|
346
|
+
}
|
|
338
347
|
}
|
|
339
348
|
logDevRouterEvent('hydrate', {
|
|
340
349
|
islands: hydrationRoots.map((root) => root.id),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routes-plugin.d.ts","sourceRoot":"","sources":["../../src/vite/routes-plugin.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;
|
|
1
|
+
{"version":3,"file":"routes-plugin.d.ts","sourceRoot":"","sources":["../../src/vite/routes-plugin.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAgXlC,wBAAsB,cAAc,CAAC,WAAW,SAAgB,iBA2B/D;AAED,wBAAgB,mBAAmB,IAAI,MAAM,CA2C5C"}
|
|
@@ -9,7 +9,7 @@ const SERVER_ONLY_ROUTE_FILE_PATTERN = /\.server\.(ts|tsx)$/u;
|
|
|
9
9
|
const SERVER_ONLY_DIR_PATTERN = /[\\/]\.server[\\/]/u;
|
|
10
10
|
const SERVER_ONLY_SPECIFIER_PATTERN = /(?:^|[\\/])\.server(?:[\\/]|$)|\.server(?:$|\.)/u;
|
|
11
11
|
const CLIENT_EVENT_HANDLER_PATTERN = /\bon[A-Z][A-Za-z0-9]*\s*=/u;
|
|
12
|
-
const CLIENT_ROUTER_HOOK_PATTERN = /\b(useNavigate|useSetSearch|Route\.useSetSearch)\b/u;
|
|
12
|
+
const CLIENT_ROUTER_HOOK_PATTERN = /\b(useNavigate|useSearch|useSetSearch|Route\.useSearch|Route\.useSetSearch)\b/u;
|
|
13
13
|
const CLIENT_SOLID_HOOK_PATTERN = /\b(createSignal|createEffect|createRenderEffect|createResource|onMount|onCleanup)\b/u;
|
|
14
14
|
const CLIENT_BROWSER_GLOBAL_PATTERN = /\b(window|document|navigator|localStorage|sessionStorage)\s*\./u;
|
|
15
15
|
const CLIENT_BROWSER_FUNCTION_PATTERN = /\b(requestAnimationFrame|matchMedia)\s*\(/u;
|
|
@@ -188,6 +188,9 @@ function detectRouteHydration(source) {
|
|
|
188
188
|
: 'static';
|
|
189
189
|
}
|
|
190
190
|
function isHydrationTrackedSpecifier(specifier) {
|
|
191
|
+
if (/^~\/(router|runtime)(\/|$)/u.test(specifier)) {
|
|
192
|
+
return false;
|
|
193
|
+
}
|
|
191
194
|
return specifier.startsWith('./')
|
|
192
195
|
|| specifier.startsWith('../')
|
|
193
196
|
|| specifier === '~'
|
|
@@ -221,8 +224,12 @@ async function resolveLocalModulePath(specifier, importerPath, projectRoot) {
|
|
|
221
224
|
: specifier.startsWith('~/')
|
|
222
225
|
? path.resolve(projectRoot, SOURCE_DIR, specifier.slice(2))
|
|
223
226
|
: path.resolve(path.dirname(importerPath), specifier);
|
|
224
|
-
const
|
|
225
|
-
|
|
227
|
+
const ext = path.extname(basePath);
|
|
228
|
+
const JS_TO_TS_EXTENSIONS = { '.js': ['.ts', '.tsx', '.js'], '.jsx': ['.tsx', '.jsx'] };
|
|
229
|
+
const candidates = ext
|
|
230
|
+
? ext in JS_TO_TS_EXTENSIONS
|
|
231
|
+
? JS_TO_TS_EXTENSIONS[ext].map((replacement) => basePath.slice(0, -ext.length) + replacement)
|
|
232
|
+
: [basePath]
|
|
226
233
|
: [
|
|
227
234
|
...SOURCE_FILE_EXTENSIONS.map((extension) => `${basePath}${extension}`),
|
|
228
235
|
...SOURCE_FILE_EXTENSIONS.map((extension) => path.join(basePath, `index${extension}`)),
|