@limlabs/rex 0.17.3 → 0.18.0
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/link.js +2 -2
- package/dist/link.js.map +1 -1
- package/dist/router.d.ts +1 -0
- package/dist/router.d.ts.map +1 -1
- package/dist/router.js +10 -1
- package/dist/router.js.map +1 -1
- package/package.json +5 -5
- package/src/link.tsx +2 -2
- package/src/router.ts +11 -1
package/dist/link.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use client";
|
|
2
2
|
import React from 'react';
|
|
3
|
-
import { navigateTo } from './router.js';
|
|
3
|
+
import { navigateTo, withBasePath } from './router.js';
|
|
4
4
|
/**
|
|
5
5
|
* rex/link - Client-side navigation link.
|
|
6
6
|
* Renders an <a> tag that intercepts clicks for SPA navigation.
|
|
@@ -19,7 +19,7 @@ export default function Link({ href, children, target, ...rest }) {
|
|
|
19
19
|
navigateTo(href);
|
|
20
20
|
}
|
|
21
21
|
return React.createElement('a', {
|
|
22
|
-
href,
|
|
22
|
+
href: withBasePath(href),
|
|
23
23
|
onClick: handleClick,
|
|
24
24
|
target,
|
|
25
25
|
...rest,
|
package/dist/link.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"link.js","sourceRoot":"","sources":["../src/link.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;AACb,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"link.js","sourceRoot":"","sources":["../src/link.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;AACb,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAMvD;;;GAGG;AACH,MAAM,CAAC,OAAO,UAAU,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI,EAAa;IACzE,SAAS,WAAW,CAAC,CAAsC;QACzD,IACE,CAAC,CAAC,OAAO;YACT,CAAC,CAAC,OAAO;YACT,CAAC,CAAC,QAAQ;YACV,CAAC,CAAC,MAAM;YACR,MAAM,KAAK,QAAQ;YACnB,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,EACrE,CAAC;YACD,OAAO;QACT,CAAC;QAED,CAAC,CAAC,cAAc,EAAE,CAAC;QACnB,UAAU,CAAC,IAAI,CAAC,CAAC;IACnB,CAAC;IAED,OAAO,KAAK,CAAC,aAAa,CACxB,GAAG,EACH;QACE,IAAI,EAAE,YAAY,CAAC,IAAI,CAAC;QACxB,OAAO,EAAE,WAAW;QACpB,MAAM;QACN,GAAG,IAAI;KACR,EACD,QAAQ,CACT,CAAC;AACJ,CAAC"}
|
package/dist/router.d.ts
CHANGED
package/dist/router.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../src/router.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,YAAY;IAC3B,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,GAAG,IAAI,CAAC;IAC/D,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,GAAG,IAAI,CAAC;IAChE,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;CAC/C;AAED,MAAM,WAAW,SAAS;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,IAAI,IAAI,IAAI,CAAC;IACb,OAAO,IAAI,IAAI,CAAC;IAChB,MAAM,IAAI,IAAI,CAAC;IACf,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,MAAM,EAAE,YAAY,CAAC;IACrB,OAAO,EAAE,OAAO,CAAC;CAClB;
|
|
1
|
+
{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../src/router.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,YAAY;IAC3B,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,GAAG,IAAI,CAAC;IAC/D,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,GAAG,IAAI,CAAC;IAChE,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;CAC/C;AAED,MAAM,WAAW,SAAS;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,IAAI,IAAI,IAAI,CAAC;IACb,OAAO,IAAI,IAAI,CAAC;IAChB,MAAM,IAAI,IAAI,CAAC;IACf,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,MAAM,EAAE,YAAY,CAAC;IACrB,OAAO,EAAE,OAAO,CAAC;CAClB;AA8BD,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAIjD;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAe7C;AAaD;;GAEG;AACH,wBAAgB,SAAS,IAAI,SAAS,CAmCrC;AAED,eAAe,SAAS,CAAC"}
|
package/dist/router.js
CHANGED
|
@@ -1,6 +1,15 @@
|
|
|
1
1
|
function getRouter() {
|
|
2
2
|
return window.__REX_ROUTER ?? null;
|
|
3
3
|
}
|
|
4
|
+
function getBasePath() {
|
|
5
|
+
return (window.__REX_BASE_PATH || '').replace(/\/+$/, '');
|
|
6
|
+
}
|
|
7
|
+
export function withBasePath(href) {
|
|
8
|
+
const bp = getBasePath();
|
|
9
|
+
if (!bp || !href.startsWith('/') || href.startsWith('//'))
|
|
10
|
+
return href;
|
|
11
|
+
return bp + href;
|
|
12
|
+
}
|
|
4
13
|
/**
|
|
5
14
|
* Navigate to a new path via client-side routing.
|
|
6
15
|
*/
|
|
@@ -8,7 +17,7 @@ export function navigateTo(path) {
|
|
|
8
17
|
// RSC app router navigation (fetches flight data, re-renders in place)
|
|
9
18
|
const rscNavigate = window.__REX_RSC_NAVIGATE;
|
|
10
19
|
if (rscNavigate) {
|
|
11
|
-
history.pushState(null, '', path);
|
|
20
|
+
history.pushState(null, '', withBasePath(path));
|
|
12
21
|
rscNavigate(path);
|
|
13
22
|
return;
|
|
14
23
|
}
|
package/dist/router.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.js","sourceRoot":"","sources":["../src/router.ts"],"names":[],"mappings":"AAyCA,SAAS,SAAS;IAChB,OAAO,MAAM,CAAC,YAAY,IAAI,IAAI,CAAC;AACrC,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,UAAU,CAAC,IAAY;IACrC,uEAAuE;IACvE,MAAM,WAAW,GAAI,MAAc,CAAC,kBAAkB,CAAC;IACvD,IAAI,WAAW,EAAE,CAAC;QAChB,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"router.js","sourceRoot":"","sources":["../src/router.ts"],"names":[],"mappings":"AAyCA,SAAS,SAAS;IAChB,OAAO,MAAM,CAAC,YAAY,IAAI,IAAI,CAAC;AACrC,CAAC;AAED,SAAS,WAAW;IAClB,OAAO,CAAE,MAAc,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;AACrE,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,IAAY;IACvC,MAAM,EAAE,GAAG,WAAW,EAAE,CAAC;IACzB,IAAI,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IACvE,OAAO,EAAE,GAAG,IAAI,CAAC;AACnB,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,UAAU,CAAC,IAAY;IACrC,uEAAuE;IACvE,MAAM,WAAW,GAAI,MAAc,CAAC,kBAAkB,CAAC;IACvD,IAAI,WAAW,EAAE,CAAC;QAChB,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC;QAChD,WAAW,CAAC,IAAI,CAAC,CAAC;QAClB,OAAO;IACT,CAAC;IACD,wBAAwB;IACxB,MAAM,CAAC,GAAG,SAAS,EAAE,CAAC;IACtB,IAAI,CAAC,EAAE,CAAC;QACN,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACf,CAAC;SAAM,CAAC;QACN,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC;IAC9B,CAAC;AACH,CAAC;AAED,SAAS,UAAU,CAAC,MAAc;IAChC,MAAM,KAAK,GAA2B,EAAE,CAAC;IACzC,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,IAAI,CAAC;QAAE,OAAO,KAAK,CAAC;IAChD,MAAM,KAAK,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC7C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACrC,KAAK,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,GAAG,kBAAkB,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;IACnE,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,SAAS;IACvB,MAAM,CAAC,GAAG,SAAS,EAAE,CAAC;IACtB,MAAM,IAAI,GAAG,GAAS,EAAE,GAAE,CAAC,CAAC;IAE5B,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC;QACb,OAAO;YACL,QAAQ,EAAE,CAAC,CAAC,KAAK,CAAC,QAAQ;YAC1B,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,MAAM;YACtB,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK;YACpB,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK;YACpB,IAAI,EAAE,CAAC,CAAC,IAAI;YACZ,OAAO,EAAE,CAAC,CAAC,OAAO;YAClB,IAAI,EAAE,CAAC,CAAC,IAAI;YACZ,OAAO,EAAE,CAAC,CAAC,OAAO;YAClB,MAAM,EAAE,CAAC,CAAC,MAAM;YAChB,QAAQ,EAAE,CAAC,CAAC,QAAQ;YACpB,MAAM,EAAE,CAAC,CAAC,MAAM;YAChB,OAAO,EAAE,IAAI;SACd,CAAC;IACJ,CAAC;IAED,OAAO;QACL,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,QAAQ;QAClC,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM;QACzD,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC;QACzC,KAAK,EAAE,MAAM,CAAC,QAAQ,CAAC,QAAQ;QAC/B,IAAI,EAAE,CAAC,GAAW,EAAE,EAAE,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC;QACtD,OAAO,EAAE,CAAC,GAAW,EAAE,EAAE,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAC3D,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QAC/B,OAAO,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QACrC,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAC3C,QAAQ,EAAE,IAAI;QACd,MAAM,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE;QAC3C,OAAO,EAAE,KAAK;KACf,CAAC;AACJ,CAAC;AAED,eAAe,SAAS,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@limlabs/rex",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.18.0",
|
|
4
4
|
"description": "Rex - Next.js Pages Router reimplemented in Rust",
|
|
5
5
|
"bin": {
|
|
6
6
|
"rex": "bin/rex.js"
|
|
@@ -56,10 +56,10 @@
|
|
|
56
56
|
},
|
|
57
57
|
"dependencies": {},
|
|
58
58
|
"optionalDependencies": {
|
|
59
|
-
"@limlabs/rex-darwin-arm64": "0.
|
|
60
|
-
"@limlabs/rex-darwin-x64": "0.
|
|
61
|
-
"@limlabs/rex-linux-x64": "0.
|
|
62
|
-
"@limlabs/rex-linux-arm64": "0.
|
|
59
|
+
"@limlabs/rex-darwin-arm64": "0.18.0",
|
|
60
|
+
"@limlabs/rex-darwin-x64": "0.18.0",
|
|
61
|
+
"@limlabs/rex-linux-x64": "0.18.0",
|
|
62
|
+
"@limlabs/rex-linux-arm64": "0.18.0"
|
|
63
63
|
},
|
|
64
64
|
"peerDependencies": {
|
|
65
65
|
"react": "^18.0.0 || ^19.0.0",
|
package/src/link.tsx
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use client";
|
|
2
2
|
import React from 'react';
|
|
3
|
-
import { navigateTo } from './router.js';
|
|
3
|
+
import { navigateTo, withBasePath } from './router.js';
|
|
4
4
|
|
|
5
5
|
interface LinkProps extends React.AnchorHTMLAttributes<HTMLAnchorElement> {
|
|
6
6
|
href: string;
|
|
@@ -30,7 +30,7 @@ export default function Link({ href, children, target, ...rest }: LinkProps): Re
|
|
|
30
30
|
return React.createElement(
|
|
31
31
|
'a',
|
|
32
32
|
{
|
|
33
|
-
href,
|
|
33
|
+
href: withBasePath(href),
|
|
34
34
|
onClick: handleClick,
|
|
35
35
|
target,
|
|
36
36
|
...rest,
|
package/src/router.ts
CHANGED
|
@@ -43,6 +43,16 @@ function getRouter(): InternalRouter | null {
|
|
|
43
43
|
return window.__REX_ROUTER ?? null;
|
|
44
44
|
}
|
|
45
45
|
|
|
46
|
+
function getBasePath(): string {
|
|
47
|
+
return ((window as any).__REX_BASE_PATH || '').replace(/\/+$/, '');
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
export function withBasePath(href: string): string {
|
|
51
|
+
const bp = getBasePath();
|
|
52
|
+
if (!bp || !href.startsWith('/') || href.startsWith('//')) return href;
|
|
53
|
+
return bp + href;
|
|
54
|
+
}
|
|
55
|
+
|
|
46
56
|
/**
|
|
47
57
|
* Navigate to a new path via client-side routing.
|
|
48
58
|
*/
|
|
@@ -50,7 +60,7 @@ export function navigateTo(path: string): void {
|
|
|
50
60
|
// RSC app router navigation (fetches flight data, re-renders in place)
|
|
51
61
|
const rscNavigate = (window as any).__REX_RSC_NAVIGATE;
|
|
52
62
|
if (rscNavigate) {
|
|
53
|
-
history.pushState(null, '', path);
|
|
63
|
+
history.pushState(null, '', withBasePath(path));
|
|
54
64
|
rscNavigate(path);
|
|
55
65
|
return;
|
|
56
66
|
}
|