@cedarjs/router 1.0.0-canary.12748 → 1.0.0-rc.26
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/rsc/RscCache.d.ts.map +1 -1
- package/dist/cjs/rsc/RscCache.js +1 -11
- package/dist/cjs/rsc/clientSsr.d.ts +0 -7
- package/dist/cjs/rsc/clientSsr.d.ts.map +1 -1
- package/dist/cjs/rsc/clientSsr.js +3 -34
- package/dist/cjs/rsc/utils.d.ts +2 -4
- package/dist/cjs/rsc/utils.d.ts.map +1 -1
- package/dist/cjs/rsc/utils.js +5 -20
- package/dist/rsc/RscCache.d.ts.map +1 -1
- package/dist/rsc/RscCache.js +1 -11
- package/dist/rsc/clientSsr.d.ts +0 -7
- package/dist/rsc/clientSsr.d.ts.map +1 -1
- package/dist/rsc/clientSsr.js +4 -35
- package/dist/rsc/utils.d.ts +2 -4
- package/dist/rsc/utils.d.ts.map +1 -1
- package/dist/rsc/utils.js +5 -20
- package/package.json +9 -10
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RscCache.d.ts","sourceRoot":"","sources":["../../../src/rsc/RscCache.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"RscCache.d.ts","sourceRoot":"","sources":["../../../src/rsc/RscCache.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,QAAQ;IACvB,cAAc,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,CAAA;IACpC,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAC3B;AAED;;;;;;GAMG;AACH,qBAAa,QAAQ;IACnB,OAAO,CAAC,KAAK,CAAwC;IACrD,OAAO,CAAC,MAAM,CAAW;IACzB,OAAO,CAAC,WAAW,CAAI;IAEvB,OAAO,CAAC,SAAS,CAAQ;;IAgDzB,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,CAAC,QAAQ,CAAC,GAAG,SAAS;IAMhD,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAAC;IA2B1C,OAAO,CAAC,eAAe;IAsBvB,OAAO,CAAC,qBAAqB;CAW9B"}
|
package/dist/cjs/rsc/RscCache.js
CHANGED
|
@@ -21,16 +21,6 @@ __export(RscCache_exports, {
|
|
|
21
21
|
RscCache: () => RscCache
|
|
22
22
|
});
|
|
23
23
|
module.exports = __toCommonJS(RscCache_exports);
|
|
24
|
-
class DummyWS {
|
|
25
|
-
readyState = WebSocket?.OPEN;
|
|
26
|
-
addEventListener() {
|
|
27
|
-
}
|
|
28
|
-
send() {
|
|
29
|
-
}
|
|
30
|
-
}
|
|
31
|
-
if (typeof globalThis.WebSocket === "undefined") {
|
|
32
|
-
globalThis.WebSocket = DummyWS;
|
|
33
|
-
}
|
|
34
24
|
class RscCache {
|
|
35
25
|
cache = /* @__PURE__ */ new Map();
|
|
36
26
|
socket;
|
|
@@ -99,7 +89,7 @@ class RscCache {
|
|
|
99
89
|
} else if (this.sendRetries >= 10) {
|
|
100
90
|
console.error("Exhausted retries to send message to WebSocket server.");
|
|
101
91
|
} else {
|
|
102
|
-
console.error("
|
|
92
|
+
console.error("WebSocket connection is closed.");
|
|
103
93
|
}
|
|
104
94
|
}
|
|
105
95
|
sendUpdateToWebSocket() {
|
|
@@ -1,9 +1,2 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Render the RW App's Routes.{tsx,jsx} component.
|
|
3
|
-
* In production, this function will read the Routes component from the App's
|
|
4
|
-
* dist directory.
|
|
5
|
-
* During dev, this function will use Vite to load the Routes component from
|
|
6
|
-
* the App's src directory.
|
|
7
|
-
*/
|
|
8
1
|
export declare function renderRoutesSsr(pathname: string): Promise<any>;
|
|
9
2
|
//# sourceMappingURL=clientSsr.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clientSsr.d.ts","sourceRoot":"","sources":["../../../src/rsc/clientSsr.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"clientSsr.d.ts","sourceRoot":"","sources":["../../../src/rsc/clientSsr.ts"],"names":[],"mappings":"AAuEA,wBAAsB,eAAe,CAAC,QAAQ,EAAE,MAAM,gBA2DrD"}
|
|
@@ -37,25 +37,11 @@ var import_ssrModuleMap = require("./ssrModuleMap.js");
|
|
|
37
37
|
var import_utils = require("./utils.js");
|
|
38
38
|
var import_utils2 = require("./utils.js");
|
|
39
39
|
async function getEntries() {
|
|
40
|
-
if (globalThis.__rwjs__vite_ssr_runtime) {
|
|
41
|
-
return {
|
|
42
|
-
serverEntries: {
|
|
43
|
-
__rwjs__Routes: "../../src/Routes.tsx"
|
|
44
|
-
},
|
|
45
|
-
ssrEntries: {}
|
|
46
|
-
};
|
|
47
|
-
}
|
|
48
40
|
const entriesPath = (0, import_project_config.getPaths)().web.distRscEntries;
|
|
49
41
|
const entries = await import((0, import_utils2.makeFilePath)(entriesPath));
|
|
50
42
|
return entries;
|
|
51
43
|
}
|
|
52
44
|
async function getRoutesComponent() {
|
|
53
|
-
if (globalThis.__rwjs__vite_rsc_runtime) {
|
|
54
|
-
const routesMod = await globalThis.__rwjs__vite_rsc_runtime.executeUrl(
|
|
55
|
-
(0, import_project_config.getPaths)().web.routes
|
|
56
|
-
);
|
|
57
|
-
return routesMod.default;
|
|
58
|
-
}
|
|
59
45
|
const { serverEntries } = await getEntries();
|
|
60
46
|
const entryPath = import_node_path.default.join(
|
|
61
47
|
(0, import_project_config.getPaths)().web.distRsc,
|
|
@@ -105,7 +91,7 @@ async function renderRoutesSsr(pathname) {
|
|
|
105
91
|
get(_target, encodedId) {
|
|
106
92
|
console.log("Proxy get encodedId", encodedId);
|
|
107
93
|
const [filePath, name] = encodedId.split("#");
|
|
108
|
-
const id =
|
|
94
|
+
const id = resolveClientEntryForProd(filePath, clientEntries);
|
|
109
95
|
console.log("clientSsr.ts::Proxy id", id);
|
|
110
96
|
return { id, chunks: [id], name, async: true };
|
|
111
97
|
}
|
|
@@ -114,26 +100,9 @@ async function renderRoutesSsr(pathname) {
|
|
|
114
100
|
const { createElement } = await (0, import_utils.importReact)();
|
|
115
101
|
const { renderToReadableStream } = await (0, import_utils.importRsdwServer)();
|
|
116
102
|
console.log("clientSsr.ts right before renderToReadableStream");
|
|
117
|
-
const
|
|
118
|
-
createElement(Routes),
|
|
119
|
-
bundlerConfig
|
|
120
|
-
);
|
|
121
|
-
const [streamForLogging, streamForRendering] = originalStream.tee();
|
|
122
|
-
(async () => {
|
|
123
|
-
const reader = streamForLogging.getReader();
|
|
124
|
-
const decoder = new TextDecoder();
|
|
125
|
-
let logContent = "";
|
|
126
|
-
while (true) {
|
|
127
|
-
const { done, value } = await reader.read();
|
|
128
|
-
if (done) {
|
|
129
|
-
break;
|
|
130
|
-
}
|
|
131
|
-
logContent += decoder.decode(value, { stream: true });
|
|
132
|
-
}
|
|
133
|
-
console.log("Stream content:", logContent);
|
|
134
|
-
})();
|
|
103
|
+
const stream = renderToReadableStream(createElement(Routes), bundlerConfig);
|
|
135
104
|
const { createFromReadableStream } = await (0, import_utils.importRsdwClient)();
|
|
136
|
-
const data = createFromReadableStream(
|
|
105
|
+
const data = createFromReadableStream(stream, {
|
|
137
106
|
ssrManifest: { moduleMap: import_ssrModuleMap.moduleMap, moduleLoading: null }
|
|
138
107
|
});
|
|
139
108
|
rscCache.set(pathname, data);
|
package/dist/cjs/rsc/utils.d.ts
CHANGED
|
@@ -6,15 +6,13 @@ export declare function makeFilePath(path: string): string;
|
|
|
6
6
|
/**
|
|
7
7
|
* See vite/streamHelpers.ts.
|
|
8
8
|
*
|
|
9
|
-
* This function ensures we load the
|
|
10
|
-
* multiple instances of React
|
|
9
|
+
* This function ensures we load the same version of rsdw_client to prevent multiple instances of React
|
|
11
10
|
*/
|
|
12
11
|
export declare function importReact(): Promise<any>;
|
|
13
12
|
/**
|
|
14
13
|
* See vite/streamHelpers.ts.
|
|
15
14
|
*
|
|
16
|
-
* This function ensures we load the same version of rsdw_client
|
|
17
|
-
* prevent multiple instances of React
|
|
15
|
+
* This function ensures we load the same version of rsdw_client to prevent multiple instances of React
|
|
18
16
|
*/
|
|
19
17
|
export declare function importRsdwClient(): Promise<RSDWClientType>;
|
|
20
18
|
export declare function importRsdwServer(): Promise<RSDWServerType>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/rsc/utils.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,sCAAsC,CAAA;AACvF,OAAO,KAAK,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,sCAAsC,CAAA;AAIvF,KAAK,cAAc,GAAG,OAAO,gBAAgB,CAAA;AAC7C,KAAK,cAAc,GAAG,OAAO,gBAAgB,CAAA;AAE7C,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,UAExC;AAED
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/rsc/utils.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,sCAAsC,CAAA;AACvF,OAAO,KAAK,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,sCAAsC,CAAA;AAIvF,KAAK,cAAc,GAAG,OAAO,gBAAgB,CAAA;AAC7C,KAAK,cAAc,GAAG,OAAO,gBAAgB,CAAA;AAE7C,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,UAExC;AAED;;;;GAIG;AACH,wBAAsB,WAAW,iBAKhC;AAED;;;;GAIG;AACH,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,cAAc,CAAC,CAOhE;AAED,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,cAAc,CAAC,CAWhE"}
|
package/dist/cjs/rsc/utils.js
CHANGED
|
@@ -41,19 +41,11 @@ function makeFilePath(path2) {
|
|
|
41
41
|
return (0, import_node_url.pathToFileURL)(path2).href;
|
|
42
42
|
}
|
|
43
43
|
async function importReact() {
|
|
44
|
-
if (globalThis.__rwjs__vite_ssr_runtime) {
|
|
45
|
-
const reactMod = await import("react");
|
|
46
|
-
return reactMod.default;
|
|
47
|
-
}
|
|
48
44
|
const distSsr = (0, import_project_config.getPaths)().web.distSsr;
|
|
49
45
|
const reactPath = makeFilePath(import_node_path.default.join(distSsr, "__rwjs__react.mjs"));
|
|
50
46
|
return (await import(reactPath)).default;
|
|
51
47
|
}
|
|
52
48
|
async function importRsdwClient() {
|
|
53
|
-
if (globalThis.__rwjs__vite_ssr_runtime) {
|
|
54
|
-
const rsdwcMod = await import("react-server-dom-webpack/client.edge");
|
|
55
|
-
return rsdwcMod.default;
|
|
56
|
-
}
|
|
57
49
|
const distSsr = (0, import_project_config.getPaths)().web.distSsr;
|
|
58
50
|
const rsdwClientPath = makeFilePath(
|
|
59
51
|
import_node_path.default.join(distSsr, "__rwjs__rsdw-client.mjs")
|
|
@@ -61,18 +53,11 @@ async function importRsdwClient() {
|
|
|
61
53
|
return (await import(rsdwClientPath)).default;
|
|
62
54
|
}
|
|
63
55
|
async function importRsdwServer() {
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
} else {
|
|
70
|
-
const dynamicImport = "";
|
|
71
|
-
return import(
|
|
72
|
-
/* @vite-ignore */
|
|
73
|
-
dynamicImport + "react-server-dom-webpack/server.edge"
|
|
74
|
-
);
|
|
75
|
-
}
|
|
56
|
+
const dynamicImport = "";
|
|
57
|
+
return import(
|
|
58
|
+
/* @vite-ignore */
|
|
59
|
+
dynamicImport + "react-server-dom-webpack/server.edge"
|
|
60
|
+
);
|
|
76
61
|
}
|
|
77
62
|
// Annotate the CommonJS export names for ESM import in node:
|
|
78
63
|
0 && (module.exports = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RscCache.d.ts","sourceRoot":"","sources":["../../src/rsc/RscCache.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"RscCache.d.ts","sourceRoot":"","sources":["../../src/rsc/RscCache.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,QAAQ;IACvB,cAAc,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,CAAA;IACpC,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAC3B;AAED;;;;;;GAMG;AACH,qBAAa,QAAQ;IACnB,OAAO,CAAC,KAAK,CAAwC;IACrD,OAAO,CAAC,MAAM,CAAW;IACzB,OAAO,CAAC,WAAW,CAAI;IAEvB,OAAO,CAAC,SAAS,CAAQ;;IAgDzB,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,CAAC,QAAQ,CAAC,GAAG,SAAS;IAMhD,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAAC;IA2B1C,OAAO,CAAC,eAAe;IAsBvB,OAAO,CAAC,qBAAqB;CAW9B"}
|
package/dist/rsc/RscCache.js
CHANGED
|
@@ -1,13 +1,3 @@
|
|
|
1
|
-
class DummyWS {
|
|
2
|
-
readyState = WebSocket?.OPEN;
|
|
3
|
-
addEventListener() {
|
|
4
|
-
}
|
|
5
|
-
send() {
|
|
6
|
-
}
|
|
7
|
-
}
|
|
8
|
-
if (typeof globalThis.WebSocket === "undefined") {
|
|
9
|
-
globalThis.WebSocket = DummyWS;
|
|
10
|
-
}
|
|
11
1
|
class RscCache {
|
|
12
2
|
cache = /* @__PURE__ */ new Map();
|
|
13
3
|
socket;
|
|
@@ -76,7 +66,7 @@ class RscCache {
|
|
|
76
66
|
} else if (this.sendRetries >= 10) {
|
|
77
67
|
console.error("Exhausted retries to send message to WebSocket server.");
|
|
78
68
|
} else {
|
|
79
|
-
console.error("
|
|
69
|
+
console.error("WebSocket connection is closed.");
|
|
80
70
|
}
|
|
81
71
|
}
|
|
82
72
|
sendUpdateToWebSocket() {
|
package/dist/rsc/clientSsr.d.ts
CHANGED
|
@@ -1,9 +1,2 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Render the RW App's Routes.{tsx,jsx} component.
|
|
3
|
-
* In production, this function will read the Routes component from the App's
|
|
4
|
-
* dist directory.
|
|
5
|
-
* During dev, this function will use Vite to load the Routes component from
|
|
6
|
-
* the App's src directory.
|
|
7
|
-
*/
|
|
8
1
|
export declare function renderRoutesSsr(pathname: string): Promise<any>;
|
|
9
2
|
//# sourceMappingURL=clientSsr.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clientSsr.d.ts","sourceRoot":"","sources":["../../src/rsc/clientSsr.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"clientSsr.d.ts","sourceRoot":"","sources":["../../src/rsc/clientSsr.ts"],"names":[],"mappings":"AAuEA,wBAAsB,eAAe,CAAC,QAAQ,EAAE,MAAM,gBA2DrD"}
|
package/dist/rsc/clientSsr.js
CHANGED
|
@@ -1,28 +1,14 @@
|
|
|
1
1
|
import path from "node:path";
|
|
2
2
|
import { getPaths } from "@cedarjs/project-config";
|
|
3
3
|
import { moduleMap } from "./ssrModuleMap.js";
|
|
4
|
-
import { importRsdwClient,
|
|
4
|
+
import { importRsdwClient, importRsdwServer, importReact } from "./utils.js";
|
|
5
5
|
import { makeFilePath } from "./utils.js";
|
|
6
6
|
async function getEntries() {
|
|
7
|
-
if (globalThis.__rwjs__vite_ssr_runtime) {
|
|
8
|
-
return {
|
|
9
|
-
serverEntries: {
|
|
10
|
-
__rwjs__Routes: "../../src/Routes.tsx"
|
|
11
|
-
},
|
|
12
|
-
ssrEntries: {}
|
|
13
|
-
};
|
|
14
|
-
}
|
|
15
7
|
const entriesPath = getPaths().web.distRscEntries;
|
|
16
8
|
const entries = await import(makeFilePath(entriesPath));
|
|
17
9
|
return entries;
|
|
18
10
|
}
|
|
19
11
|
async function getRoutesComponent() {
|
|
20
|
-
if (globalThis.__rwjs__vite_rsc_runtime) {
|
|
21
|
-
const routesMod = await globalThis.__rwjs__vite_rsc_runtime.executeUrl(
|
|
22
|
-
getPaths().web.routes
|
|
23
|
-
);
|
|
24
|
-
return routesMod.default;
|
|
25
|
-
}
|
|
26
12
|
const { serverEntries } = await getEntries();
|
|
27
13
|
const entryPath = path.join(
|
|
28
14
|
getPaths().web.distRsc,
|
|
@@ -72,7 +58,7 @@ async function renderRoutesSsr(pathname) {
|
|
|
72
58
|
get(_target, encodedId) {
|
|
73
59
|
console.log("Proxy get encodedId", encodedId);
|
|
74
60
|
const [filePath, name] = encodedId.split("#");
|
|
75
|
-
const id =
|
|
61
|
+
const id = resolveClientEntryForProd(filePath, clientEntries);
|
|
76
62
|
console.log("clientSsr.ts::Proxy id", id);
|
|
77
63
|
return { id, chunks: [id], name, async: true };
|
|
78
64
|
}
|
|
@@ -81,26 +67,9 @@ async function renderRoutesSsr(pathname) {
|
|
|
81
67
|
const { createElement } = await importReact();
|
|
82
68
|
const { renderToReadableStream } = await importRsdwServer();
|
|
83
69
|
console.log("clientSsr.ts right before renderToReadableStream");
|
|
84
|
-
const
|
|
85
|
-
createElement(Routes),
|
|
86
|
-
bundlerConfig
|
|
87
|
-
);
|
|
88
|
-
const [streamForLogging, streamForRendering] = originalStream.tee();
|
|
89
|
-
(async () => {
|
|
90
|
-
const reader = streamForLogging.getReader();
|
|
91
|
-
const decoder = new TextDecoder();
|
|
92
|
-
let logContent = "";
|
|
93
|
-
while (true) {
|
|
94
|
-
const { done, value } = await reader.read();
|
|
95
|
-
if (done) {
|
|
96
|
-
break;
|
|
97
|
-
}
|
|
98
|
-
logContent += decoder.decode(value, { stream: true });
|
|
99
|
-
}
|
|
100
|
-
console.log("Stream content:", logContent);
|
|
101
|
-
})();
|
|
70
|
+
const stream = renderToReadableStream(createElement(Routes), bundlerConfig);
|
|
102
71
|
const { createFromReadableStream } = await importRsdwClient();
|
|
103
|
-
const data = createFromReadableStream(
|
|
72
|
+
const data = createFromReadableStream(stream, {
|
|
104
73
|
ssrManifest: { moduleMap, moduleLoading: null }
|
|
105
74
|
});
|
|
106
75
|
rscCache.set(pathname, data);
|
package/dist/rsc/utils.d.ts
CHANGED
|
@@ -6,15 +6,13 @@ export declare function makeFilePath(path: string): string;
|
|
|
6
6
|
/**
|
|
7
7
|
* See vite/streamHelpers.ts.
|
|
8
8
|
*
|
|
9
|
-
* This function ensures we load the
|
|
10
|
-
* multiple instances of React
|
|
9
|
+
* This function ensures we load the same version of rsdw_client to prevent multiple instances of React
|
|
11
10
|
*/
|
|
12
11
|
export declare function importReact(): Promise<any>;
|
|
13
12
|
/**
|
|
14
13
|
* See vite/streamHelpers.ts.
|
|
15
14
|
*
|
|
16
|
-
* This function ensures we load the same version of rsdw_client
|
|
17
|
-
* prevent multiple instances of React
|
|
15
|
+
* This function ensures we load the same version of rsdw_client to prevent multiple instances of React
|
|
18
16
|
*/
|
|
19
17
|
export declare function importRsdwClient(): Promise<RSDWClientType>;
|
|
20
18
|
export declare function importRsdwServer(): Promise<RSDWServerType>;
|
package/dist/rsc/utils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/rsc/utils.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,sCAAsC,CAAA;AACvF,OAAO,KAAK,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,sCAAsC,CAAA;AAIvF,KAAK,cAAc,GAAG,OAAO,gBAAgB,CAAA;AAC7C,KAAK,cAAc,GAAG,OAAO,gBAAgB,CAAA;AAE7C,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,UAExC;AAED
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/rsc/utils.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,sCAAsC,CAAA;AACvF,OAAO,KAAK,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,sCAAsC,CAAA;AAIvF,KAAK,cAAc,GAAG,OAAO,gBAAgB,CAAA;AAC7C,KAAK,cAAc,GAAG,OAAO,gBAAgB,CAAA;AAE7C,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,UAExC;AAED;;;;GAIG;AACH,wBAAsB,WAAW,iBAKhC;AAED;;;;GAIG;AACH,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,cAAc,CAAC,CAOhE;AAED,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,cAAc,CAAC,CAWhE"}
|
package/dist/rsc/utils.js
CHANGED
|
@@ -5,19 +5,11 @@ function makeFilePath(path2) {
|
|
|
5
5
|
return pathToFileURL(path2).href;
|
|
6
6
|
}
|
|
7
7
|
async function importReact() {
|
|
8
|
-
if (globalThis.__rwjs__vite_ssr_runtime) {
|
|
9
|
-
const reactMod = await import("react");
|
|
10
|
-
return reactMod.default;
|
|
11
|
-
}
|
|
12
8
|
const distSsr = getPaths().web.distSsr;
|
|
13
9
|
const reactPath = makeFilePath(path.join(distSsr, "__rwjs__react.mjs"));
|
|
14
10
|
return (await import(reactPath)).default;
|
|
15
11
|
}
|
|
16
12
|
async function importRsdwClient() {
|
|
17
|
-
if (globalThis.__rwjs__vite_ssr_runtime) {
|
|
18
|
-
const rsdwcMod = await import("react-server-dom-webpack/client.edge");
|
|
19
|
-
return rsdwcMod.default;
|
|
20
|
-
}
|
|
21
13
|
const distSsr = getPaths().web.distSsr;
|
|
22
14
|
const rsdwClientPath = makeFilePath(
|
|
23
15
|
path.join(distSsr, "__rwjs__rsdw-client.mjs")
|
|
@@ -25,18 +17,11 @@ async function importRsdwClient() {
|
|
|
25
17
|
return (await import(rsdwClientPath)).default;
|
|
26
18
|
}
|
|
27
19
|
async function importRsdwServer() {
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
} else {
|
|
34
|
-
const dynamicImport = "";
|
|
35
|
-
return import(
|
|
36
|
-
/* @vite-ignore */
|
|
37
|
-
dynamicImport + "react-server-dom-webpack/server.edge"
|
|
38
|
-
);
|
|
39
|
-
}
|
|
20
|
+
const dynamicImport = "";
|
|
21
|
+
return import(
|
|
22
|
+
/* @vite-ignore */
|
|
23
|
+
dynamicImport + "react-server-dom-webpack/server.edge"
|
|
24
|
+
);
|
|
40
25
|
}
|
|
41
26
|
export {
|
|
42
27
|
importReact,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cedarjs/router",
|
|
3
|
-
"version": "1.0.0-
|
|
3
|
+
"version": "1.0.0-rc.26",
|
|
4
4
|
"repository": {
|
|
5
5
|
"type": "git",
|
|
6
6
|
"url": "git+https://github.com/cedarjs/cedar.git",
|
|
@@ -95,18 +95,17 @@
|
|
|
95
95
|
},
|
|
96
96
|
"dependencies": {
|
|
97
97
|
"@babel/runtime-corejs3": "7.27.6",
|
|
98
|
-
"@cedarjs/auth": "1.0.0-
|
|
99
|
-
"@cedarjs/server-store": "1.0.0-
|
|
98
|
+
"@cedarjs/auth": "1.0.0-rc.26",
|
|
99
|
+
"@cedarjs/server-store": "1.0.0-rc.26",
|
|
100
100
|
"core-js": "3.42.0",
|
|
101
|
-
"react": "
|
|
102
|
-
"react-dom": "
|
|
103
|
-
"react-server-dom-webpack": "19.0.0-rc-f2df5694-20240916"
|
|
101
|
+
"react": "18.3.1",
|
|
102
|
+
"react-dom": "18.3.1"
|
|
104
103
|
},
|
|
105
104
|
"devDependencies": {
|
|
106
105
|
"@arethetypeswrong/cli": "0.18.2",
|
|
107
106
|
"@babel/cli": "7.27.2",
|
|
108
107
|
"@babel/core": "^7.26.10",
|
|
109
|
-
"@cedarjs/framework-tools": "1.0.0-
|
|
108
|
+
"@cedarjs/framework-tools": "1.0.0-rc.26",
|
|
110
109
|
"@testing-library/jest-dom": "6.5.0",
|
|
111
110
|
"@types/react": "^18.2.55",
|
|
112
111
|
"@types/react-dom": "^18.2.19",
|
|
@@ -118,11 +117,11 @@
|
|
|
118
117
|
"vitest": "3.2.4"
|
|
119
118
|
},
|
|
120
119
|
"peerDependencies": {
|
|
121
|
-
"react": "
|
|
122
|
-
"react-dom": "
|
|
120
|
+
"react": "18.3.1",
|
|
121
|
+
"react-dom": "18.3.1"
|
|
123
122
|
},
|
|
124
123
|
"publishConfig": {
|
|
125
124
|
"access": "public"
|
|
126
125
|
},
|
|
127
|
-
"gitHead": "
|
|
126
|
+
"gitHead": "2ea84a564123f5d986dd88efcb6dddc55cbef367"
|
|
128
127
|
}
|