@quilted/create 0.1.79 → 0.1.80

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @quilted/create
 
+## 0.1.80
+
+### Patch Changes
+
+- [`97d00dd5`](https://github.com/lemonmade/quilt/commit/97d00dd5455958ba63e5cd2027f5b59af05ca9c4) Thanks [@lemonmade](https://github.com/lemonmade)! - Fix GraphQL template schema
+
+- [`99cea8fd`](https://github.com/lemonmade/quilt/commit/99cea8fd544f44b6377785a61bb760bc12263661) Thanks [@lemonmade](https://github.com/lemonmade)! - Fix template TypeScript issues
+
 ## 0.1.79
 
 ### Patch Changes

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@quilted/create",
   "type": "module",
-  "version": "0.1.79",
+  "version": "0.1.80",
   "license": "MIT",
   "repository": {
     "type": "git",

package/templates/app-basic/foundation/html/Head.test.tsx

@@ -1,7 +1,7 @@
 import {describe, it, expect} from '@quilted/quilt/testing';
 import {Viewport, SearchRobots} from '@quilted/quilt/html';
 
-import {renderApp} from '~/tests/render.tsx';
+import {renderApp} from '~/tests/render.ts';
 
 import {Head} from './Head.tsx';
 

package/templates/app-basic/foundation/http/Headers.test.tsx

@@ -1,7 +1,7 @@
 import {describe, it, expect} from '@quilted/quilt/testing';
 import {CacheControl, ContentSecurityPolicy} from '@quilted/quilt/http';
 
-import {renderApp} from '~/tests/render.tsx';
+import {renderApp} from '~/tests/render.ts';
 
 import {Headers} from './Headers.tsx';
 

package/templates/app-basic/tsconfig.json

@@ -8,6 +8,6 @@
     }
   },
   "include": ["**/*"],
-  "exclude": ["build", "quilt.project.ts", "**/*.test.ts", "**/*.test.tsx"],
+  "exclude": ["build", "quilt.project.ts"],
   "references": []
 }

package/templates/app-empty/tsconfig.json

@@ -4,6 +4,6 @@
     "outDir": "build/typescript"
   },
   "include": ["**/*"],
-  "exclude": ["build", "quilt.project.ts", "**/*.test.ts", "**/*.test.tsx"],
+  "exclude": ["build", "quilt.project.ts"],
   "references": []
 }

package/templates/app-graphql/browser.tsx

@@ -1,7 +1,7 @@
 import '@quilted/quilt/globals';
 import {hydrateRoot} from 'react-dom/client';
 
-import App from './App.tsx';
+import {App} from './App.tsx';
 
 const element = document.querySelector('#app')!;
 

package/templates/app-graphql/foundation/html/Head.test.tsx

@@ -1,7 +1,7 @@
 import {describe, it, expect} from '@quilted/quilt/testing';
 import {Viewport, SearchRobots} from '@quilted/quilt/html';
 
-import {renderApp} from '~/tests/render.tsx';
+import {renderApp} from '~/tests/render.ts';
 
 import {Head} from './Head.tsx';
 

package/templates/app-graphql/foundation/http/Headers.test.tsx

@@ -1,7 +1,7 @@
 import {describe, it, expect} from '@quilted/quilt/testing';
 import {CacheControl, ContentSecurityPolicy} from '@quilted/quilt/http';
 
-import {renderApp} from '~/tests/render.tsx';
+import {renderApp} from '~/tests/render.ts';
 
 import {Headers} from './Headers.tsx';
 

package/templates/app-graphql/graphql/schema.graphql

