@quilted/quilt 0.5.67 → 0.5.70

package/build/typescript/react/index.d.ts

@@ -1,3 +1,3 @@
-export * from '@quilted/preact-mini-compat';
-export { default } from '@quilted/preact-mini-compat';
+export * from '@quilted/react';
+export { default } from '@quilted/react';
 //# sourceMappingURL=index.d.ts.map

package/build/typescript/react/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/react/index.ts"],"names":[],"mappings":"AAEA,cAAc,6BAA6B,CAAC;AAE5C,OAAO,EAAC,OAAO,EAAC,MAAM,6BAA6B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/react/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,OAAO,EAAC,OAAO,EAAC,MAAM,gBAAgB,CAAC"}

package/build/typescript/react/jsx-runtime.d.ts

@@ -1,2 +1,2 @@
-export * from 'preact/jsx-runtime';
+export * from '@quilted/react/jsx-runtime';
 //# sourceMappingURL=jsx-runtime.d.ts.map

package/build/typescript/react/jsx-runtime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jsx-runtime.d.ts","sourceRoot":"","sources":["../../../src/react/jsx-runtime.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC"}
+{"version":3,"file":"jsx-runtime.d.ts","sourceRoot":"","sources":["../../../src/react/jsx-runtime.ts"],"names":[],"mappings":"AAAA,cAAc,4BAA4B,CAAC"}

package/build/typescript/react/server.d.ts

@@ -1,2 +1,2 @@
-export * from 'preact/compat/server';
+export * from '@quilted/react/server';
 //# sourceMappingURL=server.d.ts.map

package/build/typescript/react/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../src/react/server.ts"],"names":[],"mappings":"AAEA,cAAc,sBAAsB,CAAC"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../src/react/server.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC"}

package/build/typescript/react/test-utils.d.ts

@@ -0,0 +1,2 @@
+export * from '@quilted/react/test-utils';
+//# sourceMappingURL=test-utils.d.ts.map

package/build/typescript/react/test-utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"test-utils.d.ts","sourceRoot":"","sources":["../../../src/react/test-utils.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAC"}

package/build/typescript/server/http-handler.d.ts

@@ -1,17 +1,15 @@
 import type { ComponentType, ReactElement } from 'react';
 import type { AssetLoader } from '@quilted/async/server';
+import type { Options as ExtractOptions } from '@quilted/react-server-render/server';
 import type { Request, HttpHandler, RequestHandler } from '@quilted/http-handlers';
