@quilted/quilt 0.5.127 → 0.5.129

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.
Files changed (34) hide show
  1. package/CHANGELOG.md +12 -0
  2. package/build/cjs/graphql/testing.cjs +26 -0
  3. package/build/cjs/server/index.cjs +4 -5
  4. package/build/cjs/server/request-router.cjs +8 -16
  5. package/build/cjs/static/index.cjs +1 -1
  6. package/build/cjs/testing.cjs +3 -24
  7. package/build/esm/graphql/testing.mjs +1 -0
  8. package/build/esm/server/index.mjs +2 -2
  9. package/build/esm/server/request-router.mjs +9 -16
  10. package/build/esm/static/index.mjs +2 -2
  11. package/build/esm/testing.mjs +0 -1
  12. package/build/esnext/graphql/testing.esnext +1 -0
  13. package/build/esnext/server/index.esnext +2 -2
  14. package/build/esnext/server/request-router.esnext +9 -16
  15. package/build/esnext/static/index.esnext +2 -2
  16. package/build/esnext/testing.esnext +0 -1
  17. package/build/tsconfig.tsbuildinfo +1 -1
  18. package/build/typescript/graphql/testing.d.ts +3 -0
  19. package/build/typescript/graphql/testing.d.ts.map +1 -0
  20. package/build/typescript/magic/asset-manifest.d.ts +1 -2
  21. package/build/typescript/magic/asset-manifest.d.ts.map +1 -1
  22. package/build/typescript/server/index.d.ts +2 -2
  23. package/build/typescript/server/index.d.ts.map +1 -1
  24. package/build/typescript/server/request-router.d.ts +2 -3
  25. package/build/typescript/server/request-router.d.ts.map +1 -1
  26. package/build/typescript/testing.d.ts +0 -2
  27. package/build/typescript/testing.d.ts.map +1 -1
  28. package/package.json +12 -2
  29. package/source/graphql/testing.ts +29 -0
  30. package/source/magic/asset-manifest.ts +3 -3
  31. package/source/server/index.ts +2 -6
  32. package/source/server/request-router.tsx +10 -21
  33. package/source/static/index.tsx +2 -2
  34. package/source/testing.ts +0 -12
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../source/server/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,IAAI,EACJ,SAAS,EACT,WAAW,EACX,WAAW,EACX,gBAAgB,IAAI,qBAAqB,GAC1C,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,YAAY,EACZ,eAAe,EACf,mBAAmB,EACnB,0BAA0B,EAC1B,OAAO,GACR,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAC,mBAAmB,EAAC,MAAM,uBAAuB,CAAC;AAC1D,YAAY,EACV,KAAK,EACL,aAAa,EACb,kBAAkB,EAClB,0BAA0B,EAC1B,aAAa,EACb,UAAU,EACV,eAAe,GAChB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,gBAAgB,IAAI,6BAA6B,GAClD,MAAM,6BAA6B,CAAC;AACrC,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,SAAS,EAAC,MAAM,UAAU,CAAC;AACnC,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EACL,mCAAmC,EACnC,kCAAkC,EAClC,gBAAgB,GACjB,MAAM,kBAAkB,CAAC"}
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;AAC7C,OAAO,EAAC,mBAAmB,EAAC,MAAM,uBAAuB,CAAC;AAC1D,YAAY,EACV,KAAK,EACL,aAAa,EACb,kBAAkB,EAClB,0BAA0B,EAC1B,aAAa,EACb,UAAU,EACV,eAAe,GAChB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,gBAAgB,IAAI,6BAA6B,GAClD,MAAM,6BAA6B,CAAC;AACrC,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,SAAS,EAAC,MAAM,UAAU,CAAC;AACnC,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAC,kBAAkB,EAAE,mBAAmB,EAAC,MAAM,kBAAkB,CAAC"}
@@ -13,7 +13,6 @@ export interface Options<Context = RequestContext> extends Omit<ExtractOptions,
13
13
  readonly preload: readonly Asset[];
14
14
  }): ReactElement<any> | Promise<ReactElement<any>>;
15
15
  }
