revert some changes; make test work; break app

deployables/app/app/routes/edit-route.tsx

@@ -1,13 +1,32 @@
+import { invariantResponse } from '@epic-web/invariant'
+import { executionRouteSchema } from '@zodiac/schema'
+import { TextInput } from '@zodiac/ui'
 import type { Route } from './+types/edit-route'
 
 export const loader = ({ request }: Route.LoaderArgs) => {
   const url = new URL(request.url)
 
-  return { url }
+  const routeData = url.searchParams.get('route')
+
+  invariantResponse(routeData != null, 'Missing "route" parameter')
+
+  const decodedData = Buffer.from(routeData, 'base64')
+
+  try {
+    const rawJson = JSON.parse(decodedData.toString())
+
+    return { route: executionRouteSchema.parse(rawJson) }
+  } catch {
+    throw new Response(null, { status: 400 })
+  }
 }
 
 const EditRoute = ({ loaderData }: Route.ComponentProps) => {
-  return null
+  return (
+    <>
+      <TextInput label="Label" defaultValue={loaderData.route.label} />
+    </>
+  )
 }
 
 export default EditRoute

deployables/app/package.json

@@ -10,8 +10,10 @@
     "test": "vitest"
   },
   "dependencies": {
+    "@epic-web/invariant": "^1.0.0",
     "@react-router/node": "^7.1.1",
     "@react-router/serve": "^7.1.1",
+    "@zodiac/ui": "workspace:*",
     "@zodiac/schema": "workspace:*",
     "isbot": "^5.1.17",
     "react": "^19.0.0",

deployables/app/tsconfig.cloudflare.json

@@ -11,8 +11,12 @@
   ],
   "compilerOptions": {
     "composite": true,
+    "strict": true,
     "lib": ["DOM", "DOM.Iterable", "ES2022"],
     "types": ["@cloudflare/workers-types", "vite/client"],
+    "target": "ES2022",
+    "module": "ES2022",
+    "moduleResolution": "bundler",
     "jsx": "react-jsx",
     "baseUrl": ".",
     "rootDirs": [".", "./.react-router/types"],

deployables/app/tsconfig.json

@@ -5,14 +5,10 @@
     { "path": "./tsconfig.cloudflare.json" }
   ],
   "compilerOptions": {
-    "target": "ES2022",
-    "module": "ES2022",
     "checkJs": true,
     "verbatimModuleSyntax": true,
     "skipLibCheck": true,
     "strict": true,
-    "noEmit": true,
-    "moduleResolution": "bundler",
-    "types": ["@testing-library/jest-dom"]
+    "noEmit": true
   }
 }

deployables/app/tsconfig.node.json

@@ -1,12 +1,13 @@
 {
   "extends": "./tsconfig.json",
-  "include": ["tailwind.config.ts", "vite.config.ts", "vitest.setup.ts"],
+  "include": ["tailwind.config.ts", "vite.config.ts"],
   "compilerOptions": {
     "composite": true,
+    "strict": true,
     "types": ["node"],
     "lib": ["ES2022"],
-    "paths": {
-      "@/test-utils": ["./test-utils/index.ts"]
-    }
+    "target": "ES2022",
+    "module": "ES2022",
+    "moduleResolution": "bundler"
   }
 }

deployables/app/vite.config.ts

@@ -1,5 +1,5 @@
-import { vitePluginViteNodeMiniflare } from '@hiogawa/vite-node-miniflare'
 import { reactRouter } from '@react-router/dev/vite'
+import { cloudflareDevProxy } from '@react-router/dev/vite/cloudflare'
 import autoprefixer from 'autoprefixer'
 import tailwindcss from 'tailwindcss'
 import { defineConfig } from 'vite'
@@ -36,13 +36,14 @@ export default defineConfig(({ isSsrBuild }) => ({
     },
   },
   plugins: [
-    vitePluginViteNodeMiniflare({
-      entry: './workers/app.ts',
-      miniflareOptions: (options) => {
-        options.compatibilityDate = '2024-11-18'
-        options.compatibilityFlags = ['nodejs_compat']
-      },
-    }),
+    cloudflareDevProxy(),
+    // vitePluginViteNodeMiniflare({
+    //   entry: './workers/app.ts',
+    //   miniflareOptions: (options) => {
+    //     options.compatibilityDate = '2024-11-18'
+    //     options.compatibilityFlags = ['nodejs_compat']
+    //   },
+    // }),
     reactRouter(),
     tsconfigPaths(),
   ],

packages/test-utils/src/renderFramework.tsx

@@ -7,6 +7,7 @@ import type {
   CreateLoaderData,
   CreateServerLoaderArgs,
 } from 'react-router/route-module'
+import { getCurrentPath } from './getCurrentPath'
 import { InspectRoute } from './InspectRoute'
 import type { RenderOptions } from './render'
 import { sleepTillIdle } from './sleepTillIdle'
@@ -64,7 +65,7 @@ export type FrameworkRoute<
 export async function renderFramework<Module extends RouteModule>(
   currentPath: string,
   route: FrameworkRoute<Module>,
-  { inspectRoutes = [], ...options }: RenderOptions,
+  { inspectRoutes = [], searchParams = {}, ...options }: RenderOptions,
 ): Promise<RenderResult> {
   const Stub = createRoutesStub([
     {
@@ -73,6 +74,8 @@ export async function renderFramework<Module extends RouteModule>(
       children: [
         {
           path: route.path,
+          // @ts-expect-error
+          loader: route.loader,
           Component() {
             const loaderData = useLoaderData<typeof route.loader>()
             const params = useParams()
@@ -92,7 +95,10 @@ export async function renderFramework<Module extends RouteModule>(
     },
   ])
 
-  const result = render(<Stub initialEntries={[currentPath]} />, options)
+  const result = render(
+    <Stub initialEntries={[getCurrentPath(currentPath, searchParams)]} />,
+    options,
+  )
 
   await waitForTestElement()
   await sleepTillIdle()