reactivated 0.47.7 → 0.47.8-a3043
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/eslint.config.js +0 -1
- package/dist/eslint.config.js.map +1 -1
- package/dist/generator.mjs +8 -3
- package/dist/generator.mjs.map +1 -1
- package/dist/render.mjs +13 -8
- package/dist/render.mjs.map +1 -1
- package/package.json +1 -1
- package/src/eslint.config.ts +0 -1
- package/src/generator.mts +9 -3
- package/src/render.mts +28 -12
package/dist/eslint.config.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eslint.config.js","sourceRoot":"","sources":["../src/eslint.config.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,YAAY,CAAC;AAEhC,OAAO,oBAAoB,MAAM,wBAAwB,CAAC;AAE1D,sDAAsD;AACtD,aAAa;AACb,OAAO,YAAY,MAAM,sBAAsB,CAAC;AAChD,OAAO,WAAW,MAAM,qBAAqB,CAAC;AAC9C,aAAa;AACb,OAAO,WAAW,MAAM,2BAA2B,CAAC;AACpD,OAAO,aAAa,MAAM,8BAA8B,CAAC;AACzD,OAAO,QAAQ,MAAM,mBAAmB,CAAC;AAEzC,eAAe,QAAQ,CAAC,MAAM,CAC1B;IACI,eAAe,EAAE;QACb,aAAa,EAAE;YACX,
|
|
1
|
+
{"version":3,"file":"eslint.config.js","sourceRoot":"","sources":["../src/eslint.config.ts"],"names":[],"mappings":"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"}
|
package/dist/generator.mjs
CHANGED
|
@@ -266,8 +266,12 @@ export type models = _Types["globals"]["models"];
|
|
|
266
266
|
export type {FieldHandler} from "./forms";
|
|
267
267
|
export {Form, FormSet, Widget, useForm, useFormSet, ManagementForm} from "reactivated/dist/forms";
|
|
268
268
|
export {Iterator, CSRFToken, createRenderer} from "./forms";
|
|
269
|
+
`);
|
|
270
|
+
if (!("REACTIVATED_NO_GET_TEMPLATE" in process.env)) {
|
|
271
|
+
sourceFile.addStatements(`
|
|
269
272
|
export {getTemplate} from "./template";
|
|
270
273
|
`);
|
|
274
|
+
}
|
|
271
275
|
const formsContent = `
|
|
272
276
|
import type {_Types} from "./index";
|
|
273
277
|
import * as forms from "reactivated/dist/forms";
|
|
@@ -294,11 +298,12 @@ type TMutableContext = TContext & {
|
|
|
294
298
|
export const Context = React.createContext<TMutableContext>(null!);
|
|
295
299
|
`;
|
|
296
300
|
const templateContent = `
|
|
297
|
-
|
|
298
|
-
|
|
301
|
+
// @ts-ignore
|
|
302
|
+
const templates = import.meta.glob("@client/templates/*.tsx", {eager: true});
|
|
299
303
|
|
|
304
|
+
export const getTemplate = async ({template_name}: {template_name: string}) => {
|
|
300
305
|
const templatePath = \`/client/templates/\${template_name}.tsx\`;
|
|
301
|
-
const TemplateModule =
|
|
306
|
+
const TemplateModule = templates[templatePath] as {Template: React.ComponentType<any>}
|
|
302
307
|
return TemplateModule.Template;
|
|
303
308
|
}
|
|
304
309
|
`;
|
package/dist/generator.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.mjs","sourceRoot":"","sources":["../src/generator.mts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"generator.mjs","sourceRoot":"","sources":["../src/generator.mts"],"names":[],"mappings":"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"}
|
package/dist/render.mjs
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import React from "react";
|
|
2
2
|
import { renderToPipeableStream } from "react-dom/server";
|
|
3
|
+
import { preinit, preinitModule } from "react-dom";
|
|
3
4
|
import { Transform } from "node:stream";
|
|
4
5
|
import { serializeError } from "./errors.js";
|
|
5
6
|
// @ts-ignore
|
|
@@ -10,6 +11,16 @@ const defaultRenderer = (content) => Promise.resolve(content);
|
|
|
10
11
|
function serJSON(data) {
|
|
11
12
|
return JSON.stringify(data).replace(/</g, "\\u003c");
|
|
12
13
|
}
|
|
14
|
+
function ResourceLoader({ mode, staticUrl, entryPoint, children, }) {
|
|
15
|
+
if (mode === "production") {
|
|
16
|
+
preinit(`${staticUrl}dist/${entryPoint}.css`, { as: "style" });
|
|
17
|
+
preinitModule(`${staticUrl}dist/${entryPoint}.js`, { crossOrigin: "anonymous" });
|
|
18
|
+
}
|
|
19
|
+
else {
|
|
20
|
+
preinitModule(`${staticUrl}dist/client/${entryPoint}.tsx`);
|
|
21
|
+
}
|
|
22
|
+
return React.createElement(React.Fragment, null, children);
|
|
23
|
+
}
|
|
13
24
|
export const render = async (req, res, vite, mode, entryPoint, ssrFixStacktrace) => {
|
|
14
25
|
// @ts-ignore
|
|
15
26
|
const customConfiguration = import.meta.glob("@client/renderer.tsx", { eager: true })["/client/renderer.tsx"];
|
|
@@ -20,13 +31,7 @@ export const render = async (req, res, vite, mode, entryPoint, ssrFixStacktrace)
|
|
|
20
31
|
if (STATIC_URL == null) {
|
|
21
32
|
console.error("Ensure your context processor includes STATIC_URL");
|
|
22
33
|
}
|
|
23
|
-
const
|
|
24
|
-
? `<link rel="stylesheet" type="text/css" href="${STATIC_URL}dist/${entryPoint}.css">`
|
|
25
|
-
: "";
|
|
26
|
-
const js = mode == "production"
|
|
27
|
-
? `<script type="module" src="${STATIC_URL}dist/${entryPoint}.js" defer crossOrigin="anonymous"></script>`
|
|
28
|
-
: `<script type="module" src="${STATIC_URL}dist/client/${entryPoint}.tsx"></script>`;
|
|
29
|
-
const content = React.createElement(React.StrictMode, {}, React.createElement(Provider, { value: context }, React.createElement(Template, props)));
|
|
34
|
+
const content = React.createElement(React.StrictMode, {}, React.createElement(ResourceLoader, { mode, staticUrl: STATIC_URL, entryPoint }, React.createElement(Provider, { value: context }, React.createElement(Template, props))));
|
|
30
35
|
let hasError = false;
|
|
31
36
|
const { pipe } = renderToPipeableStream(await (customConfiguration?.default ?? defaultRenderer)(content, {
|
|
32
37
|
context,
|
|
@@ -63,7 +68,7 @@ export const render = async (req, res, vite, mode, entryPoint, ssrFixStacktrace)
|
|
|
63
68
|
},
|
|
64
69
|
});
|
|
65
70
|
transformStream.on("finish", () => {
|
|
66
|
-
res.end(vite
|
|
71
|
+
res.end(vite);
|
|
67
72
|
});
|
|
68
73
|
pipe(transformStream);
|
|
69
74
|
},
|
package/dist/render.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render.mjs","sourceRoot":"","sources":["../src/render.mts"],"names":[],"mappings":"AACA,OAAO,KAAiB,MAAM,OAAO,CAAC;AAGtC,OAAO,EAAC,sBAAsB,EAAC,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAC,SAAS,EAAC,MAAM,aAAa,CAAC;AAEtC,OAAO,EAAmB,cAAc,EAAC,MAAM,aAAa,CAAC;AAC7D,aAAa;AACb,OAAO,EAAC,QAAQ,EAAC,MAAM,cAAc,CAAC;AACtC,aAAa;AACb,OAAO,EAAC,WAAW,EAAC,MAAM,uBAAuB,CAAC;AAUlD,MAAM,eAAe,GAAa,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;AAExE,SAAS,OAAO,CAAC,IAAa;IAC1B,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;AACzD,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAAG,KAAK,EACvB,GAAY,EACZ,GAAa,EACb,IAAY,EACZ,IAAkC,EAClC,UAAkB,EAClB,gBAAyC,EAC3C,EAAE;IACA,aAAa;IACb,MAAM,mBAAmB,GAAgC,MAAM,CAAC,IAAI,CAAC,IAAI,CACrE,sBAAsB,EACtB,EAAC,KAAK,EAAE,IAAI,EAAC,CAChB,CAAC,sBAAsB,CAAC,CAAC;IAE1B,MAAM,EAAC,OAAO,EAAE,KAAK,EAAC,GAAG,GAAG,CAAC,IAAI,CAAC;IAClC,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,OAAO,CAAC,CAAC;IAC5C,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,SAAS,IAAI,SAAS,CAAC;IAE3D,MAAM,EAAC,UAAU,EAAC,GAAG,OAAO,CAAC;IAE7B,IAAI,UAAU,IAAI,IAAI,EAAE,CAAC;QACrB,OAAO,CAAC,KAAK,CAAC,mDAAmD,CAAC,CAAC;IACvE,CAAC;
|
|
1
|
+
{"version":3,"file":"render.mjs","sourceRoot":"","sources":["../src/render.mts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/eslint.config.ts
CHANGED
package/src/generator.mts
CHANGED
|
@@ -332,8 +332,13 @@ export type models = _Types["globals"]["models"];
|
|
|
332
332
|
export type {FieldHandler} from "./forms";
|
|
333
333
|
export {Form, FormSet, Widget, useForm, useFormSet, ManagementForm} from "reactivated/dist/forms";
|
|
334
334
|
export {Iterator, CSRFToken, createRenderer} from "./forms";
|
|
335
|
+
`);
|
|
336
|
+
|
|
337
|
+
if (!("REACTIVATED_NO_GET_TEMPLATE" in process.env)) {
|
|
338
|
+
sourceFile.addStatements(`
|
|
335
339
|
export {getTemplate} from "./template";
|
|
336
340
|
`);
|
|
341
|
+
}
|
|
337
342
|
|
|
338
343
|
const formsContent = `
|
|
339
344
|
import type {_Types} from "./index";
|
|
@@ -363,11 +368,12 @@ export const Context = React.createContext<TMutableContext>(null!);
|
|
|
363
368
|
`;
|
|
364
369
|
|
|
365
370
|
const templateContent = `
|
|
366
|
-
|
|
367
|
-
|
|
371
|
+
// @ts-ignore
|
|
372
|
+
const templates = import.meta.glob("@client/templates/*.tsx", {eager: true});
|
|
368
373
|
|
|
374
|
+
export const getTemplate = async ({template_name}: {template_name: string}) => {
|
|
369
375
|
const templatePath = \`/client/templates/\${template_name}.tsx\`;
|
|
370
|
-
const TemplateModule =
|
|
376
|
+
const TemplateModule = templates[templatePath] as {Template: React.ComponentType<any>}
|
|
371
377
|
return TemplateModule.Template;
|
|
372
378
|
}
|
|
373
379
|
`;
|
package/src/render.mts
CHANGED
|
@@ -3,6 +3,7 @@ import React, {type JSX} from "react";
|
|
|
3
3
|
import {Response} from "express";
|
|
4
4
|
import ReactDOMServer from "react-dom/server";
|
|
5
5
|
import {renderToPipeableStream} from "react-dom/server";
|
|
6
|
+
import {preinit, preinitModule} from "react-dom";
|
|
6
7
|
import {Transform} from "node:stream";
|
|
7
8
|
|
|
8
9
|
import {SSRErrorResponse, serializeError} from "./errors.js";
|
|
@@ -25,6 +26,25 @@ function serJSON(data: unknown): string {
|
|
|
25
26
|
return JSON.stringify(data).replace(/</g, "\\u003c");
|
|
26
27
|
}
|
|
27
28
|
|
|
29
|
+
function ResourceLoader({
|
|
30
|
+
mode,
|
|
31
|
+
staticUrl,
|
|
32
|
+
entryPoint,
|
|
33
|
+
children,
|
|
34
|
+
}: React.PropsWithChildren<{
|
|
35
|
+
mode: "production" | "development";
|
|
36
|
+
staticUrl: string;
|
|
37
|
+
entryPoint: string;
|
|
38
|
+
}>) {
|
|
39
|
+
if (mode === "production") {
|
|
40
|
+
preinit(`${staticUrl}dist/${entryPoint}.css`, {as: "style"});
|
|
41
|
+
preinitModule(`${staticUrl}dist/${entryPoint}.js`, {crossOrigin: "anonymous"});
|
|
42
|
+
} else {
|
|
43
|
+
preinitModule(`${staticUrl}dist/client/${entryPoint}.tsx`);
|
|
44
|
+
}
|
|
45
|
+
return React.createElement(React.Fragment, null, children);
|
|
46
|
+
}
|
|
47
|
+
|
|
28
48
|
export const render = async (
|
|
29
49
|
req: Request,
|
|
30
50
|
res: Response,
|
|
@@ -48,22 +68,18 @@ export const render = async (
|
|
|
48
68
|
if (STATIC_URL == null) {
|
|
49
69
|
console.error("Ensure your context processor includes STATIC_URL");
|
|
50
70
|
}
|
|
51
|
-
const css =
|
|
52
|
-
mode == "production"
|
|
53
|
-
? `<link rel="stylesheet" type="text/css" href="${STATIC_URL}dist/${entryPoint}.css">`
|
|
54
|
-
: "";
|
|
55
|
-
const js =
|
|
56
|
-
mode == "production"
|
|
57
|
-
? `<script type="module" src="${STATIC_URL}dist/${entryPoint}.js" defer crossOrigin="anonymous"></script>`
|
|
58
|
-
: `<script type="module" src="${STATIC_URL}dist/client/${entryPoint}.tsx"></script>`;
|
|
59
71
|
|
|
60
72
|
const content = React.createElement(
|
|
61
73
|
React.StrictMode,
|
|
62
74
|
{},
|
|
63
75
|
React.createElement(
|
|
64
|
-
|
|
65
|
-
{
|
|
66
|
-
React.createElement(
|
|
76
|
+
ResourceLoader,
|
|
77
|
+
{mode, staticUrl: STATIC_URL, entryPoint},
|
|
78
|
+
React.createElement(
|
|
79
|
+
Provider,
|
|
80
|
+
{value: context},
|
|
81
|
+
React.createElement(Template, props),
|
|
82
|
+
),
|
|
67
83
|
),
|
|
68
84
|
);
|
|
69
85
|
|
|
@@ -107,7 +123,7 @@ export const render = async (
|
|
|
107
123
|
},
|
|
108
124
|
});
|
|
109
125
|
transformStream.on("finish", () => {
|
|
110
|
-
res.end(vite
|
|
126
|
+
res.end(vite);
|
|
111
127
|
});
|
|
112
128
|
|
|
113
129
|
pipe(transformStream);
|