Skip to content

Commit c51b67e

Browse files
jderochervlkjderochervlk
committed
images are all loading for real
1 parent c97bb1a commit c51b67e

File tree

12 files changed

+43
-48
lines changed

12 files changed

+43
-48
lines changed

‎app/root.jsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ hljs.registerLanguage('diff', diff)
2626

2727

2828
export default function App() {
29-
console.log(import.meta.env.VITE_VERSION_LATEST);
3029
return (
3130
<html>
3231
<head>

‎app/routes/LandingPageRoute.jsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@ import { make as LandingPageLayout } from '../../src/layouts/LandingPageLayout.m
22

33

44
export default function Home() {
5-
console.log(import.meta.env);
65
return <LandingPageLayout />
76
}

‎src/ApiDocs.res‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,16 @@ module RightSidebar = {
9090
module SidebarTree = {
9191
@react.component
9292
let make = (~isOpen: bool, ~toggle: unit => unit, ~node: node, ~items: array<item>) => {
93-
let router = Next.Router.useRouter()
94-
let url = router.route->Url.parse
93+
// let router = Next.Router.useRouter() // Remove Next.js router usage if not needed
94+
open ReactRouter
95+
96+
// Use ReactRouter's useLocation if needed, or refactor to not use router
97+
let location = ReactRouter.useLocation()
98+
let url = location.pathname->Url.parse
9599
let version = url->Url.getVersionString
96100

97101
let moduleRoute =
98-
WebAPI.URL.make(~url="file://" ++ router.asPath).pathname
102+
WebAPI.URL.make(~url="file://" ++ location.pathname).pathname
99103
->String.replace(`/docs/manual/${version}/api/`, "")
100104
->String.split("/")
101105

@@ -132,9 +136,9 @@ module SidebarTree = {
132136

133137
<details key={href} open_>
134138
<summary className={summaryClassName ++ classNameActive}>
135-
<Next.Link className={"inline-block w-10/12"} href>
139+
<Link className={"inline-block w-10/12"} to={(href :> ReactRouter.Link.to)}>
136140
{node.name->React.string}
137-
</Next.Link>
141+
</Link>
138142
</summary>
139143
tocModule
140144
{if hasChildren {
@@ -150,15 +154,17 @@ module SidebarTree = {
150154
| false =>
151155
<li className={"list-none mt-1 leading-4"} key={href}>
152156
<summary className={summaryClassName ++ classNameActive}>
153-
<Next.Link className={"block"} href> {node.name->React.string} </Next.Link>
157+
<Link className={"block"} to={(href :> ReactRouter.Link.to)}>
158+
{node.name->React.string}
159+
</Link>
154160
</summary>
155161
tocModule
156162
</li>
157163
}
158164
}
159165

160166
let url =
161-
router.asPath
167+
location.pathname
162168
->Url.parse
163169
->Some
164170

@@ -171,7 +177,7 @@ module SidebarTree = {
171177
ReactEvent.Form.preventDefault(evt)
172178
let version = (evt->ReactEvent.Form.target)["value"]
173179
WebAPI.Storage.setItem(localStorage, ~key=(Manual :> string), ~value=version)
174-
let url = Url.parse(router.asPath)
180+
let url = Url.parse(location.pathname)
175181
switch url.pagepath[1] {
176182
| Some("core") | Some("stdlib") =>
177183
if version < "v12.0.0" {
@@ -186,7 +192,7 @@ module SidebarTree = {
186192
"/" ++
187193
(Array.join(url.base, "/") ++
188194
("/" ++ (version ++ ("/" ++ Array.join(url.pagepath, "/")))))
189-
router->Next.Router.push(targetUrl)
195+
ReactRouter.navigate(targetUrl)
190196
}
191197
let version = url->Url.getVersionString
192198

@@ -224,12 +230,12 @@ module SidebarTree = {
224230
<div className="hl-overline block text-gray-80 mt-5 mb-2">
225231
{"Overview"->React.string}
226232
</div>
227-
<Next.Link
233+
<Link
228234
className={"block " ++
229235
summaryClassName ++ (moduleRoute->Array.length == 1 ? classNameActive : "")}
230-
href={node.path->Array.join("/")}>
236+
to={(node.path->Array.join("/") :> ReactRouter.Link.to)}>
231237
{node.name->React.string}
232-
</Next.Link>
238+
</Link>
233239
{moduleRoute->Array.length === 1 ? subMenu : React.null}
234240
</div>
235241
<div className="hl-overline text-gray-80 mt-5 mb-2"> {"submodules"->React.string} </div>

‎src/BlogArticle.res‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,10 +171,11 @@ let default = (props: props) => {
171171
<div className="text-24 sm:text-32 text-center text-gray-80 font-medium">
172172
{React.string("Want to read more?")}
173173
</div>
174-
<Next.Link href="/blog" className="text-fire hover:text-fire-70">
174+
<ReactRouter.Link
175+
to={("/blog" :> ReactRouter.Link.to)} className="text-fire hover:text-fire-70">
175176
{React.string("Back to Overview")}
176177
<Icon.ArrowRight className="ml-2 inline-block" />
177-
</Next.Link>
178+
</ReactRouter.Link>
178179
</div>
179180
</div>
180181
</div>

‎src/bindings/Next.res‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -46,21 +46,6 @@ module GetStaticPaths = {
4646
type t<'params> = unit => promise<return<'params>>
4747
}
4848

49-
module Link = {
50-
@module("next/link") @react.component
51-
external make: (
52-
~href: string,
53-
~_as: string=?,
54-
~prefetch: bool=?,
55-
~replace: bool=?,
56-
~shallow: bool=?,
57-
~passHref: bool=?,
58-
~children: React.element,
59-
~className: string=?,
60-
~target: string=?,
61-
) => React.element = "default"
62-
}
63-
6449
module Router = {
6550
/*
6651
Make sure to only register events via a useEffect hook!

‎src/bindings/ReactRouter.res‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ module Link = {
1818

1919
@module("react-router") @react.component
2020
external make: (
21-
~children: React.element,
21+
~children: React.element=?,
2222
~className: string=?,
2323
~target: string=?,
2424
~to: to,

‎src/common/Constants.res‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ let versions = {
1717
next: env.nextVersion,
1818
}
1919

20-
Console.log(versions)
21-
2220
let latestVersion = (versions.latest, versions.latest->Semver.tryGetMajorString)
2321

2422
// This is used for the version dropdown in the manual layouts

‎src/components/CodeExample.res‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,14 +216,17 @@ module Toggle = {
216216
) {
217217
| Some({code: ""}) => React.null
218218
| Some(tab) =>
219+
open ReactRouter
219220
let playgroundLinkButton =
220221
tab->isReScript
221-
? <Next.Link href={`/try?code=${encodeURIComponent(tab.code)})}}`} target="_blank">
222+
? <Link
223+
to={(`/try?code=${encodeURIComponent(tab.code)})}}` :> ReactRouter.Link.to)}
224+
target="_blank">
222225
// ICON Link to PLAYGROUND
223226
<Icon.ExternalLink
224227
className="text-gray-30 mt-px hover:cursor-pointer hover:text-gray-60 hover:bg-gray-30 w-6 h-6 p-1 rounded transition-all duration-300 ease-in-out"
225228
/>
226-
</Next.Link>
229+
</Link>
227230
: React.null
228231

229232
let copyButton = <CopyButton code={tab.code} />

‎src/components/Footer.res‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ module Section = {
1010
}
1111
}
1212

13+
open ReactRouter
14+
1315
@react.component
1416
let make = () => {
1517
let linkClass = "hover:underline hover:pointer"
@@ -30,10 +32,11 @@ let make = () => {
3032
<Section title="About">
3133
<ul className="text-16 text-gray-80-tr space-y-2">
3234
<li>
33-
<Next.Link href="/community" className={linkClass}>
35+
<Link to={("/community" :> ReactRouter.Link.to)} className={linkClass}>
3436
{React.string("Community")}
35-
</Next.Link>
37+
</Link>
3638
</li>
39+
3740
<li>
3841
<a href="https://rescript-association.org" className=linkClass>
3942
{React.string("ReScript Association")}

‎src/components/ImageGallery.res‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ let make = (
6565
}
6666
})
6767
}
68-
68+
// TODO - Replace this with just using tailwind show and transitions?
69+
// It's causing a hydration mismatch
6970
<div className>
7071
<div className="w-full" onClick>
7172
<HeadlessUI.Transition

0 commit comments

Comments
 (0)