16
- export declare function createServerRenderingRequestRouter<Context = RequestContext>(render: (request: EnhancedRequest, context: Context) => ReactElement<any> | Promise<ReactElement<any>>, { router, ...options }: Options<Context>): RequestRouter<Context>;
17
- export declare function createServerRenderingRequestHandler<Context = RequestContext>(render: (request: EnhancedRequest, context: Context) => ReactElement<any> | Promise<ReactElement<any>>, { context, ...options }?: Omit<Options<Context>, 'router'>): RequestHandler<Context>;
18
- export declare function renderToResponse(app: ReactElement<any>, request: Request, { assets, renderHtml, ...options }?: Omit<Options, 'handler' | 'renderProps'>): Promise<import("@quilted/request-router").EnhancedResponse | undefined>;
16
+ export declare function createServerRender<Context = RequestContext>(render: (request: EnhancedRequest, context: Context) => ReactElement<any> | Promise<ReactElement<any>>, { context, ...options }?: Omit<Options<Context>, 'router'>): RequestHandler<Context>;
17
+ export declare function renderAppToResponse(app: ReactElement<any>, request: Request, { assets, renderHtml, ...options }?: Omit<Options, 'handler' | 'renderProps'>): Promise<import("@quilted/request-router").EnhancedResponse>;
19
18
  //# sourceMappingURL=request-router.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"request-router.d.ts","sourceRoot":"","sources":["../../../source/server/request-router.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,OAAO,CAAC;AAExC,OAAO,KAAK,EAAC,KAAK,EAAE,aAAa,EAAC,MAAM,uBAAuB,CAAC;AAEhE,OAAO,KAAK,EACV,OAAO,IAAI,cAAc,EACzB,0BAA0B,EAC3B,MAAM,qCAAqC,CAAC;AAG7C,OAAO,KAAK,EACV,aAAa,EACb,eAAe,EACf,cAAc,EACd,cAAc,EACf,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAY,KAAK,YAAY,IAAI,eAAe,EAAC,MAAM,UAAU,CAAC;AAEzE,MAAM,WAAW,OAAO,CAAC,OAAO,GAAG,cAAc,CAC/C,SAAQ,IAAI,CAAC,cAAc,EAAE,SAAS,CAAC;IACvC,MAAM,CAAC,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;IAChC,MAAM,CAAC,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;IAChC,OAAO,CAAC,CACN,OAAO,EAAE,eAAe,EACxB,OAAO,EAAE,OAAO,GACf,0BAA0B,CAAC;IAC9B,UAAU,CAAC,CACT,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,IAAI,CAAC,eAAe,EAAE,aAAa,GAAG,QAAQ,CAAC,GAAG;QACzD,QAAQ,CAAC,MAAM,EAAE,SAAS,KAAK,EAAE,CAAC;QAClC,QAAQ,CAAC,OAAO,EAAE,SAAS,KAAK,EAAE,CAAC;QACnC,QAAQ,CAAC,OAAO,EAAE,SAAS,KAAK,EAAE,CAAC;KACpC,GACA,YAAY,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC;CACnD;AAED,wBAAgB,kCAAkC,CAAC,OAAO,GAAG,cAAc,EACzE,MAAM,EAAE,CACN,OAAO,EAAE,eAAe,EACxB,OAAO,EAAE,OAAO,KACb,YAAY,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,EACnD,EAAC,MAAuC,EAAE,GAAG,OAAO,EAAC,EAAE,OAAO,CAAC,OAAO,CAAC,0BAIxE;AAED,wBAAgB,mCAAmC,CAAC,OAAO,GAAG,cAAc,EAC1E,MAAM,EAAE,CACN,OAAO,EAAE,eAAe,EACxB,OAAO,EAAE,OAAO,KACb,YAAY,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,EACnD,EAAC,OAAO,EAAE,GAAG,OAAO,EAAC,GAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,QAAQ,CAAM,GAC3D,cAAc,CAAC,OAAO,CAAC,CASzB;AAED,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,YAAY,CAAC,GAAG,CAAC,EACtB,OAAO,EAAE,OAAO,EAChB,EACE,MAAM,EACN,UAA8B,EAC9B,GAAG,OAAO,EACX,GAAE,IAAI,CAAC,OAAO,EAAE,SAAS,GAAG,aAAa,CAAM,2EAmDjD"}
