@makeswift/express-react 0.1.12-canary.9 → 0.2.0-canary.19

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.
@@ -25,13 +25,22 @@ var import_jsx_runtime = require("react/jsx-runtime");
25
25
  var import_server = require("react-dom/server");
26
26
  var import_stream = require("stream");
27
27
  var import_unstable_framework_support = require("@makeswift/runtime/unstable-framework-support");
28
- function renderHtml(children, { cacheKey, enableCssReset } = {}) {
29
- const cache = (0, import_unstable_framework_support.createRootStyleCache)({ key: cacheKey });
30
- const getStyles = () => (0, import_unstable_framework_support.styleTagHtml)({ cacheKey: cache.key, ...cache.flush() });
28
+ function renderHtml(children, { classNamePrefix, enableCssReset } = {}) {
29
+ const stylesRegistry = (0, import_unstable_framework_support.createMakeswiftStylesRegistry)();
30
+ const getStyles = () => stylesRegistry.serializeToHtmlStyleTags();
31
31
  return new Promise((resolve, reject) => {
32
32
  let html = "";
33
33
  const { pipe } = (0, import_server.renderToPipeableStream)(
34
- /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_unstable_framework_support.RootStyleRegistry, { cache, enableCssReset, children }),
34
+ /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
35
+ import_unstable_framework_support.RootStyleRegistry,
36
+ {
37
+ classNamePrefix,
38
+ enableCssReset,
39
+ stylesRegistry,
40
+ shouldRenderStyleElements: false,
41
+ children
42
+ }
43
+ ),
35
44
  {
36
45
  onAllReady() {
37
46
  pipe(
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../src/server/render.tsx"],"sourcesContent":["import { renderToPipeableStream } from 'react-dom/server'\nimport { Writable } from 'stream'\n\nimport { type ReactNode } from 'react'\n\nimport {\n createRootStyleCache,\n RootStyleRegistry,\n styleTagHtml,\n type RootStyleProps,\n} from '@makeswift/runtime/unstable-framework-support'\n\nexport function renderHtml(\n children: ReactNode,\n { cacheKey, enableCssReset }: RootStyleProps = {},\n): Promise<{ getStyles: () => string; html: string }> {\n const cache = createRootStyleCache({ key: cacheKey })\n const getStyles = () => styleTagHtml({ cacheKey: cache.key, ...cache.flush() })\n\n return new Promise((resolve, reject) => {\n let html = ''\n\n const { pipe } = renderToPipeableStream(\n <RootStyleRegistry cache={cache} enableCssReset={enableCssReset}>\n {children}\n </RootStyleRegistry>,\n {\n onAllReady() {\n pipe(\n new Writable({\n write(chunk, _enc, cb) {\n html += chunk\n cb()\n },\n final() {\n resolve({ html, getStyles })\n },\n }),\n )\n },\n onError: reject,\n },\n )\n })\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAuBM;AAvBN,oBAAuC;AACvC,oBAAyB;AAIzB,wCAKO;AAEA,SAAS,WACd,UACA,EAAE,UAAU,eAAe,IAAoB,CAAC,GACI;AACpD,QAAM,YAAQ,wDAAqB,EAAE,KAAK,SAAS,CAAC;AACpD,QAAM,YAAY,UAAM,gDAAa,EAAE,UAAU,MAAM,KAAK,GAAG,MAAM,MAAM,EAAE,CAAC;AAE9E,SAAO,IAAI,QAAQ,CAAC,SAAS,WAAW;AACtC,QAAI,OAAO;AAEX,UAAM,EAAE,KAAK,QAAI;AAAA,MACf,4CAAC,uDAAkB,OAAc,gBAC9B,UACH;AAAA,MACA;AAAA,QACE,aAAa;AACX;AAAA,YACE,IAAI,uBAAS;AAAA,cACX,MAAM,OAAO,MAAM,IAAI;AACrB,wBAAQ;AACR,mBAAG;AAAA,cACL;AAAA,cACA,QAAQ;AACN,wBAAQ,EAAE,MAAM,UAAU,CAAC;AAAA,cAC7B;AAAA,YACF,CAAC;AAAA,UACH;AAAA,QACF;AAAA,QACA,SAAS;AAAA,MACX;AAAA,IACF;AAAA,EACF,CAAC;AACH;","names":[]}
1
+ {"version":3,"sources":["../../../src/server/render.tsx"],"sourcesContent":["import { renderToPipeableStream } from 'react-dom/server'\nimport { Writable } from 'stream'\n\nimport { type ReactNode } from 'react'\n\nimport {\n createMakeswiftStylesRegistry,\n RootStyleRegistry,\n type RootStyleProps,\n} from '@makeswift/runtime/unstable-framework-support'\n\nexport function renderHtml(\n children: ReactNode,\n { classNamePrefix, enableCssReset }: RootStyleProps = {},\n): Promise<{ getStyles: () => string; html: string }> {\n const stylesRegistry = createMakeswiftStylesRegistry()\n const getStyles = () => stylesRegistry.serializeToHtmlStyleTags()\n\n return new Promise((resolve, reject) => {\n let html = ''\n\n const { pipe } = renderToPipeableStream(\n <RootStyleRegistry\n classNamePrefix={classNamePrefix}\n enableCssReset={enableCssReset}\n stylesRegistry={stylesRegistry}\n shouldRenderStyleElements={false}\n >\n {children}\n </RootStyleRegistry>,\n {\n onAllReady() {\n pipe(\n new Writable({\n write(chunk, _enc, cb) {\n html += chunk\n cb()\n },\n final() {\n resolve({ html, getStyles })\n },\n }),\n )\n },\n onError: reject,\n },\n )\n })\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAsBM;AAtBN,oBAAuC;AACvC,oBAAyB;AAIzB,wCAIO;AAEA,SAAS,WACd,UACA,EAAE,iBAAiB,eAAe,IAAoB,CAAC,GACH;AACpD,QAAM,qBAAiB,iEAA8B;AACrD,QAAM,YAAY,MAAM,eAAe,yBAAyB;AAEhE,SAAO,IAAI,QAAQ,CAAC,SAAS,WAAW;AACtC,QAAI,OAAO;AAEX,UAAM,EAAE,KAAK,QAAI;AAAA,MACf;AAAA,QAAC;AAAA;AAAA,UACC;AAAA,UACA;AAAA,UACA;AAAA,UACA,2BAA2B;AAAA,UAE1B;AAAA;AAAA,MACH;AAAA,MACA;AAAA,QACE,aAAa;AACX;AAAA,YACE,IAAI,uBAAS;AAAA,cACX,MAAM,OAAO,MAAM,IAAI;AACrB,wBAAQ;AACR,mBAAG;AAAA,cACL;AAAA,cACA,QAAQ;AACN,wBAAQ,EAAE,MAAM,UAAU,CAAC;AAAA,cAC7B;AAAA,YACF,CAAC;AAAA,UACH;AAAA,QACF;AAAA,QACA,SAAS;AAAA,MACX;AAAA,IACF;AAAA,EACF,CAAC;AACH;","names":[]}
@@ -2,17 +2,25 @@ import { jsx } from "react/jsx-runtime";
2
2
  import { renderToPipeableStream } from "react-dom/server";
3
3
  import { Writable } from "stream";
4
4
  import {
5
- createRootStyleCache,
6
- RootStyleRegistry,
7
- styleTagHtml
5
+ createMakeswiftStylesRegistry,
6
+ RootStyleRegistry
8
7
  } from "@makeswift/runtime/unstable-framework-support";
9
- function renderHtml(children, { cacheKey, enableCssReset } = {}) {
10
- const cache = createRootStyleCache({ key: cacheKey });
11
- const getStyles = () => styleTagHtml({ cacheKey: cache.key, ...cache.flush() });
8
+ function renderHtml(children, { classNamePrefix, enableCssReset } = {}) {
9
+ const stylesRegistry = createMakeswiftStylesRegistry();
10
+ const getStyles = () => stylesRegistry.serializeToHtmlStyleTags();
12
11
  return new Promise((resolve, reject) => {
13
12
  let html = "";
14
13
  const { pipe } = renderToPipeableStream(
15
- /* @__PURE__ */ jsx(RootStyleRegistry, { cache, enableCssReset, children }),
14
+ /* @__PURE__ */ jsx(
15
+ RootStyleRegistry,
16
+ {
17
+ classNamePrefix,
18
+ enableCssReset,
19
+ stylesRegistry,
20
+ shouldRenderStyleElements: false,
21
+ children
22
+ }
23
+ ),
16
24
  {
17
25
  onAllReady() {
18
26
  pipe(
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../src/server/render.tsx"],"sourcesContent":["import { renderToPipeableStream } from 'react-dom/server'\nimport { Writable } from 'stream'\n\nimport { type ReactNode } from 'react'\n\nimport {\n createRootStyleCache,\n RootStyleRegistry,\n styleTagHtml,\n type RootStyleProps,\n} from '@makeswift/runtime/unstable-framework-support'\n\nexport function renderHtml(\n children: ReactNode,\n { cacheKey, enableCssReset }: RootStyleProps = {},\n): Promise<{ getStyles: () => string; html: string }> {\n const cache = createRootStyleCache({ key: cacheKey })\n const getStyles = () => styleTagHtml({ cacheKey: cache.key, ...cache.flush() })\n\n return new Promise((resolve, reject) => {\n let html = ''\n\n const { pipe } = renderToPipeableStream(\n <RootStyleRegistry cache={cache} enableCssReset={enableCssReset}>\n {children}\n </RootStyleRegistry>,\n {\n onAllReady() {\n pipe(\n new Writable({\n write(chunk, _enc, cb) {\n html += chunk\n cb()\n },\n final() {\n resolve({ html, getStyles })\n },\n }),\n )\n },\n onError: reject,\n },\n )\n })\n}\n"],"mappings":"AAuBM;AAvBN,SAAS,8BAA8B;AACvC,SAAS,gBAAgB;AAIzB;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,OAEK;AAEA,SAAS,WACd,UACA,EAAE,UAAU,eAAe,IAAoB,CAAC,GACI;AACpD,QAAM,QAAQ,qBAAqB,EAAE,KAAK,SAAS,CAAC;AACpD,QAAM,YAAY,MAAM,aAAa,EAAE,UAAU,MAAM,KAAK,GAAG,MAAM,MAAM,EAAE,CAAC;AAE9E,SAAO,IAAI,QAAQ,CAAC,SAAS,WAAW;AACtC,QAAI,OAAO;AAEX,UAAM,EAAE,KAAK,IAAI;AAAA,MACf,oBAAC,qBAAkB,OAAc,gBAC9B,UACH;AAAA,MACA;AAAA,QACE,aAAa;AACX;AAAA,YACE,IAAI,SAAS;AAAA,cACX,MAAM,OAAO,MAAM,IAAI;AACrB,wBAAQ;AACR,mBAAG;AAAA,cACL;AAAA,cACA,QAAQ;AACN,wBAAQ,EAAE,MAAM,UAAU,CAAC;AAAA,cAC7B;AAAA,YACF,CAAC;AAAA,UACH;AAAA,QACF;AAAA,QACA,SAAS;AAAA,MACX;AAAA,IACF;AAAA,EACF,CAAC;AACH;","names":[]}
1
+ {"version":3,"sources":["../../../src/server/render.tsx"],"sourcesContent":["import { renderToPipeableStream } from 'react-dom/server'\nimport { Writable } from 'stream'\n\nimport { type ReactNode } from 'react'\n\nimport {\n createMakeswiftStylesRegistry,\n RootStyleRegistry,\n type RootStyleProps,\n} from '@makeswift/runtime/unstable-framework-support'\n\nexport function renderHtml(\n children: ReactNode,\n { classNamePrefix, enableCssReset }: RootStyleProps = {},\n): Promise<{ getStyles: () => string; html: string }> {\n const stylesRegistry = createMakeswiftStylesRegistry()\n const getStyles = () => stylesRegistry.serializeToHtmlStyleTags()\n\n return new Promise((resolve, reject) => {\n let html = ''\n\n const { pipe } = renderToPipeableStream(\n <RootStyleRegistry\n classNamePrefix={classNamePrefix}\n enableCssReset={enableCssReset}\n stylesRegistry={stylesRegistry}\n shouldRenderStyleElements={false}\n >\n {children}\n </RootStyleRegistry>,\n {\n onAllReady() {\n pipe(\n new Writable({\n write(chunk, _enc, cb) {\n html += chunk\n cb()\n },\n final() {\n resolve({ html, getStyles })\n },\n }),\n )\n },\n onError: reject,\n },\n )\n })\n}\n"],"mappings":"AAsBM;AAtBN,SAAS,8BAA8B;AACvC,SAAS,gBAAgB;AAIzB;AAAA,EACE;AAAA,EACA;AAAA,OAEK;AAEA,SAAS,WACd,UACA,EAAE,iBAAiB,eAAe,IAAoB,CAAC,GACH;AACpD,QAAM,iBAAiB,8BAA8B;AACrD,QAAM,YAAY,MAAM,eAAe,yBAAyB;AAEhE,SAAO,IAAI,QAAQ,CAAC,SAAS,WAAW;AACtC,QAAI,OAAO;AAEX,UAAM,EAAE,KAAK,IAAI;AAAA,MACf;AAAA,QAAC;AAAA;AAAA,UACC;AAAA,UACA;AAAA,UACA;AAAA,UACA,2BAA2B;AAAA,UAE1B;AAAA;AAAA,MACH;AAAA,MACA;AAAA,QACE,aAAa;AACX;AAAA,YACE,IAAI,SAAS;AAAA,cACX,MAAM,OAAO,MAAM,IAAI;AACrB,wBAAQ;AACR,mBAAG;AAAA,cACL;AAAA,cACA,QAAQ;AACN,wBAAQ,EAAE,MAAM,UAAU,CAAC;AAAA,cAC7B;AAAA,YACF,CAAC;AAAA,UACH;AAAA,QACF;AAAA,QACA,SAAS;AAAA,MACX;AAAA,IACF;AAAA,EACF,CAAC;AACH;","names":[]}
@@ -1,6 +1,6 @@
1
1
  import { type ReactNode } from 'react';
2
2
  import { type RootStyleProps } from '@makeswift/runtime/unstable-framework-support';
3
- export declare function renderHtml(children: ReactNode, { cacheKey, enableCssReset }?: RootStyleProps): Promise<{
3
+ export declare function renderHtml(children: ReactNode, { classNamePrefix, enableCssReset }?: RootStyleProps): Promise<{
4
4
  getStyles: () => string;
5
5
  html: string;
6
6
  }>;
@@ -1 +1 @@
1
- {"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../../../src/server/render.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,OAAO,CAAA;AAEtC,OAAO,EAIL,KAAK,cAAc,EACpB,MAAM,+CAA+C,CAAA;AAEtD,wBAAgB,UAAU,CACxB,QAAQ,EAAE,SAAS,EACnB,EAAE,QAAQ,EAAE,cAAc,EAAE,GAAE,cAAmB,GAChD,OAAO,CAAC;IAAE,SAAS,EAAE,MAAM,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CA6BpD"}
1
+ {"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../../../src/server/render.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,OAAO,CAAA;AAEtC,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,+CAA+C,CAAA;AAEtD,wBAAgB,UAAU,CACxB,QAAQ,EAAE,SAAS,EACnB,EAAE,eAAe,EAAE,cAAc,EAAE,GAAE,cAAmB,GACvD,OAAO,CAAC;IAAE,SAAS,EAAE,MAAM,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAkCpD"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@makeswift/express-react",
3
- "version": "0.1.12-canary.9",
3
+ "version": "0.2.0-canary.19",
4
4
  "license": "MIT",
5
5
  "repository": {
6
6
  "url": "makeswift/makeswift",
@@ -28,7 +28,7 @@
28
28
  },
29
29
  "dependencies": {
30
30
  "cookie": "^1.0.2",
31
- "@makeswift/runtime": "0.28.10-canary.9"
31
+ "@makeswift/runtime": "0.29.0-canary.19"
32
32
  },
33
33
  "peerDependencies": {
34
34
  "@types/express": "^5.0.0",