@quilted/create 0.2.33 → 0.2.35

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @quilted/create
 
+## 0.2.35
+
+### Patch Changes
+
+- [`5c418c3`](https://github.com/lemonmade/quilt/commit/5c418c3a9a7de7c5ee4337cbd02b68e4bcd2d581) Thanks [@lemonmade](https://github.com/lemonmade)! - Add `createContextRouteFunction()` helper for creating routes with a known context, and use it for app context
+
+- [`7dae2be`](https://github.com/lemonmade/quilt/commit/7dae2bebab01a4a4e2baf6c1799ce0adb59a5bb7) Thanks [@lemonmade](https://github.com/lemonmade)! - Rename `@quilted/quilt/navigate` to `@quilted/quilt/navigation`
+
+## 0.2.34
+
+### Patch Changes
+
+- [`759b46c`](https://github.com/lemonmade/quilt/commit/759b46c6b47efb14889b9ac80c416893bf90e83e) Thanks [@lemonmade](https://github.com/lemonmade)! - Upgrade Vite and Vitest dependencies
+
+- [`df319bd`](https://github.com/lemonmade/quilt/commit/df319bd30acf226005fcb7f9e7bf55d289004cbf) Thanks [@lemonmade](https://github.com/lemonmade)! - Fix server GraphQL execution in GraphQL template
+
 ## 0.2.33
 
 ### Patch Changes

package/build/esnext/_virtual/index2.esnext

@@ -1,3 +1,3 @@
-var out = {};
+var dirGlob = {exports: {}};
 
-export { out as __exports };
+export { dirGlob as __module };

package/build/esnext/_virtual/index3.esnext

@@ -1,3 +1,3 @@
-var out = {};
+var pathType = {};
 
-export { out as __exports };
+export { pathType as __exports };

package/build/esnext/_virtual/index4.esnext

@@ -1,3 +1,3 @@
-var dirGlob = {exports: {}};
+var out = {};
 
-export { dirGlob as __module };
+export { out as __exports };

package/build/esnext/_virtual/index5.esnext

@@ -1,3 +1,3 @@
-var pathType = {};
+var out = {};
 
-export { pathType as __exports };
+export { out as __exports };

package/build/esnext/node_modules/.pnpm/@nodelib_fs.scandir@2.1.5/node_modules/@nodelib/fs.scandir/out/providers/async.esnext

@@ -4,7 +4,7 @@ import { r as runParallel_1 } from '../../../../../../run-parallel@1.2.0/node_mo
 import '../constants.esnext';
 import '../utils/index.esnext';
 import './common.esnext';
-import { __exports as out } from '../../../../../../../../_virtual/index3.esnext';
+import { __exports as out } from '../../../../../../../../_virtual/index5.esnext';
 import { __exports as constants } from '../../../../../../../../_virtual/constants.esnext';
 import { __exports as utils$1 } from '../../../../../../../../_virtual/index7.esnext';
 import { __exports as common$1 } from '../../../../../../../../_virtual/common2.esnext';

package/build/esnext/node_modules/.pnpm/@nodelib_fs.scandir@2.1.5/node_modules/@nodelib/fs.scandir/out/providers/sync.esnext

@@ -3,7 +3,7 @@ import '../../../../../../@nodelib_fs.stat@2.0.5/node_modules/@nodelib/fs.stat/o
 import '../constants.esnext';
 import '../utils/index.esnext';
 import './common.esnext';
-import { __exports as out } from '../../../../../../../../_virtual/index3.esnext';
+import { __exports as out } from '../../../../../../../../_virtual/index5.esnext';
 import { __exports as constants } from '../../../../../../../../_virtual/constants.esnext';
 import { __exports as utils$1 } from '../../../../../../../../_virtual/index7.esnext';
 import { __exports as common$1 } from '../../../../../../../../_virtual/common2.esnext';

package/build/esnext/node_modules/.pnpm/@nodelib_fs.scandir@2.1.5/node_modules/@nodelib/fs.scandir/out/settings.esnext

@@ -2,7 +2,7 @@ import { __exports as settings } from '../../../../../../../_virtual/settings4.e
 import path__default from 'node:path';
 import '../../../../../@nodelib_fs.stat@2.0.5/node_modules/@nodelib/fs.stat/out/index.esnext';
 import './adapters/fs.esnext';
-import { __exports as out } from '../../../../../../../_virtual/index3.esnext';
+import { __exports as out } from '../../../../../../../_virtual/index5.esnext';
 import { __exports as fs$1 } from '../../../../../../../_virtual/fs3.esnext';
 
 Object.defineProperty(settings, "__esModule", { value: true });

package/build/esnext/node_modules/.pnpm/@nodelib_fs.stat@2.0.5/node_modules/@nodelib/fs.stat/out/index.esnext

@@ -1,4 +1,4 @@
-import { __exports as out } from '../../../../../../../_virtual/index3.esnext';
+import { __exports as out } from '../../../../../../../_virtual/index5.esnext';
 import './providers/async.esnext';
 import './providers/sync.esnext';
 import './settings.esnext';

package/build/esnext/node_modules/.pnpm/@nodelib_fs.walk@1.2.8/node_modules/@nodelib/fs.walk/out/index.esnext

@@ -1,4 +1,4 @@
-import { __exports as out } from '../../../../../../../_virtual/index2.esnext';
+import { __exports as out } from '../../../../../../../_virtual/index4.esnext';
 import './providers/async.esnext';
 import './providers/stream.esnext';
 import './providers/sync.esnext';

package/build/esnext/node_modules/.pnpm/dir-glob@3.0.1/node_modules/dir-glob/index.esnext

@@ -1,8 +1,8 @@
 import { getDefaultExportFromCjs } from '../../../../../_virtual/_commonjsHelpers.esnext';
-import { __module as dirGlob$1 } from '../../../../../_virtual/index4.esnext';
+import { __module as dirGlob$1 } from '../../../../../_virtual/index2.esnext';
 import path__default from 'node:path';
 import '../../../path-type@4.0.0/node_modules/path-type/index.esnext';
-import { __exports as pathType$1 } from '../../../../../_virtual/index5.esnext';
+import { __exports as pathType$1 } from '../../../../../_virtual/index3.esnext';
 
 const path = path__default;
 const pathType = pathType$1;

package/build/esnext/node_modules/.pnpm/fast-glob@3.2.12/node_modules/fast-glob/out/readers/async.esnext

@@ -2,7 +2,7 @@ import { __exports as async } from '../../../../../../../_virtual/async2.esnext'
 import '../../../../../@nodelib_fs.walk@1.2.8/node_modules/@nodelib/fs.walk/out/index.esnext';
 import './reader.esnext';
 import './stream.esnext';
-import { __exports as out } from '../../../../../../../_virtual/index2.esnext';
+import { __exports as out } from '../../../../../../../_virtual/index4.esnext';
 import { __exports as reader } from '../../../../../../../_virtual/reader.esnext';
 import { __exports as stream } from '../../../../../../../_virtual/stream2.esnext';
 

package/build/esnext/node_modules/.pnpm/fast-glob@3.2.12/node_modules/fast-glob/out/readers/reader.esnext

@@ -2,7 +2,7 @@ import { __exports as reader } from '../../../../../../../_virtual/reader.esnext
 import path__default from 'node:path';
 import '../../../../../@nodelib_fs.stat@2.0.5/node_modules/@nodelib/fs.stat/out/index.esnext';
 import '../utils/index.esnext';
-import { __exports as out } from '../../../../../../../_virtual/index3.esnext';
+import { __exports as out } from '../../../../../../../_virtual/index5.esnext';
 import { __exports as utils$1 } from '../../../../../../../_virtual/index.esnext';
 
 Object.defineProperty(reader, "__esModule", { value: true });

package/build/esnext/node_modules/.pnpm/fast-glob@3.2.12/node_modules/fast-glob/out/readers/stream.esnext

@@ -3,8 +3,8 @@ import require$$0 from 'node:stream';
 import '../../../../../@nodelib_fs.stat@2.0.5/node_modules/@nodelib/fs.stat/out/index.esnext';
 import '../../../../../@nodelib_fs.walk@1.2.8/node_modules/@nodelib/fs.walk/out/index.esnext';
 import './reader.esnext';
-import { __exports as out } from '../../../../../../../_virtual/index3.esnext';
-import { __exports as out$1 } from '../../../../../../../_virtual/index2.esnext';
+import { __exports as out } from '../../../../../../../_virtual/index5.esnext';
+import { __exports as out$1 } from '../../../../../../../_virtual/index4.esnext';
 import { __exports as reader } from '../../../../../../../_virtual/reader.esnext';
 
 Object.defineProperty(stream, "__esModule", { value: true });

package/build/esnext/node_modules/.pnpm/fast-glob@3.2.12/node_modules/fast-glob/out/readers/sync.esnext

@@ -2,8 +2,8 @@ import { __exports as sync } from '../../../../../../../_virtual/sync2.esnext';
 import '../../../../../@nodelib_fs.stat@2.0.5/node_modules/@nodelib/fs.stat/out/index.esnext';
 import '../../../../../@nodelib_fs.walk@1.2.8/node_modules/@nodelib/fs.walk/out/index.esnext';
 import './reader.esnext';
-import { __exports as out } from '../../../../../../../_virtual/index3.esnext';
-import { __exports as out$1 } from '../../../../../../../_virtual/index2.esnext';
+import { __exports as out } from '../../../../../../../_virtual/index5.esnext';
+import { __exports as out$1 } from '../../../../../../../_virtual/index4.esnext';
 import { __exports as reader } from '../../../../../../../_virtual/reader.esnext';
 
 Object.defineProperty(sync, "__esModule", { value: true });

package/build/esnext/node_modules/.pnpm/path-type@4.0.0/node_modules/path-type/index.esnext

@@ -1,4 +1,4 @@
-import { __exports as pathType } from '../../../../../_virtual/index5.esnext';
+import { __exports as pathType } from '../../../../../_virtual/index3.esnext';
 import require$$0 from 'node:util';
 import fs__default from 'node:fs';
 

package/package.json

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

package/templates/app-basic/App.tsx

@@ -1,7 +1,7 @@
 import type {RenderableProps} from 'preact';
 
 import {NotFound} from '@quilted/quilt/server';
-import {Navigation, route} from '@quilted/quilt/navigate';
+import {Navigation} from '@quilted/quilt/navigation';
 import {Localization, useLocaleFromEnvironment} from '@quilted/quilt/localize';
 
 import {HTML} from './foundation/html.ts';
@@ -13,6 +13,7 @@ import {
   AppContextReact,
   type AppContext as AppContextType,
 } from './shared/context.ts';
+import {routeWithAppContext} from './shared/navigation.ts';
 
 export interface AppProps {
   context: AppContextType;
@@ -21,16 +22,16 @@ export interface AppProps {
 // Define the routes for your application. If you have a lot of routes, you
 // might want to split this into a separate file.
 const routes = [
-  route('*', {
+  routeWithAppContext('*', {
     render: (children) => <Frame>{children}</Frame>,
     children: [
-      route('/', {
+      routeWithAppContext('/', {
         async load() {
           await Promise.all([Home.load()]);
         },
         render: <Home />,
       }),
-      route('*', {render: <NotFound />}),
+      routeWithAppContext('*', {render: <NotFound />}),
     ],
   }),
 ];

package/templates/app-basic/browser.tsx

@@ -1,7 +1,7 @@
 import '@quilted/quilt/globals';
 import {hydrate} from 'preact';
 import {Browser, BrowserContext} from '@quilted/quilt/browser';
-import {Router} from '@quilted/quilt/navigate';
+import {Router} from '@quilted/quilt/navigation';
 
 import type {AppContext} from '~/shared/context.ts';
 import {App} from './App.tsx';

package/templates/app-basic/server.tsx

@@ -1,7 +1,7 @@
 import '@quilted/quilt/globals';
 import {RequestRouter} from '@quilted/quilt/request-router';
 import {renderToResponse} from '@quilted/quilt/server';
-import {Router} from '@quilted/quilt/navigate';
+import {Router} from '@quilted/quilt/navigation';
 import {BrowserAssets} from 'quilt:module/assets';
 
 import type {AppContext} from '~/shared/context.ts';

package/templates/app-basic/shared/context.ts

@@ -1,12 +1,6 @@
 import {createOptionalContext} from '@quilted/quilt/context';
-import type {Router} from '@quilted/quilt/navigate';
 
-export interface AppContext {
-  /**
-   * The router used to control navigation throughout the application.
-   */
-  readonly router: Router;
-}
+export interface AppContext {}
 
 export const AppContextReact = createOptionalContext<AppContext>();
 export const useAppContext = AppContextReact.use;

package/templates/app-basic/shared/navigation.ts

@@ -0,0 +1,15 @@
+import type {Router} from '@quilted/quilt/navigation';
+import {createContextRouteFunction} from '@quilted/quilt/navigation';
+
+import type {AppContext} from '~/shared/context.ts';
+
+declare module '~/shared/context.ts' {
+  interface AppContext {
+    /**
+     * The router used to control navigation throughout the application.
+     */
+    readonly router: Router;
+  }
+}
+
+export const routeWithAppContext = createContextRouteFunction<AppContext>();

package/templates/app-basic/tests/render/render.tsx

@@ -1,6 +1,6 @@
 import {createRender} from '@quilted/quilt/testing';
 import {BrowserContext, BrowserTestMock} from '@quilted/quilt/browser/testing';
-import {TestRouting, TestRouter} from '@quilted/quilt/navigate/testing';
+import {TestRouting, TestRouter} from '@quilted/quilt/navigation/testing';
 import {Localization} from '@quilted/quilt/localize';
 
 import {AppContextReact} from '~/shared/context.ts';

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

@@ -1,4 +1,4 @@
-import type {TestRouter} from '@quilted/quilt/navigate/testing';
+import type {TestRouter} from '@quilted/quilt/navigation/testing';
 import type {BrowserTestMock} from '@quilted/quilt/browser/testing';
 
 import type {AppContext} from '~/shared/context.ts';

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

@@ -1,6 +1,6 @@
 import '@quilted/quilt/testing';
 
-export {TestRouter} from '@quilted/quilt/navigate/testing';
+export {TestRouter} from '@quilted/quilt/navigation/testing';
 
 export * from './render/types.ts';
 export {renderApp} from './render/render.tsx';

package/templates/app-graphql/App.tsx

@@ -2,7 +2,7 @@ import type {RenderableProps} from 'preact';
 
 import {NotFound} from '@quilted/quilt/server';
 import {GraphQLContext} from '@quilted/quilt/graphql';
-import {Navigation, route} from '@quilted/quilt/navigate';
+import {Navigation} from '@quilted/quilt/navigation';
 import {Localization, useLocaleFromEnvironment} from '@quilted/quilt/localize';
 
 import {HTML} from './foundation/html.ts';
@@ -14,6 +14,7 @@ import {
   AppContextReact,
   type AppContext as AppContextType,
 } from './shared/context.ts';
+import {routeWithAppContext} from './shared/navigation.ts';
 
 export interface AppProps {
   context: AppContextType;
@@ -22,16 +23,16 @@ export interface AppProps {
 // Define the routes for your application. If you have a lot of routes, you
 // might want to split this into a separate file.
 const routes = [
-  route('*', {
+  routeWithAppContext('*', {
     render: (children) => <Frame>{children}</Frame>,
     children: [
-      route('/', {
-        async load(_navigation, {graphql}: AppContextType) {
+      routeWithAppContext('/', {
+        async load({context: {graphql}}) {
           await Promise.all([Home.load(), graphql.cache.query(homeQuery)]);
         },
         render: <Home />,
       }),
-      route('*', {render: <NotFound />}),
+      routeWithAppContext('*', {render: <NotFound />}),
     ],
   }),
 ];

package/templates/app-graphql/browser.tsx

@@ -3,7 +3,7 @@ import '@quilted/quilt/globals';
 import {hydrate} from 'preact';
 import {createGraphQLFetch, GraphQLCache} from '@quilted/quilt/graphql';
 import {Browser, BrowserContext} from '@quilted/quilt/browser';
-import {Router} from '@quilted/quilt/navigate';
+import {Router} from '@quilted/quilt/navigation';
 
 import type {AppContext} from '~/shared/context.ts';
 

package/templates/app-graphql/server.tsx

@@ -1,7 +1,7 @@
 import '@quilted/quilt/globals';
 
 import {RequestRouter, JSONResponse} from '@quilted/quilt/request-router';
-import {Router} from '@quilted/quilt/navigate';
+import {Router} from '@quilted/quilt/navigation';
 import {BrowserAssets} from 'quilt:module/assets';
 
 import type {AppContext} from '~/shared/context.ts';
@@ -36,7 +36,7 @@ router.get(async (request) => {
     router: new Router(request.url),
     graphql: {
       fetch: performGraphQLOperation,
-      cache: new GraphQLCache(),
+      cache: new GraphQLCache({fetch: performGraphQLOperation}),
     },
   } satisfies AppContext;
 

package/templates/app-graphql/shared/context.ts

@@ -1,12 +1,6 @@
 import {createOptionalContext} from '@quilted/quilt/context';
-import type {Router} from '@quilted/quilt/navigate';
 
-export interface AppContext {
-  /**
-   * The router used to control navigation throughout the application.
-   */
-  readonly router: Router;
-}
+export interface AppContext {}
 
 export const AppContextReact = createOptionalContext<AppContext>();
 export const useAppContext = AppContextReact.use;

package/templates/app-graphql/shared/navigation.ts

@@ -0,0 +1,15 @@
+import type {Router} from '@quilted/quilt/navigation';
+import {createContextRouteFunction} from '@quilted/quilt/navigation';
+
+import type {AppContext} from '~/shared/context.ts';
+
+declare module '~/shared/context.ts' {
+  interface AppContext {
+    /**
+     * The router used to control navigation throughout the application.
+     */
+    readonly router: Router;
+  }
+}
+
+export const routeWithAppContext = createContextRouteFunction<AppContext>();

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

@@ -2,7 +2,7 @@ import {Suspense} from 'preact/compat';
 
 import {createRender} from '@quilted/quilt/testing';
 import {BrowserContext, BrowserTestMock} from '@quilted/quilt/browser/testing';
-import {TestRouting, TestRouter} from '@quilted/quilt/navigate/testing';
+import {Navigation, TestRouter} from '@quilted/quilt/navigation/testing';
 import {Localization} from '@quilted/quilt/localize';
 import {GraphQLCache} from '@quilted/quilt/graphql';
 
@@ -34,24 +34,26 @@ export const renderApp = createRender<
     return {
       router,
       browser,
-      graphql,
-      fetchGraphQL: graphql.fetch,
-      graphQLCache,
+      graphql: {fetch: graphql.fetch, cache: graphQLCache},
+      graphQLController: graphql,
     };
   },
   // Render all of our app-wide context providers around each component under test.
   render(element, context, {locale = 'en'}) {
-    const {router, browser, graphql, graphQLCache} = context;
+    const {router, browser, graphql, graphQLController} = context;
 
     return (
       <AppContextReact.Provider value={context}>
         <BrowserContext browser={browser}>
           <Localization locale={locale}>
-            <TestRouting router={router}>
-              <GraphQLTesting controller={graphql} cache={graphQLCache}>
+            <Navigation router={router}>
+              <GraphQLTesting
+                controller={graphQLController}
+                cache={graphql.cache}
+              >
                 <Suspense fallback={null}>{element}</Suspense>
               </GraphQLTesting>
-            </TestRouting>
+            </Navigation>
           </Localization>
         </BrowserContext>
       </AppContextReact.Provider>
@@ -64,7 +66,7 @@ export const renderApp = createRender<
     // once the data is ready.
 
     await wrapper.act(async () => {
-      await wrapper.context.graphql.resolveAll();
+      await wrapper.context.graphQLController.resolveAll();
     });
   },
 });

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

@@ -1,4 +1,4 @@
-import type {TestRouter} from '@quilted/quilt/navigate/testing';
+import type {TestRouter} from '@quilted/quilt/navigation/testing';
 import type {BrowserTestMock} from '@quilted/quilt/browser/testing';
 import type {GraphQLCache} from '@quilted/quilt/graphql';
 
@@ -68,12 +68,7 @@ export interface RenderContext extends AppContext {
   /**
    * The GraphQL controller used for this component test.
    */
-  readonly graphql: GraphQLController;
-
-  /**
-   * The cache of GraphQL query results.
-   */
-  readonly graphQLCache: GraphQLCache;
+  readonly graphQLController: GraphQLController;
 }
 
 export interface RenderActions extends Record<string, never> {}

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

@@ -1,6 +1,6 @@
 import '@quilted/quilt/testing';
 
-export {TestRouter} from '@quilted/quilt/navigate/testing';
+export {TestRouter} from '@quilted/quilt/navigation/testing';
 
 export * from './render/types.ts';
 export {renderApp} from './render/render.tsx';

package/templates/app-trpc/App.tsx

@@ -1,7 +1,7 @@
 import type {RenderableProps} from 'preact';
 
 import {NotFound} from '@quilted/quilt/server';
-import {Navigation, route} from '@quilted/quilt/navigate';
+import {Navigation, route} from '@quilted/quilt/navigation';
 import {Localization, useLocaleFromEnvironment} from '@quilted/quilt/localize';
 
 import {ReactQueryContext} from '@quilted/react-query';
@@ -16,6 +16,7 @@ import {
   AppContextReact,
   type AppContext as AppContextType,
 } from './shared/context.ts';
+import {routeWithAppContext} from './shared/navigation.ts';
 
 export interface AppProps {
   context: AppContextType;
@@ -24,16 +25,16 @@ export interface AppProps {
 // Define the routes for your application. If you have a lot of routes, you
 // might want to split this into a separate file.
 const routes = [
-  route('*', {
+  routeWithAppContext('*', {
     render: (children) => <Frame>{children}</Frame>,
     children: [
-      route('/', {
+      routeWithAppContext('/', {
         async load() {
           await Promise.all([Home.load()]);
         },
         render: <Home />,
       }),
-      route('*', {render: <NotFound />}),
+      routeWithAppContext('*', {render: <NotFound />}),
     ],
   }),
 ];
@@ -44,7 +45,7 @@ export function App({context}: AppProps) {
   return (
     <AppContext context={context}>
       <HTML>
-        <Navigation routes={routes} context={context} />
+        <Navigation router={context.router} routes={routes} context={context} />
       </HTML>
     </AppContext>
   );

package/templates/app-trpc/browser.tsx

@@ -4,7 +4,7 @@ import {hydrate} from 'preact';
 import {httpBatchLink} from '@trpc/client';
 import {QueryClient} from '@tanstack/react-query';
 import {Browser, BrowserContext} from '@quilted/quilt/browser';
-import {Router} from '@quilted/quilt/navigate';
+import {Router} from '@quilted/quilt/navigation';
 
 import type {AppContext} from '~/shared/context.ts';
 import {trpc} from '~/shared/trpc.ts';

package/templates/app-trpc/server.tsx

@@ -31,7 +31,7 @@ router.get(async (request) => {
     await Promise.all([
       import('./App.tsx'),
       import('@quilted/quilt/server'),
-      import('@quilted/quilt/navigate'),
+      import('@quilted/quilt/navigation'),
       import('@tanstack/react-query'),
     ]);
 

package/templates/app-trpc/shared/context.ts

@@ -1,12 +1,6 @@
 import {createOptionalContext} from '@quilted/quilt/context';
-import type {Router} from '@quilted/quilt/navigate';
 
-export interface AppContext {
-  /**
-   * The router used to control navigation throughout the application.
-   */
-  readonly router: Router;
-}
+export interface AppContext {}
 
 export const AppContextReact = createOptionalContext<AppContext>();
 export const useAppContext = AppContextReact.use;

package/templates/app-trpc/shared/navigation.ts

@@ -0,0 +1,15 @@
+import type {Router} from '@quilted/quilt/navigation';
+import {createContextRouteFunction} from '@quilted/quilt/navigation';
+
+import type {AppContext} from '~/shared/context.ts';
+
+declare module '~/shared/context.ts' {
+  interface AppContext {
+    /**
+     * The router used to control navigation throughout the application.
+     */
+    readonly router: Router;
+  }
+}
+
+export const routeWithAppContext = createContextRouteFunction<AppContext>();

package/templates/app-trpc/tests/render/render.tsx

@@ -1,6 +1,6 @@
 import {createRender} from '@quilted/quilt/testing';
 import {BrowserContext, BrowserTestMock} from '@quilted/quilt/browser/testing';
-import {TestRouting, TestRouter} from '@quilted/quilt/navigate/testing';
+import {Navigation, TestRouter} from '@quilted/quilt/navigation/testing';
 import {Localization} from '@quilted/quilt/localize';
 
 import {QueryClient, QueryClientProvider} from '@tanstack/react-query';
@@ -39,13 +39,13 @@ export const renderApp = createRender<
       <AppContextReact.Provider value={context}>
         <BrowserContext browser={browser}>
           <Localization locale={locale}>
-            <TestRouting router={router}>
+            <Navigation router={router}>
               <trpc.Provider client={trpcClient} queryClient={queryClient}>
                 <QueryClientProvider client={queryClient}>
                   {element}
                 </QueryClientProvider>
               </trpc.Provider>
-            </TestRouting>
+            </Navigation>
           </Localization>
         </BrowserContext>
       </AppContextReact.Provider>

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

@@ -1,4 +1,4 @@
-import type {TestRouter} from '@quilted/quilt/navigate/testing';
+import type {TestRouter} from '@quilted/quilt/navigation/testing';
 import type {BrowserTestMock} from '@quilted/quilt/browser/testing';
 import type {QueryClient} from '@tanstack/react-query';
 

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

@@ -1,6 +1,6 @@
 import '@quilted/quilt/testing';
 
-export {TestRouter} from '@quilted/quilt/navigate/testing';
+export {TestRouter} from '@quilted/quilt/navigation/testing';
 
 export * from './render/types.ts';
 export {renderApp} from './render/render.tsx';

package/templates/workspace/package.json

@@ -20,8 +20,8 @@
     "prettier": "^3.0.0",
     "tsx": "^4.9.0",
     "typescript": "^5.5.0",
-    "vite": "^5.2.0",
-    "vitest": "^1.6.0"
+    "vite": "^5.3.0",
+    "vitest": "^2.0.0"
   },
   "prettier": {
     "arrowParens": "always",