@@ -1,7 +1,9 @@
-scalar Name
+type Person {
+  name: String!
+}
 
 type Query {
-  name: Name!
+  me: Person!
 }
 
 schema {

package/templates/app-graphql/server/graphql.ts

@@ -7,8 +7,14 @@ import type {GraphQLResult, GraphQLSource} from '@quilted/quilt/graphql';
 
 import schemaSource, {type Schema} from '../graphql/schema.ts';
 
-const {createResolver, createQueryResolver} =
-  createGraphQLResolverBuilder<Schema>();
+interface GraphQLValues {
+  Person: {};
+}
+
+const {createResolver, createQueryResolver} = createGraphQLResolverBuilder<
+  Schema,
+  GraphQLValues
+>();
 
 const Person = createResolver('Person', {
   name: async () => 'Winston',

package/templates/app-graphql/tests/render/types.ts

@@ -21,15 +21,16 @@ export interface RenderOptions {
    * by this module.
    *
    * ```tsx
-   * import {renderWithAppContext, fillGraphQL, createGraphQLController} from '~/tests/render.tsx';
+   * import {renderApp} from '~/tests/render.ts';
+   * import {fillGraphQL, GraphQLController} from '~/tests/graphql.ts';
    *
    * import {MyComponent} from './MyComponent.tsx';
    * import myComponentQuery from './MyComponentQuery.graphql';
    *
-   * const myComponent = await renderWithAppContext(<MyComponent />, {
-   *   graphql: createGraphQLController(
-   *     fillGraphQL(myComponentQuery, {user: {name: 'Winston'}}),
-   *   ),
+   * const myComponent = await renderApp(<MyComponent />, {
+   *   graphql: new GraphQLController([
+   *     fillGraphQL(myComponentQuery, {me: {name: 'Winston'}}),
+   *   ]),
    * });
    * ```
    */

package/templates/app-graphql/tests/render.ts

@@ -4,4 +4,3 @@ export {TestRouter} from '@quilted/quilt/navigate/testing';
 
 export * from './render/types.ts';
 export {renderApp} from './render/render.tsx';
-export {fillGraphQL, GraphQLController} from './graphql.ts';

package/templates/app-graphql/tsconfig.json

@@ -8,6 +8,6 @@
     }
   },
   "include": ["**/*"],
-  "exclude": ["build", "quilt.project.ts", "**/*.test.ts", "**/*.test.tsx"],
+  "exclude": ["build", "quilt.project.ts"],
   "references": []
 }

package/templates/app-trpc/browser.tsx

@@ -4,7 +4,7 @@ import {httpBatchLink} from '@trpc/client';
 
 import {trpc} from '~/shared/trpc.ts';
 
-import App from './App.tsx';
+import {App} from './App.tsx';
 
 const element = document.querySelector('#app')!;
 

package/templates/app-trpc/foundation/html/Head.test.tsx

@@ -1,7 +1,7 @@
 import {describe, it, expect} from '@quilted/quilt/testing';
 import {Viewport, SearchRobots} from '@quilted/quilt/html';
 
-import {renderApp} from '~/tests/render.tsx';
+import {renderApp} from '~/tests/render.ts';
 
 import {Head} from './Head.tsx';
 

package/templates/app-trpc/foundation/http/Headers.test.tsx

@@ -1,7 +1,7 @@
 import {describe, it, expect} from '@quilted/quilt/testing';
 import {CacheControl, ContentSecurityPolicy} from '@quilted/quilt/http';
 
-import {renderApp} from '~/tests/render.tsx';
+import {renderApp} from '~/tests/render.ts';
 
 import {Headers} from './Headers.tsx';
 

package/templates/app-trpc/server.tsx

@@ -1,12 +1,14 @@
 import '@quilted/quilt/globals';
-import {createRequestRouter, createServerRender} from '@quilted/quilt/server';
-import {createBrowserAssets} from '@quilted/quilt/magic/assets';
+import {RequestRouter} from '@quilted/quilt/request-router';
+import {BrowserAssets} from '@quilted/quilt/magic/assets';
+
 import {createDirectClient} from '@quilted/trpc/server';
 import {fetchRequestHandler} from '@trpc/server/adapters/fetch';
 
 import {appRouter} from './trpc.ts';
 
-const router = createRequestRouter();
+const router = new RequestRouter();
+const assets = new BrowserAssets();
 
 router.any(
   'api',
@@ -22,16 +24,21 @@ router.any(
 );
 
 // For all GET requests, render our React application.
-router.get(
-  createServerRender(
-    async () => {
-      const {default: App} = await import('./App.tsx');
-      return <App trpc={createDirectClient(appRouter)} />;
-    },
+router.get(async (request) => {
+  const [{App}, {renderToResponse}] = await Promise.all([
+    import('./App.tsx'),
+    import('@quilted/quilt/server'),
+  ]);
+
+  const response = await renderToResponse(
+    <App trpc={createDirectClient(appRouter)} />,
     {
-      assets: createBrowserAssets(),
+      request,
+      assets,
     },
-  ),
-);
+  );
+
+  return response;
+});
 
 export default router;

package/templates/app-trpc/tsconfig.json

@@ -8,6 +8,6 @@
     }
   },
   "include": ["**/*"],
-  "exclude": ["build", "quilt.project.ts", "**/*.test.ts", "**/*.test.tsx"],
+  "exclude": ["build", "quilt.project.ts"],
   "references": []
 }