@baseplate-dev/react-generators 0.2.2 → 0.2.3

package/dist/generators/core/react-router/generated/template-paths.d.ts

@@ -1,7 +1,7 @@
 export interface CoreReactRouterPaths {
-    rootRoute: string;
     placeholderIndex: string;
-    appRoutes: string;
+    rootRoute: string;
+    router: string;
     routeTree: string;
 }
 export declare const CORE_REACT_ROUTER_PATHS: {

package/dist/generators/core/react-router/generated/template-paths.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"template-paths.d.ts","sourceRoot":"","sources":["../../../../../src/generators/core/react-router/generated/template-paths.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,oBAAoB;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,EAAE,MAAM,CAAC;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB;AA6BD,eAAO,MAAM,uBAAuB;;;;;;;;CAGnC,CAAC"}
+{"version":3,"file":"template-paths.d.ts","sourceRoot":"","sources":["../../../../../src/generators/core/react-router/generated/template-paths.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,oBAAoB;IACnC,gBAAgB,EAAE,MAAM,CAAC;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACnB;AA6BD,eAAO,MAAM,uBAAuB;;;;;;;;CAGnC,CAAC"}

package/dist/generators/core/react-router/generated/template-paths.js

@@ -9,14 +9,14 @@ const coreReactRouterPathsTask = createGeneratorTask({
     },
     exports: { coreReactRouterPaths: coreReactRouterPaths.export() },
     run({ packageInfo, reactRoutes }) {
-        const routesRoot = reactRoutes.getDirectoryBase();
+        const routesRoot = reactRoutes.getOutputRelativePath();
         const srcRoot = packageInfo.getPackageSrcPath();
         return {
             providers: {
                 coreReactRouterPaths: {
-                    appRoutes: `${srcRoot}/app/app-routes.tsx`,
                     placeholderIndex: `${routesRoot}/index.tsx`,
                     rootRoute: `${routesRoot}/__root.tsx`,
+                    router: `${srcRoot}/app/router.tsx`,
                     routeTree: `${srcRoot}/route-tree.gen.ts`,
                 },
             },

package/dist/generators/core/react-router/generated/template-paths.js.map

@@ -1 +1 @@
-{"version":3,"file":"template-paths.js","sourceRoot":"","sources":["../../../../../src/generators/core/react-router/generated/template-paths.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AACrE,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAE9E,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAS/D,MAAM,oBAAoB,GAAG,kBAAkB,CAC7C,yBAAyB,CAC1B,CAAC;AAEF,MAAM,wBAAwB,GAAG,mBAAmB,CAAC;IACnD,YAAY,EAAE;QACZ,WAAW,EAAE,mBAAmB;QAChC,WAAW,EAAE,mBAAmB;KACjC;IACD,OAAO,EAAE,EAAE,oBAAoB,EAAE,oBAAoB,CAAC,MAAM,EAAE,EAAE;IAChE,GAAG,CAAC,EAAE,WAAW,EAAE,WAAW,EAAE;QAC9B,MAAM,UAAU,GAAG,WAAW,CAAC,gBAAgB,EAAE,CAAC;QAClD,MAAM,OAAO,GAAG,WAAW,CAAC,iBAAiB,EAAE,CAAC;QAEhD,OAAO;YACL,SAAS,EAAE;gBACT,oBAAoB,EAAE;oBACpB,SAAS,EAAE,GAAG,OAAO,qBAAqB;oBAC1C,gBAAgB,EAAE,GAAG,UAAU,YAAY;oBAC3C,SAAS,EAAE,GAAG,UAAU,aAAa;oBACrC,SAAS,EAAE,GAAG,OAAO,oBAAoB;iBAC1C;aACF;SACF,CAAC;IACJ,CAAC;CACF,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,uBAAuB,GAAG;IACrC,QAAQ,EAAE,oBAAoB;IAC9B,IAAI,EAAE,wBAAwB;CAC/B,CAAC"}
+{"version":3,"file":"template-paths.js","sourceRoot":"","sources":["../../../../../src/generators/core/react-router/generated/template-paths.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AACrE,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAE9E,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAS/D,MAAM,oBAAoB,GAAG,kBAAkB,CAC7C,yBAAyB,CAC1B,CAAC;AAEF,MAAM,wBAAwB,GAAG,mBAAmB,CAAC;IACnD,YAAY,EAAE;QACZ,WAAW,EAAE,mBAAmB;QAChC,WAAW,EAAE,mBAAmB;KACjC;IACD,OAAO,EAAE,EAAE,oBAAoB,EAAE,oBAAoB,CAAC,MAAM,EAAE,EAAE;IAChE,GAAG,CAAC,EAAE,WAAW,EAAE,WAAW,EAAE;QAC9B,MAAM,UAAU,GAAG,WAAW,CAAC,qBAAqB,EAAE,CAAC;QACvD,MAAM,OAAO,GAAG,WAAW,CAAC,iBAAiB,EAAE,CAAC;QAEhD,OAAO;YACL,SAAS,EAAE;gBACT,oBAAoB,EAAE;oBACpB,gBAAgB,EAAE,GAAG,UAAU,YAAY;oBAC3C,SAAS,EAAE,GAAG,UAAU,aAAa;oBACrC,MAAM,EAAE,GAAG,OAAO,iBAAiB;oBACnC,SAAS,EAAE,GAAG,OAAO,oBAAoB;iBAC1C;aACF;SACF,CAAC;IACJ,CAAC;CACF,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,uBAAuB,GAAG;IACrC,QAAQ,EAAE,oBAAoB;IAC9B,IAAI,EAAE,wBAAwB;CAC/B,CAAC"}

package/dist/generators/core/react-router/generated/template-renderers.d.ts

@@ -2,15 +2,15 @@ import type { RenderTsTemplateFileActionInput } from '@baseplate-dev/core-genera
 import type { BuilderAction } from '@baseplate-dev/sync';
 import { CORE_REACT_ROUTER_TEMPLATES } from './typed-templates.js';
 export interface CoreReactRouterRenderers {
-    appRoutes: {
-        render: (options: Omit<RenderTsTemplateFileActionInput<typeof CORE_REACT_ROUTER_TEMPLATES.appRoutes>, 'destination' | 'importMapProviders' | 'template'>) => BuilderAction;
-    };
     placeholderIndex: {
         render: (options: Omit<RenderTsTemplateFileActionInput<typeof CORE_REACT_ROUTER_TEMPLATES.placeholderIndex>, 'destination' | 'importMapProviders' | 'template'>) => BuilderAction;
     };
     rootRoute: {
         render: (options: Omit<RenderTsTemplateFileActionInput<typeof CORE_REACT_ROUTER_TEMPLATES.rootRoute>, 'destination' | 'importMapProviders' | 'template'>) => BuilderAction;
     };
+    router: {
+        render: (options: Omit<RenderTsTemplateFileActionInput<typeof CORE_REACT_ROUTER_TEMPLATES.router>, 'destination' | 'importMapProviders' | 'template'>) => BuilderAction;
+    };
     routeTree: {
         render: (options: Omit<RenderTsTemplateFileActionInput<typeof CORE_REACT_ROUTER_TEMPLATES.routeTree>, 'destination' | 'importMapProviders' | 'template'>) => BuilderAction;
     };
@@ -26,10 +26,17 @@ export declare const CORE_REACT_ROUTER_RENDERERS: {
                 isTypeOnly: true;
             };
             Alert: {};
+            AlertDescription: {};
+            AlertTitle: {};
             Button: {};
             buttonVariants: {};
             Calendar: {};
             Card: {};
+            CardContent: {};
+            CardDescription: {};
+            CardFooter: {};
+            CardHeader: {};
+            CardTitle: {};
             Checkbox: {};
             CheckboxField: {};
             CheckboxFieldController: {};
@@ -116,12 +123,6 @@ export declare const CORE_REACT_ROUTER_RENDERERS: {
             SidebarLayout: {};
             SidebarLayoutContent: {};
             SidebarLayoutSidebar: {};
-            Status: {
-                isTypeOnly: true;
-            };
-            StatusType: {
-                isTypeOnly: true;
-            };
             Switch: {};
             SwitchField: {};
             SwitchFieldController: {};
@@ -146,7 +147,6 @@ export declare const CORE_REACT_ROUTER_RENDERERS: {
             useConfirmDialogState: {};
             useControlledState: {};
             useControllerMerged: {};
-            useStatus: {};
         }>>;
         typescriptFile: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").TypescriptFileProvider>;
     }, undefined>;

package/dist/generators/core/react-router/generated/template-renderers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"template-renderers.d.ts","sourceRoot":"","sources":["../../../../../src/generators/core/react-router/generated/template-renderers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,gCAAgC,CAAC;AACtF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAQzD,OAAO,EAAE,2BAA2B,EAAE,MAAM,sBAAsB,CAAC;AAEnE,MAAM,WAAW,wBAAwB;IACvC,SAAS,EAAE;QACT,MAAM,EAAE,CACN,OAAO,EAAE,IAAI,CACX,+BAA+B,CAC7B,OAAO,2BAA2B,CAAC,SAAS,CAC7C,EACD,aAAa,GAAG,oBAAoB,GAAG,UAAU,CAClD,KACE,aAAa,CAAC;KACpB,CAAC;IACF,gBAAgB,EAAE;QAChB,MAAM,EAAE,CACN,OAAO,EAAE,IAAI,CACX,+BAA+B,CAC7B,OAAO,2BAA2B,CAAC,gBAAgB,CACpD,EACD,aAAa,GAAG,oBAAoB,GAAG,UAAU,CAClD,KACE,aAAa,CAAC;KACpB,CAAC;IACF,SAAS,EAAE;QACT,MAAM,EAAE,CACN,OAAO,EAAE,IAAI,CACX,+BAA+B,CAC7B,OAAO,2BAA2B,CAAC,SAAS,CAC7C,EACD,aAAa,GAAG,oBAAoB,GAAG,UAAU,CAClD,KACE,aAAa,CAAC;KACpB,CAAC;IACF,SAAS,EAAE;QACT,MAAM,EAAE,CACN,OAAO,EAAE,IAAI,CACX,+BAA+B,CAC7B,OAAO,2BAA2B,CAAC,SAAS,CAC7C,EACD,aAAa,GAAG,oBAAoB,GAAG,UAAU,CAClD,KACE,aAAa,CAAC;KACpB,CAAC;CACH;AA0DD,eAAO,MAAM,2BAA2B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAGvC,CAAC"}
+{"version":3,"file":"template-renderers.d.ts","sourceRoot":"","sources":["../../../../../src/generators/core/react-router/generated/template-renderers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,gCAAgC,CAAC;AACtF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAQzD,OAAO,EAAE,2BAA2B,EAAE,MAAM,sBAAsB,CAAC;AAEnE,MAAM,WAAW,wBAAwB;IACvC,gBAAgB,EAAE;QAChB,MAAM,EAAE,CACN,OAAO,EAAE,IAAI,CACX,+BAA+B,CAC7B,OAAO,2BAA2B,CAAC,gBAAgB,CACpD,EACD,aAAa,GAAG,oBAAoB,GAAG,UAAU,CAClD,KACE,aAAa,CAAC;KACpB,CAAC;IACF,SAAS,EAAE;QACT,MAAM,EAAE,CACN,OAAO,EAAE,IAAI,CACX,+BAA+B,CAC7B,OAAO,2BAA2B,CAAC,SAAS,CAC7C,EACD,aAAa,GAAG,oBAAoB,GAAG,UAAU,CAClD,KACE,aAAa,CAAC;KACpB,CAAC;IACF,MAAM,EAAE;QACN,MAAM,EAAE,CACN,OAAO,EAAE,IAAI,CACX,+BAA+B,CAC7B,OAAO,2BAA2B,CAAC,MAAM,CAC1C,EACD,aAAa,GAAG,oBAAoB,GAAG,UAAU,CAClD,KACE,aAAa,CAAC;KACpB,CAAC;IACF,SAAS,EAAE;QACT,MAAM,EAAE,CACN,OAAO,EAAE,IAAI,CACX,+BAA+B,CAC7B,OAAO,2BAA2B,CAAC,SAAS,CAC7C,EACD,aAAa,GAAG,oBAAoB,GAAG,UAAU,CAClD,KACE,aAAa,CAAC;KACpB,CAAC;CACH;AA0DD,eAAO,MAAM,2BAA2B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAGvC,CAAC"}

package/dist/generators/core/react-router/generated/template-renderers.js

@@ -15,16 +15,6 @@ const coreReactRouterRenderersTask = createGeneratorTask({
         return {
             providers: {
                 coreReactRouterRenderers: {
-                    appRoutes: {
-                        render: (options) => typescriptFile.renderTemplateFile({
-                            template: CORE_REACT_ROUTER_TEMPLATES.appRoutes,
-                            destination: paths.appRoutes,
-                            importMapProviders: {
-                                reactComponentsImports,
-                            },
-                            ...options,
-                        }),
-                    },
                     placeholderIndex: {
                         render: (options) => typescriptFile.renderTemplateFile({
                             template: CORE_REACT_ROUTER_TEMPLATES.placeholderIndex,
@@ -39,6 +29,16 @@ const coreReactRouterRenderersTask = createGeneratorTask({
                             ...options,
                         }),
                     },
+                    router: {
+                        render: (options) => typescriptFile.renderTemplateFile({
+                            template: CORE_REACT_ROUTER_TEMPLATES.router,
+                            destination: paths.router,
+                            importMapProviders: {
+                                reactComponentsImports,
+                            },
+                            ...options,
+                        }),
+                    },
                     routeTree: {
                         render: (options) => typescriptFile.renderTemplateFile({
                             template: CORE_REACT_ROUTER_TEMPLATES.routeTree,

package/dist/generators/core/react-router/generated/template-renderers.js.map

@@ -1 +1 @@
-{"version":3,"file":"template-renderers.js","sourceRoot":"","sources":["../../../../../src/generators/core/react-router/generated/template-renderers.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AACxE,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAE9E,OAAO,EAAE,8BAA8B,EAAE,MAAM,wEAAwE,CAAC;AAExH,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAE,2BAA2B,EAAE,MAAM,sBAAsB,CAAC;AA6CnE,MAAM,wBAAwB,GAAG,kBAAkB,CACjD,6BAA6B,CAC9B,CAAC;AAEF,MAAM,4BAA4B,GAAG,mBAAmB,CAAC;IACvD,YAAY,EAAE;QACZ,KAAK,EAAE,uBAAuB,CAAC,QAAQ;QACvC,sBAAsB,EAAE,8BAA8B;QACtD,cAAc,EAAE,sBAAsB;KACvC;IACD,OAAO,EAAE,EAAE,wBAAwB,EAAE,wBAAwB,CAAC,MAAM,EAAE,EAAE;IACxE,GAAG,CAAC,EAAE,KAAK,EAAE,sBAAsB,EAAE,cAAc,EAAE;QACnD,OAAO;YACL,SAAS,EAAE;gBACT,wBAAwB,EAAE;oBACxB,SAAS,EAAE;wBACT,MAAM,EAAE,CAAC,OAAO,EAAE,EAAE,CAClB,cAAc,CAAC,kBAAkB,CAAC;4BAChC,QAAQ,EAAE,2BAA2B,CAAC,SAAS;4BAC/C,WAAW,EAAE,KAAK,CAAC,SAAS;4BAC5B,kBAAkB,EAAE;gCAClB,sBAAsB;6BACvB;4BACD,GAAG,OAAO;yBACX,CAAC;qBACL;oBACD,gBAAgB,EAAE;wBAChB,MAAM,EAAE,CAAC,OAAO,EAAE,EAAE,CAClB,cAAc,CAAC,kBAAkB,CAAC;4BAChC,QAAQ,EAAE,2BAA2B,CAAC,gBAAgB;4BACtD,WAAW,EAAE,KAAK,CAAC,gBAAgB;4BACnC,GAAG,OAAO;yBACX,CAAC;qBACL;oBACD,SAAS,EAAE;wBACT,MAAM,EAAE,CAAC,OAAO,EAAE,EAAE,CAClB,cAAc,CAAC,kBAAkB,CAAC;4BAChC,QAAQ,EAAE,2BAA2B,CAAC,SAAS;4BAC/C,WAAW,EAAE,KAAK,CAAC,SAAS;4BAC5B,GAAG,OAAO;yBACX,CAAC;qBACL;oBACD,SAAS,EAAE;wBACT,MAAM,EAAE,CAAC,OAAO,EAAE,EAAE,CAClB,cAAc,CAAC,kBAAkB,CAAC;4BAChC,QAAQ,EAAE,2BAA2B,CAAC,SAAS;4BAC/C,WAAW,EAAE,KAAK,CAAC,SAAS;4BAC5B,GAAG,OAAO;yBACX,CAAC;qBACL;iBACF;aACF;SACF,CAAC;IACJ,CAAC;CACF,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,2BAA2B,GAAG;IACzC,QAAQ,EAAE,wBAAwB;IAClC,IAAI,EAAE,4BAA4B;CACnC,CAAC"}
+{"version":3,"file":"template-renderers.js","sourceRoot":"","sources":["../../../../../src/generators/core/react-router/generated/template-renderers.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AACxE,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAE9E,OAAO,EAAE,8BAA8B,EAAE,MAAM,wEAAwE,CAAC;AAExH,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAE,2BAA2B,EAAE,MAAM,sBAAsB,CAAC;AA6CnE,MAAM,wBAAwB,GAAG,kBAAkB,CACjD,6BAA6B,CAC9B,CAAC;AAEF,MAAM,4BAA4B,GAAG,mBAAmB,CAAC;IACvD,YAAY,EAAE;QACZ,KAAK,EAAE,uBAAuB,CAAC,QAAQ;QACvC,sBAAsB,EAAE,8BAA8B;QACtD,cAAc,EAAE,sBAAsB;KACvC;IACD,OAAO,EAAE,EAAE,wBAAwB,EAAE,wBAAwB,CAAC,MAAM,EAAE,EAAE;IACxE,GAAG,CAAC,EAAE,KAAK,EAAE,sBAAsB,EAAE,cAAc,EAAE;QACnD,OAAO;YACL,SAAS,EAAE;gBACT,wBAAwB,EAAE;oBACxB,gBAAgB,EAAE;wBAChB,MAAM,EAAE,CAAC,OAAO,EAAE,EAAE,CAClB,cAAc,CAAC,kBAAkB,CAAC;4BAChC,QAAQ,EAAE,2BAA2B,CAAC,gBAAgB;4BACtD,WAAW,EAAE,KAAK,CAAC,gBAAgB;4BACnC,GAAG,OAAO;yBACX,CAAC;qBACL;oBACD,SAAS,EAAE;wBACT,MAAM,EAAE,CAAC,OAAO,EAAE,EAAE,CAClB,cAAc,CAAC,kBAAkB,CAAC;4BAChC,QAAQ,EAAE,2BAA2B,CAAC,SAAS;4BAC/C,WAAW,EAAE,KAAK,CAAC,SAAS;4BAC5B,GAAG,OAAO;yBACX,CAAC;qBACL;oBACD,MAAM,EAAE;wBACN,MAAM,EAAE,CAAC,OAAO,EAAE,EAAE,CAClB,cAAc,CAAC,kBAAkB,CAAC;4BAChC,QAAQ,EAAE,2BAA2B,CAAC,MAAM;4BAC5C,WAAW,EAAE,KAAK,CAAC,MAAM;4BACzB,kBAAkB,EAAE;gCAClB,sBAAsB;6BACvB;4BACD,GAAG,OAAO;yBACX,CAAC;qBACL;oBACD,SAAS,EAAE;wBACT,MAAM,EAAE,CAAC,OAAO,EAAE,EAAE,CAClB,cAAc,CAAC,kBAAkB,CAAC;4BAChC,QAAQ,EAAE,2BAA2B,CAAC,SAAS;4BAC/C,WAAW,EAAE,KAAK,CAAC,SAAS;4BAC5B,GAAG,OAAO;yBACX,CAAC;qBACL;iBACF;aACF;SACF,CAAC;IACJ,CAAC;CACF,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,2BAA2B,GAAG;IACzC,QAAQ,EAAE,wBAAwB;IAClC,IAAI,EAAE,4BAA4B;CACnC,CAAC"}

package/dist/generators/core/react-router/generated/ts-import-providers.d.ts

@@ -1,20 +1,17 @@
 import type { TsImportMapProviderFromSchema } from '@baseplate-dev/core-generators';
 declare const reactRouterImportsSchema: {
     AppRoutes: {};
-    Route: {};
     router: {};
 };
 export type ReactRouterImportsProvider = TsImportMapProviderFromSchema<typeof reactRouterImportsSchema>;
 export declare const reactRouterImportsProvider: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
     AppRoutes: {};
-    Route: {};
     router: {};
 }>>;
 export declare const CORE_REACT_ROUTER_IMPORTS: {
     task: import("@baseplate-dev/sync").GeneratorTask<{
         reactRouterImports: import("@baseplate-dev/sync").ProviderExport<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
             AppRoutes: {};
-            Route: {};
             router: {};
         }>>;
     }, {

package/dist/generators/core/react-router/generated/ts-import-providers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ts-import-providers.d.ts","sourceRoot":"","sources":["../../../../../src/generators/core/react-router/generated/ts-import-providers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,gCAAgC,CAAC;AAcpF,QAAA,MAAM,wBAAwB;;;;CAI5B,CAAC;AAEH,MAAM,MAAM,0BAA0B,GAAG,6BAA6B,CACpE,OAAO,wBAAwB,CAChC,CAAC;AAEF,eAAO,MAAM,0BAA0B;;;;GAGpC,CAAC;AAsBJ,eAAO,MAAM,yBAAyB;;;;;;;;;;CAErC,CAAC"}
+{"version":3,"file":"ts-import-providers.d.ts","sourceRoot":"","sources":["../../../../../src/generators/core/react-router/generated/ts-import-providers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,gCAAgC,CAAC;AAcpF,QAAA,MAAM,wBAAwB;;;CAG5B,CAAC;AAEH,MAAM,MAAM,0BAA0B,GAAG,6BAA6B,CACpE,OAAO,wBAAwB,CAChC,CAAC;AAEF,eAAO,MAAM,0BAA0B;;;GAGpC,CAAC;AAqBJ,eAAO,MAAM,yBAAyB;;;;;;;;;CAErC,CAAC"}

package/dist/generators/core/react-router/generated/ts-import-providers.js

@@ -3,7 +3,6 @@ import { createGeneratorTask, createReadOnlyProviderType, } from '@baseplate-dev
 import { CORE_REACT_ROUTER_PATHS } from './template-paths.js';
 const reactRouterImportsSchema = createTsImportMapSchema({
     AppRoutes: {},
-    Route: {},
     router: {},
 });
 export const reactRouterImportsProvider = createReadOnlyProviderType('react-router-imports');
@@ -18,9 +17,8 @@ const coreReactRouterImportsTask = createGeneratorTask({
         return {
             providers: {
                 reactRouterImports: createTsImportMap(reactRouterImportsSchema, {
-                    AppRoutes: paths.appRoutes,
-                    Route: paths.rootRoute,
-                    router: paths.appRoutes,
+                    AppRoutes: paths.router,
+                    router: paths.router,
                 }),
             },
         };

package/dist/generators/core/react-router/generated/ts-import-providers.js.map

@@ -1 +1 @@
-{"version":3,"file":"ts-import-providers.js","sourceRoot":"","sources":["../../../../../src/generators/core/react-router/generated/ts-import-providers.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,iBAAiB,EACjB,uBAAuB,EACvB,YAAY,GACb,MAAM,gCAAgC,CAAC;AACxC,OAAO,EACL,mBAAmB,EACnB,0BAA0B,GAC3B,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAE9D,MAAM,wBAAwB,GAAG,uBAAuB,CAAC;IACvD,SAAS,EAAE,EAAE;IACb,KAAK,EAAE,EAAE;IACT,MAAM,EAAE,EAAE;CACX,CAAC,CAAC;AAMH,MAAM,CAAC,MAAM,0BAA0B,GACrC,0BAA0B,CACxB,sBAAsB,CACvB,CAAC;AAEJ,MAAM,0BAA0B,GAAG,mBAAmB,CAAC;IACrD,YAAY,EAAE;QACZ,KAAK,EAAE,uBAAuB,CAAC,QAAQ;KACxC;IACD,OAAO,EAAE;QACP,kBAAkB,EAAE,0BAA0B,CAAC,MAAM,CAAC,YAAY,CAAC;KACpE;IACD,GAAG,CAAC,EAAE,KAAK,EAAE;QACX,OAAO;YACL,SAAS,EAAE;gBACT,kBAAkB,EAAE,iBAAiB,CAAC,wBAAwB,EAAE;oBAC9D,SAAS,EAAE,KAAK,CAAC,SAAS;oBAC1B,KAAK,EAAE,KAAK,CAAC,SAAS;oBACtB,MAAM,EAAE,KAAK,CAAC,SAAS;iBACxB,CAAC;aACH;SACF,CAAC;IACJ,CAAC;CACF,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,yBAAyB,GAAG;IACvC,IAAI,EAAE,0BAA0B;CACjC,CAAC"}
+{"version":3,"file":"ts-import-providers.js","sourceRoot":"","sources":["../../../../../src/generators/core/react-router/generated/ts-import-providers.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,iBAAiB,EACjB,uBAAuB,EACvB,YAAY,GACb,MAAM,gCAAgC,CAAC;AACxC,OAAO,EACL,mBAAmB,EACnB,0BAA0B,GAC3B,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAE9D,MAAM,wBAAwB,GAAG,uBAAuB,CAAC;IACvD,SAAS,EAAE,EAAE;IACb,MAAM,EAAE,EAAE;CACX,CAAC,CAAC;AAMH,MAAM,CAAC,MAAM,0BAA0B,GACrC,0BAA0B,CACxB,sBAAsB,CACvB,CAAC;AAEJ,MAAM,0BAA0B,GAAG,mBAAmB,CAAC;IACrD,YAAY,EAAE;QACZ,KAAK,EAAE,uBAAuB,CAAC,QAAQ;KACxC;IACD,OAAO,EAAE;QACP,kBAAkB,EAAE,0BAA0B,CAAC,MAAM,CAAC,YAAY,CAAC;KACpE;IACD,GAAG,CAAC,EAAE,KAAK,EAAE;QACX,OAAO;YACL,SAAS,EAAE;gBACT,kBAAkB,EAAE,iBAAiB,CAAC,wBAAwB,EAAE;oBAC9D,SAAS,EAAE,KAAK,CAAC,MAAM;oBACvB,MAAM,EAAE,KAAK,CAAC,MAAM;iBACrB,CAAC;aACH;SACF,CAAC;IACJ,CAAC;CACF,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,yBAAyB,GAAG;IACvC,IAAI,EAAE,0BAA0B;CACjC,CAAC"}

package/dist/generators/core/react-router/generated/typed-templates.d.ts

@@ -1,20 +1,32 @@
 export declare const CORE_REACT_ROUTER_TEMPLATES: {
+    placeholderIndex: import("@baseplate-dev/core-generators").TsTemplateFile<{}, {}>;
     rootRoute: import("@baseplate-dev/core-generators").TsTemplateFile<{
+        TPL_ROOT_ROUTE_CONTEXT: {};
         TPL_ROOT_ROUTE_OPTIONS: {};
     }, {}>;
-    placeholderIndex: import("@baseplate-dev/core-generators").TsTemplateFile<{}, {}>;
-    appRoutes: import("@baseplate-dev/core-generators").TsTemplateFile<{
-        TPL_RENDER_HEADER: {};
+    router: import("@baseplate-dev/core-generators").TsTemplateFile<{
+        TPL_ADDITIONAL_ROUTER_OPTIONS: {};
+        TPL_COMPONENT_BODY: {};
+        TPL_COMPONENT_SETUP: {};
+        TPL_ROUTER_CONTEXT: {};
+        TPL_ROUTER_PROVIDER: {};
     }, {
         reactComponentsImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
             AddOptionRequiredFields: {
                 isTypeOnly: true;
             };
             Alert: {};
+            AlertDescription: {};
+            AlertTitle: {};
             Button: {};
             buttonVariants: {};
             Calendar: {};
             Card: {};
+            CardContent: {};
+            CardDescription: {};
+            CardFooter: {};
+            CardHeader: {};
+            CardTitle: {};
             Checkbox: {};
             CheckboxField: {};
             CheckboxFieldController: {};
@@ -101,12 +113,6 @@ export declare const CORE_REACT_ROUTER_TEMPLATES: {
             SidebarLayout: {};
             SidebarLayoutContent: {};
             SidebarLayoutSidebar: {};
-            Status: {
-                isTypeOnly: true;
-            };
-            StatusType: {
-                isTypeOnly: true;
-            };
             Switch: {};
             SwitchField: {};
             SwitchFieldController: {};
@@ -131,7 +137,6 @@ export declare const CORE_REACT_ROUTER_TEMPLATES: {
             useConfirmDialogState: {};
             useControlledState: {};
             useControllerMerged: {};
-            useStatus: {};
         }>>;
     }>;
     routeTree: import("@baseplate-dev/core-generators").TsTemplateFile<{}, Record<never, import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/sync").Provider>>>;

package/dist/generators/core/react-router/generated/typed-templates.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"typed-templates.d.ts","sourceRoot":"","sources":["../../../../../src/generators/core/react-router/generated/typed-templates.ts"],"names":[],"mappings":"AAgDA,eAAO,MAAM,2BAA2B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAKvC,CAAC"}
+{"version":3,"file":"typed-templates.d.ts","sourceRoot":"","sources":["../../../../../src/generators/core/react-router/generated/typed-templates.ts"],"names":[],"mappings":"AAoDA,eAAO,MAAM,2BAA2B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAKvC,CAAC"}

package/dist/generators/core/react-router/generated/typed-templates.js

@@ -1,18 +1,6 @@
 import { createTsTemplateFile } from '@baseplate-dev/core-generators';
 import path from 'node:path';
 import { reactComponentsImportsProvider } from '#src/generators/core/react-components/generated/ts-import-providers.js';
-const appRoutes = createTsTemplateFile({
-    fileOptions: { kind: 'singleton' },
-    importMapProviders: {
-        reactComponentsImports: reactComponentsImportsProvider,
-    },
-    name: 'app-routes',
-    projectExports: { AppRoutes: {}, router: {} },
-    source: {
-        path: path.join(import.meta.dirname, '../templates/src/app/app-routes.tsx'),
-    },
-    variables: { TPL_RENDER_HEADER: {} },
-});
 const placeholderIndex = createTsTemplateFile({
     fileOptions: { kind: 'singleton' },
     importMapProviders: {},
@@ -26,24 +14,40 @@ const rootRoute = createTsTemplateFile({
     fileOptions: { kind: 'singleton' },
     importMapProviders: {},
     name: 'root-route',
-    projectExports: { Route: {} },
     source: {
         path: path.join(import.meta.dirname, '../templates/routes/__root.tsx'),
     },
-    variables: { TPL_ROOT_ROUTE_OPTIONS: {} },
+    variables: { TPL_ROOT_ROUTE_CONTEXT: {}, TPL_ROOT_ROUTE_OPTIONS: {} },
 });
 const routeTree = createTsTemplateFile({
     fileOptions: { kind: 'singleton' },
     name: 'route-tree',
+    projectExportsOnly: true,
+    source: { contents: '' },
+    variables: {},
+});
+const router = createTsTemplateFile({
+    fileOptions: { kind: 'singleton' },
+    importMapProviders: {
+        reactComponentsImports: reactComponentsImportsProvider,
+    },
+    name: 'router',
+    projectExports: { AppRoutes: {}, router: {} },
     source: {
-        path: path.join(import.meta.dirname, '../templates/src/route-tree.gen.ts'),
+        path: path.join(import.meta.dirname, '../templates/src/app/router.tsx'),
+    },
+    variables: {
+        TPL_ADDITIONAL_ROUTER_OPTIONS: {},
+        TPL_COMPONENT_BODY: {},
+        TPL_COMPONENT_SETUP: {},
+        TPL_ROUTER_CONTEXT: {},
+        TPL_ROUTER_PROVIDER: {},
     },
-    variables: {},
 });
 export const CORE_REACT_ROUTER_TEMPLATES = {
-    rootRoute,
     placeholderIndex,
-    appRoutes,
+    rootRoute,
+    router,
     routeTree,
 };
 //# sourceMappingURL=typed-templates.js.map

package/dist/generators/core/react-router/generated/typed-templates.js.map

@@ -1 +1 @@
-{"version":3,"file":"typed-templates.js","sourceRoot":"","sources":["../../../../../src/generators/core/react-router/generated/typed-templates.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,8BAA8B,EAAE,MAAM,wEAAwE,CAAC;AAExH,MAAM,SAAS,GAAG,oBAAoB,CAAC;IACrC,WAAW,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE;IAClC,kBAAkB,EAAE;QAClB,sBAAsB,EAAE,8BAA8B;KACvD;IACD,IAAI,EAAE,YAAY;IAClB,cAAc,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;IAC7C,MAAM,EAAE;QACN,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,qCAAqC,CAAC;KAC5E;IACD,SAAS,EAAE,EAAE,iBAAiB,EAAE,EAAE,EAAE;CACrC,CAAC,CAAC;AAEH,MAAM,gBAAgB,GAAG,oBAAoB,CAAC;IAC5C,WAAW,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE;IAClC,kBAAkB,EAAE,EAAE;IACtB,IAAI,EAAE,mBAAmB;IACzB,MAAM,EAAE;QACN,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,+BAA+B,CAAC;KACtE;IACD,SAAS,EAAE,EAAE;CACd,CAAC,CAAC;AAEH,MAAM,SAAS,GAAG,oBAAoB,CAAC;IACrC,WAAW,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE;IAClC,kBAAkB,EAAE,EAAE;IACtB,IAAI,EAAE,YAAY;IAClB,cAAc,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE;IAC7B,MAAM,EAAE;QACN,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,gCAAgC,CAAC;KACvE;IACD,SAAS,EAAE,EAAE,sBAAsB,EAAE,EAAE,EAAE;CAC1C,CAAC,CAAC;AAEH,MAAM,SAAS,GAAG,oBAAoB,CAAC;IACrC,WAAW,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE;IAClC,IAAI,EAAE,YAAY;IAClB,MAAM,EAAE;QACN,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,oCAAoC,CAAC;KAC3E;IACD,SAAS,EAAE,EAAE;CACd,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,2BAA2B,GAAG;IACzC,SAAS;IACT,gBAAgB;IAChB,SAAS;IACT,SAAS;CACV,CAAC"}
+{"version":3,"file":"typed-templates.js","sourceRoot":"","sources":["../../../../../src/generators/core/react-router/generated/typed-templates.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,8BAA8B,EAAE,MAAM,wEAAwE,CAAC;AAExH,MAAM,gBAAgB,GAAG,oBAAoB,CAAC;IAC5C,WAAW,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE;IAClC,kBAAkB,EAAE,EAAE;IACtB,IAAI,EAAE,mBAAmB;IACzB,MAAM,EAAE;QACN,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,+BAA+B,CAAC;KACtE;IACD,SAAS,EAAE,EAAE;CACd,CAAC,CAAC;AAEH,MAAM,SAAS,GAAG,oBAAoB,CAAC;IACrC,WAAW,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE;IAClC,kBAAkB,EAAE,EAAE;IACtB,IAAI,EAAE,YAAY;IAClB,MAAM,EAAE;QACN,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,gCAAgC,CAAC;KACvE;IACD,SAAS,EAAE,EAAE,sBAAsB,EAAE,EAAE,EAAE,sBAAsB,EAAE,EAAE,EAAE;CACtE,CAAC,CAAC;AAEH,MAAM,SAAS,GAAG,oBAAoB,CAAC;IACrC,WAAW,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE;IAClC,IAAI,EAAE,YAAY;IAClB,kBAAkB,EAAE,IAAI;IACxB,MAAM,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE;IACxB,SAAS,EAAE,EAAE;CACd,CAAC,CAAC;AAEH,MAAM,MAAM,GAAG,oBAAoB,CAAC;IAClC,WAAW,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE;IAClC,kBAAkB,EAAE;QAClB,sBAAsB,EAAE,8BAA8B;KACvD;IACD,IAAI,EAAE,QAAQ;IACd,cAAc,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;IAC7C,MAAM,EAAE;QACN,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,iCAAiC,CAAC;KACxE;IACD,SAAS,EAAE;QACT,6BAA6B,EAAE,EAAE;QACjC,kBAAkB,EAAE,EAAE;QACtB,mBAAmB,EAAE,EAAE;QACvB,kBAAkB,EAAE,EAAE;QACtB,mBAAmB,EAAE,EAAE;KACxB;CACF,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,2BAA2B,GAAG;IACzC,gBAAgB;IAChB,SAAS;IACT,MAAM;IACN,SAAS;CACV,CAAC"}

package/dist/generators/core/react-router/react-router.generator.d.ts

@@ -1,9 +1,35 @@
 import type { TsCodeFragment } from '@baseplate-dev/core-generators';
+/**
+ * A field in the root route context.
+ */
+export interface RootRouteContextField {
+    /** The name of the field */
+    name: string;
+    /** The type of the field */
+    type: TsCodeFragment;
+    /** Whether the field is optional */
+    optional: boolean;
+    /** The code to initialize the field in the createRouter function */
+    createRouteInitializer?: TsCodeFragment;
+    /** The code to initialize the field in the RouterProvider context */
+    routerProviderInitializer?: {
+        /** The code to initialize the field */
+        code: TsCodeFragment;
+        /** Any dependencies that should be included in the useMemo dependency array */
+        dependencies: string[];
+    };
+}
 declare const reactRouterConfigProvider: import("@baseplate-dev/sync").ProviderType<Omit<import("@baseplate-dev/utils").FieldMap<{
-    renderHeaders: import("@baseplate-dev/utils").MapContainer<string, TsCodeFragment>;
+    routerSetupFragments: import("@baseplate-dev/utils").MapContainer<string, TsCodeFragment>;
+    routerBodyFragments: import("@baseplate-dev/utils").MapContainer<string, TsCodeFragment>;
     rootLayoutComponent: import("@baseplate-dev/utils").ScalarContainer<TsCodeFragment | undefined>;
+    rootContextFields: import("@baseplate-dev/utils").NamedArrayFieldContainer<RootRouteContextField>;
 }>, "getValues">>;
 export { reactRouterConfigProvider };
+export interface ReactRouterProvider {
+    getRootRouteDirectory(): string;
+}
+export declare const reactRouterProvider: import("@baseplate-dev/sync").ProviderType<ReactRouterProvider>;
 export declare const reactRouterGenerator: import("@baseplate-dev/sync").GeneratorBundleCreator<{
     renderPlaceholderIndex?: boolean | undefined;
 }, {
@@ -18,7 +44,6 @@ export declare const reactRouterGenerator: import("@baseplate-dev/sync").Generat
     imports: import("@baseplate-dev/sync").GeneratorTask<{
         reactRouterImports: import("@baseplate-dev/sync").ProviderExport<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
             AppRoutes: {};
-            Route: {};
             router: {};
         }>>;
     }, {
@@ -33,10 +58,17 @@ export declare const reactRouterGenerator: import("@baseplate-dev/sync").Generat
                 isTypeOnly: true;
             };
             Alert: {};
+            AlertDescription: {};
+            AlertTitle: {};
             Button: {};
             buttonVariants: {};
             Calendar: {};
             Card: {};
+            CardContent: {};
+            CardDescription: {};
+            CardFooter: {};
+            CardHeader: {};
+            CardTitle: {};
             Checkbox: {};
             CheckboxField: {};
             CheckboxFieldController: {};
@@ -123,12 +155,6 @@ export declare const reactRouterGenerator: import("@baseplate-dev/sync").Generat
             SidebarLayout: {};
             SidebarLayoutContent: {};
             SidebarLayoutSidebar: {};
-            Status: {
-                isTypeOnly: true;
-            };
-            StatusType: {
-                isTypeOnly: true;
-            };
             Switch: {};
             SwitchField: {};
             SwitchFieldController: {};
@@ -153,7 +179,6 @@ export declare const reactRouterGenerator: import("@baseplate-dev/sync").Generat
             useConfirmDialogState: {};
             useControlledState: {};
             useControllerMerged: {};
-            useStatus: {};
         }>>;
         typescriptFile: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").TypescriptFileProvider>;
     }, undefined>;
@@ -188,15 +213,23 @@ export declare const reactRouterGenerator: import("@baseplate-dev/sync").Generat
     }, undefined>;
     routes: import("@baseplate-dev/sync").GeneratorTask<{
         reactRoutes: import("@baseplate-dev/sync").ProviderExport<import("#src/providers/routes.js").ReactRoutesProvider>;
+        reactRouter: import("@baseplate-dev/sync").ProviderExport<ReactRouterProvider>;
     }, {
         pathRoots: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").PathRootsProvider>;
     }, any>;
     main: import("@baseplate-dev/sync").GeneratorTask<any, {
         reactRouterConfigValues: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/utils").FieldMapValues<{
-            renderHeaders: import("@baseplate-dev/utils").MapContainer<string, TsCodeFragment>;
+            routerSetupFragments: import("@baseplate-dev/utils").MapContainer<string, TsCodeFragment>;
+            routerBodyFragments: import("@baseplate-dev/utils").MapContainer<string, TsCodeFragment>;
             rootLayoutComponent: import("@baseplate-dev/utils").ScalarContainer<TsCodeFragment | undefined>;
+            rootContextFields: import("@baseplate-dev/utils").NamedArrayFieldContainer<RootRouteContextField>;
         }>>;
         renderers: import("@baseplate-dev/sync").ProviderType<import("./generated/template-renderers.js").CoreReactRouterRenderers>;
+        reactErrorImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
+            formatError: {};
+            logAndFormatError: {};
+            logError: {};
+        }>>;
     }, any>;
 }>;
 //# sourceMappingURL=react-router.generator.d.ts.map

package/dist/generators/core/react-router/react-router.generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"react-router.generator.d.ts","sourceRoot":"","sources":["../../../../src/generators/core/react-router/react-router.generator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EAEf,MAAM,gCAAgC,CAAC;AAiCxC,QAAA,MAAkB,yBAAyB;;;iBAUxC,CAAC;AAEJ,OAAO,EAAE,yBAAyB,EAAE,CAAC;AAErC,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;0BA3C/B,sBAAmB;iCAInB,sBACD;oCAGE,sBACQ;kCAEE,sBACN;0CAGU,sBACR;;;;;;;;;;;;;;;EAqJP,CAAC"}
+{"version":3,"file":"react-router.generator.d.ts","sourceRoot":"","sources":["../../../../src/generators/core/react-router/react-router.generator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAoCrE;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,4BAA4B;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,4BAA4B;IAC5B,IAAI,EAAE,cAAc,CAAC;IACrB,oCAAoC;IACpC,QAAQ,EAAE,OAAO,CAAC;IAClB,oEAAoE;IACpE,sBAAsB,CAAC,EAAE,cAAc,CAAC;IACxC,qEAAqE;IACrE,yBAAyB,CAAC,EAAE;QAC1B,uCAAuC;QACvC,IAAI,EAAE,cAAc,CAAC;QACrB,+EAA+E;QAC/E,YAAY,EAAE,MAAM,EAAE,CAAC;KACxB,CAAC;CACH;AAED,QAAA,MAAkB,yBAAyB;;;;;iBAgBxC,CAAC;AAEJ,OAAO,EAAE,yBAAyB,EAAE,CAAC;AAErC,MAAM,WAAW,mBAAmB;IAClC,qBAAqB,IAAI,MAAM,CAAC;CACjC;AAED,eAAO,MAAM,mBAAmB,iEACyB,CAAC;AAE1D,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;0BA/EnB,sBACJ;iCAIR,sBACK;oCAGJ,sBAAsB;kCAGvB,sBACA;0CAGO,sBACR;;;;;;;;;;;;;;;;;;;;;;;EAwRC,CAAC"}

package/dist/generators/core/react-router/react-router.generator.js

@@ -1,22 +1,30 @@
-import { createNodePackagesTask, eslintConfigProvider, extractPackageVersions, packageScope, pathRootsProvider, prettierProvider, tsCodeFragment, TsCodeUtils, tsImportBuilder, tsTemplate, } from '@baseplate-dev/core-generators';
-import { createConfigProviderTask, createGenerator, createGeneratorTask, createProviderTask, } from '@baseplate-dev/sync';
+import { createNodePackagesTask, eslintConfigProvider, extractPackageVersions, packageScope, pathRootsProvider, prettierProvider, tsCodeFragment, TsCodeUtils, tsImportBuilder, tsTemplate, tsTemplateWithImports, } from '@baseplate-dev/core-generators';
+import { createConfigProviderTask, createGenerator, createGeneratorTask, createProviderTask, createProviderType, } from '@baseplate-dev/sync';
 import { z } from 'zod';
 import { REACT_PACKAGES } from '#src/constants/react-packages.js';
 import { reactRoutesProvider } from '#src/providers/routes.js';
 import { reactAppConfigProvider } from '../react-app/index.js';
+import { reactErrorImportsProvider } from '../react-error/index.js';
 import { reactBaseConfigProvider } from '../react/react.generator.js';
 import { CORE_REACT_ROUTER_GENERATED } from './generated/index.js';
 const descriptorSchema = z.object({
     renderPlaceholderIndex: z.boolean().default(false),
 });
 const [setupTask, reactRouterConfigProvider, reactRouterConfigValuesProvider] = createConfigProviderTask((t) => ({
-    renderHeaders: t.map(),
+    /* The code to set up the component that will be placed in the render function of the router component (no conditional logic, hooks only) */
+    routerSetupFragments: t.map(),
+    /* The code to set up the component that will be placed in the body of the router component (conditional logic, no hooks) */
+    routerBodyFragments: t.map(),
+    /* The component that contains the root layout, e.g. <RootLayout /> */
     rootLayoutComponent: t.scalar(),
+    /* The fields in the root route context */
+    rootContextFields: t.namedArray(),
 }), {
     prefix: 'react-router',
     configScope: packageScope,
 });
 export { reactRouterConfigProvider };
+export const reactRouterProvider = createProviderType('react-router');
 export const reactRouterGenerator = createGenerator({
     name: 'core/react-router',
     generatorFileUrl: import.meta.url,
@@ -44,7 +52,7 @@ export const reactRouterGenerator = createGenerator({
                 paths: CORE_REACT_ROUTER_GENERATED.paths.provider,
             },
             run({ reactAppConfig, paths }) {
-                reactAppConfig.renderRoot.set(tsCodeFragment('<AppRoutes />', tsImportBuilder(['AppRoutes']).from(paths.appRoutes)));
+                reactAppConfig.renderRoot.set(tsCodeFragment('<AppRoutes />', tsImportBuilder(['AppRoutes']).from(paths.router)));
             },
         }),
         prettier: createProviderTask(prettierProvider, (prettier) => {
@@ -59,6 +67,7 @@ export const reactRouterGenerator = createGenerator({
             },
             exports: {
                 reactRoutes: reactRoutesProvider.export(packageScope),
+                reactRouter: reactRouterProvider.export(packageScope),
             },
             run({ pathRoots }) {
                 const directoryBase = `@/src/routes`;
@@ -66,8 +75,12 @@ export const reactRouterGenerator = createGenerator({
                 return {
                     providers: {
                         reactRoutes: {
-                            getDirectoryBase: () => directoryBase,
-                            getRoutePrefix: () => ``,
+                            getOutputRelativePath: () => directoryBase,
+                            getRoutePrefix: () => '',
+                            getRouteFilePath: () => '',
+                        },
+                        reactRouter: {
+                            getRootRouteDirectory: () => directoryBase,
                         },
                     },
                 };
@@ -77,17 +90,74 @@ export const reactRouterGenerator = createGenerator({
             dependencies: {
                 reactRouterConfigValues: reactRouterConfigValuesProvider,
                 renderers: CORE_REACT_ROUTER_GENERATED.renderers.provider,
+                reactErrorImports: reactErrorImportsProvider,
             },
-            run({ reactRouterConfigValues: { renderHeaders, rootLayoutComponent }, renderers, }) {
+            run({ reactRouterConfigValues: { routerSetupFragments, routerBodyFragments, rootLayoutComponent, rootContextFields, }, renderers, reactErrorImports, }) {
+                const fieldMissingInitializer = rootContextFields.filter((field) => !field.createRouteInitializer &&
+                    !field.routerProviderInitializer &&
+                    !field.optional);
+                if (fieldMissingInitializer.length > 0) {
+                    throw new Error(`The following route root context fields are missing an initializer: ${fieldMissingInitializer.map((field) => field.name).join(', ')}`);
+                }
+                const sortedRootContextFields = rootContextFields.toSorted((a, b) => a.name.localeCompare(b.name));
                 return {
                     build: async (builder) => {
-                        await builder.apply(renderers.appRoutes.render({
+                        const routerProvider = TsCodeUtils.importFragment('RouterProvider', '@tanstack/react-router');
+                        const routeProviderInitializers = new Map(sortedRootContextFields
+                            .filter((f) => f.routerProviderInitializer?.code)
+                            .map((field) => [
+                            field.name,
+                            field.routerProviderInitializer?.code,
+                        ]));
+                        const routerContext = routeProviderInitializers.size > 0
+                            ? tsTemplateWithImports([
+                                reactErrorImports.logError.declaration(),
+                                tsImportBuilder(['useMemo', 'useEffect', 'useRef']).from('react'),
+                            ]) `
+            const routerContext = useMemo(() => (${TsCodeUtils.mergeFragmentsAsObject(routeProviderInitializers)}), [${[...sortedRootContextFields]
+                                .flatMap((v) => v.routerProviderInitializer?.dependencies ?? [])
+                                .join(', ')}])
+
+            // Ensure we always have the latest context in the router
+            const previousContext = useRef<typeof routerContext>(undefined);
+            useEffect(() => {
+              if (previousContext.current && previousContext.current !== routerContext) {
+                router.invalidate().catch(logError);
+              }
+              previousContext.current = routerContext;
+            }, [routerContext])
+            `
+                            : '';
+                        await builder.apply(renderers.router.render({
                             variables: {
-                                TPL_RENDER_HEADER: TsCodeUtils.mergeFragments(renderHeaders),
+                                TPL_ADDITIONAL_ROUTER_OPTIONS: rootContextFields.length > 0
+                                    ? tsTemplate `
+                    context: {
+                      ${TsCodeUtils.mergeFragmentsPresorted(sortedRootContextFields
+                                        .filter((f) => !f.optional || f.createRouteInitializer)
+                                        .map((field) => field.createRouteInitializer
+                                        ? tsTemplate `${field.name}: ${field.createRouteInitializer},`
+                                        : `// eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- context instantiated in the RouteProvider
+                           ${field.name}: undefined!,`))}
+                    }
+                  `
+                                    : '',
+                                TPL_COMPONENT_SETUP: TsCodeUtils.mergeFragments(routerSetupFragments, '\n\n'),
+                                TPL_COMPONENT_BODY: TsCodeUtils.mergeFragments(routerBodyFragments, '\n\n'),
+                                TPL_ROUTER_CONTEXT: routerContext,
+                                TPL_ROUTER_PROVIDER: tsTemplate `<${routerProvider} router={router} ${routeProviderInitializers.size > 0
+                                    ? tsTemplate `context={routerContext}`
+                                    : ''} />`,
                             },
                         }));
                         await builder.apply(renderers.rootRoute.render({
                             variables: {
+                                TPL_ROOT_ROUTE_CONTEXT: rootContextFields.length > 0
+                                    ? TsCodeUtils.mergeFragmentsAsInterfaceContent(new Map(sortedRootContextFields.map((field) => [
+                                        field.optional ? `${field.name}?` : field.name,
+                                        field.type,
+                                    ])))
+                                    : 'placeholder?: string',
                                 TPL_ROOT_ROUTE_OPTIONS: TsCodeUtils.mergeFragmentsAsObject({
                                     component: rootLayoutComponent,
                                 }),
@@ -96,21 +166,7 @@ export const reactRouterGenerator = createGenerator({
                         if (renderPlaceholderIndex) {
                             await builder.apply(renderers.placeholderIndex.render({}));
                         }
-                        // Write a pseudo-file so that the template extractor can infer metadata for the
-                        // generated route tree file
-                        builder.writeFile({
-                            id: 'route-tree',
-                            destination: '@/src/route-tree.gen.ts',
-                            contents: '',
-                            options: { skipWriting: true },
-                            templateMetadata: {
-                                generator: builder.generatorInfo.name,
-                                name: 'route-tree',
-                                projectExportsOnly: true,
-                                type: 'ts',
-                                fileOptions: { kind: 'singleton' },
-                            },
-                        });
+                        await builder.apply(renderers.routeTree.render({}));
                     },
                 };
             },