@tanstack/cta-framework-solid 0.15.2 → 0.15.4

package/dist/index.js

@@ -1,18 +1,37 @@
 import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { registerFramework } from '@tanstack/cta-engine';
-export function register() {
-    registerFramework({
+import { registerFramework, scanAddOnDirectories, scanProjectDirectory, } from '@tanstack/cta-engine';
+export function createFrameworkDefinition() {
+    const baseDirectory = dirname(dirname(fileURLToPath(import.meta.url)));
+    const addOns = scanAddOnDirectories([
+        join(baseDirectory, 'add-ons'),
+        join(baseDirectory, 'toolchains'),
+        join(baseDirectory, 'examples'),
+    ]);
+    const { files, basePackageJSON, optionalPackages } = scanProjectDirectory(join(baseDirectory, 'project'), join(baseDirectory, 'project/base'));
+    return {
         id: 'solid',
         name: 'solid',
         description: 'Solid templates for Tanstack Router Applications',
         version: '0.1.0',
-        baseDirectory: join(dirname(dirname(fileURLToPath(import.meta.url))), 'project'),
-        addOnsDirectories: [
-            join(dirname(dirname(fileURLToPath(import.meta.url))), 'add-ons'),
-            join(dirname(dirname(fileURLToPath(import.meta.url))), 'toolchains'),
-            join(dirname(dirname(fileURLToPath(import.meta.url))), 'examples'),
-        ],
-        examplesDirectory: join(dirname(dirname(fileURLToPath(import.meta.url))), 'examples'),
-    });
+        base: files,
+        addOns,
+        basePackageJSON,
+        optionalPackages,
+        supportedModes: {
+            'code-router': {
+                displayName: 'Code Router',
+                description: 'TanStack Router using code to define the routes',
+                forceTypescript: true,
+            },
+            'file-router': {
+                displayName: 'File Router',
+                description: 'TanStack Router using files to define the routes',
+                forceTypescript: true,
+            },
+        },
+    };
+}
+export function register() {
+    registerFramework(createFrameworkDefinition());
 }

package/dist/types/index.d.ts

@@ -1 +1,3 @@
+import type { FrameworkDefinition } from '@tanstack/cta-engine';
+export declare function createFrameworkDefinition(): FrameworkDefinition;
 export declare function register(): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/cta-framework-solid",
-  "version": "0.15.2",
+  "version": "0.15.4",
   "description": "CTA Framework for Solid",
   "type": "module",
   "main": "./dist/index.js",
@@ -22,7 +22,7 @@
   "author": "Jack Herrington <jherr@pobox.com>",
   "license": "MIT",
   "dependencies": {
-    "@tanstack/cta-engine": "0.15.2"
+    "@tanstack/cta-engine": "0.15.4"
   },
   "devDependencies": {
     "@types/node": "^22.13.4",

package/src/index.ts

@@ -1,26 +1,51 @@
 import { dirname, join } from 'node:path'
 import { fileURLToPath } from 'node:url'
 
-import { registerFramework } from '@tanstack/cta-engine'
+import {
+  registerFramework,
+  scanAddOnDirectories,
+  scanProjectDirectory,
+} from '@tanstack/cta-engine'
+import type { FrameworkDefinition } from '@tanstack/cta-engine'
 
-export function register() {
-  registerFramework({
+export function createFrameworkDefinition(): FrameworkDefinition {
+  const baseDirectory = dirname(dirname(fileURLToPath(import.meta.url)))
+
+  const addOns = scanAddOnDirectories([
+    join(baseDirectory, 'add-ons'),
+    join(baseDirectory, 'toolchains'),
+    join(baseDirectory, 'examples'),
+  ])
+
+  const { files, basePackageJSON, optionalPackages } = scanProjectDirectory(
+    join(baseDirectory, 'project'),
+    join(baseDirectory, 'project/base'),
+  )
+
+  return {
     id: 'solid',
     name: 'solid',
     description: 'Solid templates for Tanstack Router Applications',
     version: '0.1.0',
-    baseDirectory: join(
-      dirname(dirname(fileURLToPath(import.meta.url))),
-      'project',
-    ),
-    addOnsDirectories: [
-      join(dirname(dirname(fileURLToPath(import.meta.url))), 'add-ons'),
-      join(dirname(dirname(fileURLToPath(import.meta.url))), 'toolchains'),
-      join(dirname(dirname(fileURLToPath(import.meta.url))), 'examples'),
-    ],
-    examplesDirectory: join(
-      dirname(dirname(fileURLToPath(import.meta.url))),
-      'examples',
-    ),
-  })
+    base: files,
+    addOns,
+    basePackageJSON,
+    optionalPackages,
+    supportedModes: {
+      'code-router': {
+        displayName: 'Code Router',
+        description: 'TanStack Router using code to define the routes',
+        forceTypescript: true,
+      },
+      'file-router': {
+        displayName: 'File Router',
+        description: 'TanStack Router using files to define the routes',
+        forceTypescript: true,
+      },
+    },
+  }
+}
+
+export function register() {
+  registerFramework(createFrameworkDefinition())
 }

package/tests/solid.test.ts

@@ -7,7 +7,7 @@ import {
   getFrameworkById,
 } from '@tanstack/cta-engine'
 
-import type { AddOn, Mode, Options } from '@tanstack/cta-engine'
+import type { AddOn, Options } from '@tanstack/cta-engine'
 
 import { cleanupOutput } from './test-utilities.js'
 
@@ -77,7 +77,7 @@ test('file router on npm', async () => {
   const { environment, output } = createMemoryEnvironment()
   const options = {
     ...(await createSolidOptions(projectName)),
-    mode: 'file-router' as Mode,
+    mode: 'file-router',
     typescript: true,
   }
   await createApp(environment, options)
@@ -92,7 +92,7 @@ test('file router with tailwind on npm', async () => {
   const { environment, output } = createMemoryEnvironment()
   const options = {
     ...(await createSolidOptions(projectName)),
-    mode: 'file-router' as Mode,
+    mode: 'file-router',
     typescript: true,
     tailwind: true,
   }