fix(create): preserve Rsbuild dev-watch and update Solid Biome config

Author: SyMind

packages/cli/src/dev-watch.ts

@@ -257,6 +257,7 @@ export class DevWatchManager {
         registeredFramework,
         this.options.cliOptions.mode,
         chosenAddonIds,
+        this.options.cliOptions.bundler,
       )
 
       // Check if package metadata was modified
@@ -467,6 +468,8 @@ export class DevWatchManager {
       addOns,
       basePackageJSON,
       optionalPackages,
+      bundlers: this.options.framework.bundlers,
+      defaultBundler: this.options.framework.defaultBundler,
       supportedModes: this.options.framework.supportedModes,
     }
   }

packages/cli/tests/dev-watch.test.ts

@@ -0,0 +1,80 @@
+import { mkdir, mkdtemp, rm, writeFile } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+
+import { describe, expect, it } from 'vitest'
+import {
+  createMemoryEnvironment,
+  createReactFrameworkDefinition,
+} from '@tanstack/create'
+
+import { DevWatchManager } from '../src/dev-watch'
+
+import type {
+  Framework,
+  FrameworkDefinition,
+  Options,
+} from '@tanstack/create'
+
+function frameworkFromDefinition(definition: FrameworkDefinition): Framework {
+  const { addOns, base, ...framework } = definition
+
+  return {
+    ...framework,
+    getFiles: () => Promise.resolve(Object.keys(base)),
+    getFileContents: (path) => Promise.resolve(base[path]),
+    getDeletedFiles: () => Promise.resolve([]),
+    getAddOns: () => addOns,
+  }
+}
+
+describe('DevWatchManager', () => {
+  it('preserves bundler metadata when rebuilding a watched framework', async () => {
+    const watchPath = await mkdtemp(join(tmpdir(), 'tanstack-dev-watch-'))
+    const baseDirectory = join(watchPath, 'project', 'base')
+    await mkdir(baseDirectory, { recursive: true })
+    await writeFile(join(baseDirectory, 'package.json'), '{}')
+
+    try {
+      const framework = frameworkFromDefinition(
+        createReactFrameworkDefinition(),
+      )
+      const { environment } = createMemoryEnvironment()
+      const cliOptions: Options = {
+        projectName: 'dev-watch-app',
+        targetDir: join(watchPath, 'target'),
+        framework,
+        mode: 'file-router',
+        bundler: 'rsbuild',
+        typescript: true,
+        tailwind: true,
+        packageManager: 'npm',
+        git: false,
+        install: true,
+        intent: false,
+        chosenAddOns: [],
+        addOnOptions: {},
+      }
+      const manager = new DevWatchManager({
+        watchPath,
+        targetDir: cliOptions.targetDir,
+        framework,
+        cliOptions,
+        packageManager: 'npm',
+        environment,
+      })
+      const refreshedFramework = (
+        manager as unknown as {
+          createFrameworkDefinitionFromWatchPath: () => FrameworkDefinition | null
+        }
+      ).createFrameworkDefinitionFromWatchPath()
+
+      expect(refreshedFramework?.bundlers).toEqual(framework.bundlers)
+      expect(refreshedFramework?.defaultBundler).toBe(
+        framework.defaultBundler,
+      )
+    } finally {
+      await rm(watchPath, { recursive: true, force: true })
+    }
+  })
+})

packages/create/src/frameworks/solid/toolchains/biome/assets/biome.json.ejs

@@ -1,22 +1,26 @@
 {
-  "$schema": "https://biomejs.dev/schemas/1.9.4/schema.json",
+  "$schema": "https://biomejs.dev/schemas/2.2.4/schema.json",
   "vcs": {
     "enabled": false,
     "clientKind": "git",
     "useIgnoreFile": false
   },
   "files": {
     "ignoreUnknown": false,
-    "ignore": ["src/routeTree.gen.ts"],
-    "include": ["src/*", ".vscode/*", <% if (bundler === 'vite') { %>"index.html", <% } %>"<%= bundler %>.config.ts"]
+    "includes": [
+      "**/src/**/*",
+      "**/.vscode/**/*",
+      <% if (bundler === 'vite') { %>"**/index.html",
+      <% } %>"**/<%= bundler %>.config.ts",
+      "!**/src/routeTree.gen.ts",
+      "!**/src/styles.css"
+    ]
   },
   "formatter": {
     "enabled": true,
     "indentStyle": "tab"
   },
-  "organizeImports": {
-    "enabled": true
-  },
+  "assist": { "actions": { "source": { "organizeImports": "on" } } },
   "linter": {
     "enabled": true,
     "rules": {