-export interface Options<Props = Record<string, never>> {
+export interface Options<Props = Record<string, never>> extends ExtractOptions {
     assets?: AssetLoader<unknown>;
     handler?: HttpHandler;
     renderProps?(options: {
         request: Request;
     }): Props;
 }
-export declare function createServerRenderingRequestHandler<Props>(App: ComponentType<Props>, { assets, renderProps }?: Pick<Options<Props>, 'assets' | 'renderProps'>): RequestHandler;
-export declare function createServerRenderingHttpHandler<Props>(App: ComponentType<Props>, { assets, renderProps, handler }: Options<Props>): HttpHandler;
-export declare function renderToResponse(element: ReactElement<any>, request: Request, { assets }?: {
-    assets?: AssetLoader<unknown>;
-    request?: Request;
-}): Promise<import("@quilted/http-handlers").Response | undefined>;
+export declare function createServerRenderingHttpHandler<Props>(App: ComponentType<Props>, { handler, ...options }: Options<Props>): HttpHandler;
+export declare function createServerRenderingRequestHandler<Props>(App: ComponentType<Props>, { renderProps, ...options }?: Omit<Options<Props>, 'handler'>): RequestHandler;
+export declare function renderToResponse<Props>(element: ReactElement<Props>, request: Request, { assets, ...options }?: Omit<Options<Props>, 'handler' | 'renderProps'>): Promise<import("@quilted/http-handlers").Response | undefined>;
 //# sourceMappingURL=http-handler.d.ts.map

package/build/typescript/server/http-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"http-handler.d.ts","sourceRoot":"","sources":["../../../src/server/http-handler.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,aAAa,EAAE,YAAY,EAAC,MAAM,OAAO,CAAC;AAEvD,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,uBAAuB,CAAC;AAIvD,OAAO,KAAK,EACV,OAAO,EACP,WAAW,EACX,cAAc,EACf,MAAM,wBAAwB,CAAC;AAIhC,MAAM,WAAW,OAAO,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC;IACpD,MAAM,CAAC,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IAC9B,OAAO,CAAC,EAAE,WAAW,CAAC;IACtB,WAAW,CAAC,CAAC,OAAO,EAAE;QAAC,OAAO,EAAE,OAAO,CAAA;KAAC,GAAG,KAAK,CAAC;CAClD;AAED,wBAAgB,mCAAmC,CAAC,KAAK,EACvD,GAAG,EAAE,aAAa,CAAC,KAAK,CAAC,EACzB,EAAC,MAAM,EAAE,WAAW,EAAC,GAAE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,QAAQ,GAAG,aAAa,CAAM,GACzE,cAAc,CAQhB;AAED,wBAAgB,gCAAgC,CAAC,KAAK,EACpD,GAAG,EAAE,aAAa,CAAC,KAAK,CAAC,EACzB,EAAC,MAAM,EAAE,WAAW,EAAE,OAA6B,EAAC,EAAE,OAAO,CAAC,KAAK,CAAC,eAIrE;AAED,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,YAAY,CAAC,GAAG,CAAC,EAC1B,OAAO,EAAE,OAAO,EAChB,EAAC,MAAM,EAAC,GAAE;IAAC,MAAM,CAAC,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAA;CAAM,kEAsDlE"}
+{"version":3,"file":"http-handler.d.ts","sourceRoot":"","sources":["../../../src/server/http-handler.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,aAAa,EAAE,YAAY,EAAC,MAAM,OAAO,CAAC;AAEvD,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,uBAAuB,CAAC;AAEvD,OAAO,KAAK,EAAC,OAAO,IAAI,cAAc,EAAC,MAAM,qCAAqC,CAAC;AAGnF,OAAO,KAAK,EACV,OAAO,EACP,WAAW,EACX,cAAc,EACf,MAAM,wBAAwB,CAAC;AAIhC,MAAM,WAAW,OAAO,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAE,SAAQ,cAAc;IAC5E,MAAM,CAAC,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IAC9B,OAAO,CAAC,EAAE,WAAW,CAAC;IACtB,WAAW,CAAC,CAAC,OAAO,EAAE;QAAC,OAAO,EAAE,OAAO,CAAA;KAAC,GAAG,KAAK,CAAC;CAClD;AAED,wBAAgB,gCAAgC,CAAC,KAAK,EACpD,GAAG,EAAE,aAAa,CAAC,KAAK,CAAC,EACzB,EAAC,OAA6B,EAAE,GAAG,OAAO,EAAC,EAAE,OAAO,CAAC,KAAK,CAAC,eAI5D;AAED,wBAAgB,mCAAmC,CAAC,KAAK,EACvD,GAAG,EAAE,aAAa,CAAC,KAAK,CAAC,EACzB,EAAC,WAAW,EAAE,GAAG,OAAO,EAAC,GAAE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,SAAS,CAAM,GAC9D,cAAc,CAQhB;AAED,wBAAsB,gBAAgB,CAAC,KAAK,EAC1C,OAAO,EAAE,YAAY,CAAC,KAAK,CAAC,EAC5B,OAAO,EAAE,OAAO,EAChB,EAAC,MAAM,EAAE,GAAG,OAAO,EAAC,GAAE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,SAAS,GAAG,aAAa,CAAM,kEAuD3E"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@quilted/quilt",
   "type": "module",
-  "version": "0.5.67",
+  "version": "0.5.70",
   "repository": {
     "type": "git",
     "url": "https://github.com/lemonmade/quilt.git",
@@ -79,6 +79,12 @@
       "import": "./build/esm/react/server.mjs",
       "require": "./build/cjs/react/server.cjs"
     },
+    "./react/test-utils": {
+      "quilt:from-source": "./src/react/test-utils.ts",
+      "quilt:esnext": "./build/esnext/react/test-utils.esnext",
+      "import": "./build/esm/react/test-utils.mjs",
+      "require": "./build/cjs/react/test-utils.cjs"
+    },
     "./react": {
       "quilt:from-source": "./src/react/index.ts",
       "quilt:esnext": "./build/esnext/react/index.esnext",
@@ -158,6 +164,9 @@
       "react/server": [
         "./build/typescript/react/server.d.ts"
       ],
+      "react/test-utils": [
+        "./build/typescript/react/test-utils.d.ts"
+      ],
       "react": [
         "./build/typescript/react/index.d.ts"
       ],
@@ -195,11 +204,12 @@
     "./build/esm/global.mjs"
   ],
   "dependencies": {
+    "@babel/runtime": ">=7.0.0 <8.0.0",
     "@quilted/async": "^0.3.12",
     "@quilted/graphql": "^0.4.14",
     "@quilted/http-handlers": "^0.2.20",
     "@quilted/polyfills": "^0.2.12",
-    "@quilted/preact-mini-compat": "^0.2.7",
+    "@quilted/react": "^0.1.0",
     "@quilted/react-async": "^0.3.22",
     "@quilted/react-email": "^0.2.18",
     "@quilted/react-graphql": "^0.4.30",
@@ -214,7 +224,7 @@
     "@quilted/useful-react-types": "^0.1.0",
     "@types/react": "^17.0.0",
     "@types/react-dom": "^17.0.0",
-    "preact": "^10.5.0",
+    "preact": "^10.6.0",
     "preact-render-to-string": "^5.0.0"
   },
   "devDependencies": {

package/sewing-kit.config.ts

@@ -14,6 +14,7 @@ export default createPackage((pkg) => {
     runtime: Runtime.Node,
   });
   pkg.entry({source: './src/react/jsx-runtime', name: 'react/jsx-runtime'});
+  pkg.entry({source: './src/react/test-utils', name: 'react/test-utils'});
   pkg.entry({source: './src/http-handlers', name: 'http-handlers'});
   pkg.entry({
     source: './src/http-handlers/node',

package/src/react/index.ts

@@ -1,5 +1,2 @@
-// @ts-expect-error No types for this package, but it is typically only used
-// as an alias anyways
-export * from '@quilted/preact-mini-compat';
-// @ts-expect-error See above
-export {default} from '@quilted/preact-mini-compat';
+export * from '@quilted/react';
+export {default} from '@quilted/react';

package/src/react/jsx-runtime.ts

@@ -1 +1 @@
-export * from 'preact/jsx-runtime';
+export * from '@quilted/react/jsx-runtime';

package/src/react/server.ts

@@ -1,3 +1 @@
-// @ts-expect-error No types for this package, but it is typically only used
-// as an alias anyways
-export * from 'preact/compat/server';
+export * from '@quilted/react/server';

package/src/react/test-utils.ts

@@ -0,0 +1 @@
+export * from '@quilted/react/test-utils';

package/src/server/http-handler.tsx

@@ -2,6 +2,7 @@ import type {ComponentType, ReactElement} from 'react';
 
 import type {AssetLoader} from '@quilted/async/server';
 import {render as renderToString, Html} from '@quilted/react-html/server';
+import type {Options as ExtractOptions} from '@quilted/react-server-render/server';
 
 import {createHttpHandler, html, redirect} from '@quilted/http-handlers';
 import type {
@@ -12,37 +13,37 @@ import type {
 
 import {renderApp} from './render';
 
-export interface Options<Props = Record<string, never>> {
+export interface Options<Props = Record<string, never>> extends ExtractOptions {
   assets?: AssetLoader<unknown>;
   handler?: HttpHandler;
   renderProps?(options: {request: Request}): Props;
 }
 
+export function createServerRenderingHttpHandler<Props>(
+  App: ComponentType<Props>,
+  {handler = createHttpHandler(), ...options}: Options<Props>,
+) {
+  handler.get(createServerRenderingRequestHandler(App, options));
+  return handler;
+}
+
 export function createServerRenderingRequestHandler<Props>(
   App: ComponentType<Props>,
-  {assets, renderProps}: Pick<Options<Props>, 'assets' | 'renderProps'> = {},
+  {renderProps, ...options}: Omit<Options<Props>, 'handler'> = {},
 ): RequestHandler {
   return (request) => {
     return renderToResponse(
       <App {...(renderProps?.({request}) as any)} />,
       request,
-      {assets},
+      options,
     );
   };
 }
 
-export function createServerRenderingHttpHandler<Props>(
-  App: ComponentType<Props>,
-  {assets, renderProps, handler = createHttpHandler()}: Options<Props>,
-) {
-  handler.get(createServerRenderingRequestHandler(App, {assets, renderProps}));
-  return handler;
-}
-
-export async function renderToResponse(
-  element: ReactElement<any>,
+export async function renderToResponse<Props>(
+  element: ReactElement<Props>,
   request: Request,
-  {assets}: {assets?: AssetLoader<unknown>; request?: Request} = {},
+  {assets, ...options}: Omit<Options<Props>, 'handler' | 'renderProps'> = {},
 ) {
   const accepts = request.headers.get('Accept');
 
@@ -54,6 +55,7 @@ export async function renderToResponse(
     markup,
     asyncAssets,
   } = await renderApp(element, {
+    ...options,
     url: request.url,
     headers: request.headers,
   });

package/tsconfig.json

@@ -5,12 +5,13 @@
     "outDir": "build/typescript"
   },
   "include": ["src"],
-  "exclude": ["sewing-kit.config.ts", "*.test.ts", "*.test.tsx"],
+  "exclude": ["sewing-kit.config.ts", "**/*.test.ts", "**/*.test.tsx"],
   "references": [
     {"path": "../async"},
     {"path": "../graphql"},
     {"path": "../http-handlers"},
     {"path": "../polyfills"},
+    {"path": "../react"},
     {"path": "../react-async"},
     {"path": "../react-email"},
     {"path": "../react-graphql"},