1
+ {"version":3,"file":"request-router.d.ts","sourceRoot":"","sources":["../../../source/server/request-router.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,OAAO,CAAC;AAExC,OAAO,KAAK,EAAC,KAAK,EAAE,aAAa,EAAC,MAAM,uBAAuB,CAAC;AAEhE,OAAO,KAAK,EACV,OAAO,IAAI,cAAc,EACzB,0BAA0B,EAC3B,MAAM,qCAAqC,CAAC;AAG7C,OAAO,KAAK,EACV,aAAa,EACb,eAAe,EACf,cAAc,EACd,cAAc,EACf,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAY,KAAK,YAAY,IAAI,eAAe,EAAC,MAAM,UAAU,CAAC;AAEzE,MAAM,WAAW,OAAO,CAAC,OAAO,GAAG,cAAc,CAC/C,SAAQ,IAAI,CAAC,cAAc,EAAE,SAAS,CAAC;IACvC,MAAM,CAAC,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;IAChC,MAAM,CAAC,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;IAChC,OAAO,CAAC,CACN,OAAO,EAAE,eAAe,EACxB,OAAO,EAAE,OAAO,GACf,0BAA0B,CAAC;IAC9B,UAAU,CAAC,CACT,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,IAAI,CAAC,eAAe,EAAE,aAAa,GAAG,QAAQ,CAAC,GAAG;QACzD,QAAQ,CAAC,MAAM,EAAE,SAAS,KAAK,EAAE,CAAC;QAClC,QAAQ,CAAC,OAAO,EAAE,SAAS,KAAK,EAAE,CAAC;QACnC,QAAQ,CAAC,OAAO,EAAE,SAAS,KAAK,EAAE,CAAC;KACpC,GACA,YAAY,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC;CACnD;AAED,wBAAgB,kBAAkB,CAAC,OAAO,GAAG,cAAc,EACzD,MAAM,EAAE,CACN,OAAO,EAAE,eAAe,EACxB,OAAO,EAAE,OAAO,KACb,YAAY,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,EACnD,EAAC,OAAO,EAAE,GAAG,OAAO,EAAC,GAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,QAAQ,CAAM,GAC3D,cAAc,CAAC,OAAO,CAAC,CAazB;AAED,wBAAsB,mBAAmB,CACvC,GAAG,EAAE,YAAY,CAAC,GAAG,CAAC,EACtB,OAAO,EAAE,OAAO,EAChB,EACE,MAAM,EACN,UAA8B,EAC9B,GAAG,OAAO,EACX,GAAE,IAAI,CAAC,OAAO,EAAE,SAAS,GAAG,aAAa,CAAM,+DA+CjD"}
@@ -2,7 +2,5 @@ export * from '@quilted/testing';
2
2
  export { mount, mounted, unmountAll, createMount } from '@quilted/react-testing';
3
3
  export type { CustomMount, HookRunner, Node, NodeApi, Root, RootApi, EnvironmentOptions, ContextOption, RenderOption, ActionsOption, DebugOptions, EmptyObject, PlainObject, Predicate, } from '@quilted/react-testing';
4
4
  export { TestRouting, createTestRouter } from '@quilted/react-router/testing';
5
- export { TestGraphQL, createFiller, createSchema, GraphQLController, createGraphQLController, } from '@quilted/react-graphql/testing';
6
- export type { GraphQLMock, GraphQLMockFunction, GraphQLMockObject, } from '@quilted/react-graphql/testing';
7
5
  export { QuiltAppTesting } from './TestApp';
8
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,EAAC,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,WAAW,EAAC,MAAM,wBAAwB,CAAC;AAC/E,YAAY,EACV,WAAW,EACX,UAAU,EACV,IAAI,EACJ,OAAO,EACP,IAAI,EACJ,OAAO,EACP,kBAAkB,EAClB,aAAa,EACb,YAAY,EACZ,aAAa,EACb,YAAY,EACZ,WAAW,EACX,WAAW,EACX,SAAS,GACV,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAC,WAAW,EAAE,gBAAgB,EAAC,MAAM,+BAA+B,CAAC;AAC5E,OAAO,EACL,WAAW,EACX,YAAY,EACZ,YAAY,EACZ,iBAAiB,EACjB,uBAAuB,GACxB,MAAM,gCAAgC,CAAC;AACxC,YAAY,EACV,WAAW,EACX,mBAAmB,EACnB,iBAAiB,GAClB,MAAM,gCAAgC,CAAC;AAExC,OAAO,EAAC,eAAe,EAAC,MAAM,WAAW,CAAC"}
1
+ {"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../../source/testing.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,OAAO,EAAC,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,WAAW,EAAC,MAAM,wBAAwB,CAAC;AAC/E,YAAY,EACV,WAAW,EACX,UAAU,EACV,IAAI,EACJ,OAAO,EACP,IAAI,EACJ,OAAO,EACP,kBAAkB,EAClB,aAAa,EACb,YAAY,EACZ,aAAa,EACb,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,WAAW,CAAC"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@quilted/quilt",
3
3
  "type": "module",
4
- "version": "0.5.127",
4
+ "version": "0.5.129",
5
5
  "repository": {
6
6
  "type": "git",
7
7
  "url": "https://github.com/lemonmade/quilt.git",
@@ -62,6 +62,13 @@
62
62
  "import": "./build/esm/testing.mjs",
63
63
  "require": "./build/cjs/testing.cjs"
64
64
  },
65
+ "./graphql/testing": {
66
+ "types": "./build/typescript/graphql/testing.d.ts",
67
+ "quilt:source": "./source/graphql/testing.ts",
68
+ "quilt:esnext": "./build/esnext/graphql/testing.esnext",
69
+ "import": "./build/esm/graphql/testing.mjs",
70
+ "require": "./build/cjs/graphql/testing.cjs"
71
+ },
65
72
  "./env": {
66
73
  "types": "./build/typescript/env.d.ts",
67
74
  "quilt:source": "./source/env.ts",
@@ -157,6 +164,9 @@
157
164
  "testing": [
158
165
  "./build/typescript/testing.d.ts"
159
166
  ],
167
+ "graphql/testing": [
168
+ "./build/typescript/graphql/testing.d.ts"
169
+ ],
160
170
  "matchers": [
161
171
  "./build/typescript/matchers.d.ts"
162
172
  ],
@@ -187,7 +197,7 @@
187
197
  "magic/app": [
188
198
  "./build/typescript/magic/app.d.ts"
189
199
  ],
190
- "magic/app/asset-manifest": [
200
+ "magic/asset-manifest": [
191
201
  "./build/typescript/magic/asset-manifest.d.ts"
192
202
  ],
193
203
  "magic/request-router": [
@@ -0,0 +1,29 @@
1
+ export {
2
+ TestGraphQL,
3
+ createGraphQLFiller,
4
+ createGraphQLSchema,
5
+ GraphQLController,
6
+ createGraphQLController,
7
+ } from '@quilted/react-graphql/testing';
8
+ export type {
9
+ GraphQLOperation,
10
+ GraphQLOperationType,
11
+ GraphQLAnyOperation,
12
+ GraphQLData,
13
+ GraphQLVariables,
14
+ GraphQLDeepPartialData,
15
+ GraphQLFetch,
16
+ GraphQLFetchContext,
17
+ GraphQLMock,
18
+ GraphQLMockFunction,
19
+ GraphQLMockObject,
20
+ GraphQLResult,
21
+ GraphQLError,
22
+ GraphQLVariableOptions,
23
+ PickGraphQLType,
24
+ GraphQLFillerOptions,
25
+ GraphQLFillerDetails,
26
+ GraphQLFillerResolver,
27
+ GraphQLFillerResolverContext,
28
+ GraphQLFillerResolverMap,
29
+ } from '@quilted/react-graphql/testing';
@@ -1,5 +1,5 @@
1
1
  import type {AssetManifest} from '@quilted/async/server';
2
2
 
3
- declare function createAssetManifest(): AssetManifest<{userAgent?: string}>;
4
-
5
- export default createAssetManifest;
3
+ export declare function createAssetManifest(): AssetManifest<{
4
+ userAgent?: string;
5
+ }>;
@@ -1,9 +1,9 @@
1
1
  export {
2
- render,
3
2
  Html,
4
3
  Serialize,
5
4
  HtmlManager,
6
5
  HtmlContext,
6
+ renderHtmlToString,
7
7
  SERVER_ACTION_ID as HTML_SERVER_ACTION_ID,
8
8
  } from '@quilted/react-html/server';
9
9
  export {
@@ -68,8 +68,4 @@ export {parseAcceptLanguageHeader} from '@quilted/react-localize';
68
68
 
69
69
  export {renderApp} from './render';
70
70
  export {ServerContext} from './ServerContext';
71
- export {
72
- createServerRenderingRequestHandler,
73
- createServerRenderingRequestRouter,
74
- renderToResponse,
75
- } from './request-router';
71
+ export {createServerRender, renderAppToResponse} from './request-router';
@@ -1,13 +1,13 @@
1
1
  import type {ReactElement} from 'react';
2
2
 
3
3
  import type {Asset, AssetManifest} from '@quilted/async/server';
4
- import {render as renderToString, Html} from '@quilted/react-html/server';
4
+ import {renderHtmlToString, Html} from '@quilted/react-html/server';
5
5
  import type {
6
6
  Options as ExtractOptions,
7
7
  ServerRenderRequestContext,
8
8
  } from '@quilted/react-server-render/server';
9
9
 
10
- import {createRequestRouter, html, redirect} from '@quilted/request-router';
10
+ import {html, redirect} from '@quilted/request-router';
11
11
  import type {
12
12
  RequestRouter,
13
13
  EnhancedRequest,
@@ -36,18 +36,7 @@ export interface Options<Context = RequestContext>
36
36
  ): ReactElement<any> | Promise<ReactElement<any>>;
37
37
  }
38
38
 
39
- export function createServerRenderingRequestRouter<Context = RequestContext>(
40
- render: (
41
- request: EnhancedRequest,
42
- context: Context,
43
- ) => ReactElement<any> | Promise<ReactElement<any>>,
44
- {router = createRequestRouter<Context>(), ...options}: Options<Context>,
45
- ) {
46
- router.get(createServerRenderingRequestHandler<Context>(render, options));
47
- return router;
48
- }
49
-
50
- export function createServerRenderingRequestHandler<Context = RequestContext>(
39
+ export function createServerRender<Context = RequestContext>(
51
40
  render: (
52
41
  request: EnhancedRequest,
53
42
  context: Context,
@@ -55,16 +44,20 @@ export function createServerRenderingRequestHandler<Context = RequestContext>(
55
44
  {context, ...options}: Omit<Options<Context>, 'router'> = {},
56
45
  ): RequestHandler<Context> {
57
46
  return async (request, requestContext) => {
47
+ const accepts = request.headers.get('Accept');
48
+
49
+ if (accepts != null && !accepts.includes('text/html')) return;
50
+
58
51
  const app = await render(request, requestContext);
59
52
 
60
- return renderToResponse(app, request, {
53
+ return renderAppToResponse(app, request, {
61
54
  ...options,
62
55
  context: context?.(request, requestContext) ?? (requestContext as any),
63
56
  });
64
57
  };
65
58
  }
66
59
 
67
- export async function renderToResponse(
60
+ export async function renderAppToResponse(
68
61
  app: ReactElement<any>,
69
62
  request: Request,
70
63
  {
@@ -73,10 +66,6 @@ export async function renderToResponse(
73
66
  ...options
74
67
  }: Omit<Options, 'handler' | 'renderProps'> = {},
75
68
  ) {
76
- const accepts = request.headers.get('Accept');
77
-
78
- if (accepts != null && !accepts.includes('text/html')) return;
79
-
80
69
  const {
81
70
  html: htmlManager,
82
71
  http,
@@ -118,7 +107,7 @@ export async function renderToResponse(
118
107
  preload,
119
108
  });
120
109
 
121
- return html(renderToString(htmlElement), {
110
+ return html(renderHtmlToString(htmlElement), {
122
111
  headers,
123
112
  status: statusCode,
124
113
  });
@@ -1,7 +1,7 @@
1
1
  import type {ComponentType} from 'react';
2
2
 
3
3
  import type {AssetManifest} from '@quilted/async/server';
4
- import {render, Html} from '@quilted/react-html/server';
4
+ import {renderHtmlToString, Html} from '@quilted/react-html/server';
5
5
  import type {RouteDefinition} from '@quilted/react-router';
6
6
  import {
7
7
  StaticRenderer,
@@ -255,7 +255,7 @@ export async function renderStatic(
255
255
  ...nomoduleScripts.map((script) => ({...script, nomodule: true})),
256
256
  ];
257
257
 
258
- const minifiedHtml = render(
258
+ const minifiedHtml = renderHtmlToString(
259
259
  <Html
260
260
  url={url}
261
261
  manager={htmlManager}
package/source/testing.ts CHANGED
@@ -17,17 +17,5 @@ export type {
17
17
  Predicate,
18
18
  } from '@quilted/react-testing';
19
19
  export {TestRouting, createTestRouter} from '@quilted/react-router/testing';
20
- export {
21
- TestGraphQL,
22
- createFiller,
23
- createSchema,
24
- GraphQLController,
25
- createGraphQLController,
26
- } from '@quilted/react-graphql/testing';
27
- export type {
28
- GraphQLMock,
29
- GraphQLMockFunction,
30
- GraphQLMockObject,
31
- } from '@quilted/react-graphql/testing';
32
20
 
33
21
  export {QuiltAppTesting} from './TestApp';