@quilted/quilt 0.5.137 → 0.5.139
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/CHANGELOG.md +20 -0
- package/build/cjs/index.cjs +6 -2
- package/build/cjs/magic/app.cjs +2 -0
- package/build/cjs/magic/assets.cjs +2 -0
- package/build/cjs/magic/request-router.cjs +2 -0
- package/build/cjs/server/ServerContext.cjs +4 -6
- package/build/cjs/server/index.cjs +4 -13
- package/build/cjs/server/request-router.cjs +9 -14
- package/build/cjs/static/StaticContext.cjs +4 -6
- package/build/cjs/static/index.cjs +3 -4
- package/build/cjs/static/render.cjs +8 -11
- package/build/esm/index.mjs +1 -1
- package/build/esm/magic/app.mjs +1 -0
- package/build/esm/magic/assets.mjs +1 -0
- package/build/esm/magic/request-router.mjs +1 -0
- package/build/esm/server/ServerContext.mjs +1 -3
- package/build/esm/server/index.mjs +1 -2
- package/build/esm/server/request-router.mjs +3 -8
- package/build/esm/static/StaticContext.mjs +1 -3
- package/build/esm/static/index.mjs +3 -4
- package/build/esm/static/render.mjs +2 -5
- package/build/esnext/index.esnext +1 -1
- package/build/esnext/magic/app.esnext +1 -0
- package/build/esnext/magic/assets.esnext +1 -0
- package/build/esnext/magic/request-router.esnext +1 -0
- package/build/esnext/server/ServerContext.esnext +1 -3
- package/build/esnext/server/index.esnext +1 -2
- package/build/esnext/server/request-router.esnext +3 -8
- package/build/esnext/static/StaticContext.esnext +1 -3
- package/build/esnext/static/index.esnext +3 -4
- package/build/esnext/static/render.esnext +2 -5
- package/build/tsconfig.tsbuildinfo +1 -1
- package/build/typescript/index.d.ts +2 -2
- package/build/typescript/index.d.ts.map +1 -1
- package/build/typescript/server/ServerContext.d.ts +4 -6
- package/build/typescript/server/ServerContext.d.ts.map +1 -1
- package/build/typescript/server/index.d.ts +4 -5
- package/build/typescript/server/index.d.ts.map +1 -1
- package/build/typescript/server/request-router.d.ts +0 -2
- package/build/typescript/server/request-router.d.ts.map +1 -1
- package/build/typescript/static/StaticContext.d.ts +4 -6
- package/build/typescript/static/StaticContext.d.ts.map +1 -1
- package/build/typescript/static/index.d.ts.map +1 -1
- package/build/typescript/static/render.d.ts +0 -2
- package/build/typescript/static/render.d.ts.map +1 -1
- package/build/typescript/testing.d.ts +1 -1
- package/build/typescript/testing.d.ts.map +1 -1
- package/package.json +24 -3
- package/source/TestApp.tsx +1 -1
- package/source/index.ts +2 -2
- package/source/server/ServerContext.tsx +9 -20
- package/source/server/index.ts +5 -9
- package/source/server/request-router.tsx +6 -21
- package/source/static/StaticContext.tsx +9 -20
- package/source/static/index.tsx +8 -4
- package/source/static/render.tsx +3 -10
- package/source/testing.ts +1 -1
- package/build/typescript/magic/asset-manifest.d.ts +0 -5
- package/build/typescript/magic/asset-manifest.d.ts.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../source/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,oBAAoB,EACpB,2BAA2B,EAC3B,qBAAqB,EACrB,4BAA4B,EAC5B,oCAAoC,EACpC,gCAAgC,GACjC,MAAM,iBAAiB,CAAC;AACzB,YAAY,EACV,KAAK,EACL,cAAc,EACd,aAAa,EACb,kBAAkB,EAClB,oBAAoB,EACpB,0BAA0B,EAC1B,mBAAmB,EACnB,wBAAwB,GACzB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAC,iBAAiB,EAAC,MAAM,gBAAgB,CAAC;AACjD,YAAY,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAChD,OAAO,EACL,EAAE,EACF,IAAI,EACJ,KAAK,EACL,aAAa,EACb,UAAU,EACV,qBAAqB,EACrB,oBAAoB,EACpB,cAAc,EACd,sBAAsB,GACvB,MAAM,iBAAiB,CAAC;AACzB,YAAY,EACV,aAAa,EACb,OAAO,EACP,cAAc,EACd,WAAW,EACX,2BAA2B,EAC3B,mBAAmB,EACnB,aAAa,GACd,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAC,iBAAiB,EAAC,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../source/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,15 +1,13 @@
|
|
|
1
1
|
import type { PropsWithChildren } from 'react';
|
|
2
|
-
import type
|
|
3
|
-
import type
|
|
4
|
-
import type
|
|
5
|
-
import type { HttpManager } from '@quilted/react-http/server';
|
|
2
|
+
import { type AssetsManager } from '@quilted/react-assets/server';
|
|
3
|
+
import { type HtmlManager } from '@quilted/react-html/server';
|
|
4
|
+
import { type HttpManager } from '@quilted/react-http/server';
|
|
6
5
|
interface Props {
|
|
7
6
|
url?: string | URL;
|
|
8
7
|
html?: HtmlManager;
|
|
9
8
|
http?: HttpManager;
|
|
10
9
|
assets?: AssetsManager;
|
|
11
|
-
asyncAssets?: AsyncAssetManager;
|
|
12
10
|
}
|
|
13
|
-
export declare function ServerContext({ url, html, http, assets,
|
|
11
|
+
export declare function ServerContext({ url, html, http, assets, children, }: PropsWithChildren<Props>): import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
|
|
14
12
|
export {};
|
|
15
13
|
//# sourceMappingURL=ServerContext.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ServerContext.d.ts","sourceRoot":"","sources":["../../../source/server/ServerContext.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"ServerContext.d.ts","sourceRoot":"","sources":["../../../source/server/ServerContext.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,OAAO,CAAC;AAE7C,OAAO,EAAgB,KAAK,aAAa,EAAC,MAAM,8BAA8B,CAAC;AAE/E,OAAO,EAAc,KAAK,WAAW,EAAC,MAAM,4BAA4B,CAAC;AACzE,OAAO,EAAoB,KAAK,WAAW,EAAC,MAAM,4BAA4B,CAAC;AAI/E,UAAU,KAAK;IACb,GAAG,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;IACnB,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,MAAM,CAAC,EAAE,aAAa,CAAC;CACxB;AAED,wBAAgB,aAAa,CAAC,EAC5B,GAAG,EACH,IAAI,EACJ,IAAI,EACJ,MAAM,EACN,QAAQ,GACT,EAAE,iBAAiB,CAAC,KAAK,CAAC,0FAgB1B"}
|
|
@@ -2,8 +2,7 @@ export { Html, Serialize, HtmlManager, HtmlContext, renderHtmlToString, SERVER_A
|
|
|
2
2
|
export { ServerAction, useServerAction, ServerRenderManager, ServerRenderManagerContext, extract, } from '@quilted/react-server-render/server';
|
|
3
3
|
export { styleAssetAttributes, styleAssetPreloadAttributes, scriptAssetAttributes, scriptAssetPreloadAttributes, createBrowserAssetsFromManifests, createBrowserAssetsEntryFromManifest, } from '@quilted/assets';
|
|
4
4
|
export type { Asset, AssetsCacheKey, BrowserAssets, BrowserAssetsEntry, BrowserAssetSelector, BrowserAssetModuleSelector, AssetsBuildManifest, AssetsBuildManifestEntry, } from '@quilted/assets';
|
|
5
|
-
export {
|
|
6
|
-
export { AsyncAssetContext, AsyncAssetManager, SERVER_ACTION_ID as ASYNC_ASSETS_SERVER_ACTION_ID, } from '@quilted/react-async/server';
|
|
5
|
+
export { useAssetsCacheKey, useModuleAssets, AssetsContext, AssetsManager, SERVER_ACTION_ID as ASSETS_SERVER_ACTION_ID, } from '@quilted/react-assets/server';
|
|
7
6
|
export type { ServerActionKind, ServerActionOptions, ServerActionPerform, ServerRenderPass, } from '@quilted/react-server-render/server';
|
|
8
7
|
export type { HttpState } from '@quilted/react-http/server';
|
|
9
8
|
export { createRequestRouterLocalization } from '@quilted/react-localize/request-router';
|
|
@@ -11,7 +10,7 @@ export type { RequestRouterLocalization, RouteLocalization, ResolvedRouteLocaliz
|
|
|
11
10
|
export { Request, Response, EnhancedRequest, EnhancedResponse, createRequestRouter, createHeaders, } from '@quilted/request-router';
|
|
12
11
|
export type { Headers, BodyInit, ResponseInit, RequestInit, Cookies, CookieOptions, RequestRouter, RequestContext, RequestHandler, ResponseOrEnhancedResponse, CookieDefinition, RequestRegistration, RequestRegistrationOptions, } from '@quilted/request-router';
|
|
13
12
|
export { parseAcceptLanguageHeader } from '@quilted/react-localize';
|
|
14
|
-
export { ServerContext } from './ServerContext';
|
|
15
|
-
export { createServerRender, renderAppToResponse, renderAppToStreamedResponse, } from './request-router';
|
|
16
|
-
export { createAssetPreloader, type AssetPreloadOptions } from './preload';
|
|
13
|
+
export { ServerContext } from './ServerContext.tsx';
|
|
14
|
+
export { createServerRender, renderAppToResponse, renderAppToStreamedResponse, } from './request-router.tsx';
|
|
15
|
+
export { createAssetPreloader, type AssetPreloadOptions } from './preload.ts';
|
|
17
16
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../source/server/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EACJ,SAAS,EACT,WAAW,EACX,WAAW,EACX,kBAAkB,EAClB,gBAAgB,IAAI,qBAAqB,GAC1C,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,YAAY,EACZ,eAAe,EACf,mBAAmB,EACnB,0BAA0B,EAC1B,OAAO,GACR,MAAM,qCAAqC,CAAC;AAE7C,OAAO,EACL,oBAAoB,EACpB,2BAA2B,EAC3B,qBAAqB,EACrB,4BAA4B,EAC5B,gCAAgC,EAChC,oCAAoC,GACrC,MAAM,iBAAiB,CAAC;AACzB,YAAY,EACV,KAAK,EACL,cAAc,EACd,aAAa,EACb,kBAAkB,EAClB,oBAAoB,EACpB,0BAA0B,EAC1B,mBAAmB,EACnB,wBAAwB,GACzB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,iBAAiB,EACjB,aAAa,EACb,aAAa,EACb,gBAAgB,IAAI,uBAAuB,GAC5C,MAAM,8BAA8B,CAAC;AACtC,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../source/server/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EACJ,SAAS,EACT,WAAW,EACX,WAAW,EACX,kBAAkB,EAClB,gBAAgB,IAAI,qBAAqB,GAC1C,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,YAAY,EACZ,eAAe,EACf,mBAAmB,EACnB,0BAA0B,EAC1B,OAAO,GACR,MAAM,qCAAqC,CAAC;AAE7C,OAAO,EACL,oBAAoB,EACpB,2BAA2B,EAC3B,qBAAqB,EACrB,4BAA4B,EAC5B,gCAAgC,EAChC,oCAAoC,GACrC,MAAM,iBAAiB,CAAC;AACzB,YAAY,EACV,KAAK,EACL,cAAc,EACd,aAAa,EACb,kBAAkB,EAClB,oBAAoB,EACpB,0BAA0B,EAC1B,mBAAmB,EACnB,wBAAwB,GACzB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,iBAAiB,EACjB,eAAe,EACf,aAAa,EACb,aAAa,EACb,gBAAgB,IAAI,uBAAuB,GAC5C,MAAM,8BAA8B,CAAC;AACtC,YAAY,EACV,gBAAgB,EAChB,mBAAmB,EACnB,mBAAmB,EACnB,gBAAgB,GACjB,MAAM,qCAAqC,CAAC;AAC7C,YAAY,EAAC,SAAS,EAAC,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAC,+BAA+B,EAAC,MAAM,wCAAwC,CAAC;AACvF,YAAY,EACV,yBAAyB,EACzB,iBAAiB,EACjB,yBAAyB,GAC1B,MAAM,wCAAwC,CAAC;AAChD,OAAO,EACL,OAAO,EACP,QAAQ,EACR,eAAe,EACf,gBAAgB,EAChB,mBAAmB,EACnB,aAAa,GACd,MAAM,yBAAyB,CAAC;AACjC,YAAY,EACV,OAAO,EACP,QAAQ,EACR,YAAY,EACZ,WAAW,EACX,OAAO,EACP,aAAa,EACb,aAAa,EACb,cAAc,EACd,cAAc,EACd,0BAA0B,EAC1B,gBAAgB,EAChB,mBAAmB,EACnB,0BAA0B,GAC3B,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAC,yBAAyB,EAAC,MAAM,yBAAyB,CAAC;AAElE,OAAO,EAAC,aAAa,EAAC,MAAM,qBAAqB,CAAC;AAClD,OAAO,EACL,kBAAkB,EAClB,mBAAmB,EACnB,2BAA2B,GAC5B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAC,oBAAoB,EAAE,KAAK,mBAAmB,EAAC,MAAM,cAAc,CAAC"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { type ReactElement } from 'react';
|
|
2
2
|
import { type AssetsCacheKey, type BrowserAssets, type BrowserAssetsEntry } from '@quilted/assets';
|
|
3
3
|
import { AssetsManager } from '@quilted/react-assets/server';
|
|
4
|
-
import { AsyncAssetManager } from '@quilted/react-async/server';
|
|
5
4
|
import { HttpManager } from '@quilted/react-http/server';
|
|
6
5
|
import { HtmlManager } from '@quilted/react-html/server';
|
|
7
6
|
import type { Options as ExtractOptions, ServerRenderRequestContext } from '@quilted/react-server-render/server';
|
|
@@ -24,7 +23,6 @@ export interface ServerRenderAppDetails<_Context = RequestContext, CacheKey = As
|
|
|
24
23
|
readonly html: HtmlManager;
|
|
25
24
|
readonly assets: AssetsManager<CacheKey>;
|
|
26
25
|
readonly rendered?: string;
|
|
27
|
-
readonly asyncAssets: AsyncAssetManager;
|
|
28
26
|
}
|
|
29
27
|
export declare function createServerRender<Context = RequestContext, CacheKey = AssetsCacheKey>(getApp: ReactElement<any> | ((request: EnhancedRequest, context: Context) => ReactElement<any> | Promise<ReactElement<any>>), { stream, ...options }?: ServerRenderOptions<Context, CacheKey>): RequestHandler<Context>;
|
|
30
28
|
export declare function renderAppToResponse<Context = RequestContext, CacheKey = AssetsCacheKey>(getApp: ReactElement<any> | (() => ReactElement<any> | Promise<ReactElement<any>>), { request, context, assets, extract, renderHtml, }: Pick<ServerRenderOptions<Context, CacheKey>, 'assets' | 'renderHtml' | 'extract'> & {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request-router.d.ts","sourceRoot":"","sources":["../../../source/server/request-router.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAW,KAAK,YAAY,EAAC,MAAM,OAAO,CAAC;AAElD,OAAO,EAKL,KAAK,cAAc,EACnB,KAAK,aAAa,EAClB,KAAK,kBAAkB,EACxB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAC,aAAa,EAAC,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"request-router.d.ts","sourceRoot":"","sources":["../../../source/server/request-router.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,15 +1,13 @@
|
|
|
1
1
|
import type { PropsWithChildren } from 'react';
|
|
2
|
-
import type
|
|
3
|
-
import type
|
|
4
|
-
import type
|
|
5
|
-
import type { HttpManager } from '@quilted/react-http/server';
|
|
2
|
+
import { type AssetsManager } from '@quilted/react-assets/server';
|
|
3
|
+
import { type HtmlManager } from '@quilted/react-html/server';
|
|
4
|
+
import { type HttpManager } from '@quilted/react-http/server';
|
|
6
5
|
interface Props {
|
|
7
6
|
url?: string | URL;
|
|
8
7
|
html?: HtmlManager;
|
|
9
8
|
http?: HttpManager;
|
|
10
9
|
assets?: AssetsManager;
|
|
11
|
-
asyncAssets?: AsyncAssetManager;
|
|
12
10
|
}
|
|
13
|
-
export declare function StaticContext({ url, html, http, assets,
|
|
11
|
+
export declare function StaticContext({ url, html, http, assets, children, }: PropsWithChildren<Props>): import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
|
|
14
12
|
export {};
|
|
15
13
|
//# sourceMappingURL=StaticContext.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StaticContext.d.ts","sourceRoot":"","sources":["../../../source/static/StaticContext.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"StaticContext.d.ts","sourceRoot":"","sources":["../../../source/static/StaticContext.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,OAAO,CAAC;AAE7C,OAAO,EAAgB,KAAK,aAAa,EAAC,MAAM,8BAA8B,CAAC;AAE/E,OAAO,EAAc,KAAK,WAAW,EAAC,MAAM,4BAA4B,CAAC;AACzE,OAAO,EAAoB,KAAK,WAAW,EAAC,MAAM,4BAA4B,CAAC;AAI/E,UAAU,KAAK;IACb,GAAG,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;IACnB,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,MAAM,CAAC,EAAE,aAAa,CAAC;CACxB;AAED,wBAAgB,aAAa,CAAC,EAC5B,GAAG,EACH,IAAI,EACJ,IAAI,EACJ,MAAM,EACN,QAAQ,GACT,EAAE,iBAAiB,CAAC,KAAK,CAAC,0FAgB1B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../source/static/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAW,KAAK,aAAa,EAAC,MAAM,OAAO,CAAC;AAEnD,OAAO,EAKL,KAAK,aAAa,EACnB,MAAM,iBAAiB,CAAC;AAOzB,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,4BAA4B,CAAC;AAI1D,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC;IAC9B,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;CAC1B;AAOD,MAAM,WAAW,OAAO;IACtB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,MAAM,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACxD;AAID,wBAAsB,YAAY,CAChC,GAAG,EAAE,aAAa,CAAC,GAAG,CAAC,EACvB,EACE,MAAM,EACN,MAAM,EAAE,cAAc,EACtB,QAAQ,EACR,KAAY,EACZ,OAAkB,EAClB,QAAe,GAChB,EAAE,OAAO,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../source/static/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAW,KAAK,aAAa,EAAC,MAAM,OAAO,CAAC;AAEnD,OAAO,EAKL,KAAK,aAAa,EACnB,MAAM,iBAAiB,CAAC;AAOzB,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,4BAA4B,CAAC;AAI1D,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC;IAC9B,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;CAC1B;AAOD,MAAM,WAAW,OAAO;IACtB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,MAAM,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACxD;AAID,wBAAsB,YAAY,CAChC,GAAG,EAAE,aAAa,CAAC,GAAG,CAAC,EACvB,EACE,MAAM,EACN,MAAM,EAAE,cAAc,EACtB,QAAQ,EACR,KAAY,EACZ,OAAkB,EAClB,QAAe,GAChB,EAAE,OAAO,iBAwPX"}
|
|
@@ -2,7 +2,6 @@ import type { ReactElement } from 'react';
|
|
|
2
2
|
import type { Options as ExtractOptions } from '@quilted/react-server-render/server';
|
|
3
3
|
import { HtmlManager } from '@quilted/react-html/server';
|
|
4
4
|
import { HttpManager } from '@quilted/react-http/server';
|
|
5
|
-
import { AsyncAssetManager } from '@quilted/react-async/server';
|
|
6
5
|
import { AssetsManager } from '@quilted/react-assets/server';
|
|
7
6
|
import type { AssetsCacheKey } from '@quilted/assets';
|
|
8
7
|
interface Options<CacheKey = AssetsCacheKey> extends ExtractOptions {
|
|
@@ -15,7 +14,6 @@ export declare function renderApp<CacheKey = AssetsCacheKey>(app: ReactElement<a
|
|
|
15
14
|
http: HttpManager;
|
|
16
15
|
html: HtmlManager;
|
|
17
16
|
assets: AssetsManager<CacheKey>;
|
|
18
|
-
asyncAssets: AsyncAssetManager;
|
|
19
17
|
}>;
|
|
20
18
|
export {};
|
|
21
19
|
//# sourceMappingURL=render.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../../../source/static/render.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,OAAO,CAAC;AAGxC,OAAO,KAAK,EAAC,OAAO,IAAI,cAAc,EAAC,MAAM,qCAAqC,CAAC;AACnF,OAAO,EAAC,WAAW,EAAC,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAC,WAAW,EAAC,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../../../source/static/render.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,OAAO,CAAC;AAGxC,OAAO,KAAK,EAAC,OAAO,IAAI,cAAc,EAAC,MAAM,qCAAqC,CAAC;AACnF,OAAO,EAAC,WAAW,EAAC,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAC,WAAW,EAAC,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAC,aAAa,EAAC,MAAM,8BAA8B,CAAC;AAC3D,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,iBAAiB,CAAC;AAIpD,UAAU,OAAO,CAAC,QAAQ,GAAG,cAAc,CAAE,SAAQ,cAAc;IACjE,GAAG,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;IACnB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,OAAO,CAAC,EAAE,WAAW,CACnB,qBAAqB,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,CAC7C,CAAC,SAAS,CAAC,CAAC;CACd;AAED,wBAAsB,SAAS,CAAC,QAAQ,GAAG,cAAc,EACvD,GAAG,EAAE,YAAY,CAAC,GAAG,CAAC,EACtB,EAAC,QAAQ,EAAE,GAAG,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,IAAI,EAAC,GAAE,OAAO,CAAC,QAAQ,CAAM;;;;;GAkBpE"}
|
|
@@ -2,5 +2,5 @@ export * from '@quilted/testing';
|
|
|
2
2
|
export { render, createRender, rendered, destroyAll, } from '@quilted/react-testing';
|
|
3
3
|
export type { CustomRender, CustomRenderResult, CustomRenderOptions, CustomRenderExtendOptions, HookRunner, Environment, EnvironmentOptions, ContextOption, RenderOption, ActionsOption, Node, NodeApi, Root, RootApi, DebugOptions, EmptyObject, PlainObject, Predicate, } from '@quilted/react-testing';
|
|
4
4
|
export { TestRouting, createTestRouter } from '@quilted/react-router/testing';
|
|
5
|
-
export { QuiltAppTesting } from './TestApp';
|
|
5
|
+
export { QuiltAppTesting } from './TestApp.tsx';
|
|
6
6
|
//# sourceMappingURL=testing.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../../source/testing.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,OAAO,EACL,MAAM,EACN,YAAY,EACZ,QAAQ,EACR,UAAU,GACX,MAAM,wBAAwB,CAAC;AAChC,YAAY,EACV,YAAY,EACZ,kBAAkB,EAClB,mBAAmB,EACnB,yBAAyB,EACzB,UAAU,EACV,WAAW,EACX,kBAAkB,EAClB,aAAa,EACb,YAAY,EACZ,aAAa,EACb,IAAI,EACJ,OAAO,EACP,IAAI,EACJ,OAAO,EACP,YAAY,EACZ,WAAW,EACX,WAAW,EACX,SAAS,GACV,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAC,WAAW,EAAE,gBAAgB,EAAC,MAAM,+BAA+B,CAAC;AAE5E,OAAO,EAAC,eAAe,EAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../../source/testing.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,OAAO,EACL,MAAM,EACN,YAAY,EACZ,QAAQ,EACR,UAAU,GACX,MAAM,wBAAwB,CAAC;AAChC,YAAY,EACV,YAAY,EACZ,kBAAkB,EAClB,mBAAmB,EACnB,yBAAyB,EACzB,UAAU,EACV,WAAW,EACX,kBAAkB,EAClB,aAAa,EACb,YAAY,EACZ,aAAa,EACb,IAAI,EACJ,OAAO,EACP,IAAI,EACJ,OAAO,EACP,YAAY,EACZ,WAAW,EACX,WAAW,EACX,SAAS,GACV,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAC,WAAW,EAAE,gBAAgB,EAAC,MAAM,+BAA+B,CAAC;AAE5E,OAAO,EAAC,eAAe,EAAC,MAAM,eAAe,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@quilted/quilt",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "0.5.
|
|
4
|
+
"version": "0.5.139",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
7
7
|
"url": "https://github.com/lemonmade/quilt.git",
|
|
@@ -138,6 +138,27 @@
|
|
|
138
138
|
"quilt:esnext": "./build/esnext/polyfills/noop.esnext",
|
|
139
139
|
"import": "./build/esm/polyfills/noop.mjs",
|
|
140
140
|
"require": "./build/cjs/polyfills/noop.cjs"
|
|
141
|
+
},
|
|
142
|
+
"./magic/app": {
|
|
143
|
+
"types": "./build/typescript/magic/app.d.ts",
|
|
144
|
+
"quilt:source": "./source/magic/app.ts",
|
|
145
|
+
"quilt:esnext": "./build/esnext/magic/app.esnext",
|
|
146
|
+
"import": "./build/esm/magic/app.mjs",
|
|
147
|
+
"require": "./build/cjs/magic/app.cjs"
|
|
148
|
+
},
|
|
149
|
+
"./magic/assets": {
|
|
150
|
+
"types": "./build/typescript/magic/assets.d.ts",
|
|
151
|
+
"quilt:source": "./source/magic/assets.ts",
|
|
152
|
+
"quilt:esnext": "./build/esnext/magic/assets.esnext",
|
|
153
|
+
"import": "./build/esm/magic/assets.mjs",
|
|
154
|
+
"require": "./build/cjs/magic/assets.cjs"
|
|
155
|
+
},
|
|
156
|
+
"./magic/request-router": {
|
|
157
|
+
"types": "./build/typescript/magic/request-router.d.ts",
|
|
158
|
+
"quilt:source": "./source/magic/request-router.ts",
|
|
159
|
+
"quilt:esnext": "./build/esnext/magic/request-router.esnext",
|
|
160
|
+
"import": "./build/esm/magic/request-router.mjs",
|
|
161
|
+
"require": "./build/cjs/magic/request-router.cjs"
|
|
141
162
|
}
|
|
142
163
|
},
|
|
143
164
|
"types": "./build/typescript/index.d.ts",
|
|
@@ -214,13 +235,13 @@
|
|
|
214
235
|
"./build/esm/polyfills/*.mjs"
|
|
215
236
|
],
|
|
216
237
|
"dependencies": {
|
|
217
|
-
"@quilted/assets": "^0.0.
|
|
238
|
+
"@quilted/assets": "^0.0.3",
|
|
218
239
|
"@quilted/async": "^0.3.34",
|
|
219
240
|
"@quilted/events": "^0.1.0",
|
|
220
241
|
"@quilted/graphql": "^0.4.34",
|
|
221
242
|
"@quilted/polyfills": "^0.2.12",
|
|
222
243
|
"@quilted/react": "^18.2.0",
|
|
223
|
-
"@quilted/react-assets": "^0.0.
|
|
244
|
+
"@quilted/react-assets": "^0.0.3",
|
|
224
245
|
"@quilted/react-async": "^0.3.43",
|
|
225
246
|
"@quilted/react-dom": "^18.2.0",
|
|
226
247
|
"@quilted/react-graphql": "^0.4.30",
|
package/source/TestApp.tsx
CHANGED
package/source/index.ts
CHANGED
|
@@ -38,7 +38,7 @@ export type {
|
|
|
38
38
|
EventTargetFunction,
|
|
39
39
|
EventTargetOn,
|
|
40
40
|
} from '@quilted/events';
|
|
41
|
-
export {
|
|
41
|
+
export {useAssetsCacheKey, useModuleAssets} from '@quilted/react-assets';
|
|
42
42
|
export {
|
|
43
43
|
useAsyncModule,
|
|
44
44
|
useAsyncModulePreload,
|
|
@@ -167,4 +167,4 @@ export {
|
|
|
167
167
|
type SignalOrValue,
|
|
168
168
|
} from '@quilted/react-signals';
|
|
169
169
|
|
|
170
|
-
export {QuiltApp} from './App';
|
|
170
|
+
export {QuiltApp} from './App.tsx';
|
|
@@ -1,23 +1,17 @@
|
|
|
1
1
|
import type {PropsWithChildren} from 'react';
|
|
2
2
|
|
|
3
|
-
import {AssetsContext} from '@quilted/react-assets/server';
|
|
4
|
-
import type {AssetsManager} from '@quilted/react-assets/server';
|
|
3
|
+
import {AssetsContext, type AssetsManager} from '@quilted/react-assets/server';
|
|
5
4
|
import {InitialUrlContext} from '@quilted/react-router';
|
|
6
|
-
import {HtmlContext} from '@quilted/react-html/server';
|
|
7
|
-
import type
|
|
8
|
-
import {AsyncAssetContext} from '@quilted/react-async/server';
|
|
9
|
-
import type {AsyncAssetManager} from '@quilted/react-async/server';
|
|
10
|
-
import {HttpServerContext} from '@quilted/react-http/server';
|
|
11
|
-
import type {HttpManager} from '@quilted/react-http/server';
|
|
5
|
+
import {HtmlContext, type HtmlManager} from '@quilted/react-html/server';
|
|
6
|
+
import {HttpServerContext, type HttpManager} from '@quilted/react-http/server';
|
|
12
7
|
|
|
13
|
-
import {maybeWrapContext} from '../utilities/react';
|
|
8
|
+
import {maybeWrapContext} from '../utilities/react.tsx';
|
|
14
9
|
|
|
15
10
|
interface Props {
|
|
16
11
|
url?: string | URL;
|
|
17
12
|
html?: HtmlManager;
|
|
18
13
|
http?: HttpManager;
|
|
19
14
|
assets?: AssetsManager;
|
|
20
|
-
asyncAssets?: AsyncAssetManager;
|
|
21
15
|
}
|
|
22
16
|
|
|
23
17
|
export function ServerContext({
|
|
@@ -25,7 +19,6 @@ export function ServerContext({
|
|
|
25
19
|
html,
|
|
26
20
|
http,
|
|
27
21
|
assets,
|
|
28
|
-
asyncAssets,
|
|
29
22
|
children,
|
|
30
23
|
}: PropsWithChildren<Props>) {
|
|
31
24
|
const normalizedUrl = typeof url === 'string' ? new URL(url) : url;
|
|
@@ -34,16 +27,12 @@ export function ServerContext({
|
|
|
34
27
|
AssetsContext,
|
|
35
28
|
assets,
|
|
36
29
|
maybeWrapContext(
|
|
37
|
-
|
|
38
|
-
|
|
30
|
+
HttpServerContext,
|
|
31
|
+
http,
|
|
39
32
|
maybeWrapContext(
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
maybeWrapContext(
|
|
43
|
-
HtmlContext,
|
|
44
|
-
html,
|
|
45
|
-
maybeWrapContext(InitialUrlContext, normalizedUrl, children),
|
|
46
|
-
),
|
|
33
|
+
HtmlContext,
|
|
34
|
+
html,
|
|
35
|
+
maybeWrapContext(InitialUrlContext, normalizedUrl, children),
|
|
47
36
|
),
|
|
48
37
|
),
|
|
49
38
|
);
|
package/source/server/index.ts
CHANGED
|
@@ -33,16 +33,12 @@ export type {
|
|
|
33
33
|
AssetsBuildManifestEntry,
|
|
34
34
|
} from '@quilted/assets';
|
|
35
35
|
export {
|
|
36
|
-
|
|
36
|
+
useAssetsCacheKey,
|
|
37
|
+
useModuleAssets,
|
|
37
38
|
AssetsContext,
|
|
38
39
|
AssetsManager,
|
|
39
40
|
SERVER_ACTION_ID as ASSETS_SERVER_ACTION_ID,
|
|
40
41
|
} from '@quilted/react-assets/server';
|
|
41
|
-
export {
|
|
42
|
-
AsyncAssetContext,
|
|
43
|
-
AsyncAssetManager,
|
|
44
|
-
SERVER_ACTION_ID as ASYNC_ASSETS_SERVER_ACTION_ID,
|
|
45
|
-
} from '@quilted/react-async/server';
|
|
46
42
|
export type {
|
|
47
43
|
ServerActionKind,
|
|
48
44
|
ServerActionOptions,
|
|
@@ -81,10 +77,10 @@ export type {
|
|
|
81
77
|
} from '@quilted/request-router';
|
|
82
78
|
export {parseAcceptLanguageHeader} from '@quilted/react-localize';
|
|
83
79
|
|
|
84
|
-
export {ServerContext} from './ServerContext';
|
|
80
|
+
export {ServerContext} from './ServerContext.tsx';
|
|
85
81
|
export {
|
|
86
82
|
createServerRender,
|
|
87
83
|
renderAppToResponse,
|
|
88
84
|
renderAppToStreamedResponse,
|
|
89
|
-
} from './request-router';
|
|
90
|
-
export {createAssetPreloader, type AssetPreloadOptions} from './preload';
|
|
85
|
+
} from './request-router.tsx';
|
|
86
|
+
export {createAssetPreloader, type AssetPreloadOptions} from './preload.ts';
|
|
@@ -10,7 +10,6 @@ import {
|
|
|
10
10
|
type BrowserAssetsEntry,
|
|
11
11
|
} from '@quilted/assets';
|
|
12
12
|
import {AssetsManager} from '@quilted/react-assets/server';
|
|
13
|
-
import {AsyncAssetManager} from '@quilted/react-async/server';
|
|
14
13
|
import {HttpManager} from '@quilted/react-http/server';
|
|
15
14
|
import {
|
|
16
15
|
renderHtmlToString,
|
|
@@ -30,7 +29,7 @@ import type {
|
|
|
30
29
|
RequestContext,
|
|
31
30
|
} from '@quilted/request-router';
|
|
32
31
|
|
|
33
|
-
import {ServerContext} from './ServerContext';
|
|
32
|
+
import {ServerContext} from './ServerContext.tsx';
|
|
34
33
|
|
|
35
34
|
export interface ServerRenderOptions<
|
|
36
35
|
Context = RequestContext,
|
|
@@ -65,7 +64,6 @@ export interface ServerRenderAppDetails<
|
|
|
65
64
|
readonly html: HtmlManager;
|
|
66
65
|
readonly assets: AssetsManager<CacheKey>;
|
|
67
66
|
readonly rendered?: string;
|
|
68
|
-
readonly asyncAssets: AsyncAssetManager;
|
|
69
67
|
}
|
|
70
68
|
|
|
71
69
|
export function createServerRender<
|
|
@@ -252,7 +250,6 @@ async function serverRenderDetailsForApp<
|
|
|
252
250
|
} = {},
|
|
253
251
|
): Promise<ServerRenderAppDetails<Context, CacheKey>> {
|
|
254
252
|
const html = new HtmlManager();
|
|
255
|
-
const asyncAssets = new AsyncAssetManager();
|
|
256
253
|
const http = new HttpManager({headers});
|
|
257
254
|
const assets = new AssetsManager<CacheKey>({cacheKey});
|
|
258
255
|
|
|
@@ -261,13 +258,7 @@ async function serverRenderDetailsForApp<
|
|
|
261
258
|
const rendered = await extract(app, {
|
|
262
259
|
decorate(app) {
|
|
263
260
|
return (
|
|
264
|
-
<ServerContext
|
|
265
|
-
asyncAssets={asyncAssets}
|
|
266
|
-
http={http}
|
|
267
|
-
html={html}
|
|
268
|
-
url={url}
|
|
269
|
-
assets={assets}
|
|
270
|
-
>
|
|
261
|
+
<ServerContext http={http} html={html} url={url} assets={assets}>
|
|
271
262
|
{decorate?.(app) ?? app}
|
|
272
263
|
</ServerContext>
|
|
273
264
|
);
|
|
@@ -275,7 +266,7 @@ async function serverRenderDetailsForApp<
|
|
|
275
266
|
...rest,
|
|
276
267
|
});
|
|
277
268
|
|
|
278
|
-
return {rendered, http, html,
|
|
269
|
+
return {rendered, http, html, assets};
|
|
279
270
|
}
|
|
280
271
|
|
|
281
272
|
async function renderAppDetailsToHtmlString<
|
|
@@ -294,21 +285,15 @@ async function renderAppDetailsToHtmlString<
|
|
|
294
285
|
readonly cacheKey?: Partial<CacheKey>;
|
|
295
286
|
},
|
|
296
287
|
) {
|
|
297
|
-
const {
|
|
298
|
-
http,
|
|
299
|
-
rendered,
|
|
300
|
-
asyncAssets,
|
|
301
|
-
html: htmlManager,
|
|
302
|
-
assets: assetsManager,
|
|
303
|
-
} = details;
|
|
288
|
+
const {http, rendered, html: htmlManager, assets: assetsManager} = details;
|
|
304
289
|
|
|
305
|
-
const usedModules = asyncAssets.used({timing: 'load'});
|
|
306
290
|
const cacheKey = assetsManager.cacheKey as CacheKey;
|
|
291
|
+
const usedModules = assetsManager.usedModules({timing: 'load'});
|
|
307
292
|
|
|
308
293
|
const [entryAssets, preloadAssets] = assets
|
|
309
294
|
? await Promise.all([
|
|
310
295
|
assets.entry({modules: usedModules, cacheKey}),
|
|
311
|
-
assets.modules(
|
|
296
|
+
assets.modules(assetsManager.usedModules({timing: 'preload'}), {
|
|
312
297
|
cacheKey,
|
|
313
298
|
}),
|
|
314
299
|
])
|
|
@@ -1,23 +1,17 @@
|
|
|
1
1
|
import type {PropsWithChildren} from 'react';
|
|
2
2
|
|
|
3
|
-
import {AssetsContext} from '@quilted/react-assets/server';
|
|
4
|
-
import type {AssetsManager} from '@quilted/react-assets/server';
|
|
3
|
+
import {AssetsContext, type AssetsManager} from '@quilted/react-assets/server';
|
|
5
4
|
import {InitialUrlContext} from '@quilted/react-router';
|
|
6
|
-
import {HtmlContext} from '@quilted/react-html/server';
|
|
7
|
-
import type
|
|
8
|
-
import {AsyncAssetContext} from '@quilted/react-async/server';
|
|
9
|
-
import type {AsyncAssetManager} from '@quilted/react-async/server';
|
|
10
|
-
import {HttpServerContext} from '@quilted/react-http/server';
|
|
11
|
-
import type {HttpManager} from '@quilted/react-http/server';
|
|
5
|
+
import {HtmlContext, type HtmlManager} from '@quilted/react-html/server';
|
|
6
|
+
import {HttpServerContext, type HttpManager} from '@quilted/react-http/server';
|
|
12
7
|
|
|
13
|
-
import {maybeWrapContext} from '../utilities/react';
|
|
8
|
+
import {maybeWrapContext} from '../utilities/react.tsx';
|
|
14
9
|
|
|
15
10
|
interface Props {
|
|
16
11
|
url?: string | URL;
|
|
17
12
|
html?: HtmlManager;
|
|
18
13
|
http?: HttpManager;
|
|
19
14
|
assets?: AssetsManager;
|
|
20
|
-
asyncAssets?: AsyncAssetManager;
|
|
21
15
|
}
|
|
22
16
|
|
|
23
17
|
export function StaticContext({
|
|
@@ -25,7 +19,6 @@ export function StaticContext({
|
|
|
25
19
|
html,
|
|
26
20
|
http,
|
|
27
21
|
assets,
|
|
28
|
-
asyncAssets,
|
|
29
22
|
children,
|
|
30
23
|
}: PropsWithChildren<Props>) {
|
|
31
24
|
const normalizedUrl = typeof url === 'string' ? new URL(url) : url;
|
|
@@ -34,16 +27,12 @@ export function StaticContext({
|
|
|
34
27
|
AssetsContext,
|
|
35
28
|
assets,
|
|
36
29
|
maybeWrapContext(
|
|
37
|
-
|
|
38
|
-
|
|
30
|
+
HttpServerContext,
|
|
31
|
+
http,
|
|
39
32
|
maybeWrapContext(
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
maybeWrapContext(
|
|
43
|
-
HtmlContext,
|
|
44
|
-
html,
|
|
45
|
-
maybeWrapContext(InitialUrlContext, normalizedUrl, children),
|
|
46
|
-
),
|
|
33
|
+
HtmlContext,
|
|
34
|
+
html,
|
|
35
|
+
maybeWrapContext(InitialUrlContext, normalizedUrl, children),
|
|
47
36
|
),
|
|
48
37
|
),
|
|
49
38
|
);
|
package/source/static/index.tsx
CHANGED
|
@@ -15,7 +15,7 @@ import {
|
|
|
15
15
|
} from '@quilted/react-router/static';
|
|
16
16
|
import type {HttpState} from '@quilted/react-http/server';
|
|
17
17
|
|
|
18
|
-
import {renderApp} from './render';
|
|
18
|
+
import {renderApp} from './render.tsx';
|
|
19
19
|
|
|
20
20
|
export interface RenderDetails {
|
|
21
21
|
readonly route: string;
|
|
@@ -219,7 +219,6 @@ export async function renderStatic(
|
|
|
219
219
|
html: htmlManager,
|
|
220
220
|
assets: assetsManager,
|
|
221
221
|
markup,
|
|
222
|
-
asyncAssets,
|
|
223
222
|
} = await renderApp(<App />, {
|
|
224
223
|
url,
|
|
225
224
|
cacheKey: initialCacheKey,
|
|
@@ -235,8 +234,13 @@ export async function renderStatic(
|
|
|
235
234
|
const cacheKey = assetsManager.cacheKey;
|
|
236
235
|
|
|
237
236
|
const [mainAssets, preloadAssets] = await Promise.all([
|
|
238
|
-
assets.entry({
|
|
239
|
-
|
|
237
|
+
assets.entry({
|
|
238
|
+
modules: assetsManager.usedModules({timing: 'load'}),
|
|
239
|
+
cacheKey,
|
|
240
|
+
}),
|
|
241
|
+
assets.modules(assetsManager.usedModules({timing: 'preload'}), {
|
|
242
|
+
cacheKey,
|
|
243
|
+
}),
|
|
240
244
|
]);
|
|
241
245
|
|
|
242
246
|
const minifiedHtml = renderHtmlToString(
|
package/source/static/render.tsx
CHANGED
|
@@ -4,11 +4,10 @@ import {extract} from '@quilted/react-server-render/server';
|
|
|
4
4
|
import type {Options as ExtractOptions} from '@quilted/react-server-render/server';
|
|
5
5
|
import {HtmlManager} from '@quilted/react-html/server';
|
|
6
6
|
import {HttpManager} from '@quilted/react-http/server';
|
|
7
|
-
import {AsyncAssetManager} from '@quilted/react-async/server';
|
|
8
7
|
import {AssetsManager} from '@quilted/react-assets/server';
|
|
9
8
|
import type {AssetsCacheKey} from '@quilted/assets';
|
|
10
9
|
|
|
11
|
-
import {StaticContext} from './StaticContext';
|
|
10
|
+
import {StaticContext} from './StaticContext.tsx';
|
|
12
11
|
|
|
13
12
|
interface Options<CacheKey = AssetsCacheKey> extends ExtractOptions {
|
|
14
13
|
url?: string | URL;
|
|
@@ -23,19 +22,13 @@ export async function renderApp<CacheKey = AssetsCacheKey>(
|
|
|
23
22
|
{decorate, url, headers, cacheKey, ...rest}: Options<CacheKey> = {},
|
|
24
23
|
) {
|
|
25
24
|
const html = new HtmlManager();
|
|
26
|
-
const asyncAssets = new AsyncAssetManager();
|
|
27
25
|
const http = new HttpManager({headers});
|
|
28
26
|
const assets = new AssetsManager<CacheKey>({cacheKey});
|
|
29
27
|
|
|
30
28
|
const markup = await extract(app, {
|
|
31
29
|
decorate(app) {
|
|
32
30
|
return (
|
|
33
|
-
<StaticContext
|
|
34
|
-
asyncAssets={asyncAssets}
|
|
35
|
-
html={html}
|
|
36
|
-
http={http}
|
|
37
|
-
url={url}
|
|
38
|
-
>
|
|
31
|
+
<StaticContext html={html} http={http} url={url} assets={assets}>
|
|
39
32
|
{decorate?.(app) ?? app}
|
|
40
33
|
</StaticContext>
|
|
41
34
|
);
|
|
@@ -43,5 +36,5 @@ export async function renderApp<CacheKey = AssetsCacheKey>(
|
|
|
43
36
|
...rest,
|
|
44
37
|
});
|
|
45
38
|
|
|
46
|
-
return {markup, http, html, assets
|
|
39
|
+
return {markup, http, html, assets};
|
|
47
40
|
}
|
package/source/testing.ts
CHANGED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"asset-manifest.d.ts","sourceRoot":"","sources":["../../../source/magic/asset-manifest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,uBAAuB,CAAC;AAEzD,MAAM,CAAC,OAAO,UAAU,mBAAmB,IAAI,aAAa,CAAC;IAC3D,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC,CAAC"}
|