breaking: reverse order of definePage - react-refresh sometimes breaks when the first parameter is not a react component

Author: hanayashiki

README.md

@@ -168,9 +168,9 @@ Example:
 import React from 'react';
 import { definePage } from '@monoid-dev/split-pages/client';
 
-export const A = definePage({}, (props) => {
+export const A = definePage((props) => {
   return <>A</>;
-});
+}, {});
 ```
 
 Usage:
@@ -185,14 +185,14 @@ import { definePage } from '@monoid-dev/split-pages/client';
 import { numberField, struct } from '@monoid-dev/reform';
 
 export const A = definePage(
+  ({ a }) => {
+    return <>{a}</>;
+  },
   {
     props: struct({
       a: numberField(),
     }),
   },
-  ({ a }) => {
-    return <>{a}</>;
-  },
 );
 ```
 

demo/querystring/src/pages/A.tsx

@@ -3,12 +3,12 @@ import { definePage } from '@monoid-dev/split-pages/client';
 import { stringField, struct } from '@monoid-dev/reform';
 
 export const A = definePage(
+  ({ a }) => {
+    return <>{a}</>;
+  },
   {
     props: struct({
       a: stringField(),
     }),
   },
-  ({ a }) => {
-    return <>{a}</>;
-  },
 );

demo/querystring/src/pages/B.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { definePage } from '@monoid-dev/split-pages/client';
 
-export const B = definePage({}, (props) => {
+export const B = definePage((props) => {
   return <>B</>;
-});
+}, {});

demo/querystring/src/pages/C.tsx

@@ -3,12 +3,12 @@ import { definePage } from '@monoid-dev/split-pages/client';
 import { string, struct, omittable } from '@monoid-dev/reform';
 
 export const C = definePage(
+  ({ a }) => {
+    return <>{a}</>;
+  },
   {
     props: struct({
       a: omittable(string()),
     }),
   },
-  ({ a }) => {
-    return <>{a}</>;
-  },
 );

demo/querystring/src/pages/NoMatch.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { definePage } from '@monoid-dev/split-pages/client';
 
-export const NoMatch = definePage({}, (props) => {
+export const NoMatch = definePage((props) => {
   return <>NoMatch</>;
-});
+}, {});

demo/readme/src/pages/A.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { definePage } from '@monoid-dev/split-pages/client';
 
-export const A = definePage({}, (props) => {
+export const A = definePage((props) => {
   return <>A</>;
-});
+}, {});

demo/readme/src/pages/B.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { definePage } from '@monoid-dev/split-pages/client';
 
-export const B = definePage({}, (props) => {
+export const B = definePage((props) => {
   return <>B</>;
-});
+}, {});

demo/readme/src/pages/NoMatch.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { definePage } from '@monoid-dev/split-pages/client';
 
-export const NoMatch = definePage({}, (props) => {
+export const NoMatch = definePage((props) => {
   return <>NoMatch</>;
-});
+}, {});

demo/simple/pages/NoMatch.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { definePage } from '@monoid-dev/split-pages/client';
 
-export const NoMatch = definePage({}, (props) => {
+export const NoMatch = definePage((props) => {
   return <>NoMatch</>;
-});
+}, {});

demo/simple/pages/a.tsx

@@ -3,14 +3,13 @@ import { struct, numberField } from '@monoid-dev/reform';
 import { definePage } from '@monoid-dev/split-pages/client';
 
 export const a = definePage(
+  (props) => {
+    const { id } = props;
+    return <>{id}</>;
+  },
   {
     props: struct({
       id: numberField(),
     }),
   },
-  (props) => {
-    const { id } = props;
-
-    return <>{id}</>;
-  },
 );