update rescript to v12-beta.11, fix monorepo setup

tsnobip · tsnobip · commit 95a8610e1262 · 2025-09-19T17:00:45.000+02:00
diff --git a/.changeset/silver-windows-beg.md b/.changeset/silver-windows-beg.md
@@ -0,0 +1,8 @@
+---
+"@rescript-relay-router-example/client-rendering": patch
+"@rescript-relay-router-example/express": patch
+"rescript-relay-router": patch
+"@rescript-relay-router/test-utils": patch
+---
+
+update rescript to v12-beta.11, fix the monorepo setup to use rewatch
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -34,7 +34,7 @@ jobs:
           yarn install --immutable
       - name: Format ReScript
         run: |
-          yarn workspaces foreach run rescript format -all
+          yarn rescript format
       - name: Build all projects
         run: |
           yarn build
diff --git a/examples/client-rendering/package.json b/examples/client-rendering/package.json
@@ -24,7 +24,7 @@
   },
   "devDependencies": {
     "@remix-run/web-fetch": "^4.1.3",
-    "@rescript/react": "0.13.0",
+    "@rescript/react": "0.14.0",
     "@testing-library/dom": "^10.4.0",
     "@testing-library/react": "^16.1.0",
     "@vitejs/plugin-react-refresh": "1.3.6",
@@ -44,7 +44,7 @@
     "react-dom": "^18.2.0",
     "react-relay": "17.0.0",
     "relay-runtime": "17.0.0",
-    "rescript": "12.0.0-alpha.13",
+    "rescript": "12.0.0-beta.11",
     "rescript-relay": "3.0.0",
     "rollup": "^2",
     "rollup-plugin-visualizer": "5.5.0",
diff --git a/examples/client-rendering/rescript.json b/examples/client-rendering/rescript.json
@@ -1,10 +1,9 @@
 {
-  "name": "main",
-  "uncurried": true,
+  "name": "@rescript-relay-router-example/client-rendering",
   "jsx": {
-    "version": 4,
-    "mode": "automatic"
+    "version": 4
   },
+  "namespace": true,
   "version": "0.1.0",
   "sources": [
     {
@@ -25,12 +24,10 @@
   ],
   "suffix": ".res.mjs",
   "ppx-flags": [["rescript-relay/ppx", "-uncurried"]],
-  "bs-dependencies": [
+  "dependencies": [
     "@rescript/react",
     "rescript-relay",
     "rescript-relay-router"
   ],
-  "bs-dev-dependencies": ["@rescript-relay-router/test-utils"],
-  "bsc-flags": [],
-  "pinned-dependencies": ["rescript-relay-router"]
+  "dev-dependencies": ["@rescript-relay-router/test-utils"]
 }
diff --git a/examples/client-rendering/src/components/Layout.res b/examples/client-rendering/src/components/Layout.res
@@ -12,7 +12,7 @@ let make = (~queryRef, ~children) => {
 
   <div>
     <h1> {React.string("My fine site")} </h1>
-    <div style={ReactDOM.Style.make(~display="flex", ~flexDirection="row", ())}>
+    <div style={{display: "flex", flexDirection: "row"}}>
       {links
       ->Array.map(((label, link)) =>
         <RelayRouter.Link key=label to_=link> {React.string(label)} </RelayRouter.Link>
diff --git a/examples/client-rendering/src/components/SingleTodoDisplay.res b/examples/client-rendering/src/components/SingleTodoDisplay.res
@@ -46,7 +46,8 @@ let make = (~todo) => {
               },
             },
           )
-        }}>
+        }}
+      >
         {React.string(completed ? "Uncomplete" : "Complete")}
       </button>
     } else {
@@ -64,7 +65,8 @@ let make = (~todo) => {
               })
             },
           )
-        }}>
+        }}
+      >
         {React.string("Show more")}
       </button>
     }}
diff --git a/examples/express/package.json b/examples/express/package.json
@@ -28,7 +28,7 @@
   },
   "devDependencies": {
     "@remix-run/web-fetch": "^4.1.3",
-    "@rescript/react": "0.13.0",
+    "@rescript/react": "0.14.0",
     "@vitejs/plugin-react-refresh": "1.3.3",
     "chalk": "^5.0.1",
     "chokidar": "^3.5.3",
@@ -46,7 +46,7 @@
     "react-dom": "^18.2.0",
     "react-relay": "17.0.0",
     "relay-runtime": "17.0.0",
-    "rescript": "12.0.0-alpha.13",
+    "rescript": "12.0.0-beta.11",
     "rescript-relay": "3.0.0",
     "rollup": "^2",
     "rollup-plugin-visualizer": "5.5.0",
diff --git a/examples/express/rescript.json b/examples/express/rescript.json
@@ -1,10 +1,9 @@
 {
-  "name": "main",
-  "uncurried": true,
+  "name": "@rescript-relay-router-example/express",
   "jsx": {
-    "version": 4,
-    "mode": "automatic"
+    "version": 4
   },
+  "namespace": true,
   "version": "0.1.0",
   "sources": [
     {
@@ -21,11 +20,5 @@
   ],
   "suffix": ".res.mjs",
   "ppx-flags": [["rescript-relay/ppx", "-uncurried"]],
-  "bs-dependencies": [
-    "@rescript/react",
-    "rescript-relay",
-    "rescript-relay-router"
-  ],
-  "bsc-flags": [],
-  "pinned-dependencies": ["rescript-relay-router"]
+  "dependencies": ["@rescript/react", "rescript-relay", "rescript-relay-router"]
 }
diff --git a/examples/express/src/components/Layout.res b/examples/express/src/components/Layout.res
@@ -12,7 +12,7 @@ let make = (~queryRef, ~children) => {
 
   <div>
     <h1> {React.string("My fine site")} </h1>
-    <div style={ReactDOM.Style.make(~display="flex", ~flexDirection="row", ())}>
+    <div style={{display: "flex", flexDirection: "row"}}>
       {links
       ->Array.map(((label, link)) =>
         <RelayRouter.Link key=label to_=link> {React.string(label)} </RelayRouter.Link>
diff --git a/examples/express/src/components/SingleTodoDisplay.res b/examples/express/src/components/SingleTodoDisplay.res
@@ -46,7 +46,8 @@ let make = (~todo) => {
               },
             },
           )
-        }}>
+        }}
+      >
         {React.string(completed ? "Uncomplete" : "Complete")}
       </button>
     } else {
@@ -64,7 +65,8 @@ let make = (~todo) => {
               })
             },
           )
-        }}>
+        }}
+      >
         {React.string("Show more")}
       </button>
     }}
diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "rescript-relay-router-monorepo",
+  "name": "@rescript-relay-router-example/monorepo",
   "version": "0.0.0",
   "type": "module",
   "license": "MIT",
@@ -21,6 +21,7 @@
     "release": "yarn build && yarn changeset publish"
   },
   "dependencies": {
-    "@changesets/cli": "^2.23.1"
+    "@changesets/cli": "^2.23.1",
+    "rescript": "12.0.0-beta.11"
   }
 }
diff --git a/packages/rescript-relay-router/package.json b/packages/rescript-relay-router/package.json
@@ -58,7 +58,7 @@
   "devDependencies": {
     "@rescript-relay-router/test-utils": "workspace:^",
     "@rollup/plugin-node-resolve": "^16.0.0",
-    "rescript": "12.0.0-alpha.13",
+    "rescript": "12.0.0-beta.11",
     "rollup": "^4.29.1",
     "vitest": "^2.1.8"
   }
diff --git a/packages/rescript-relay-router/rescript.json b/packages/rescript-relay-router/rescript.json
@@ -1,10 +1,8 @@
 {
   "name": "rescript-relay-router",
   "jsx": {
-    "version": 4,
-    "mode": "automatic"
+    "version": 4
   },
-  "uncurried": true,
   "version": "0.0.17",
   "sources": [
     {
@@ -33,7 +31,6 @@
     }
   ],
   "suffix": ".res.mjs",
-  "bs-dependencies": ["@rescript/react", "rescript-relay"],
-  "bs-dev-dependencies": ["@rescript-relay-router/test-utils"],
-  "bsc-flags": []
+  "dependencies": ["@rescript/react", "rescript-relay"],
+  "dev-dependencies": ["@rescript-relay-router/test-utils"]
 }
diff --git a/packages/rescript-relay-router/src/RelayRouter__Link.res b/packages/rescript-relay-router/src/RelayRouter__Link.res
@@ -178,7 +178,8 @@ let make = (
       doPreloadDataAndCode(Some(High))
     }}
     onMouseEnter={_ => onIntent(None)}
-    onFocus={_ => onIntent(None)}>
+    onFocus={_ => onIntent(None)}
+  >
     children
   </a>
 }
diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json
@@ -11,6 +11,6 @@
     "build": "rescript"
   },
   "dependencies": {
-    "rescript": "12.0.0-alpha.13"
+    "rescript": "12.0.0-beta.11"
   }
 }
diff --git a/packages/test-utils/rescript.json b/packages/test-utils/rescript.json
@@ -3,8 +3,7 @@
   "namespace": "rescript-relay-router-test-utils",
   "uncurried": true,
   "jsx": {
-    "version": 4,
-    "mode": "automatic"
+    "version": 4
   },
   "version": "0.1.0",
   "sources": [
@@ -19,6 +18,5 @@
       "in-source": true
     }
   ],
-  "suffix": ".res.mjs",
-  "bsc-flags": []
+  "suffix": ".res.mjs"
 }
diff --git a/rescript.json b/rescript.json
@@ -0,0 +1,20 @@
+{
+  "name": "@rescript-relay-router-example/monorepo",
+  "jsx": {
+    "version": 4
+  },
+  "version": "0.1.0",
+  "package-specs": [
+    {
+      "module": "esmodule",
+      "in-source": true
+    }
+  ],
+  "suffix": ".res.mjs",
+  "dependencies": [
+    "@rescript-relay-router-example/client-rendering",
+    "@rescript-relay-router-example/express",
+    "@rescript-relay-router/test-utils",
+    "rescript-relay-router"
+  ]
+}
diff --git a/yarn.lock b/yarn.lock
