-
content
+ {content}
-
{node.children
@@ -172,7 +172,7 @@ module SidebarTree = {
- */
/*
*/ /* {React.string("Writing Bindings & Libraries")} */ @@ -310,6 +312,7 @@ type state = | All | Filtered(string) // search term +@react.componentWithProps let make = (props: props) => { open Markdown @@ -369,7 +372,7 @@ let make = (props: props) => { }) let onKeywordSelect = keyword => { - WebAPI.Window.scrollTo(window, ~options={left: 0.0, top: 0.0, behavior: Smooth}) + WebAPI.Window.scrollTo(WebAPI.DOM.window, ~options={left: 0.0, top: 0.0, behavior: Smooth}) setState(_ => { Filtered(keyword) }) @@ -443,8 +446,8 @@ let make = (props: props) => { value={searchValue} /> - officialCategory - communityCategory + {officialCategory} + {communityCategory} - ,
- ~children: option
=React.null, - ~activeItem: option - =?, -) => { +let make = (~mdxSources: array
- , ~children=React.null, ~activeItem: option
- =?) => { let allItems = mdxSources->Array.map(mdxSource => { let {id, keywords, category, summary, name, status, href} = mdxSource { @@ -184,22 +180,21 @@ let make = ( } }) - let fuseOpts = Fuse.Options.t( - ~shouldSort=false, - ~includeScore=true, - ~threshold=0.2, - ~location=0, - ~distance=30, - ~minMatchCharLength=1, - ~keys=["keywords", "name"], - (), - ) + let fuseOpts: Fuse.Options.t = { + shouldSort: false, + includeScore: true, + threshold: 0.2, + location: 0, + distance: 30, + minMatchCharLength: 1, + keys: ["keywords", "name"], + } let fuse: Fuse.t
= Fuse.make(allItems, fuseOpts) let (state, setState) = React.useState(_ => { switch activeItem { - | Some(item) => ShowDetails((item :> Item.t)) + | Some(item) => ShowDetails(item :> Item.t) | None => ShowAll } }) @@ -237,17 +232,15 @@ let make = ( navigate("/syntax-lookup") | value => switch findItemByExactName(value) { - | None => { - let filtered = searchItems(value) - setState(_ => ShowFiltered(value, filtered)) - } - | Some(item) => { - let target = "/syntax-lookup/" ++ item.href - - // This makes sure we don't double navigate - if (pathname :> string) != target { - navigate(target) - } + | None => + let filtered = searchItems(value) + setState(_ => ShowFiltered(value, filtered)) + | Some(item) => + let target = "/syntax-lookup/" ++ item.href + + // This makes sure we don't double navigate + if (pathname :> string) != target { + navigate(target) } } } @@ -262,7 +255,7 @@ let make = ( {React.string("Syntax Lookup")} {React.string(item.name)}
-children +{children} - =?, -) => { +let make = (~mdxSources: array
- content +
- {content} } } module Strong = { @react.component - let make = (~children) => children + let make = (~children) => {children} } module Image = { diff --git a/apps/docs/src/components/MarkdownComponents.res b/apps/docs/src/components/MarkdownComponents.res index ebd829c92..f73ebf980 100644 --- a/apps/docs/src/components/MarkdownComponents.res +++ b/apps/docs/src/components/MarkdownComponents.res @@ -3,44 +3,41 @@ open Markdown type t = { /* MDX shortnames for more advanced components */ @as("Cite") - cite?: React.componentLike
-
, ~activeToc, ~route) => {
@@ -10,7 +10,7 @@ let make = (~categories: array, ~activeToc, ~route) => {
switch node {
| Nullable.Value(element) =>
let dialog = element->elementToDialog
- let breakpoint = window->WebAPI.Window.matchMedia("(min-width: 768px)")
+ let breakpoint = WebAPI.DOM.window->WebAPI.Window.matchMedia("(min-width: 768px)")
let handleClose = _ => {
// StrictMode can reopen the dialog before a cleanup's close event arrives.
if !dialog.open_ {
diff --git a/apps/docs/src/components/Docson.res b/apps/docs/src/components/Docson.res
index d7e35ad0f..aaac39980 100644
--- a/apps/docs/src/components/Docson.res
+++ b/apps/docs/src/components/Docson.res
@@ -20,7 +20,7 @@ let make = (~tag) => {
// The api for docson is a little bit funky, so you need to check out the source to understand what it's doing
// See: https://github.com/lbovet/docson/blob/master/src/index.js
let _ =
- fetch(segment)
+ WebAPI.Fetch.fetch(segment)
->Promise.then(WebAPI.Response.json)
->Promise.then(schema => {
let _ = switch element.current->Nullable.toOption {
diff --git a/apps/docs/src/components/LandingPageCopyButton.res b/apps/docs/src/components/LandingPageCopyButton.res
index c9dbd90a3..573f0607b 100644
--- a/apps/docs/src/components/LandingPageCopyButton.res
+++ b/apps/docs/src/components/LandingPageCopyButton.res
@@ -5,14 +5,17 @@ type state =
| Failed
let useFeedbackRef = setState => React.useCallback(_ => {
- let timer = setTimeout(~handler=() => setState(_ => Idle), ~timeout=2000)
- Some(() => clearTimeout(timer))
+ let timer = WebAPI.Window.setTimeout(
+ WebAPI.DOM.window,
+ ~handler=() => setState(_ => Idle),
+ ~timeout=2000,
+ )
+ Some(() => WebAPI.Window.clearTimeout(WebAPI.DOM.window, timer))
}, [])
@react.component
let make =
- @directive("'use memo'")
- (~code, ~writeClipboard=Clipboard.writeText) => {
+ @directive("'use memo'") (~code, ~writeClipboard=Clipboard.writeText) => {
let (state, setState) = React.useState(_ => Idle)
let feedbackRef = useFeedbackRef(setState)
@@ -54,6 +57,6 @@ let make =
>
authorImg
+ {authorImg}
- archivedNote
+ {archivedNote}
{React.string("Blog")}
- children
+ {children}
diff --git a/apps/docs/app/routes/BlogArticleRoute.res b/apps/docs/app/routes/BlogArticleRoute.res
index 6644a1509..557d5c2e0 100644
--- a/apps/docs/app/routes/BlogArticleRoute.res
+++ b/apps/docs/app/routes/BlogArticleRoute.res
@@ -7,7 +7,7 @@ type loaderData = {
let loader: ReactRouter.Loader.t = async ({request}) => {
let {pathname} = WebAPI.URL.make(~url=request.url)
let filePath = MdxFile.resolveFilePath(
- (pathname :> string),
+ pathname :> string,
~dir="markdown-pages/blog",
~alias="blog",
)
diff --git a/apps/docs/app/routes/CommunityRoute.res b/apps/docs/app/routes/CommunityRoute.res
index 9fc078338..2d03e3a06 100644
--- a/apps/docs/app/routes/CommunityRoute.res
+++ b/apps/docs/app/routes/CommunityRoute.res
@@ -22,7 +22,7 @@ let communityTableOfContents = async () => {
let loader: ReactRouter.Loader.t = async ({request}) => {
let {pathname} = WebAPI.URL.make(~url=request.url)
let filePath = MdxFile.resolveFilePath(
- (pathname :> string),
+ pathname :> string,
~dir="markdown-pages/community",
~alias="community",
)
diff --git a/apps/docs/app/routes/DocsGuidesRoute.res b/apps/docs/app/routes/DocsGuidesRoute.res
index 820e81d92..1174b4981 100644
--- a/apps/docs/app/routes/DocsGuidesRoute.res
+++ b/apps/docs/app/routes/DocsGuidesRoute.res
@@ -22,7 +22,7 @@ let guidesTableOfContents = async () => {
let loader: ReactRouter.Loader.t = async ({request}) => {
let {pathname} = WebAPI.URL.make(~url=request.url)
let filePath = MdxFile.resolveFilePath(
- (pathname :> string),
+ pathname :> string,
~dir="markdown-pages/docs/guides",
~alias="docs/guides",
)
diff --git a/apps/docs/app/routes/DocsManualRoute.res b/apps/docs/app/routes/DocsManualRoute.res
index 9c163bb03..91280d01c 100644
--- a/apps/docs/app/routes/DocsManualRoute.res
+++ b/apps/docs/app/routes/DocsManualRoute.res
@@ -33,7 +33,7 @@ let manualTableOfContents = async () => {
let loader: ReactRouter.Loader.t = async ({request}) => {
let {pathname} = WebAPI.URL.make(~url=request.url)
let filePath = MdxFile.resolveFilePath(
- (pathname :> string),
+ pathname :> string,
~dir="markdown-pages/docs/manual",
~alias="docs/manual",
)
diff --git a/apps/docs/app/routes/DocsOverview.res b/apps/docs/app/routes/DocsOverview.res
index dbffbd735..05b00e61c 100644
--- a/apps/docs/app/routes/DocsOverview.res
+++ b/apps/docs/app/routes/DocsOverview.res
@@ -15,7 +15,7 @@ module Card = {
}
@react.component
-let default = (~showVersionSelect=true) => {
+let default = () => {
let languageManual = Constants.languageManual
let ecosystem = [
@@ -27,7 +27,7 @@ let default = (~showVersionSelect=true) => {
,
}
-let make: props => React.element
+let make: React.component
let getStaticProps: unit => promise
diff --git a/apps/docs/app/routes/SyntaxLookup.res b/apps/docs/app/routes/SyntaxLookup.res
index 2c88212aa..27df79e8c 100644
--- a/apps/docs/app/routes/SyntaxLookup.res
+++ b/apps/docs/app/routes/SyntaxLookup.res
@@ -137,15 +137,15 @@ module DetailBox = {
React.string(third),
]
->Array.mapWithIndex((el, i) => {
- el
+ {el}
})
->React.array
| more => Array.map(more, s => React.string(s))->React.array
}
}
@@ -433,7 +426,7 @@ let make = (
diff --git a/apps/docs/app/routes/SyntaxLookupDetailRoute.res b/apps/docs/app/routes/SyntaxLookupDetailRoute.res
index b5bdfda99..fd35b580c 100644
--- a/apps/docs/app/routes/SyntaxLookupDetailRoute.res
+++ b/apps/docs/app/routes/SyntaxLookupDetailRoute.res
@@ -9,7 +9,7 @@ type loaderData = {
let loader: ReactRouter.Loader.t = async ({request}) => {
let {pathname} = WebAPI.URL.make(~url=request.url)
let filePath = MdxFile.resolveFilePath(
- (pathname :> string),
+ pathname :> string,
~dir="markdown-pages/syntax-lookup",
~alias="syntax-lookup",
)
diff --git a/apps/docs/app/routes/TryRoute.res b/apps/docs/app/routes/TryRoute.res
index 22785fe5b..478d2e963 100644
--- a/apps/docs/app/routes/TryRoute.res
+++ b/apps/docs/app/routes/TryRoute.res
@@ -16,11 +16,10 @@ let loader = async () => {
Node.Process.Env.nodeEnv,
) {
| (Some(baseUrl), _) => (baseUrl, baseUrl)
- | (None, "development") => {
- // Use remote bundles in dev
- let baseUrl = "https://cdn.rescript-lang.org"
- (baseUrl, baseUrl)
- }
+ | (None, "development") =>
+ // Use remote bundles in dev
+ let baseUrl = "https://cdn.rescript-lang.org"
+ (baseUrl, baseUrl)
| (None, _) => (
// Use same-origin requests for the bundle
"/playground-bundles",
@@ -31,7 +30,7 @@ let loader = async () => {
try {
let versions = {
- let response = await fetch(versionsBaseUrl + "/playground-bundles/versions.json")
+ let response = await WebAPI.Fetch.fetch(versionsBaseUrl + "/playground-bundles/versions.json")
let json = await WebAPI.Response.json(response)
json
->JSON.Decode.array
@@ -49,6 +48,7 @@ let loader = async () => {
None
}
}
+
module ClientOnly = {
@react.component
let make = (~bundleBaseUrl, ~versions) => {
diff --git a/apps/docs/e2e/Playground.cy.res b/apps/docs/e2e/Playground.cy.res
index 165510c1e..60980eead 100644
--- a/apps/docs/e2e/Playground.cy.res
+++ b/apps/docs/e2e/Playground.cy.res
@@ -166,7 +166,10 @@ Console.log(isRetriable(HttpError({status: 500})))`
->shouldCss("background-color", "rgb(255, 255, 255)")
->ignore
cyWindow()
- ->thenMap(window => window.localStorage->WebAPI.Storage.getItem("playgroundTheme"))
+ ->thenMap(
+ window =>
+ window->asWebWindow->WebAPI.Window.localStorage->WebAPI.Storage.getItem("playgroundTheme"),
+ )
->shouldEqual(Null.make("light"))
->ignore
@@ -183,7 +186,10 @@ Console.log(isRetriable(HttpError({status: 500})))`
get("main")->shouldCss("background-color", "rgb(11, 13, 34)")->ignore
get(".cm-editor")->shouldCss("background-color", "rgb(11, 13, 34)")->ignore
cyWindow()
- ->thenMap(window => window.localStorage->WebAPI.Storage.getItem("playgroundTheme"))
+ ->thenMap(
+ window =>
+ window->asWebWindow->WebAPI.Window.localStorage->WebAPI.Storage.getItem("playgroundTheme"),
+ )
->shouldEqual(Null.make("dark"))
->ignore
})
diff --git a/apps/docs/e2e/bindings/Cypress.res b/apps/docs/e2e/bindings/Cypress.res
index 02c77791d..1f56626e3 100644
--- a/apps/docs/e2e/bindings/Cypress.res
+++ b/apps/docs/e2e/bindings/Cypress.res
@@ -8,14 +8,16 @@ type consoleCall = {args: array}
@val external consoleArgumentString: option => string = "String"
type console
type history
+
type rec window = {
document: Dom.document,
console: console,
navigator: {clipboard: clipboard},
scrollY: float,
- localStorage: WebAPI.WebStorageAPI.storage,
}
and clipboard
+
+external asWebWindow: window => WebAPI.Window.t = "%identity"
@get external windowHistory: window => history = "history"
@send external replaceState: (history, JSON.t, string, string) => unit = "replaceState"
type response = {status: int, body: string, headers: Dict.t}
@@ -61,19 +63,26 @@ type cssStyle
@val @scope("cy") external intercept: (routeMatcher, request => unit) => chain = "intercept"
@val @scope("cy") external interceptAll: (string, request => unit) => chain = "intercept"
@val @scope("cy") external interceptRoute: routeMatcher => chain = "intercept"
+
@val @scope("cy")
external interceptStatic: (searchRouteMatcher, staticResponse) => chain = "intercept"
+
@val @scope("cy")
external interceptPattern: (RegExp.t, request => unit) => chain = "intercept"
+
@val @scope("cy")
external interceptFailurePattern: (RegExp.t, networkError) => chain = "intercept"
+
@val @scope("cy")
external interceptFailureString: (string, networkError) => chain = "intercept"
+
@val @scope("cy")
external interceptDeferred: (RegExp.t, unit => promise) => chain = "intercept"
+
@val @scope("cy")
external interceptDeferredRequest: (routeMatcher, request => promise) => chain =
"intercept"
+
@val @scope("cy") external wait: string => chain = "wait"
@val @scope("cy") external wrap: 'a => chain<'a> = "wrap"
@val @scope("cy") external wrapWithOptions: ('a, wrapOptions) => chain<'a> = "wrap"
@@ -83,11 +92,15 @@ external interceptDeferredRequest: (routeMatcher, request => promise) => c
@val @scope("cy") external realPressKey: string => chain = "realPress"
@val @scope("cy") external realPressKeys: array => chain = "realPress"
@val @scope("cy") external reload: unit => unit = "reload"
+
@val @scope("cy")
external onBeforeLoad: (@as("window:before:load") _, window => unit) => unit = "on"
+
@val @scope("cy") external spy: (console, @as("error") _) => spy = "spy"
+
@val @scope("Cypress")
external automate: (@as("remote:debugger:protocol") _, automation) => promise = "automation"
+
@val @scope("Cypress") external baseUrl: @as("baseUrl") _ => string = "config"
@val @scope("Cypress") external isInteractive: @as("isInteractive") _ => bool = "config"
@val @scope("mocha") external forbidOnly: bool => unit = "forbidOnly"
@@ -97,38 +110,51 @@ external automate: (@as("remote:debugger:protocol") _, automation) => promise, 'a => 'b) => chain<'b> = "then"
@send external thenPromise: (chain<'a>, 'a => promise<'b>) => chain<'b> = "then"
@send external should: (chain<'a>, string) => chain<'a> = "should"
+
@send
external shouldCss: (chain, @as("have.css") _, string, string) => chain =
"should"
+
@send
external shouldCssProperty: (chain, @as("have.css") _, string) => chain = "should"
+
@send external shouldInt: (chain<'a>, string, int) => chain<'a> = "should"
+
@send
external shouldValue: (chain, @as("have.value") _, string) => chain = "should"
+
@send
external shouldText: (chain, @as("have.text") _, string) => chain = "should"
+
@send external shouldEqual: (chain<'a>, @as("equal") _, 'a) => chain<'a> = "should"
@send external shouldDeepEqual: (chain<'a>, @as("deep.equal") _, 'a) => chain<'a> = "should"
@send external shouldMatch: (chain<'a>, @as("match") _, RegExp.t) => chain<'a> = "should"
@send external andMatch: (chain, @as("match") _, RegExp.t) => chain = "and"
@send external shouldWithin: (chain, @as("be.within") _, int, int) => chain = "should"
+
@send
external shouldAttribute: (chain, @as("have.attr") _, string, string) => chain =
"should"
+
@send
external shouldProperty: (chain, @as("have.prop") _, string, string) => chain =
"should"
+
@send external attribute: (chain, @as("attr") _, string) => chain = "invoke"
@send external propertyInt: (chain<'a>, string) => chain = "its"
@send external propertyString: (chain<'a>, string) => chain = "its"
+
@send
external shouldPropertyExist: (chain<'a>, @as("have.property") _, string) => chain<'a> = "should"
+
@send external shouldSatisfy: (chain<'a>, 'a => unit) => chain<'a> = "should"
@send external click: chain => chain = "click"
@send external first: chain => chain = "first"
@send external typeText: (chain, string) => chain = "type"
+
@send
external containsChildRegex: (chain, string, RegExp.t) => chain = "contains"
+
@send external focusElement: chain => chain = "focus"
@send external realClick: chain => chain = "realClick"
@send external realPress: (chain, string) => chain = "realPress"
@@ -160,13 +186,17 @@ type parser
@send external parseHtml: (parser, string, @as("text/html") _) => Dom.document = "parseFromString"
@send external querySelector: (Dom.document, string) => Null.t = "querySelector"
@send external querySelectorAll: (Dom.document, string) => elementList = "querySelectorAll"
+
@send
external querySelectorFromElement: (Dom.element, string) => Null.t = "querySelector"
+
@send
external querySelectorAllFromElement: (Dom.element, string) => elementList = "querySelectorAll"
+
@send
external addEventListenerOnce: (Dom.document, string, unit => unit, listenerOptions) => unit =
"addEventListener"
+
@get external body: Dom.document => Dom.element = "body"
@get external documentElement: Dom.document => Dom.element = "documentElement"
@get external currentScript: Dom.document => Null.t = "currentScript"
@@ -226,16 +256,20 @@ external addEventListenerOnce: (Dom.document, string, unit => unit, listenerOpti
@send external containsChild: (chain, string) => chain = "contains"
@send external containsChildIn: (chain, string, string) => chain = "contains"
@send external select: (chain, string) => chain = "select"
+
@send
external typeWithOptions: (
chain,
string,
{"force": bool, "delay": int},
) => chain = "type"
+
@send
external shouldContainText: (chain, @as("contain.text") _, string) => chain =
"should"
+
@send external shouldInclude: (chain, @as("include") _, string) => chain = "should"
+
@send
external shouldClass: (chain, @as("have.class") _, string) => chain = "should"
diff --git a/apps/docs/functions/ogimage/[[path]]/index.png.res b/apps/docs/functions/ogimage/[[path]]/index.png.res
index 8191170d8..1d524dd2c 100644
--- a/apps/docs/functions/ogimage/[[path]]/index.png.res
+++ b/apps/docs/functions/ogimage/[[path]]/index.png.res
@@ -2,20 +2,20 @@ open WebAPI
let loadGoogleFont = async (family: string) => {
let url = `https://fonts.googleapis.com/css2?family=${family}`
- let css = await (await fetch(url))->Response.text
+ let css = await (await WebAPI.Fetch.fetch(url))->Response.text
// this function should fail if we can't load the font
let resource =
css->String.match(/src: url\((.+)\) format\('(opentype|truetype)'\)/)->Option.getOrThrow
- let response = await fetch(resource[1]->Option.getOrThrow->Option.getOrThrow)
+ let response = await WebAPI.Fetch.fetch(resource[1]->Option.getOrThrow->Option.getOrThrow)
await response->Response.arrayBuffer
}
type assets
type env = {@as("ASSETS") assets: assets}
-type context = {request: FetchAPI.request, params: {path: array}, env: env}
+type context = {request: Request.t, params: {path: array}, env: env}
-@send external fetchAsset: (assets, string) => promise = "fetch"
+@send external fetchAsset: (assets, string) => promise = "fetch"
let textResponse = (~status, message) => Response.fromString(message, ~init={status: status})
@@ -111,14 +111,14 @@ let splitPreviewText = (~title, ~description) => {
(titleSegments[0]->Option.getOr("")->normalizeText, subTitle, description->normalizeText)
}
-let requestedUrl = (~requestUrl: URLAPI.url, ~params) => {
- switch requestUrl.searchParams->URLSearchParams.get("url")->Nullable.make->Nullable.toOption {
+let requestedUrl = (~searchParams, ~path) => {
+ switch searchParams->URLSearchParams.get("url")->Null.toOption {
| Some(url) => Some(url)
- | None => params.path[0]->Option.map(decodeURIComponent)
+ | None => path[0]->Option.map(decodeURIComponent)
}
}
-let isHtmlResponse = (response: FetchAPI.response) =>
+let isHtmlResponse = (response: Response.t) =>
response.headers
->Headers.get("content-type")
->Null.toOption
@@ -126,14 +126,14 @@ let isHtmlResponse = (response: FetchAPI.response) =>
contentType->String.toLowerCase->String.includes("text/html")
)
-let renderImage = async (~assets, ~requestUrl: URLAPI.url, ~targetUrl: URLAPI.url) => {
- if targetUrl.origin != requestUrl.origin {
+let renderImage = async (~assets, ~origin, ~targetOrigin, ~targetPathname, ~targetHref) => {
+ if targetOrigin != origin {
textResponse(~status=400, "Open Graph image URL must be same-origin")
- } else if targetUrl.pathname->String.startsWith("/ogimage/") {
+ } else if targetPathname->String.startsWith("/ogimage/") {
textResponse(~status=400, "Open Graph image URL cannot point at the image endpoint")
} else {
let pageResponse = try {
- Some(await assets->fetchAsset(targetUrl.href))
+ Some(await assets->fetchAsset(targetHref))
} catch {
| _ => None
}
@@ -144,7 +144,7 @@ let renderImage = async (~assets, ~requestUrl: URLAPI.url, ~targetUrl: URLAPI.ur
textResponse(~status=pageResponse.status, "Could not fetch Open Graph image URL")
| Some(pageResponse) =>
switch pageResponse.url->parseUrl {
- | Some(responseUrl) if responseUrl.origin != requestUrl.origin =>
+ | Some(responseUrl) if responseUrl.origin != origin =>
textResponse(~status=400, "Fetched Open Graph image URL must be same-origin")
| Some(_) | None =>
if !(pageResponse->isHtmlResponse) {
@@ -256,8 +256,17 @@ let renderImage = async (~assets, ~requestUrl: URLAPI.url, ~targetUrl: URLAPI.ur
let onRequest = async ({request, params, env}: context) => {
let requestUrl = URL.make(~url=request.url)
- switch requestedUrl(~requestUrl, ~params)->Option.flatMap(parseUrl) {
+ switch requestedUrl(~searchParams=requestUrl.searchParams, ~path=params.path)->Option.flatMap(
+ parseUrl,
+ ) {
| None => textResponse(~status=400, "Missing or invalid url")
- | Some(targetUrl) => await renderImage(~assets=env.assets, ~requestUrl, ~targetUrl)
+ | Some(targetUrl) =>
+ await renderImage(
+ ~assets=env.assets,
+ ~origin=requestUrl.origin,
+ ~targetOrigin=targetUrl.origin,
+ ~targetPathname=targetUrl.pathname,
+ ~targetHref=targetUrl.href,
+ )
}
}
diff --git a/apps/docs/package.json b/apps/docs/package.json
index d781bd29e..5424b97ee 100644
--- a/apps/docs/package.json
+++ b/apps/docs/package.json
@@ -47,8 +47,8 @@
"@react-router/node": "^8.3.1",
"@rescript-lang/playground": "workspace:*",
"@rescript-lang/shared": "workspace:*",
- "@rescript/react": "^0.14.2",
- "@rescript/webapi": "0.1.0-experimental-29db5f4",
+ "@rescript/react": "^0.16.0-beta.1",
+ "@rescript/webapi": "alpha",
"docson": "^2.1.0",
"fuse.js": "^6.6.2",
"highlight.js": "^11.11.1",
@@ -65,7 +65,7 @@
"remark-frontmatter": "^5.0.0",
"remark-gfm": "^4.0.1",
"remark-validate-links": "^13.1.0",
- "rescript": "^12.2.0",
+ "rescript": "^13.0.0-alpha.6",
"tinyglobby": "^0.2.15",
"unified": "^11.0.5",
"vfile-matter": "^5.0.1"
diff --git a/apps/docs/rescript.json b/apps/docs/rescript.json
index d77357b84..78ad7d046 100644
--- a/apps/docs/rescript.json
+++ b/apps/docs/rescript.json
@@ -7,7 +7,6 @@
"@rescript/react",
"@rescript/webapi"
],
- "compiler-flags": ["-open WebAPI.Global"],
"sources": [
{
"dir": "__tests__",
@@ -43,10 +42,5 @@
],
"warnings": {
"error": "+8"
- },
- "gentypeconfig": {
- "language": "untyped",
- "shims": [],
- "module": "es6"
}
}
diff --git a/apps/docs/scripts/__tests__/Clipboard_.test.res b/apps/docs/scripts/__tests__/Clipboard_.test.res
index b1e12a4b1..f7bf184ef 100644
--- a/apps/docs/scripts/__tests__/Clipboard_.test.res
+++ b/apps/docs/scripts/__tests__/Clipboard_.test.res
@@ -1,27 +1,26 @@
open ScriptTest
-type dom = {window: WebAPI.DOMAPI.window}
+type dom = {window: WebAPI.Window.t}
type clipboard = {writeText: string => promise}
type navigator = {clipboard?: clipboard}
+type mockWindow = {document: WebAPI.DOM.document, navigator: navigator}
@module("jsdom") @new external makeDom: string => dom = "JSDOM"
@module("vitest") @scope("vi") external stubGlobal: (string, 'a) => unit = "stubGlobal"
@module("vitest") @scope("vi") external unstubGlobals: unit => unit = "unstubAllGlobals"
-@send external close: WebAPI.DOMAPI.window => unit = "close"
-@set external setCopyCommand: (WebAPI.DOMAPI.document, string => bool) => unit = "execCommand"
-@get external textareaValue: WebAPI.DOMAPI.element => string = "value"
+@send external close: WebAPI.Window.t => unit = "close"
+@set external setCopyCommand: (WebAPI.DOM.document, string => bool) => unit = "execCommand"
+@get external textareaValue: WebAPI.Element.t => string = "value"
let setup = (~writeNative=?) => {
let dom = makeDom("}
+
type media = {
images: int,
imagesMissingWidth: int,
@@ -11,13 +12,17 @@ type media = {
videosMissingHeight: int,
localAssets: int,
}
+
type report = {javascript: assetGroup, css: assetGroup, bodyElements: int, media: media}
-type input = {html: string, readAsset: WebAPI.URLAPI.url => promise}
+type assetUrl = {pathname: string}
+type input = {html: string, readAsset: assetUrl => promise}
+
@module("../homepage-performance.mjs")
external createReport: input => promise = "createReport"
let javascript = buffer("console.log('home')")
let css = buffer("body { color: black; }")
+
let html = `
@@ -26,7 +31,7 @@ let html = `
= "ImageResponse"
diff --git a/apps/docs/src/bindings/Fuse.res b/apps/docs/src/bindings/Fuse.res
index f29d3f564..5c3bca7cc 100644
--- a/apps/docs/src/bindings/Fuse.res
+++ b/apps/docs/src/bindings/Fuse.res
@@ -1,22 +1,13 @@
module Options = {
- @deriving(abstract)
type t = {
- @optional
- shouldSort: bool,
- @optional
- includeScore: bool,
- @optional
- threshold: float,
- @optional
- location: int,
- @optional
- distance: int,
- @optional
- ignoreLocation: bool,
- @optional
- minMatchCharLength: int,
- @optional
- keys: array,
+ shouldSort?: bool,
+ includeScore?: bool,
+ threshold?: float,
+ location?: int,
+ distance?: int,
+ ignoreLocation?: bool,
+ minMatchCharLength?: int,
+ keys?: array,
}
}
diff --git a/apps/docs/src/common/Hooks.res b/apps/docs/src/common/Hooks.res
index 1e8ae16ee..64f16e34b 100644
--- a/apps/docs/src/common/Hooks.res
+++ b/apps/docs/src/common/Hooks.res
@@ -24,7 +24,7 @@ let useScrollDirection = (~topMargin=80, ~threshold=20) => {
React.useEffect(() => {
let onScroll = _e => {
setScrollDir(prev => {
- let scrollY = scrollY->Float.toInt
+ let scrollY = WebAPI.DOM.window->WebAPI.Window.scrollY->Float.toInt
let enterTopMargin = scrollY <= topMargin
let action = switch prev {
@@ -45,8 +45,8 @@ let useScrollDirection = (~topMargin=80, ~threshold=20) => {
})
}
- WebAPI.Window.addEventListener(window, Scroll, onScroll)
- Some(() => WebAPI.Window.removeEventListener(window, Scroll, onScroll))
+ WebAPI.Window.addEventListener(WebAPI.DOM.window, Scroll, onScroll)
+ Some(() => WebAPI.Window.removeEventListener(WebAPI.DOM.window, Scroll, onScroll))
}, [topMargin, threshold])
scrollDir
diff --git a/apps/docs/src/components/CodeCopyButton.res b/apps/docs/src/components/CodeCopyButton.res
index ed56f0187..4fcc25afb 100644
--- a/apps/docs/src/components/CodeCopyButton.res
+++ b/apps/docs/src/components/CodeCopyButton.res
@@ -34,28 +34,35 @@ let make = (~code, ~writeClipboard=Clipboard.writeText) => {
// For Tailwind transitions to behave correctly, we need to first paint the DOM element in the tree,
// and in the next tick, add the opacity-100 class, so the transition animation actually takes place.
// If we don't do that, the banner will essentially pop up without any animation
- let bannerEl = WebAPI.Document.createElement(document, "div")
+ let bannerEl = WebAPI.Document.createElement(WebAPI.DOM.window->WebAPI.Window.document, "div")
bannerEl.className = "opacity-0 absolute -top-6 right-0 -mt-5 -mr-4 px-4 py-2 w-40 rounded-lg captions text-white bg-gray-100 text-gray-80-tr transition-all duration-1000 ease-in-out "
- let textNode = WebAPI.Document.createTextNode(document, "Copied to clipboard")
+ let textNode = WebAPI.Document.createTextNode(
+ WebAPI.DOM.window->WebAPI.Window.document,
+ "Copied to clipboard",
+ )
WebAPI.Element.appendChild(bannerEl, textNode)->ignore
WebAPI.Element.appendChild(buttonEl, bannerEl)->ignore
- let nextFrameId = WebAPI.Window.requestAnimationFrame(window, _ => {
+ let nextFrameId = WebAPI.Window.requestAnimationFrame(WebAPI.DOM.window, _ => {
WebAPI.DOMTokenList.toggle(bannerEl.classList, ~token="opacity-0")->ignore
WebAPI.DOMTokenList.toggle(bannerEl.classList, ~token="opacity-100")->ignore
})
- let timeoutId = setTimeout(~handler=() => {
- buttonEl->WebAPI.Element.removeChild(bannerEl)->ignore
- setState(_ => Init)
- }, ~timeout=3000)
+ let timeoutId = WebAPI.Window.setTimeout(
+ WebAPI.DOM.window,
+ ~handler=() => {
+ buttonEl->WebAPI.Element.removeChild(bannerEl)->ignore
+ setState(_ => Init)
+ },
+ ~timeout=3000,
+ )
Some(
() => {
- cancelAnimationFrame(nextFrameId)
- clearTimeout(timeoutId)
+ WebAPI.Window.cancelAnimationFrame(WebAPI.DOM.window, nextFrameId)
+ WebAPI.Window.clearTimeout(WebAPI.DOM.window, timeoutId)
bannerEl->WebAPI.Element.remove
},
)
diff --git a/apps/docs/src/components/CodeExample.res b/apps/docs/src/components/CodeExample.res
index 5346b4e49..b4c313355 100644
--- a/apps/docs/src/components/CodeExample.res
+++ b/apps/docs/src/components/CodeExample.res
@@ -34,7 +34,7 @@ let make = (
}
@@ -73,13 +73,16 @@ module Toggle = {
switch tabs {
| [tab] =>
- make({
- highlightedLines: ?tab.highlightedLines,
- code: tab.code,
- lang: ?tab.lang,
- showLabel: true,
- showCopyButton: true,
- })
+ React.createElement(
+ make,
+ {
+ highlightedLines: ?tab.highlightedLines,
+ code: tab.code,
+ lang: ?tab.lang,
+ showLabel: true,
+ showCopyButton: true,
+ },
+ )
| multiple =>
let numberOfItems = Array.length(multiple)
let tabElements = Array.mapWithIndex(multiple, (tab, i) => {
@@ -156,7 +159,7 @@ module Toggle = {
to={`/try?code=${LzString.lzString.compressToEncodedURIComponent(tab.code)}`}
target="_blank"
>
- // ICON Link to PLAYGROUND
+ /* ICON Link to PLAYGROUND */
- //
+ /* */
{React.string("Docs")}
{
- // setFilter(prev => {
- // {...prev, Filter.includeNpm: !filter.includeNpm}
- // })
- // }}>
- // {React.string("NPM package")}
- //
+
+ /* { */
+ /* setFilter(prev => { */
+ /* {...prev, Filter.includeNpm: !filter.includeNpm} */
+ /* }) */
+ /* }}> */
+ /* {React.string("NPM package")} */
+ /* */
+
{
@@ -290,6 +291,7 @@ module InfoSidebar = {
{React.string("Publishing ReScript npm packages")}
+
/*
@@ -519,9 +522,9 @@ let getStaticProps = async (): props => {
let baseUrl = "https://registry.npmjs.org/-/v1/search?text=keywords:rescript&size=250&maintenance=1.0&popularity=0.5&quality=0.9"
let (one, two, three) = await Promise.all3((
- fetch(baseUrl),
- fetch(baseUrl ++ "&from=250"),
- fetch(baseUrl ++ "&from=500"),
+ WebAPI.Fetch.fetch(baseUrl),
+ WebAPI.Fetch.fetch(baseUrl ++ "&from=250"),
+ WebAPI.Fetch.fetch(baseUrl ++ "&from=500"),
))
let responseToOption = async response => {
diff --git a/apps/docs/app/routes/Packages.resi b/apps/docs/app/routes/Packages.resi
index a89c521d5..4fe6f38bc 100644
--- a/apps/docs/app/routes/Packages.resi
+++ b/apps/docs/app/routes/Packages.resi
@@ -22,6 +22,6 @@ type props = {
unmaintained: array
diff --git a/apps/docs/app/routes/DocsOverview.resi b/apps/docs/app/routes/DocsOverview.resi
index 45deeeacb..47fa1ac2e 100644
--- a/apps/docs/app/routes/DocsOverview.resi
+++ b/apps/docs/app/routes/DocsOverview.resi
@@ -1,2 +1,2 @@
@react.component
-let default: (~showVersionSelect: bool=?) => React.element
+let default: unit => React.element
diff --git a/apps/docs/app/routes/DocsReactRoute.res b/apps/docs/app/routes/DocsReactRoute.res
index 8e3dcb073..75e319ca5 100644
--- a/apps/docs/app/routes/DocsReactRoute.res
+++ b/apps/docs/app/routes/DocsReactRoute.res
@@ -26,7 +26,7 @@ let reactTableOfContents = async () => {
let loader: ReactRouter.Loader.t = async ({request}) => {
let {pathname} = WebAPI.URL.make(~url=request.url)
let filePath = MdxFile.resolveFilePath(
- (pathname :> string),
+ pathname :> string,
~dir="markdown-pages/docs/react",
~alias="docs/react",
)
diff --git a/apps/docs/app/routes/LandingPage.res b/apps/docs/app/routes/LandingPage.res
index 5fbaf7240..46a81eded 100644
--- a/apps/docs/app/routes/LandingPage.res
+++ b/apps/docs/app/routes/LandingPage.res
@@ -1,7 +1,6 @@
@react.component
let make =
- @directive("'use memo'")
- (~playgroundData) => {
+ @directive("'use memo'") (~playgroundData) => {
<>
, pattern: string): array<
Fuse.match,
> => {
- let fuseOpts = Fuse.Options.t(
- ~shouldSort=true,
- ~includeScore=true,
- ~threshold=0.2,
- ~ignoreLocation=true,
- ~minMatchCharLength=1,
- ~keys=["meta.uid", "name", "keywords"],
- (),
- )
+ let fuseOpts: Fuse.Options.t = {
+ shouldSort: true,
+ includeScore: true,
+ threshold: 0.2,
+ ignoreLocation: true,
+ minMatchCharLength: 1,
+ keys: ["meta.uid", "name", "keywords"],
+ }
let fuser = Fuse.make(packages, fuseOpts)
@@ -204,7 +203,7 @@ module Category = {
}
}
@@ -230,7 +229,7 @@ module InfoSidebar = {
toggle()
}
-
+
}
}
@@ -263,15 +262,17 @@ module InfoSidebar = {
>
{React.string("Community")}
- // {React.string(title)}
- children
+ {children}
-
}
}
@@ -166,11 +166,7 @@ type item = {
}
@react.component
-let make = (
- ~mdxSources: array summaryEl
- children
+ {summaryEl}
+ {children}
Selected text
") - stubGlobal("document", dom.window.document) - stubGlobal( - "navigator", - {clipboard: ?(writeNative->Option.map(writeText => {writeText: writeText}))}, - ) + let document = dom.window->WebAPI.Window.document + let navigator = {clipboard: ?(writeNative->Option.map(writeText => {writeText: writeText}))} + stubGlobal("window", {document, navigator}) onTestFinished(async () => { unstubGlobals() close(dom.window) }) - dom.window.document + document } let textareaCount = document => (document->WebAPI.Document.querySelectorAll("textarea")).length @@ -42,7 +41,7 @@ test("missing Clipboard API falls back and restores focus and selected text", as let button = document->WebAPI.Document.querySelector("button")->Null.getOrThrow Clipboard.focusElement(button) let paragraph = document->WebAPI.Document.querySelector("p")->Null.getOrThrow - let selection = document->WebAPI.Document.getSelection + let selection = document->WebAPI.Document.getSelection->Null.getOrThrow let range = document->WebAPI.Document.createRange range->WebAPI.Range.selectNodeContents(paragraph->WebAPI.Element.asNode) selection->WebAPI.Selection.removeAllRanges @@ -59,7 +58,7 @@ test("missing Clipboard API falls back and restores focus and selected text", as expect(await Clipboard.writeText("let answer = 42"))->toStrictEqual(Ok()) expect(copied.contents)->toBe("let answer = 42") - expect(document.activeElement)->toBe(Null.make(button)) + expect(document->WebDocument.activeElement)->toBe(Null.make(button)) expect(String.make(selection))->toBe("Selected text") expect(textareaCount(document))->toBe(0) }) diff --git a/apps/docs/scripts/__tests__/HomepagePerformance_.test.res b/apps/docs/scripts/__tests__/HomepagePerformance_.test.res index a5ca20e43..3a9018640 100644 --- a/apps/docs/scripts/__tests__/HomepagePerformance_.test.res +++ b/apps/docs/scripts/__tests__/HomepagePerformance_.test.res @@ -2,6 +2,7 @@ open ScriptTest type asset = {path: string, rawBytes: int, gzipBytes: int} type assetGroup = {requests: int, rawBytes: int, gzipBytes: int, assets: array
- {//RES or JS Label
+ {/* RES or JS Label */
String.toUpperCase(label)->React.string}
} else {
@@ -53,9 +53,9 @@ let make = (
//normal code-text without tabs
className="relative w-full flex-col rounded xs:rounded border border-gray-20 bg-gray-10 pt-2 text-gray-80"
>
- label
- copyButton
- children
+ {label}
+ {copyButton}
+ {children}
- playgroundLinkButton
- copyButton
+ {playgroundLinkButton}
+ {copyButton}
| None => React.null
}
- //text within code-box
+ /* text within code-box */
}
diff --git a/apps/docs/src/components/CommunityMobileSidebar.res b/apps/docs/src/components/CommunityMobileSidebar.res
index 551aa546b..3c29d5ca1 100644
--- a/apps/docs/src/components/CommunityMobileSidebar.res
+++ b/apps/docs/src/components/CommunityMobileSidebar.res
@@ -1,4 +1,4 @@
-external elementToDialog: Dom.element => WebAPI.DOMAPI.htmlDialogElement = "%identity"
+external elementToDialog: Dom.element => WebAPI.HTMLDialogElement.t = "%identity"
@react.component
let make = (~categories: array {React.array(tabElements)}
- buttonDiv
+ {buttonDiv}
-
children+
{children}
{React.string("Quick Install")}
diff --git a/apps/docs/src/components/LandingPageIntro.res b/apps/docs/src/components/LandingPageIntro.res
index 01767bd75..bc25e13cc 100644
--- a/apps/docs/src/components/LandingPageIntro.res
+++ b/apps/docs/src/components/LandingPageIntro.res
@@ -1,7 +1,6 @@
@react.component
let make =
- @directive("'use memo'")
- () => {
+ @directive("'use memo'") () => {
diff --git a/apps/docs/src/components/LandingPageTrustedBy.res b/apps/docs/src/components/LandingPageTrustedBy.res
index 3041a1134..07dd2cf32 100644
--- a/apps/docs/src/components/LandingPageTrustedBy.res
+++ b/apps/docs/src/components/LandingPageTrustedBy.res
@@ -1,7 +1,6 @@
@react.component
let make =
- @directive("'use memo'")
- () => {
+ @directive("'use memo'") () => {
let ourUsersSourcePath = "apps/docs/src/data/OurUsers.res"
diff --git a/apps/docs/src/components/LandingPageTrustedBy.res b/apps/docs/src/components/LandingPageTrustedBy.res
index 3041a1134..07dd2cf32 100644
--- a/apps/docs/src/components/LandingPageTrustedBy.res
+++ b/apps/docs/src/components/LandingPageTrustedBy.res
@@ -1,7 +1,6 @@
@react.component
let make =
- @directive("'use memo'")
- () => {
+ @directive("'use memo'") () => {
let ourUsersSourcePath = "apps/docs/src/data/OurUsers.res"
diff --git a/apps/docs/src/components/Markdown.res b/apps/docs/src/components/Markdown.res
index 9840ee22d..56134da9f 100644
--- a/apps/docs/src/components/Markdown.res
+++ b/apps/docs/src/components/Markdown.res
@@ -4,14 +4,14 @@
module P = {
@react.component
let make = (~children) =>
- children
+ {children}
}
// Used for hero like introduction text in
// e.g Doc sections
module Intro = {
@react.component
- let make = (~children) => children
+ let make = (~children) => {children}
}
module Cite = {
@@ -20,7 +20,7 @@ module Cite = {
// For semantics, check out
// https://css-tricks.com/quoting-in-html-quotations-citations-and-blockquotes/
- children
+ {children}
{Option.mapOr(author, React.null, author =>
{React.string(author)}
)}
@@ -30,13 +30,13 @@ module Cite = {
module Info = {
@react.component
let make = (~children) =>
- children
+ {children}
}
module Warn = {
@react.component
let make = (~children) =>
- children
+ {children}
}
module UrlBox = {
@@ -47,7 +47,7 @@ module UrlBox = {
let elements = React.Children.toArray(children)
let content = if typeof(children) == #string || React.isValidElement(children) {
- imgEl
+ {imgEl}
{MdxLegacy.getChildren(children)}
} else {
@@ -57,7 +57,7 @@ module UrlBox = {
let rest = elements->Array.slice(~start=1)
<>
- imgEl
+ {imgEl}
{MdxLegacy.getChildren(head)}
{React.array(rest)}
@@ -82,8 +82,8 @@ module UrlBox = {
}
- content
- link
+ {content}
+ {link}
}
}
@@ -103,12 +103,13 @@ module Anchor = {
}
}
+
//*--- HEADLINES ---*//
module H1 = {
@react.component
let make = (~id=?, ~title=?, ~children) =>
- children
+ {children}
}
module H2 = {
@@ -118,7 +119,7 @@ module H2 = {
<>
- children
+ {children}
- children
+ {children}
- children
+ {children}
children
+ let make = (~children) => {children}
}
module InlineCode = {
@@ -177,7 +178,7 @@ module InlineCode = {
- children
+ {children}
}
@@ -185,13 +186,13 @@ module Table = {
@react.component
let make = (~children) =>
- children
+ {children}
}
module Thead = {
@react.component
- let make = (~children) => children
+ let make = (~children) => {children}
}
module Th = {
@@ -200,13 +201,13 @@ module Th = {
- children
+ {children}
}
module Td = {
@react.component
- let make = (~children) => children
+ let make = (~children) => {children}
}
module Code = {
@@ -233,16 +234,16 @@ module Code = {
let highlightedLines = parseNumericRangeMeta(metastring)
- if List.has(metaSplits, "example", String.equal) {
+ if metaSplits->List.some(value => value == "example") {
- children
+ {children}
}
@@ -353,13 +354,13 @@ module A = {
?target
dataTestId="absolute-url"
>
- children
+ {children}
} else {
- children
+ {children}
}
}
@@ -367,12 +368,12 @@ module A = {
module Ul = {
@react.component
- let make = (~children) => children
+ let make = (~children) => {children}
}
module Ol = {
@react.component
- let make = (~children) => children
+ let make = (~children) => {children}
}
module Li = {
@@ -397,7 +398,7 @@ module Li = {
| [child] =>
switch getType(child) {
| "pre" | "p" => child
- | _ =>
child
+ | _ => {child}
}
| _ =>
let first = elements[0]->Option.getOrThrow
@@ -407,18 +408,18 @@ module Li = {
| "ul" | "ol" | "li" | "pre" =>
<>
{getType(first) == "p" ? React.array(head) : {React.array(head)}
}
- last
+ {last}
- | _ => children
+ | _ => {children}
}
}
- , React.element>, React.element>,
+ cite?: React.component, React.element>>,
@as("Info")
- info?: React.componentLike, React.element>,
+ info?: React.component>,
@as("Warn")
- warn?: React.componentLike, React.element>,
+ warn?: React.component>,
@as("Intro")
- intro?: React.componentLike, React.element>,
+ intro?: React.component>,
@as("Image")
- image?: React.componentLike<
- Image.props,
- React.element,
- >,
+ image?: React.component>,
@as("Video")
- video?: React.componentLike, React.element>,
+ video?: React.component>,
@as("UrlBox")
- urlBox?: React.componentLike, React.element>,
+ urlBox?: React.component>,
@as("CodeTab")
- codeTab?: CodeTab.props> => React.element,
+ codeTab?: React.component>>,
/* Common markdown elements */
- p?: P.props => React.element,
- li?: Li.props => React.element,
- h1?: H1.props => React.element,
- h2?: H2.props => React.element,
- h3?: H3.props => React.element,
- h4?: H4.props => React.element,
- h5?: H5.props => React.element,
- ul?: Ul.props => React.element,
- ol?: Ol.props => React.element,
- table?: Table.props => React.element,
- thead?: Thead.props => React.element,
- th?: Th.props => React.element,
- td?: Td.props => React.element,
- blockquote?: Blockquote.props => React.element,
- strong?: Strong.props => React.element,
- hr?: Hr.props => React.element,
- code?: React.componentLike, React.element>, React.element>,
- pre?: Pre.props => React.element,
- a?: A.props => React.element,
+ p?: React.component>,
+ li?: React.component>,
+ h1?: React.component>,
+ h2?: React.component>,
+ h3?: React.component>,
+ h4?: React.component>,
+ h5?: React.component>,
+ ul?: React.component>,
+ ol?: React.component>,
+ table?: React.component>,
+ thead?: React.component>,
+ th?: React.component>,
+ td?: React.component>,
+ blockquote?: React.component>,
+ strong?: React.component>,
+ hr?: React.component,
+ code?: React.component, React.element>>,
+ pre?: React.component>,
+ a?: React.component>,
}
let default = {
diff --git a/apps/docs/src/components/NavbarPrimary.res b/apps/docs/src/components/NavbarPrimary.res
index a8e5d1c6a..d9b5c5dd1 100644
--- a/apps/docs/src/components/NavbarPrimary.res
+++ b/apps/docs/src/components/NavbarPrimary.res
@@ -10,8 +10,7 @@ let isActive = (~url, ~pathname: Path.t) => {
module LeftContent = {
@react.component
let make =
- @directive("'use memo'")
- () => {
+ @directive("'use memo'") () => {
let {pathname} = useLocation()
{
+ @directive("'use memo'") () => {
let iconClasses = "w-6 h-6 opacity-50 hover:opacity-100"
let linkClasses = "hidden md:block"
{
+ @directive("'use memo'") () => {
let scrollDirection = Hooks.useScrollDirection(~topMargin=64, ~threshold=32)
let navbarClasses = switch scrollDirection {
diff --git a/apps/docs/src/components/NavbarUtils.res b/apps/docs/src/components/NavbarUtils.res
index 0f639ffdb..2677b3a3e 100644
--- a/apps/docs/src/components/NavbarUtils.res
+++ b/apps/docs/src/components/NavbarUtils.res
@@ -16,35 +16,36 @@ let isActiveLink = (~includes: string, ~excludes: option=?, ~route: Path
let linkOrActiveLink = (~target: Path.t, ~route: Path.t) => target === route ? activeLink : link
let linkOrActiveLinkSubroute = (~target: Path.t, ~route: Path.t) =>
- String.startsWith((route :> string), (target :> string)) ? activeLink : link
+ String.startsWith(route :> string, target :> string) ? activeLink : link
-external elementToDialog: WebAPI.DOMAPI.element => WebAPI.DOMAPI.htmlDialogElement = "%identity"
+external elementToDialog: WebAPI.Element.t => WebAPI.HTMLDialogElement.t = "%identity"
let getMobileOverlayDialog = () => {
- Nullable.make(document->WebAPI.Document.getElementById("mobile-overlay")->elementToDialog)
+ WebAPI.DOM.window
+ ->WebAPI.Window.document
+ ->WebAPI.Document.getElementById("mobile-overlay")
+ ->Null.toOption
+ ->Option.map(elementToDialog)
}
-@get external _open: WebAPI.DOMAPI.htmlDialogElement => bool = "open"
+@get external _open: WebAPI.HTMLDialogElement.t => bool = "open"
let openMobileOverlay = _ =>
switch getMobileOverlayDialog() {
- | Nullable.Value(dialog) => dialog->WebAPI.HTMLDialogElement.showModal
- | Null => ()
- | Undefined => ()
+ | Some(dialog) => dialog->WebAPI.HTMLDialogElement.showModal
+ | None => ()
}
let closeMobileOverlay = _ =>
switch getMobileOverlayDialog() {
- | Nullable.Value(dialog) => dialog->WebAPI.HTMLDialogElement.close
- | Null => ()
- | Undefined => ()
+ | Some(dialog) => dialog->WebAPI.HTMLDialogElement.close
+ | None => ()
}
let toggleMobileOverlay = _ => {
let isOpen = switch getMobileOverlayDialog() {
- | Nullable.Value(dialog) => dialog->_open
- | Null => false
- | Undefined => false
+ | Some(dialog) => dialog->_open
+ | None => false
}
if isOpen {
@@ -55,28 +56,29 @@ let toggleMobileOverlay = _ => {
}
let getMobileTertiaryDialog = () => {
- Nullable.make(document->WebAPI.Document.getElementById("mobile-tertiary-drawer")->elementToDialog)
+ WebAPI.DOM.window
+ ->WebAPI.Window.document
+ ->WebAPI.Document.getElementById("mobile-tertiary-drawer")
+ ->Null.toOption
+ ->Option.map(elementToDialog)
}
let openMobileTertiaryDrawer = _ =>
switch getMobileTertiaryDialog() {
- | Nullable.Value(dialog) => dialog->WebAPI.HTMLDialogElement.showModal
- | Null => ()
- | Undefined => ()
+ | Some(dialog) => dialog->WebAPI.HTMLDialogElement.showModal
+ | None => ()
}
let closeMobileTertiaryDrawer = _ =>
switch getMobileTertiaryDialog() {
- | Nullable.Value(dialog) => dialog->WebAPI.HTMLDialogElement.close
- | Null => ()
- | Undefined => ()
+ | Some(dialog) => dialog->WebAPI.HTMLDialogElement.close
+ | None => ()
}
let toggleMobileTertiaryDrawer = _ => {
let isOpen = switch getMobileTertiaryDialog() {
- | Nullable.Value(dialog) => dialog->_open
- | Null => false
- | Undefined => false
+ | Some(dialog) => dialog->_open
+ | None => false
}
if isOpen {
diff --git a/apps/docs/src/components/Search.res b/apps/docs/src/components/Search.res
index 4669666eb..5dac83c13 100644
--- a/apps/docs/src/components/Search.res
+++ b/apps/docs/src/components/Search.res
@@ -12,12 +12,12 @@ let reduce = (state, action) =>
let unavailableText = "Search unavailable"
let unavailableLabel = "Search unavailable for this build"
-@get external isContentEditable: WebAPI.DOMAPI.element => option = "isContentEditable"
-@get external focusMethod: WebAPI.DOMAPI.element => option unit> = "focus"
-@get external inputValue: WebAPI.DOMAPI.element => option = "value"
-@send external focusElement: WebAPI.DOMAPI.element => unit = "focus"
+@get external isContentEditable: WebAPI.Element.t => option = "isContentEditable"
+@get external focusMethod: WebAPI.Element.t => option unit> = "focus"
+@get external inputValue: WebAPI.Element.t => option = "value"
+@send external focusElement: WebAPI.Element.t => unit = "focus"
-let isEditable = (element: WebAPI.DOMAPI.element) =>
+let isEditable = (element: WebAPI.Element.t) =>
switch element.tagName {
| "TEXTAREA" | "SELECT" | "INPUT" => true
| _ => element->isContentEditable->Option.getOr(false)
@@ -30,16 +30,17 @@ let restoreFocus = element =>
}
let hasSearchQuery = () =>
- switch document.activeElement {
+ switch WebAPI.DOM.window->WebAPI.Window.document->WebDocument.activeElement {
| Value(element) =>
WebAPI.DOMTokenList.contains(element.classList, "DocSearch-Input") &&
element->inputValue->Option.map(value => value !== "")->Option.getOr(false)
| Null => false
}
-let activateSearch = (~dispatch, ~returnFocus: React.ref>) => {
+let activateSearch = (~dispatch, ~returnFocus: React.ref>) => {
if returnFocus.current->Option.isNone {
- returnFocus.current = document.activeElement->Null.toOption
+ returnFocus.current =
+ WebAPI.DOM.window->WebAPI.Window.document->WebDocument.activeElement->Null.toOption
}
dispatch(Open(React.lazy_(() => import(SearchModal.make))))
}
@@ -51,7 +52,7 @@ let make = () => {
let algoliaConfig = Env.algoliaPublicConfig
let onClose = React.useCallback(() => {
- switch WebAPI.Document.querySelector(document, "body") {
+ switch WebAPI.Document.querySelector(WebAPI.DOM.window->WebAPI.Window.document, "body") {
| Value(body) => WebAPI.DOMTokenList.remove(body.classList, "DocSearch--active")
| Null => ()
}
@@ -65,24 +66,30 @@ let make = () => {
switch algoliaConfig {
| None => None
| Some(_) =>
- let handleGlobalKeyDown = (event: WebAPI.UIEventsAPI.keyboardEvent) => {
+ let handleGlobalKeyDown = event => {
+ let preventDefault = () => event->WebAPI.KeyboardEvent.preventDefault
if event.key === "Escape" && !hasSearchQuery() {
onClose()
} else if event.key === "/" || (event.key === "k" && (event.ctrlKey || event.metaKey)) {
- switch document.activeElement {
+ switch WebAPI.DOM.window->WebAPI.Window.document->WebDocument.activeElement {
| Value(element) if isEditable(element) => ()
| _ =>
activateSearch(~dispatch, ~returnFocus)
- WebAPI.KeyboardEvent.preventDefault(event)
+ preventDefault()
}
}
}
// Read Escape's query before autocomplete clears it at the input.
- WebAPI.Window.addEventListener(window, Keydown, handleGlobalKeyDown, ~options={capture: true})
+ WebAPI.Window.addEventListener(
+ WebAPI.DOM.window,
+ Keydown,
+ handleGlobalKeyDown,
+ ~options={capture: true},
+ )
Some(
() =>
WebAPI.Window.removeEventListener(
- window,
+ WebAPI.DOM.window,
Keydown,
handleGlobalKeyDown,
~options={capture: true},
diff --git a/apps/docs/src/components/SearchModal.res b/apps/docs/src/components/SearchModal.res
index 9101eac9e..ee9603ecf 100644
--- a/apps/docs/src/components/SearchModal.res
+++ b/apps/docs/src/components/SearchModal.res
@@ -17,7 +17,7 @@ let make = (~apiKey, ~appId, ~indexName, ~onClose: unit => unit) => {
hitComponent
onClose
insights=true
- initialScrollY={window.scrollY->Float.toInt}
+ initialScrollY={WebAPI.DOM.window->WebAPI.Window.scrollY->Float.toInt}
searchParameters={
distinct: 3,
hitsPerPage: 20,
diff --git a/apps/docs/src/components/SidebarNav.res b/apps/docs/src/components/SidebarNav.res
index cc2c4ba34..9d75b1022 100644
--- a/apps/docs/src/components/SidebarNav.res
+++ b/apps/docs/src/components/SidebarNav.res
@@ -11,9 +11,9 @@ module Toc = {
onClick={evt => {
evt->ReactEvent.Mouse.preventDefault
WebAPI.Document.getElementById(
- document,
+ WebAPI.DOM.window->WebAPI.Window.document,
href->String.replace("#", ""),
- )->WebAPI.Element.scrollIntoView_alignToTop
+ )->Null.forEach(WebAPI.Element.scrollIntoViewAlignToTop)
onClick()
}}
to={"#" ++ href->Url.normalizeAnchor}
@@ -36,7 +36,7 @@ module Title = {
let make = (~children) => {
let className = "hl-overline text-gray-80 mt-5" //overline
- children
+ {children}
}
}
@@ -142,10 +142,10 @@ let make = (
className="h-full relative top-0 px-4 w-full block md:top-40 md:sticky border-r border-gray-20 overflow-y-auto pb-24 max-h-[calc(100vh-10rem)] pt-8"
>
- toplevelNav
+ {toplevelNav}
- preludeSection
+ {preludeSection}
/* Firefox ignores padding in scroll containers, so we need margin
to make a bottom gap for the sidebar.
diff --git a/apps/docs/src/layouts/CommunityLayout.res b/apps/docs/src/layouts/CommunityLayout.res
index f704be1c9..a1dc6310e 100644
--- a/apps/docs/src/layouts/CommunityLayout.res
+++ b/apps/docs/src/layouts/CommunityLayout.res
@@ -15,7 +15,7 @@ let make = (~children, ~categories, ~entries) => {
<>
string)} route={(pathname :> string)} categories activeToc
+ key={pathname :> string} route={pathname :> string} categories activeToc
/>
=?,
~categories: array,
- ~components=MarkdownComponents.default,
~docSearchLvl0=?,
~children,
) => {
@@ -20,5 +19,5 @@ let make = (
let sidebar = children
+ {children}
}
diff --git a/apps/docs/src/layouts/MainLayout.res b/apps/docs/src/layouts/MainLayout.res
index 059e9f8d4..9de35dc42 100644
--- a/apps/docs/src/layouts/MainLayout.res
+++ b/apps/docs/src/layouts/MainLayout.res
@@ -1,11 +1,11 @@
@react.component
-let make = (~components=MarkdownComponents.default, ~children) => {
+let make = (~children) => {
<>
- children
+ {children}
diff --git a/apps/docs/src/layouts/MainLayout.resi b/apps/docs/src/layouts/MainLayout.resi
index e76a5ba10..940ed3d87 100644
--- a/apps/docs/src/layouts/MainLayout.resi
+++ b/apps/docs/src/layouts/MainLayout.resi
@@ -1,2 +1,2 @@
@react.component
-let make: (~components: MarkdownComponents.t=?, ~children: React.element) => React.element
+let make: (~children: React.element) => React.element
diff --git a/apps/docs/src/layouts/SidebarPageLayout.res b/apps/docs/src/layouts/SidebarPageLayout.res
index 8445b4572..a2c95e940 100644
--- a/apps/docs/src/layouts/SidebarPageLayout.res
+++ b/apps/docs/src/layouts/SidebarPageLayout.res
@@ -2,8 +2,6 @@ module Link = ReactRouter.Link
@react.component
let make = (
- ~sidebarState: (bool, (bool => bool) => unit)=(false, _ => ()),
- // (Sidebar, toggleSidebar) ... for toggling sidebar in mobile view
~sidebar: React.element,
~rightSidebar: option=?,
~categories: option>=?,
@@ -45,8 +43,8 @@ let make = (
| None => React.null
}
- previous
- next
+ {previous}
+ {next}
}
| None => React.null
@@ -56,7 +54,7 @@ let make = (
- sidebar
+ {sidebar}
| None => React.null
}}
- children
- pagination
+ {children}
+ {pagination}
{switch rightSidebar {
| Some(ele) => ele
diff --git a/apps/docs/src/layouts/SidebarPageLayout.resi b/apps/docs/src/layouts/SidebarPageLayout.resi
index d9730f135..acf6130f8 100644
--- a/apps/docs/src/layouts/SidebarPageLayout.resi
+++ b/apps/docs/src/layouts/SidebarPageLayout.resi
@@ -1,7 +1,5 @@
@react.component
let make: (
- // (Sidebar, toggleSidebar) ... for toggling sidebar in mobile view
- ~sidebarState: (bool, (bool => bool) => unit)=?,
~sidebar: React.element,
~rightSidebar: React.element=?,
~categories: array=?,
diff --git a/apps/docs/src/markdown/Mdx.res b/apps/docs/src/markdown/Mdx.res
index e17226a6a..1e1e1eb40 100644
--- a/apps/docs/src/markdown/Mdx.res
+++ b/apps/docs/src/markdown/Mdx.res
@@ -68,7 +68,7 @@ let sortSection = mdxPages =>
)
let groupBySection = mdxPages =>
- Array.reduce(mdxPages, (Dict.make() :> Dict.t>), (acc, item) => {
+ Array.reduce(mdxPages, Dict.make() :> Dict.t>, (acc, item) => {
let section = item.section->Option.flatMap(Dict.get(acc, _))
switch section {
// If the section already exists, add this item to it
diff --git a/apps/docs/src/markdown/MdxLegacy.res b/apps/docs/src/markdown/MdxLegacy.res
index 5ee546bd3..46239dc3e 100644
--- a/apps/docs/src/markdown/MdxLegacy.res
+++ b/apps/docs/src/markdown/MdxLegacy.res
@@ -21,15 +21,14 @@ let getType = element => {
if React.isValidElement(element) {
switch props(element).mdxType {
| Some(tag) => tag
- | None => {
- let tag = elementType(element)
- typeof(tag) == #string ? String.make(tag) : "unknown"
- }
+ | None =>
+ let tag = elementType(element)
+ typeof(tag) == #string ? String.make(tag) : "unknown"
}
} else {
"unknown"
}
}
-@get external component: React.element => React.componentLike<'props, React.element> = "type"
+@get external component: React.element => React.component<'props> = "type"
let isComponent = (element, make) => React.isValidElement(element) && component(element) === make
diff --git a/apps/docs/test-utils/TestUtils.res b/apps/docs/test-utils/TestUtils.res
index 1edc1da72..3c0f6c7c3 100644
--- a/apps/docs/test-utils/TestUtils.res
+++ b/apps/docs/test-utils/TestUtils.res
@@ -1,16 +1,18 @@
-external imageFromNode: WebAPI.DOMAPI.node => WebAPI.DOMAPI.htmlImageElement = "%identity"
+external imageFromElement: WebAPI.Element.t => WebAPI.HTMLImageElement.t = "%identity"
let waitForImages = async (selector: string) => {
- let root = switch document->WebAPI.Document.querySelector(selector) {
+ let root = switch WebAPI.DOM.window
+ ->WebAPI.Window.document
+ ->WebAPI.Document.querySelector(selector) {
| Value(root) => root
- | Null => failwith(`expected to find screenshot target ${selector}`)
+ | Null => panic(`expected to find screenshot target ${selector}`)
}
let images = root->WebAPI.Element.querySelectorAll("img")
if images.length > 0 {
for i in 0 to images.length - 1 {
- let image = images->WebAPI.NodeList.item(i)->imageFromNode
+ let image = images->WebAPI.NodeList.item(i)->Null.getOrThrow->imageFromElement
await image->WebAPI.HTMLImageElement.decode
}
}
diff --git a/apps/guide/app/GuideCompilerBridgeHook.res b/apps/guide/app/GuideCompilerBridgeHook.res
index 2b19d1a1b..b64874e6d 100644
--- a/apps/guide/app/GuideCompilerBridgeHook.res
+++ b/apps/guide/app/GuideCompilerBridgeHook.res
@@ -30,11 +30,15 @@ let useCompilerBridge = (
React.useEffect(() => {
switch compilerState {
| Ready({targetLang}) if code !== lastCompiledCode.current =>
- let timer = setTimeout(~handler=() => {
- lastCompiledCode.current = code
- compilerDispatch(CompileCode(targetLang, code))
- }, ~timeout=150)
- Some(() => clearTimeout(timer))
+ let timer = WebAPI.Window.setTimeout(
+ WebAPI.DOM.window,
+ ~handler=() => {
+ lastCompiledCode.current = code
+ compilerDispatch(CompileCode(targetLang, code))
+ },
+ ~timeout=150,
+ )
+ Some(() => WebAPI.Window.clearTimeout(WebAPI.DOM.window, timer))
| _ => None
}
}, (code, compilerState, compilerDispatch))
@@ -59,8 +63,8 @@ let useCompilerBridge = (
| _ => ()
}
}
- WebAPI.Window.addEventListener(window, Custom("message"), cb)
- Some(() => WebAPI.Window.removeEventListener(window, Custom("message"), cb))
+ WebAPI.Window.addEventListener(WebAPI.DOM.window, Custom("message"), cb)
+ Some(() => WebAPI.Window.removeEventListener(WebAPI.DOM.window, Custom("message"), cb))
}, [setOutput])
React.useEffect(() => {
@@ -102,14 +106,15 @@ let useCompilerBridge = (
imports->Dict.mapValues(path =>
path->GuideRuntimeImport.url(~bundleBaseUrl, ~compilerVersion=selected.id)
)
- let timer = setTimeout(
+ let timer = WebAPI.Window.setTimeout(
+ WebAPI.DOM.window,
~handler=() => EvalIFrame.sendOutput(runtimeCode, imports),
~timeout=50,
)
Some(
() => {
isWaitingForRuntimeOutput.current = false
- clearTimeout(timer)
+ WebAPI.Window.clearTimeout(WebAPI.DOM.window, timer)
},
)
| None => None
diff --git a/apps/guide/app/GuideCompilerData.res b/apps/guide/app/GuideCompilerData.res
index d4a32be91..ce7f3cdc5 100644
--- a/apps/guide/app/GuideCompilerData.res
+++ b/apps/guide/app/GuideCompilerData.res
@@ -5,12 +5,13 @@ type t = {
module Env = {
@scope(("process", "env")) external nodeEnv: string = "NODE_ENV"
+
@scope(("process", "env"))
external playgroundBundleEndpoint: option = "PLAYGROUND_BUNDLE_ENDPOINT"
}
let fetchVersions = async versionsBaseUrl => {
- let response = await fetch(versionsBaseUrl ++ "/playground-bundles/versions.json")
+ let response = await WebAPI.Fetch.fetch(versionsBaseUrl ++ "/playground-bundles/versions.json")
let json = await WebAPI.Response.json(response)
json
->JSON.Decode.array
diff --git a/apps/guide/app/GuideDom.res b/apps/guide/app/GuideDom.res
index 406bf1246..90f33b2f7 100644
--- a/apps/guide/app/GuideDom.res
+++ b/apps/guide/app/GuideDom.res
@@ -1,3 +1,3 @@
-external domElementToWebElement: Dom.element => WebAPI.DOMAPI.element = "%identity"
+external domElementToWebElement: Dom.element => WebAPI.Element.t = "%identity"
let toWebElement = domElementToWebElement
diff --git a/apps/guide/app/GuideHome.res b/apps/guide/app/GuideHome.res
index 1462ecde6..0906944aa 100644
--- a/apps/guide/app/GuideHome.res
+++ b/apps/guide/app/GuideHome.res
@@ -1,4 +1,5 @@
-let navigateToDocsIntro = url => window.location->WebAPI.Location.assign(url)
+let navigateToDocsIntro = url =>
+ WebAPI.DOM.window->WebAPI.Window.location->WebAPI.Location.assign(url)
@react.component
let make = (
@@ -39,7 +40,7 @@ let make = (
{React.string(lesson.title)}
- lesson.content
+ {lesson.content}
// for the guide, so storage failures fall back to the current UI state.
let getLocalStorageItem = key => {
try {
- WebAPI.Storage.getItem(window.localStorage, key)->Null.toOption
+ WebAPI.Storage.getItem(WebAPI.DOM.window->WebAPI.Window.localStorage, key)->Null.toOption
} catch {
| JsExn(_) => None
}
@@ -115,7 +115,7 @@ let getLocalStorageItem = key => {
let setLocalStorageItem = (~key, ~value) => {
try {
- WebAPI.Storage.setItem(window.localStorage, ~key, ~value)
+ WebAPI.Storage.setItem(WebAPI.DOM.window->WebAPI.Window.localStorage, ~key, ~value)
} catch {
| JsExn(_) => ()
}
@@ -123,7 +123,7 @@ let setLocalStorageItem = (~key, ~value) => {
let removeLocalStorageItem = key => {
try {
- WebAPI.Storage.removeItem(window.localStorage, key)
+ WebAPI.Storage.removeItem(WebAPI.DOM.window->WebAPI.Window.localStorage, key)
} catch {
| JsExn(_) => ()
}
diff --git a/apps/guide/app/GuideLayoutHook.res b/apps/guide/app/GuideLayoutHook.res
index 211dad3cc..dfc5d137c 100644
--- a/apps/guide/app/GuideLayoutHook.res
+++ b/apps/guide/app/GuideLayoutHook.res
@@ -12,7 +12,9 @@ type t = {
}
let syncThemeColor = theme =>
- switch document->WebAPI.Document.querySelector(`meta[name="theme-color"]`) {
+ switch WebAPI.DOM.window
+ ->WebAPI.Window.document
+ ->WebAPI.Document.querySelector(`meta[name="theme-color"]`) {
| Value(element) =>
WebAPI.Element.setAttribute(
element,
@@ -34,8 +36,8 @@ let useLayout = (): t => {
setTheme(_ => GuideLayout.loadTheme())
setPaneSizes(_ =>
GuideLayout.loadPaneSizes()->GuideLayout.clampPaneSizes(
- ~viewportWidth=window.innerWidth->Int.toFloat,
- ~viewportHeight=window.innerHeight->Int.toFloat,
+ ~viewportWidth=WebAPI.DOM.window->WebAPI.Window.innerWidth->Int.toFloat,
+ ~viewportHeight=WebAPI.DOM.window->WebAPI.Window.innerHeight->Int.toFloat,
)
)
setThemeLoaded(_ => true)
@@ -83,24 +85,24 @@ let useLayout = (): t => {
switch dragTarget.current {
| ResizingColumns =>
let pointerX = event->ReactEvent.Mouse.clientX->Int.toFloat
- let viewportWidth = window.innerWidth->Int.toFloat
+ let viewportWidth = WebAPI.DOM.window->WebAPI.Window.innerWidth->Int.toFloat
let instructionsWidth = GuideLayout.clampInstructionsWidth(~viewportWidth, ~pointerX)
setPaneSizes(previous => {...previous, instructionsWidth: Some(instructionsWidth)})
| ResizingRows =>
let pointerY = event->ReactEvent.Mouse.clientY->Int.toFloat
- let viewportHeight = window.innerHeight->Int.toFloat
+ let viewportHeight = WebAPI.DOM.window->WebAPI.Window.innerHeight->Int.toFloat
let outputHeight = GuideLayout.clampOutputHeight(~viewportHeight, ~pointerY)
setPaneSizes(previous => {...previous, outputHeight})
| NotDragging => ()
}
- WebAPI.Window.addEventListener(window, Mousemove, onMouseMove)
- WebAPI.Window.addEventListener(window, Mouseup, stopDragging)
+ WebAPI.Window.addEventListener(WebAPI.DOM.window, Mousemove, onMouseMove)
+ WebAPI.Window.addEventListener(WebAPI.DOM.window, Mouseup, stopDragging)
Some(
() => {
- WebAPI.Window.removeEventListener(window, Mousemove, onMouseMove)
- WebAPI.Window.removeEventListener(window, Mouseup, stopDragging)
+ WebAPI.Window.removeEventListener(WebAPI.DOM.window, Mousemove, onMouseMove)
+ WebAPI.Window.removeEventListener(WebAPI.DOM.window, Mouseup, stopDragging)
},
)
}, [])
diff --git a/apps/guide/package.json b/apps/guide/package.json
index fd319ca9b..2303154af 100644
--- a/apps/guide/package.json
+++ b/apps/guide/package.json
@@ -21,8 +21,8 @@
"@react-router/node": "^8.3.1",
"@rescript-lang/playground": "workspace:*",
"@rescript-lang/shared": "workspace:*",
- "@rescript/react": "^0.14.2",
- "@rescript/webapi": "0.1.0-experimental-29db5f4",
+ "@rescript/react": "^0.16.0-beta.1",
+ "@rescript/webapi": "alpha",
"isbot": "^5",
"react": "^19.3.0",
"react-dom": "^19.3.0",
@@ -32,7 +32,7 @@
"remark-gfm": "^4.0.1",
"remark-parse": "^11.0.0",
"remark-stringify": "^11.0.0",
- "rescript": "^12.2.0",
+ "rescript": "^13.0.0-alpha.6",
"unified": "^11.0.5",
"vfile-matter": "^5.0.1"
},
diff --git a/apps/guide/rescript.json b/apps/guide/rescript.json
index 3c89889a8..5eb916b23 100644
--- a/apps/guide/rescript.json
+++ b/apps/guide/rescript.json
@@ -7,7 +7,6 @@
"@rescript/react",
"@rescript/webapi"
],
- "compiler-flags": ["-open WebAPI.Global"],
"sources": [
{
"dir": "__tests__",
diff --git a/apps/guide/vite.config.mjs b/apps/guide/vite.config.mjs
index a4e2a4a1d..63f3ccf2c 100644
--- a/apps/guide/vite.config.mjs
+++ b/apps/guide/vite.config.mjs
@@ -19,17 +19,16 @@ const sharedEditorDeps = [
"@codemirror/view",
"@lezer/highlight",
"@replit/codemirror-vim",
- "@rescript/runtime/lib/es6/Belt_Array.js",
- "@rescript/runtime/lib/es6/Primitive_int.js",
- "@rescript/runtime/lib/es6/Primitive_object.js",
- "@rescript/runtime/lib/es6/Primitive_option.js",
- "@rescript/runtime/lib/es6/Primitive_string.js",
- "@rescript/runtime/lib/es6/Stdlib_Array.js",
- "@rescript/runtime/lib/es6/Stdlib_Dict.js",
- "@rescript/runtime/lib/es6/Stdlib_Int.js",
- "@rescript/runtime/lib/es6/Stdlib_JsExn.js",
- "@rescript/runtime/lib/es6/Stdlib_List.js",
- "@rescript/runtime/lib/es6/Stdlib_Option.js",
+ "@rescript/runtime/lib/es6/Primitive_int.mjs",
+ "@rescript/runtime/lib/es6/Primitive_object.mjs",
+ "@rescript/runtime/lib/es6/Primitive_option.mjs",
+ "@rescript/runtime/lib/es6/Primitive_string.mjs",
+ "@rescript/runtime/lib/es6/Stdlib_Array.mjs",
+ "@rescript/runtime/lib/es6/Stdlib_Dict.mjs",
+ "@rescript/runtime/lib/es6/Stdlib_Int.mjs",
+ "@rescript/runtime/lib/es6/Stdlib_JsExn.mjs",
+ "@rescript/runtime/lib/es6/Stdlib_List.mjs",
+ "@rescript/runtime/lib/es6/Stdlib_Option.mjs",
"@tsnobip/rescript-lezer",
"lz-string",
"react-markdown",
diff --git a/package.json b/package.json
index 182786394..2b8c62d84 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
"devDependencies": {
"lefthook": "^2.1.4",
"oxfmt": "^0.46.0",
- "rescript": "^12.2.0"
+ "rescript": "^13.0.0-alpha.6"
},
"resolutions": {
"marked": "4.0.10",
diff --git a/packages/playground/package.json b/packages/playground/package.json
index e6cae5796..77b9bef8c 100644
--- a/packages/playground/package.json
+++ b/packages/playground/package.json
@@ -6,8 +6,8 @@
"dependencies": {
"@babel/parser": "^7.29.2",
"@rescript-lang/shared": "workspace:*",
- "@rescript/react": "^0.14.2",
- "@rescript/webapi": "0.1.0-experimental-29db5f4",
+ "@rescript/react": "^0.16.0-beta.1",
+ "@rescript/webapi": "alpha",
"lz-string": "^1.5.0",
"react": "^19.3.0",
"react-dom": "^19.3.0",
diff --git a/packages/playground/rescript.json b/packages/playground/rescript.json
index 997cde23e..d8fa7b14e 100644
--- a/packages/playground/rescript.json
+++ b/packages/playground/rescript.json
@@ -6,7 +6,6 @@
"@rescript/react",
"@rescript/webapi"
],
- "compiler-flags": ["-open WebAPI.Global"],
"sources": [
{
"dir": "src",
diff --git a/packages/playground/src/CompilerManagerHook.res b/packages/playground/src/CompilerManagerHook.res
index 1b3f35c53..82438f874 100644
--- a/packages/playground/src/CompilerManagerHook.res
+++ b/packages/playground/src/CompilerManagerHook.res
@@ -633,8 +633,13 @@ let useCompilerManager = (
setState(_ => Ready({...state, logs: [], validReactCode: entryPointExists}))
| SetupFailed(_) => ()
| Ready(ready) if syncUrl =>
- let url = createUrl((pathname :> string), ready)
- WebAPI.History.replaceState(history, ~data=JSON.Null, ~unused="", ~url)
+ let url = createUrl(pathname :> string, ready)
+ WebAPI.History.replaceState(
+ WebAPI.DOM.window->WebAPI.Window.history,
+ ~data=JSON.Null,
+ ~unused="",
+ ~url,
+ )
| Ready(_) => ()
}
}
diff --git a/packages/playground/src/ConsolePanel.res b/packages/playground/src/ConsolePanel.res
index 0c9bff4ed..174549768 100644
--- a/packages/playground/src/ConsolePanel.res
+++ b/packages/playground/src/ConsolePanel.res
@@ -3,6 +3,7 @@ type logLevel = [
| #warn
| #error
]
+
type log = {level: logLevel, content: array}
@react.component
@@ -17,8 +18,8 @@ let make = (~logs, ~appendLog) => {
| _ => ()
}
}
- WebAPI.Window.addEventListener(window, Custom("message"), cb)
- Some(() => WebAPI.Window.removeEventListener(window, Custom("message"), cb))
+ WebAPI.Window.addEventListener(WebAPI.DOM.window, Custom("message"), cb)
+ Some(() => WebAPI.Window.removeEventListener(WebAPI.DOM.window, Custom("message"), cb))
}, [appendLog])
@@ -48,7 +49,7 @@ let make = (~logs, ~appendLog) => {
})
->React.array
- content
+ {content}
}}
}
diff --git a/packages/playground/src/EvalIFrame.res b/packages/playground/src/EvalIFrame.res
index aaee8db3d..5de9a5e97 100644
--- a/packages/playground/src/EvalIFrame.res
+++ b/packages/playground/src/EvalIFrame.res
@@ -69,23 +69,24 @@ let srcDoc = `
`
-external asIFrame: WebAPI.DOMAPI.element => WebAPI.DOMAPI.htmliFrameElement = "%identity"
+external asIFrame: WebAPI.Element.t => WebAPI.HTMLIFrameElement.t = "%identity"
let sendOutput = (code, imports) => {
- let frame = document->WebAPI.Document.querySelector("#iframe-eval")
+ let frame =
+ WebAPI.DOM.window->WebAPI.Window.document->WebAPI.Document.querySelector("#iframe-eval")
switch frame {
| Value(element) if element.tagName == "IFRAME" =>
let element = element->asIFrame
switch element.contentWindow {
- | Value({window}) =>
+ | Value(frameWindow) =>
let message = JSON.Object(
dict{
"code": JSON.String(code),
"imports": JSON.Object(imports->Dict.mapValues(v => JSON.String(v))),
},
)
- window->WebAPI.Window.postMessage(~message, ~targetOrigin="*")
+ frameWindow->WebAPI.Window.postMessage(~message, ~targetOrigin="*")
| Null => Console.error("contentWindow not found")
}
| Value(_) | Null => Console.error("iframe not found")
diff --git a/packages/playground/src/Playground.res b/packages/playground/src/Playground.res
index 8897b0047..ee1fec30d 100644
--- a/packages/playground/src/Playground.res
+++ b/packages/playground/src/Playground.res
@@ -47,7 +47,7 @@ let dropdownLabelReleased = "--- Released ---"
let getLocalStorageItem = key => {
try {
- WebAPI.Storage.getItem(window.localStorage, key)->Null.toOption
+ WebAPI.Storage.getItem(WebAPI.DOM.window->WebAPI.Window.localStorage, key)->Null.toOption
} catch {
| JsExn(_) => None
}
@@ -55,7 +55,7 @@ let getLocalStorageItem = key => {
let setLocalStorageItem = (~key, ~value) => {
try {
- WebAPI.Storage.setItem(window.localStorage, ~key, ~value)
+ WebAPI.Storage.setItem(WebAPI.DOM.window->WebAPI.Window.localStorage, ~key, ~value)
} catch {
| JsExn(_) => ()
}
@@ -63,7 +63,7 @@ let setLocalStorageItem = (~key, ~value) => {
let getSessionStorageItem = key => {
try {
- WebAPI.Storage.getItem(window.sessionStorage, key)->Null.toOption
+ WebAPI.Storage.getItem(WebAPI.DOM.window->WebAPI.Window.sessionStorage, key)->Null.toOption
} catch {
| JsExn(_) => None
}
@@ -71,7 +71,7 @@ let getSessionStorageItem = key => {
let setSessionStorageItem = (~key, ~value) => {
try {
- WebAPI.Storage.setItem(window.sessionStorage, ~key, ~value)
+ WebAPI.Storage.setItem(WebAPI.DOM.window->WebAPI.Window.sessionStorage, ~key, ~value)
} catch {
| JsExn(_) => ()
}
@@ -107,7 +107,7 @@ module DropdownSelect = {
disabled
onChange
>
- children
+ {children}
}
}
@@ -174,9 +174,11 @@ module ResultPane = {
module PreWrap = {
@react.component
let make = (~className="", ~children) =>
- children
+ {children}
}
+
type prefix = [#W | #E]
+
let compactErrorLine = (~highlight=false, ~prefix: prefix, locMsg: Api.LocMsg.t) => {
let {Api.LocMsg.row: row, column, shortMsg} = locMsg
let prefixColor = switch prefix {
@@ -201,7 +203,7 @@ module ResultPane = {
{React.string(` Line ${row->Int.toString}, column ${column->Int.toString}:`)}
- shortMsg
+ {shortMsg}
}
@@ -348,7 +350,7 @@ module ResultPane = {
}
{React.string(msg)}
- errs
+ {errs}
| Comp(UnexpectedError(msg))
| Conv(UnexpectedError(msg)) =>
@@ -446,20 +448,19 @@ module ResultPane = {
}
module WarningFlagsWidget = {
+ @set external setScrollTop: (WebAPI.HTMLElement.t, float) => unit = "scrollTop"
+
// Inspired by MUI (who got inspired by WAI best practise examples)
// https://github.com/mui-org/material-ui/blob/next/packages/material-ui-lab/src/useAutocomplete/useAutocomplete.js#L327
- let scrollToElement = (
- ~parent: WebAPI.DOMAPI.htmlElement,
- element: WebAPI.DOMAPI.htmlElement,
- ): unit =>
+ let scrollToElement = (~parent: WebAPI.HTMLElement.t, element: WebAPI.HTMLElement.t): unit =>
if parent.scrollHeight > parent.clientHeight {
let scrollBottom = parent.clientHeight + Float.toInt(parent.scrollTop)
let elementBottom = element.offsetTop + element.offsetHeight
if elementBottom > scrollBottom {
- parent.scrollTop = Float.fromInt(elementBottom - parent.clientHeight)
+ parent->setScrollTop(Float.fromInt(elementBottom - parent.clientHeight))
} else if element.offsetTop - element.offsetHeight < Float.toInt(parent.scrollTop) {
- parent.scrollTop = Float.fromInt(element.offsetTop - element.offsetHeight)
+ parent->setScrollTop(Float.fromInt(element.offsetTop - element.offsetHeight))
}
}
@@ -830,7 +831,7 @@ module WarningFlagsWidget = {
- elements
+ {elements}
)->Option.getOr(React.null)
@@ -897,7 +898,7 @@ module WarningFlagsWidget = {
- chips
+ {chips}
- deleteButton
+ {deleteButton}
- suggestionBox
+ {suggestionBox}
}
}
@@ -1187,12 +1188,12 @@ module ControlPanel = {
?onClick
className="inline-block text-sky hover:cursor-pointer hover:bg-sky hover:text-white-80-tr rounded border active:bg-sky-70 border-sky-70 px-2 py-1 "
>
- children
+ {children}
}
let commandWithKeyboardShortcut = (commandName, ~key) => {
- let userAgent = window.navigator.userAgent
+ let userAgent = WebAPI.DOM.window->WebAPI.Window.navigator->WebAPI.Navigator.userAgent
if userAgent->String.includes("iPhone") || userAgent->String.includes("Android") {
commandName
} else if userAgent->String.includes("Mac") {
@@ -1235,8 +1236,8 @@ module ControlPanel = {
}
}
- WebAPI.Window.addEventListener(window, Keydown, onKeyDown)
- Some(() => WebAPI.Window.removeEventListener(window, Keydown, onKeyDown))
+ WebAPI.Window.addEventListener(WebAPI.DOM.window, Keydown, onKeyDown)
+ Some(() => WebAPI.Window.removeEventListener(WebAPI.DOM.window, Keydown, onKeyDown))
| _ => None
}
}, (state, dispatch, setCurrentTab))
@@ -1289,7 +1290,7 @@ module ControlPanel = {
}
- children
+ {children}
}
}
@@ -1434,7 +1435,7 @@ module OutputPanel = {
let body = Array.mapWithIndex(tabs, ((tab, content), i) => {
let className = currentTab == tab ? "block h-inherit" : "hidden"
- content
+ {content}
})
<> {body->React.array}
@@ -1612,48 +1613,43 @@ let make = (~bundleBaseUrl: string, ~versions: array) => {
let initialVersion = switch versions {
| [v] => Some(v) // only single version available. maybe local dev.
- | versions => {
- let lastStableVersion = versions->Array.find(version => version.preRelease->Option.isNone)
- switch Nullable.make(
- searchParams->WebAPI.URLSearchParams.get((CompilerManagerHook.Version :> string)),
- ) {
- | Nullable.Value(version) => version->Semver.parse
- | _ =>
- switch getLocalStorageItem(playgroundVersionStorageKey) {
- | Some(v) => v->Semver.parse
- | None => lastStableVersion
- }
+ | versions =>
+ let lastStableVersion = versions->Array.find(version => version.preRelease->Option.isNone)
+ switch searchParams
+ ->WebAPI.URLSearchParams.get(CompilerManagerHook.Version :> string)
+ ->Null.toOption {
+ | Some(version) => version->Semver.parse
+ | _ =>
+ switch getLocalStorageItem(playgroundVersionStorageKey) {
+ | Some(v) => v->Semver.parse
+ | None => lastStableVersion
}
}
}
- let initialLang = switch Nullable.make(
- searchParams->WebAPI.URLSearchParams.get((CompilerManagerHook.Ext :> string)),
- ) {
- | Nullable.Value("re") => Api.Lang.Reason
+ let initialLang = switch searchParams
+ ->WebAPI.URLSearchParams.get(CompilerManagerHook.Ext :> string)
+ ->Null.toOption {
+ | Some("re") => Api.Lang.Reason
| _ => Api.Lang.Res
}
let initialModuleSystem =
- Nullable.make(searchParams->WebAPI.URLSearchParams.get((Module :> string)))->Nullable.toOption
+ searchParams->WebAPI.URLSearchParams.get(Module :> string)->Null.toOption
- let initialJsxPreserveMode = !(
- Nullable.make(
- searchParams->WebAPI.URLSearchParams.get((JsxPreserve :> string)),
- )->Nullable.isNullable
- )
+ let initialJsxPreserveMode =
+ searchParams->WebAPI.URLSearchParams.get(JsxPreserve :> string)->Null.toOption->Option.isSome
let initialExperimentalFeatures =
- Nullable.make(
- searchParams->WebAPI.URLSearchParams.get((Experiments :> string)),
- )->Nullable.mapOr([], str => str->String.split(",")->Array.map(String.trim))
+ searchParams
+ ->WebAPI.URLSearchParams.get(Experiments :> string)
+ ->Null.mapOr([], str => str->String.split(",")->Array.map(String.trim))
let initialContent = switch (
- Nullable.make(searchParams->WebAPI.URLSearchParams.get((Code :> string))),
+ searchParams->WebAPI.URLSearchParams.get(Code :> string)->Null.toOption,
initialLang,
) {
- | (Nullable.Value(compressedCode), _) =>
- LzString.lzString.decompressFromEncodedURIComponent(compressedCode)
+ | (Some(compressedCode), _) => LzString.lzString.decompressFromEncodedURIComponent(compressedCode)
| (_, Reason) => initialReContent
| (_, Res) =>
switch initialVersion {
@@ -1713,8 +1709,8 @@ let make = (~bundleBaseUrl: string, ~versions: array) => {
setSessionStorageItem(~key=newLightModeToastSeenStorageKey, ~value="true")
}
- let timer = setTimeout(~handler=hideToast, ~timeout=10000)
- Some(() => clearTimeout(timer))
+ let timer = WebAPI.Window.setTimeout(WebAPI.DOM.window, ~handler=hideToast, ~timeout=10000)
+ Some(() => WebAPI.Window.clearTimeout(WebAPI.DOM.window, timer))
}
}, [])
@@ -1741,12 +1737,16 @@ let make = (~bundleBaseUrl: string, ~versions: array) => {
value => {
switch typingTimer.current {
| None => ()
- | Some(timer) => clearTimeout(timer)
+ | Some(timer) => WebAPI.Window.clearTimeout(WebAPI.DOM.window, timer)
}
- let timer = setTimeout(~handler=() => {
- timeoutCompile.current(value)
- typingTimer.current = None
- }, ~timeout=100)
+ let timer = WebAPI.Window.setTimeout(
+ WebAPI.DOM.window,
+ ~handler=() => {
+ timeoutCompile.current(value)
+ typingTimer.current = None
+ },
+ ~timeout=100,
+ )
typingTimer.current = Some(timer)
}
},
@@ -1869,7 +1869,7 @@ let make = (~bundleBaseUrl: string, ~versions: array) => {
let (layout, setLayout) = React.useState(() => Row)
React.useEffect(() => {
- setLayout(_ => window.innerWidth < breakingPoint ? Column : Row)
+ setLayout(_ => WebAPI.DOM.window->WebAPI.Window.innerWidth < breakingPoint ? Column : Row)
None
}, [])
@@ -1883,7 +1883,7 @@ let make = (~bundleBaseUrl: string, ~versions: array) => {
let subPanelRef = React.useRef(Nullable.null)
let onResize = () => {
- let newLayout = window.innerWidth < breakingPoint ? Column : Row
+ let newLayout = WebAPI.DOM.window->WebAPI.Window.innerWidth < breakingPoint ? Column : Row
setLayout(_ => newLayout)
switch panelRef.current->Nullable.toOption {
| Some(element) =>
@@ -1909,8 +1909,8 @@ let make = (~bundleBaseUrl: string, ~versions: array) => {
}
React.useEffect(() => {
- WebAPI.Window.addEventListener(window, Resize, onResize)
- Some(() => WebAPI.Window.removeEventListener(window, Resize, onResize))
+ WebAPI.Window.addEventListener(WebAPI.DOM.window, Resize, onResize)
+ Some(() => WebAPI.Window.removeEventListener(WebAPI.DOM.window, Resize, onResize))
}, [])
// To force CodeMirror render scrollbar on first render
@@ -1995,15 +1995,15 @@ let make = (~bundleBaseUrl: string, ~versions: array) => {
onMove(position)
}
- WebAPI.Window.addEventListener(window, Mousemove, onMouseMove)
- WebAPI.Window.addEventListener(window, Touchmove, onTouchMove)
- WebAPI.Window.addEventListener(window, Mouseup, onMouseUp)
+ WebAPI.Window.addEventListener(WebAPI.DOM.window, Mousemove, onMouseMove)
+ WebAPI.Window.addEventListener(WebAPI.DOM.window, Touchmove, onTouchMove)
+ WebAPI.Window.addEventListener(WebAPI.DOM.window, Mouseup, onMouseUp)
Some(
() => {
- WebAPI.Window.removeEventListener(window, Mousemove, onMouseMove)
- WebAPI.Window.removeEventListener(window, Touchmove, onTouchMove)
- WebAPI.Window.removeEventListener(window, Mouseup, onMouseUp)
+ WebAPI.Window.removeEventListener(WebAPI.DOM.window, Mousemove, onMouseMove)
+ WebAPI.Window.removeEventListener(WebAPI.DOM.window, Touchmove, onTouchMove)
+ WebAPI.Window.removeEventListener(WebAPI.DOM.window, Mouseup, onMouseUp)
},
)
}, [layout])
@@ -2013,7 +2013,7 @@ let make = (~bundleBaseUrl: string, ~versions: array) => {
let hideNewLightModeToast = () => {
setShowNewLightModeToast(_ => false)
WebAPI.Storage.setItem(
- window.sessionStorage,
+ WebAPI.DOM.window->WebAPI.Window.sessionStorage,
~key=newLightModeToastSeenStorageKey,
~value="true",
)
@@ -2040,59 +2040,58 @@ let make = (~bundleBaseUrl: string, ~versions: array) => {
| JavaScript => "JavaScript"->React.string
- | Problems => {
- let problemCounts: {"warnings": int, "errors": int} = switch compilerState {
- | Compiling({state: ready})
- | Ready(ready)
- | Executing({state: ready})
- | SwitchingCompiler(ready, _) => {
- "warnings": switch ready.result {
- | Comp(Success({warnings})) => warnings->Array.length
- | _ => 0
- },
- "errors": switch ready.result {
- | FinalResult.Comp(Fail(result)) =>
- switch result {
- | SyntaxErr(errors) | TypecheckErr(errors) | OtherErr(errors) => errors->Array.length
- | WarningErr(errors) => errors->Array.length
- | WarningFlagErr(_) => 1
- }
- | Conv(Fail({details})) => details->Array.length
- | Comp(Success(_)) => 0
- | Conv(Success(_)) => 0
- | Comp(UnexpectedError(_))
- | Conv(UnexpectedError(_))
- | Comp(Unknown(_))
- | Conv(Unknown(_)) => 1
- | Nothing => 0
- },
- }
-
- | SetupFailed(_) | Init => {
- "warnings": 0,
- "errors": 0,
- }
+ | Problems =>
+ let problemCounts: {"warnings": int, "errors": int} = switch compilerState {
+ | Compiling({state: ready})
+ | Ready(ready)
+ | Executing({state: ready})
+ | SwitchingCompiler(ready, _) => {
+ "warnings": switch ready.result {
+ | Comp(Success({warnings})) => warnings->Array.length
+ | _ => 0
+ },
+ "errors": switch ready.result {
+ | FinalResult.Comp(Fail(result)) =>
+ switch result {
+ | SyntaxErr(errors) | TypecheckErr(errors) | OtherErr(errors) => errors->Array.length
+ | WarningErr(errors) => errors->Array.length
+ | WarningFlagErr(_) => 1
+ }
+ | Conv(Fail({details})) => details->Array.length
+ | Comp(Success(_)) => 0
+ | Conv(Success(_)) => 0
+ | Comp(UnexpectedError(_))
+ | Conv(UnexpectedError(_))
+ | Comp(Unknown(_))
+ | Conv(Unknown(_)) => 1
+ | Nothing => 0
+ },
}
-
- {"Problems"->React.string}
- {if problemCounts["errors"] > 0 {
-
- {problemCounts["errors"]->React.int}
-
- } else {
- React.null
- }}
- {if problemCounts["warnings"] > 0 {
-
- {problemCounts["warnings"]->React.int}
-
- } else {
- React.null
- }}
-
+ | SetupFailed(_) | Init => {
+ "warnings": 0,
+ "errors": 0,
+ }
}
+
+ {"Problems"->React.string}
+ {if problemCounts["errors"] > 0 {
+
+ {problemCounts["errors"]->React.int}
+
+ } else {
+ React.null
+ }}
+ {if problemCounts["warnings"] > 0 {
+
+ {problemCounts["warnings"]->React.int}
+
+ } else {
+ React.null
+ }}
+
+
| Settings => "Settings"->React.string
}
@@ -2121,7 +2120,7 @@ let make = (~bundleBaseUrl: string, ~versions: array) => {
className={`flex ${layout == Column ? "flex-col" : "flex-row"}`}
ref={HtmlRef.elementRef(panelRef)}
>
- // Left Panel
+ /* Left Panel */
) => {
>
- // Separator
+
+ /* Separator */
) => {
{React.string("⣿")}
- // Right Panel
+
+ /* Right Panel */
{
let copy = async () => {
setState(_ => Pending)
- let result = await writeClipboard(window.location.href)
+ let result = await writeClipboard((WebAPI.DOM.window->WebAPI.Window.location).href)
setState(_ =>
switch result {
| Ok() => CopySuccess
diff --git a/packages/shared/package.json b/packages/shared/package.json
index 02291215e..cb536e563 100644
--- a/packages/shared/package.json
+++ b/packages/shared/package.json
@@ -17,8 +17,8 @@
"@codemirror/view": "^6.41.0",
"@lezer/highlight": "^1.2.3",
"@replit/codemirror-vim": "^6.3.0",
- "@rescript/react": "^0.14.2",
- "@rescript/webapi": "0.1.0-experimental-29db5f4",
+ "@rescript/react": "^0.16.0-beta.1",
+ "@rescript/webapi": "alpha",
"@tsnobip/rescript-lezer": "^0.9.0",
"highlight.js": "^11.11.1",
"react": "^19.3.0",
diff --git a/packages/shared/rescript.json b/packages/shared/rescript.json
index 40328e643..a6e880174 100644
--- a/packages/shared/rescript.json
+++ b/packages/shared/rescript.json
@@ -2,7 +2,6 @@
"name": "@rescript-lang/shared",
"namespace": false,
"dependencies": ["@rescript/react", "@rescript/webapi"],
- "compiler-flags": ["-open WebAPI.Global"],
"sources": [
{
"dir": "src",
diff --git a/packages/shared/src/Clipboard.res b/packages/shared/src/Clipboard.res
index af4355463..adf1ecfba 100644
--- a/packages/shared/src/Clipboard.res
+++ b/packages/shared/src/Clipboard.res
@@ -1,21 +1,20 @@
type error = WriteFailed
@send
-external createTextArea: (
- WebAPI.DOMAPI.document,
- @as("textarea") _,
-) => WebAPI.DOMAPI.htmlTextAreaElement = "createElement"
+external createTextArea: (WebAPI.DOM.document, @as("textarea") _) => WebAPI.HTMLTextAreaElement.t =
+ "createElement"
+
+@send external copySelection: (WebAPI.DOM.document, @as("copy") _) => bool = "execCommand"
+@send external focusElement: WebAPI.Element.t => unit = "focus"
-@send external copySelection: (WebAPI.DOMAPI.document, @as("copy") _) => bool = "execCommand"
-@send external focusElement: WebAPI.DOMAPI.element => unit = "focus"
@send
-external getSelection: WebAPI.DOMAPI.document => Null.t = "getSelection"
+external getSelection: WebAPI.DOM.document => Null.t = "getSelection"
let writeWithSelection = text => {
try {
- let textarea = createTextArea(document)
- let activeElement = document.activeElement
- let selection = getSelection(document)->Null.toOption
+ let textarea = createTextArea(WebAPI.DOM.window->WebAPI.Window.document)
+ let activeElement = WebAPI.DOM.window->WebAPI.Window.document->WebDocument.activeElement
+ let selection = getSelection(WebAPI.DOM.window->WebAPI.Window.document)->Null.toOption
let ranges =
selection->Option.mapOr([], selection =>
Array.fromInitializer(~length=selection.rangeCount, index =>
@@ -30,11 +29,13 @@ let writeWithSelection = text => {
~qualifiedName="style",
~value="position: fixed; left: -9999px; top: 0",
)
- document.body
+ WebAPI.DOM.window
+ ->WebAPI.Window.document
+ ->WebDocument.body
->WebAPI.HTMLElement.appendChild(textarea->WebAPI.HTMLTextAreaElement.asNode)
->ignore
textarea->WebAPI.HTMLTextAreaElement.select
- copySelection(document)
+ copySelection(WebAPI.DOM.window->WebAPI.Window.document)
} catch {
| _ => false
}
@@ -54,7 +55,10 @@ let writeWithSelection = text => {
let writeText = async text => {
try {
- await navigator.clipboard->WebAPI.Clipboard.writeText(text)
+ await WebAPI.DOM.window
+ ->WebAPI.Window.navigator
+ ->WebAPI.Navigator.clipboard
+ ->WebAPI.Clipboard.writeText(text)
Ok()
} catch {
| _ => writeWithSelection(text)
diff --git a/packages/shared/src/CodeMirror.res b/packages/shared/src/CodeMirror.res
index 77357b388..2fca1e362 100644
--- a/packages/shared/src/CodeMirror.res
+++ b/packages/shared/src/CodeMirror.res
@@ -12,6 +12,7 @@
module KeyMap = {
type t = Default | Vim
+
let toString = (keyMap: t) =>
switch keyMap {
| Default => "default"
@@ -43,6 +44,7 @@ module Theme = {
module Side = {
@@warning("-37")
+
type t =
| @as(-1) BeforePointer
| @as(1) AfterPointer
@@ -67,6 +69,7 @@ module HoverHint = {
line: int,
col: int,
}
+
let compareLineCol = (pos1, pos2) => {
if pos1.line < pos2.line {
Ordering.less
@@ -81,6 +84,7 @@ module HoverHint = {
Ordering.equal
}
}
+
// let \"<" = (pos1, pos2) => compareLineCol(pos1, pos2) === Ordering.less
let \"<=" = (pos1, pos2) => compareLineCol(pos1, pos2) !== Ordering.greater
// let \">" = (pos1, pos2) => compareLineCol(pos1, pos2) === Ordering.greater
@@ -130,8 +134,10 @@ module CM6 = {
module EditorSelection = {
type t
type range
+
@module("@codemirror/state") @scope("EditorSelection") @val
external single: (int, int) => t = "single"
+
@get external main: t => range = "main"
@get external anchor: range => int = "anchor"
@get external head: range => int = "head"
@@ -142,18 +148,21 @@ module CM6 = {
@module("@codemirror/state") @scope("EditorState")
external create: createConfig => editorState = "create"
+
@get external selection: editorState => EditorSelection.t = "selection"
module ReadOnly = {
@module("@codemirror/state") @scope(("EditorState", "readOnly")) @val
external of_: bool => extension = "of"
}
+
@get external doc: editorState => Text.t = "doc"
}
module Compartment = {
@module("@codemirror/state") @new
external create: unit => compartment = "Compartment"
+
@send external make: (compartment, extension) => extension = "of"
@send external reconfigure: (compartment, extension) => effect = "reconfigure"
}
@@ -161,8 +170,9 @@ module CM6 = {
module EditorView = {
module Tooltip = {
module View = {
- type t = {dom: WebAPI.DOMAPI.element, offset?: {x: int, y: int}}
+ type t = {dom: WebAPI.Element.t, offset?: {x: int, y: int}}
}
+
type t = {
pos: int,
end?: int,
@@ -174,26 +184,30 @@ module CM6 = {
}
}
- type createConfig = {state: editorState, parent: WebAPI.DOMAPI.element}
+ type createConfig = {state: editorState, parent: WebAPI.Element.t}
+
@module("@codemirror/view") @new
external create: createConfig => editorView = "EditorView"
@send external destroy: editorView => unit = "destroy"
@get external state: editorView => editorState = "state"
- @get external dom: editorView => WebAPI.DOMAPI.htmlElement = "dom"
+ @get external dom: editorView => WebAPI.HTMLElement.t = "dom"
type change = {from: int, to: int, insert: string}
type dispatchArg = {changes: change, selection?: EditorSelection.t}
+
@send
external dispatch: (editorView, dispatchArg) => unit = "dispatch"
type dispatchEffectsArg = {effects: effect}
+
@send
external dispatchEffects: (editorView, dispatchEffectsArg) => unit = "dispatch"
module ThemeOptions = {
type t = {dark?: bool}
}
+
@module("@codemirror/view") @scope("EditorView") @val
external theme: (dict>, ~options: ThemeOptions.t=?) => extension = "theme"
@@ -218,6 +232,7 @@ module CM6 = {
module HoverTooltipOptions = {
type t = {hoverTime?: int, hideOnChange?: bool}
}
+
@module("@codemirror/view")
external hoverTooltip: (
(editorView, int, Side.t) => null,
@@ -256,177 +271,263 @@ module CM6 = {
module Language = {
module HighlightStyle = {
type tag
+
module Tags = {
@@warning("-32") // Suppress "unused external" warnings
+
@module("@lezer/highlight") @scope("tags")
external comment: tag = "comment"
+
@module("@lezer/highlight") @scope("tags")
external lineComment: tag = "lineComment"
+
@module("@lezer/highlight") @scope("tags")
external blockComment: tag = "blockComment"
+
@module("@lezer/highlight") @scope("tags")
external docComment: tag = "docComment"
+
@module("@lezer/highlight") @scope("tags")
external name: tag = "name"
+
@module("@lezer/highlight") @scope("tags")
external variableName: tag = "variableName"
+
@module("@lezer/highlight") @scope("tags")
external typeName: tag = "typeName"
+
@module("@lezer/highlight") @scope("tags")
external tagName: tag = "tagName"
+
@module("@lezer/highlight") @scope("tags")
external propertyName: tag = "propertyName"
+
@module("@lezer/highlight") @scope("tags")
external attributeName: tag = "attributeName"
+
@module("@lezer/highlight") @scope("tags")
external className: tag = "className"
+
@module("@lezer/highlight") @scope("tags")
external labelName: tag = "labelName"
+
@module("@lezer/highlight") @scope("tags")
external namespace: tag = "namespace"
+
@module("@lezer/highlight") @scope("tags")
external macroName: tag = "macroName"
+
@module("@lezer/highlight") @scope("tags")
external literal: tag = "literal"
+
@module("@lezer/highlight") @scope("tags")
external string: tag = "string"
+
@module("@lezer/highlight") @scope("tags")
external docString: tag = "docString"
+
@module("@lezer/highlight") @scope("tags")
external character: tag = "character"
+
@module("@lezer/highlight") @scope("tags")
external attributeValue: tag = "attributeValue"
+
@module("@lezer/highlight") @scope("tags")
external number: tag = "number"
+
@module("@lezer/highlight") @scope("tags")
external integer: tag = "integer"
+
@module("@lezer/highlight") @scope("tags")
external float: tag = "float"
+
@module("@lezer/highlight") @scope("tags")
external bool: tag = "bool"
+
@module("@lezer/highlight") @scope("tags")
external regexp: tag = "regexp"
+
@module("@lezer/highlight") @scope("tags")
external escape: tag = "escape"
+
@module("@lezer/highlight") @scope("tags")
external color: tag = "color"
+
@module("@lezer/highlight") @scope("tags")
external url: tag = "url"
+
@module("@lezer/highlight") @scope("tags")
external keyword: tag = "keyword"
+
@module("@lezer/highlight") @scope("tags")
external self: tag = "self"
+
@module("@lezer/highlight") @scope("tags")
external null: tag = "null"
+
@module("@lezer/highlight") @scope("tags")
external atom: tag = "atom"
+
@module("@lezer/highlight") @scope("tags")
external unit: tag = "unit"
+
@module("@lezer/highlight") @scope("tags")
external modifier: tag = "modifier"
+
@module("@lezer/highlight") @scope("tags")
external operatorKeyword: tag = "operatorKeyword"
+
@module("@lezer/highlight") @scope("tags")
external controlKeyword: tag = "controlKeyword"
+
@module("@lezer/highlight") @scope("tags")
external definitionKeyword: tag = "definitionKeyword"
+
@module("@lezer/highlight") @scope("tags")
external moduleKeyword: tag = "moduleKeyword"
+
@module("@lezer/highlight") @scope("tags")
external operator: tag = "operator"
+
@module("@lezer/highlight") @scope("tags")
external derefOperator: tag = "derefOperator"
+
@module("@lezer/highlight") @scope("tags")
external arithmeticOperator: tag = "arithmeticOperator"
+
@module("@lezer/highlight") @scope("tags")
external logicOperator: tag = "logicOperator"
+
@module("@lezer/highlight") @scope("tags")
external bitwiseOperator: tag = "bitwiseOperator"
+
@module("@lezer/highlight") @scope("tags")
external compareOperator: tag = "compareOperator"
+
@module("@lezer/highlight") @scope("tags")
external updateOperator: tag = "updateOperator"
+
@module("@lezer/highlight") @scope("tags")
external definitionOperator: tag = "definitionOperator"
+
@module("@lezer/highlight") @scope("tags")
external typeOperator: tag = "typeOperator"
+
@module("@lezer/highlight") @scope("tags")
external controlOperator: tag = "controlOperator"
+
@module("@lezer/highlight") @scope("tags")
external punctuation: tag = "punctuation"
+
@module("@lezer/highlight") @scope("tags")
external separator: tag = "separator"
+
@module("@lezer/highlight") @scope("tags")
external bracket: tag = "bracket"
+
@module("@lezer/highlight") @scope("tags")
external angleBracket: tag = "angleBracket"
+
@module("@lezer/highlight") @scope("tags")
external squareBracket: tag = "squareBracket"
+
@module("@lezer/highlight") @scope("tags")
external paren: tag = "paren"
+
@module("@lezer/highlight") @scope("tags")
external brace: tag = "brace"
+
@module("@lezer/highlight") @scope("tags")
external content: tag = "content"
+
@module("@lezer/highlight") @scope("tags")
external heading: tag = "heading"
+
@module("@lezer/highlight") @scope("tags")
external heading1: tag = "heading1"
+
@module("@lezer/highlight") @scope("tags")
external heading2: tag = "heading2"
+
@module("@lezer/highlight") @scope("tags")
external heading3: tag = "heading3"
+
@module("@lezer/highlight") @scope("tags")
external heading4: tag = "heading4"
+
@module("@lezer/highlight") @scope("tags")
external heading5: tag = "heading5"
+
@module("@lezer/highlight") @scope("tags")
external heading6: tag = "heading6"
+
@module("@lezer/highlight") @scope("tags")
external contentSeparator: tag = "contentSeparator"
+
@module("@lezer/highlight") @scope("tags")
external list: tag = "list"
+
@module("@lezer/highlight") @scope("tags")
external quote: tag = "quote"
+
@module("@lezer/highlight") @scope("tags")
external emphasis: tag = "emphasis"
+
@module("@lezer/highlight") @scope("tags")
external strong: tag = "strong"
+
@module("@lezer/highlight") @scope("tags")
external link: tag = "link"
+
@module("@lezer/highlight") @scope("tags")
external monospace: tag = "monospace"
+
@module("@lezer/highlight") @scope("tags")
external strikethrough: tag = "strikethrough"
+
@module("@lezer/highlight") @scope("tags")
external inserted: tag = "inserted"
+
@module("@lezer/highlight") @scope("tags")
external deleted: tag = "deleted"
+
@module("@lezer/highlight") @scope("tags")
external changed: tag = "changed"
+
@module("@lezer/highlight") @scope("tags")
external invalid: tag = "invalid"
+
@module("@lezer/highlight") @scope("tags")
external meta: tag = "meta"
+
@module("@lezer/highlight") @scope("tags")
external documentMeta: tag = "documentMeta"
+
@module("@lezer/highlight") @scope("tags")
external annotation: tag = "annotation"
+
@module("@lezer/highlight") @scope("tags")
external processingInstruction: tag = "processingInstruction"
+
@module("@lezer/highlight") @scope("tags")
external definition: tag => tag = "definition"
+
@module("@lezer/highlight") @scope("tags")
external constant: tag => tag = "constant"
+
@module("@lezer/highlight") @scope("tags")
external function: tag => tag = "function"
+
@module("@lezer/highlight") @scope("tags")
external standard: tag => tag = "standard"
+
@module("@lezer/highlight") @scope("tags")
external local: tag => tag = "local"
+
@module("@lezer/highlight") @scope("tags")
external special: tag => tag = "special"
}
+
module TagStyle = {
type t = {
tag: array,
@@ -437,7 +538,9 @@ module CM6 = {
textDecoration?: string,
}
}
+
type t
+
@scope("HighlightStyle") @module("@codemirror/language")
external define: array => t = "define"
@@ -493,6 +596,7 @@ module CM6 = {
}
type t
+
@module("@codemirror/language")
external bracketMatching: unit => extension = "bracketMatching"
@@ -517,6 +621,7 @@ module CM6 = {
parser: LRParser.t,
languageData?: 'a. {..} as 'a,
}
+
@scope("LRLanguage") @module("@codemirror/language")
external define: spec => t = "define"
}
@@ -577,7 +682,7 @@ type editorInstance = {
}
type editorConfig = {
- parent: WebAPI.DOMAPI.element,
+ parent: WebAPI.Element.t,
initialValue: string,
mode: string,
readOnly: bool,
@@ -661,7 +766,7 @@ let createHoverHintExtension = (hoverHints: array) => {
| Some({hint, start, end}) =>
let pos = CM6.Text.line(doc, start.line).from + start.col
let end = CM6.Text.line(doc, end.line).from + end.col
- let dom = WebAPI.Global.document->WebAPI.Document.createElement("div")
+ let dom = WebAPI.DOM.window->WebAPI.Window.document->WebAPI.Document.createElement("div")
dom.textContent = Value(hint)
dom.className = "p-1 border"
Value({
diff --git a/packages/shared/src/CodeMirror.resi b/packages/shared/src/CodeMirror.resi
index 6c55487f0..ee089a2b5 100644
--- a/packages/shared/src/CodeMirror.resi
+++ b/packages/shared/src/CodeMirror.resi
@@ -41,7 +41,7 @@ module HoverHint: {
type editorInstance
type editorConfig = {
- parent: WebAPI.DOMAPI.element,
+ parent: WebAPI.Element.t,
initialValue: string,
mode: string,
readOnly: bool,
diff --git a/packages/shared/src/HtmlRef.res b/packages/shared/src/HtmlRef.res
index d2d2bfbcc..17c4c5b7f 100644
--- a/packages/shared/src/HtmlRef.res
+++ b/packages/shared/src/HtmlRef.res
@@ -1,5 +1,5 @@
/** For refs attached to HTML tags; bridge React's DOM type to WebAPI's HTML type. */
-external fromDom: Dom.element => WebAPI.DOMAPI.htmlElement = "%identity"
+external fromDom: Dom.element => WebAPI.HTMLElement.t = "%identity"
let domRef = ref =>
ReactDOM.Ref.callbackDomRef(element => {
diff --git a/packages/shared/src/ReactRouter.res b/packages/shared/src/ReactRouter.res
index 2edf81b73..409726608 100644
--- a/packages/shared/src/ReactRouter.res
+++ b/packages/shared/src/ReactRouter.res
@@ -6,7 +6,7 @@ type navigate = (string, ~options: navigateOptions=?) => unit
external useNavigate: unit => navigate = "useNavigate"
@module("react-router")
-external useSearchParams: unit => (WebAPI.URLAPI.urlSearchParams, {..} => unit) = "useSearchParams"
+external useSearchParams: unit => (WebAPI.URLSearchParams.t, {..} => unit) = "useSearchParams"
@module("react-router")
external useLoaderData: unit => 'a = "useLoaderData"
@@ -15,7 +15,7 @@ external useLoaderData: unit => 'a = "useLoaderData"
type path = {pathname: Path.t, search?: string, hash?: string}
module Loader = {
- type loaderArgs = {request: WebAPI.FetchAPI.request}
+ type loaderArgs = {request: WebAPI.Request.t}
type t<'a> = loaderArgs => promise<'a>
}
diff --git a/packages/shared/src/WebDocument.res b/packages/shared/src/WebDocument.res
new file mode 100644
index 000000000..41b5227c7
--- /dev/null
+++ b/packages/shared/src/WebDocument.res
@@ -0,0 +1,2 @@
+@get external activeElement: WebAPI.DOM.document => Null.t = "activeElement"
+@get external body: WebAPI.DOM.document => WebAPI.HTMLElement.t = "body"
diff --git a/yarn.lock b/yarn.lock
index a0558cc2c..374b14b69 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1815,8 +1815,8 @@ __metadata:
"@react-router/node": "npm:^8.3.1"
"@rescript-lang/playground": "workspace:*"
"@rescript-lang/shared": "workspace:*"
- "@rescript/react": "npm:^0.14.2"
- "@rescript/webapi": "npm:0.1.0-experimental-29db5f4"
+ "@rescript/react": "npm:^0.16.0-beta.1"
+ "@rescript/webapi": "npm:alpha"
"@responsive-image/core": "npm:2.1.0"
"@responsive-image/vite-plugin": "npm:3.0.1"
"@rolldown/plugin-babel": "npm:^0.2.4"
@@ -1851,7 +1851,7 @@ __metadata:
remark-frontmatter: "npm:^5.0.0"
remark-gfm: "npm:^4.0.1"
remark-validate-links: "npm:^13.1.0"
- rescript: "npm:^12.2.0"
+ rescript: "npm:^13.0.0-alpha.6"
rolldown: "npm:1.2.8"
search-insights: "npm:^2.17.3"
tailwindcss: "npm:^4"
@@ -1881,8 +1881,8 @@ __metadata:
"@react-router/node": "npm:^8.3.1"
"@rescript-lang/playground": "workspace:*"
"@rescript-lang/shared": "workspace:*"
- "@rescript/react": "npm:^0.14.2"
- "@rescript/webapi": "npm:0.1.0-experimental-29db5f4"
+ "@rescript/react": "npm:^0.16.0-beta.1"
+ "@rescript/webapi": "npm:alpha"
"@types/react": "npm:^19.2.14"
"@vitejs/plugin-react": "npm:^6.0.1"
"@vitest/browser-playwright": "npm:^5.0.0"
@@ -1897,7 +1897,7 @@ __metadata:
remark-gfm: "npm:^4.0.1"
remark-parse: "npm:^11.0.0"
remark-stringify: "npm:^11.0.0"
- rescript: "npm:^12.2.0"
+ rescript: "npm:^13.0.0-alpha.6"
unified: "npm:^11.0.5"
vfile-matter: "npm:^5.0.1"
vite: "npm:^8.3.0"
@@ -1914,8 +1914,8 @@ __metadata:
dependencies:
"@babel/parser": "npm:^7.29.2"
"@rescript-lang/shared": "workspace:*"
- "@rescript/react": "npm:^0.14.2"
- "@rescript/webapi": "npm:0.1.0-experimental-29db5f4"
+ "@rescript/react": "npm:^0.16.0-beta.1"
+ "@rescript/webapi": "npm:alpha"
lz-string: "npm:^1.5.0"
react: "npm:^19.3.0"
react-dom: "npm:^19.3.0"
@@ -1940,8 +1940,8 @@ __metadata:
"@codemirror/view": "npm:^6.41.0"
"@lezer/highlight": "npm:^1.2.3"
"@replit/codemirror-vim": "npm:^6.3.0"
- "@rescript/react": "npm:^0.14.2"
- "@rescript/webapi": "npm:0.1.0-experimental-29db5f4"
+ "@rescript/react": "npm:^0.16.0-beta.1"
+ "@rescript/webapi": "npm:alpha"
"@tsnobip/rescript-lezer": "npm:^0.9.0"
highlight.js: "npm:^11.11.1"
react: "npm:^19.3.0"
@@ -1957,63 +1957,64 @@ __metadata:
languageName: unknown
linkType: soft
-"@rescript/darwin-arm64@npm:12.2.0":
- version: 12.2.0
- resolution: "@rescript/darwin-arm64@npm:12.2.0"
+"@rescript/darwin-arm64@npm:13.0.0-alpha.6":
+ version: 13.0.0-alpha.6
+ resolution: "@rescript/darwin-arm64@npm:13.0.0-alpha.6"
conditions: os=darwin & cpu=arm64
languageName: node
linkType: hard
-"@rescript/darwin-x64@npm:12.2.0":
- version: 12.2.0
- resolution: "@rescript/darwin-x64@npm:12.2.0"
+"@rescript/darwin-x64@npm:13.0.0-alpha.6":
+ version: 13.0.0-alpha.6
+ resolution: "@rescript/darwin-x64@npm:13.0.0-alpha.6"
conditions: os=darwin & cpu=x64
languageName: node
linkType: hard
-"@rescript/linux-arm64@npm:12.2.0":
- version: 12.2.0
- resolution: "@rescript/linux-arm64@npm:12.2.0"
+"@rescript/linux-arm64@npm:13.0.0-alpha.6":
+ version: 13.0.0-alpha.6
+ resolution: "@rescript/linux-arm64@npm:13.0.0-alpha.6"
conditions: os=linux & cpu=arm64
languageName: node
linkType: hard
-"@rescript/linux-x64@npm:12.2.0":
- version: 12.2.0
- resolution: "@rescript/linux-x64@npm:12.2.0"
+"@rescript/linux-x64@npm:13.0.0-alpha.6":
+ version: 13.0.0-alpha.6
+ resolution: "@rescript/linux-x64@npm:13.0.0-alpha.6"
conditions: os=linux & cpu=x64
languageName: node
linkType: hard
-"@rescript/react@npm:^0.14.2":
- version: 0.14.2
- resolution: "@rescript/react@npm:0.14.2"
+"@rescript/react@npm:^0.16.0-beta.1":
+ version: 0.16.0-beta.1
+ resolution: "@rescript/react@npm:0.16.0-beta.1"
peerDependencies:
- react: ">=19.1.0"
- react-dom: ">=19.1.0"
- checksum: 10c0/6fbc0614ac4e4e5ad37abe474dcc137dc8cb7c3351dbc9afa4de92f080614e78809278a034c52da1676e89c299ab07154760d8b80f68f0a5cfd284e22035f713
+ "@rescript/runtime": ">=13.0.0-alpha.5"
+ react: ">=19.2.0"
+ react-dom: ">=19.2.0"
+ checksum: 10c0/bcf008bfb91d07a15dbec273de633104c56147c56e84c8deebb14a2f6cc95eea8a0ff90c19be6ce272f0e768e0f1f6122386e8ac348beb04bffff84ee49d4ec4
languageName: node
linkType: hard
-"@rescript/runtime@npm:12.2.0":
- version: 12.2.0
- resolution: "@rescript/runtime@npm:12.2.0"
- checksum: 10c0/59c0194ae52fbbaadc736bbf1cfac1ed6ffde92b2346e36b9f1a29bb136e38b7ef203c780647203912fa657d293eab5c4e208f04dd65ed4bf47d53843980f7e1
+"@rescript/runtime@npm:13.0.0-alpha.6":
+ version: 13.0.0-alpha.6
+ resolution: "@rescript/runtime@npm:13.0.0-alpha.6"
+ checksum: 10c0/8d351bc3ff8e47c7ff9af871da90982aab056955d9990e38618285aa2eb0ecf6ec5094e07e63f1457957d6f273f1167ecfe67439547d5bcfeb547c2b0489129f
languageName: node
linkType: hard
-"@rescript/webapi@npm:0.1.0-experimental-29db5f4":
- version: 0.1.0-experimental-29db5f4
- resolution: "@rescript/webapi@npm:0.1.0-experimental-29db5f4"
- dependencies:
- rescript: "npm:^12.0.0-beta.3"
- checksum: 10c0/0ef8538fe59b2c058217dd17a5e653ac4902a87caad3b78bde2efc8099538c33e8c1fc7cef41595fd385a78de2ca172c60bdd36a100839f8983da7a40ebd9560
+"@rescript/webapi@npm:alpha":
+ version: 0.1.0-alpha-b1d58f9
+ resolution: "@rescript/webapi@npm:0.1.0-alpha-b1d58f9"
+ peerDependencies:
+ rescript: ">=13"
+ checksum: 10c0/4d242fd3deabf511552f936fe2a5dfa141da7932a644e96528e65c7d32f3bfa29ae4e0e548c5912995d0467312aa1c89b00267fc05b1c80ad373d13d3cd7945c
languageName: node
linkType: hard
-"@rescript/win32-x64@npm:12.2.0":
- version: 12.2.0
- resolution: "@rescript/win32-x64@npm:12.2.0"
+"@rescript/win32-x64@npm:13.0.0-alpha.6":
+ version: 13.0.0-alpha.6
+ resolution: "@rescript/win32-x64@npm:13.0.0-alpha.6"
conditions: os=win32 & cpu=x64
languageName: node
linkType: hard
@@ -9121,20 +9122,20 @@ __metadata:
dependencies:
lefthook: "npm:^2.1.4"
oxfmt: "npm:^0.46.0"
- rescript: "npm:^12.2.0"
+ rescript: "npm:^13.0.0-alpha.6"
languageName: unknown
linkType: soft
-"rescript@npm:^12.0.0-beta.3, rescript@npm:^12.2.0":
- version: 12.2.0
- resolution: "rescript@npm:12.2.0"
+"rescript@npm:^13.0.0-alpha.6":
+ version: 13.0.0-alpha.6
+ resolution: "rescript@npm:13.0.0-alpha.6"
dependencies:
- "@rescript/darwin-arm64": "npm:12.2.0"
- "@rescript/darwin-x64": "npm:12.2.0"
- "@rescript/linux-arm64": "npm:12.2.0"
- "@rescript/linux-x64": "npm:12.2.0"
- "@rescript/runtime": "npm:12.2.0"
- "@rescript/win32-x64": "npm:12.2.0"
+ "@rescript/darwin-arm64": "npm:13.0.0-alpha.6"
+ "@rescript/darwin-x64": "npm:13.0.0-alpha.6"
+ "@rescript/linux-arm64": "npm:13.0.0-alpha.6"
+ "@rescript/linux-x64": "npm:13.0.0-alpha.6"
+ "@rescript/runtime": "npm:13.0.0-alpha.6"
+ "@rescript/win32-x64": "npm:13.0.0-alpha.6"
dependenciesMeta:
"@rescript/darwin-arm64":
optional: true
@@ -9148,11 +9149,9 @@ __metadata:
optional: true
bin:
bsc: cli/bsc.js
- bstracing: cli/bstracing.js
rescript: cli/rescript.js
- rescript-legacy: cli/rescript-legacy.js
rescript-tools: cli/rescript-tools.js
- checksum: 10c0/7650a77a66e2f2ba2523eac54fd930f0b70bad922e9b498678e701e842a56c7b6facd0daf1ef9c7b71d344d9483a0293d17db72a67515a22d07856bdfc34fb46
+ checksum: 10c0/8b4a7430444a4db28e2e480b6750f700ceca0d899d3262248c682314e372cb33fb9030962e0628c93bd6dfc6ea07f03143423aa48f2d478c22152496ee211adf
languageName: node
linkType: hard
children
+{children}
} // Used for hero like introduction text in // e.g Doc sections module Intro = { @react.component - let make = (~children) => children
+ let make = (~children) => {children}
}
module Cite = {
@@ -20,7 +20,7 @@ module Cite = {
// For semantics, check out
// https://css-tricks.com/quoting-in-html-quotations-citations-and-blockquotes/
- {React.string(author)}
)}
@@ -30,13 +30,13 @@ module Cite = {
module Info = {
@react.component
let make = (~children) =>
-
- children
+ {children}
, React.element>, React.element>,
+ cite?: React.component, React.element>>,
@as("Info")
- info?: React.componentLike, React.element>,
+ info?: React.component>,
@as("Warn")
- warn?: React.componentLike, React.element>,
+ warn?: React.component>,
@as("Intro")
- intro?: React.componentLike, React.element>,
+ intro?: React.component>,
@as("Image")
- image?: React.componentLike<
- Image.props,
- React.element,
- >,
+ image?: React.component>,
@as("Video")
- video?: React.componentLike, React.element>,
+ video?: React.component>,
@as("UrlBox")
- urlBox?: React.componentLike, React.element>,
+ urlBox?: React.component>,
@as("CodeTab")
- codeTab?: CodeTab.props> => React.element,
+ codeTab?: React.component>>,
/* Common markdown elements */
- p?: P.props => React.element,
- li?: Li.props => React.element,
- h1?: H1.props => React.element,
- h2?: H2.props => React.element,
- h3?: H3.props => React.element,
- h4?: H4.props => React.element,
- h5?: H5.props => React.element,
- ul?: Ul.props => React.element,
- ol?: Ol.props => React.element,
- table?: Table.props => React.element,
- thead?: Thead.props => React.element,
- th?: Th.props => React.element,
- td?: Td.props => React.element,
- blockquote?: Blockquote.props => React.element,
- strong?: Strong.props => React.element,
- hr?: Hr.props => React.element,
- code?: React.componentLike, React.element>, React.element>,
- pre?: Pre.props => React.element,
- a?: A.props => React.element,
+ p?: React.component>,
+ li?: React.component>,
+ h1?: React.component>,
+ h2?: React.component>,
+ h3?: React.component>,
+ h4?: React.component>,
+ h5?: React.component>,
+ ul?: React.component>,
+ ol?: React.component>,
+ table?: React.component>,
+ thead?: React.component>,
+ th?: React.component>,
+ td?: React.component>,
+ blockquote?: React.component>,
+ strong?: React.component>,
+ hr?: React.component,
+ code?: React.component, React.element>>,
+ pre?: React.component>,
+ a?: React.component>,
}
let default = {
diff --git a/apps/docs/src/components/NavbarPrimary.res b/apps/docs/src/components/NavbarPrimary.res
index a8e5d1c6a..d9b5c5dd1 100644
--- a/apps/docs/src/components/NavbarPrimary.res
+++ b/apps/docs/src/components/NavbarPrimary.res
@@ -10,8 +10,7 @@ let isActive = (~url, ~pathname: Path.t) => {
module LeftContent = {
@react.component
let make =
- @directive("'use memo'")
- () => {
+ @directive("'use memo'") () => {
let {pathname} = useLocation()
children+
{children}{Option.mapOr(author, React.null, author =>
children
+ {children}
}
module Warn = {
@react.component
let make = (~children) =>
- children
+ {children}
}
module UrlBox = {
@@ -47,7 +47,7 @@ module UrlBox = {
let elements = React.Children.toArray(children)
let content = if typeof(children) == #string || React.isValidElement(children) {
- imgEl + {imgEl} {MdxLegacy.getChildren(children)}
} else { @@ -57,7 +57,7 @@ module UrlBox = { let rest = elements->Array.slice(~start=1) <>- imgEl + {imgEl} {MdxLegacy.getChildren(head)}
{React.array(rest)} @@ -82,8 +82,8 @@ module UrlBox = { }
- content
-
}
}
@@ -103,12 +103,13 @@ module Anchor = {
}
}
+
//*--- HEADLINES ---*//
module H1 = {
@react.component
let make = (~id=?, ~title=?, ~children) =>
- link
+ {content}
+ {link}
children
+{children}
} module H2 = { @@ -118,7 +119,7 @@ module H2 = { <>
- children
+ {children}
- children
+ {children}
- children
+ {children}
children
+ let make = (~children) => {children}
}
module InlineCode = {
@@ -177,7 +178,7 @@ module InlineCode = {
- children
+ {children}
}
@@ -185,13 +186,13 @@ module Table = {
@react.component
let make = (~children) =>
- children
+ {children}
}
module Thead = {
@react.component
- let make = (~children) => children
+ let make = (~children) => {children}
}
module Th = {
@@ -200,13 +201,13 @@ module Th = {
- children
+ {children}
}
module Td = {
@react.component
- let make = (~children) => children
+ let make = (~children) => {children}
}
module Code = {
@@ -233,16 +234,16 @@ module Code = {
let highlightedLines = parseNumericRangeMeta(metastring)
- if List.has(metaSplits, "example", String.equal) {
+ if metaSplits->List.some(value => value == "example") {
- children
+ {children}
}
@@ -353,13 +354,13 @@ module A = {
?target
dataTestId="absolute-url"
>
- children
+ {children}
} else {
- children
+ {children}
}
}
@@ -367,12 +368,12 @@ module A = {
module Ul = {
@react.component
- let make = (~children) => children
+ let make = (~children) => {children}
}
module Ol = {
@react.component
- let make = (~children) => children
+ let make = (~children) => {children}
}
module Li = {
@@ -397,7 +398,7 @@ module Li = {
| [child] =>
switch getType(child) {
| "pre" | "p" => child
- | _ =>
- children
+ {children}
children
+ let make = (~children) => {children}
}
module InlineCode = {
@@ -177,7 +178,7 @@ module InlineCode = {
- children
+ {children}
}
@@ -185,13 +186,13 @@ module Table = {
@react.component
let make = (~children) =>
- children
+ {children}
}
module Thead = {
@react.component
- let make = (~children) => children
+ let make = (~children) => {children}
}
module Th = {
@@ -200,13 +201,13 @@ module Th = {
- children
+ {children}
}
module Td = {
@react.component
- let make = (~children) => children
+ let make = (~children) => {children}
}
module Code = {
@@ -233,16 +234,16 @@ module Code = {
let highlightedLines = parseNumericRangeMeta(metastring)
- if List.has(metaSplits, "example", String.equal) {
+ if metaSplits->List.some(value => value == "example") {
- children
+ {children}
}
@@ -353,13 +354,13 @@ module A = {
?target
dataTestId="absolute-url"
>
- children
+ {children}
} else {
- children
+ {children}
}
}
@@ -367,12 +368,12 @@ module A = {
module Ul = {
@react.component
- let make = (~children) => children
+ let make = (~children) => {children}
}
module Ol = {
@react.component
- let make = (~children) => children
+ let make = (~children) => {children}
}
module Li = {
@@ -397,7 +398,7 @@ module Li = {
| [child] =>
switch getType(child) {
| "pre" | "p" => child
- | _ =>
child
+ | _ =>{child}
} | _ => let first = elements[0]->Option.getOrThrow @@ -407,18 +408,18 @@ module Li = { | "ul" | "ol" | "li" | "pre" => <> {getType(first) == "p" ? React.array(head) :{React.array(head)}
} - last + {last} - | _ =>children
+ | _ =>{children}
} } - {
+ @directive("'use memo'") () => {
let iconClasses = "w-6 h-6 opacity-50 hover:opacity-100"
let linkClasses = "hidden md:block"
{
+ @directive("'use memo'") () => {
let scrollDirection = Hooks.useScrollDirection(~topMargin=64, ~threshold=32)
let navbarClasses = switch scrollDirection {
diff --git a/apps/docs/src/components/NavbarUtils.res b/apps/docs/src/components/NavbarUtils.res
index 0f639ffdb..2677b3a3e 100644
--- a/apps/docs/src/components/NavbarUtils.res
+++ b/apps/docs/src/components/NavbarUtils.res
@@ -16,35 +16,36 @@ let isActiveLink = (~includes: string, ~excludes: option=?, ~route: Path
let linkOrActiveLink = (~target: Path.t, ~route: Path.t) => target === route ? activeLink : link
let linkOrActiveLinkSubroute = (~target: Path.t, ~route: Path.t) =>
- String.startsWith((route :> string), (target :> string)) ? activeLink : link
+ String.startsWith(route :> string, target :> string) ? activeLink : link
-external elementToDialog: WebAPI.DOMAPI.element => WebAPI.DOMAPI.htmlDialogElement = "%identity"
+external elementToDialog: WebAPI.Element.t => WebAPI.HTMLDialogElement.t = "%identity"
let getMobileOverlayDialog = () => {
- Nullable.make(document->WebAPI.Document.getElementById("mobile-overlay")->elementToDialog)
+ WebAPI.DOM.window
+ ->WebAPI.Window.document
+ ->WebAPI.Document.getElementById("mobile-overlay")
+ ->Null.toOption
+ ->Option.map(elementToDialog)
}
-@get external _open: WebAPI.DOMAPI.htmlDialogElement => bool = "open"
+@get external _open: WebAPI.HTMLDialogElement.t => bool = "open"
let openMobileOverlay = _ =>
switch getMobileOverlayDialog() {
- | Nullable.Value(dialog) => dialog->WebAPI.HTMLDialogElement.showModal
- | Null => ()
- | Undefined => ()
+ | Some(dialog) => dialog->WebAPI.HTMLDialogElement.showModal
+ | None => ()
}
let closeMobileOverlay = _ =>
switch getMobileOverlayDialog() {
- | Nullable.Value(dialog) => dialog->WebAPI.HTMLDialogElement.close
- | Null => ()
- | Undefined => ()
+ | Some(dialog) => dialog->WebAPI.HTMLDialogElement.close
+ | None => ()
}
let toggleMobileOverlay = _ => {
let isOpen = switch getMobileOverlayDialog() {
- | Nullable.Value(dialog) => dialog->_open
- | Null => false
- | Undefined => false
+ | Some(dialog) => dialog->_open
+ | None => false
}
if isOpen {
@@ -55,28 +56,29 @@ let toggleMobileOverlay = _ => {
}
let getMobileTertiaryDialog = () => {
- Nullable.make(document->WebAPI.Document.getElementById("mobile-tertiary-drawer")->elementToDialog)
+ WebAPI.DOM.window
+ ->WebAPI.Window.document
+ ->WebAPI.Document.getElementById("mobile-tertiary-drawer")
+ ->Null.toOption
+ ->Option.map(elementToDialog)
}
let openMobileTertiaryDrawer = _ =>
switch getMobileTertiaryDialog() {
- | Nullable.Value(dialog) => dialog->WebAPI.HTMLDialogElement.showModal
- | Null => ()
- | Undefined => ()
+ | Some(dialog) => dialog->WebAPI.HTMLDialogElement.showModal
+ | None => ()
}
let closeMobileTertiaryDrawer = _ =>
switch getMobileTertiaryDialog() {
- | Nullable.Value(dialog) => dialog->WebAPI.HTMLDialogElement.close
- | Null => ()
- | Undefined => ()
+ | Some(dialog) => dialog->WebAPI.HTMLDialogElement.close
+ | None => ()
}
let toggleMobileTertiaryDrawer = _ => {
let isOpen = switch getMobileTertiaryDialog() {
- | Nullable.Value(dialog) => dialog->_open
- | Null => false
- | Undefined => false
+ | Some(dialog) => dialog->_open
+ | None => false
}
if isOpen {
diff --git a/apps/docs/src/components/Search.res b/apps/docs/src/components/Search.res
index 4669666eb..5dac83c13 100644
--- a/apps/docs/src/components/Search.res
+++ b/apps/docs/src/components/Search.res
@@ -12,12 +12,12 @@ let reduce = (state, action) =>
let unavailableText = "Search unavailable"
let unavailableLabel = "Search unavailable for this build"
-@get external isContentEditable: WebAPI.DOMAPI.element => option = "isContentEditable"
-@get external focusMethod: WebAPI.DOMAPI.element => option unit> = "focus"
-@get external inputValue: WebAPI.DOMAPI.element => option = "value"
-@send external focusElement: WebAPI.DOMAPI.element => unit = "focus"
+@get external isContentEditable: WebAPI.Element.t => option = "isContentEditable"
+@get external focusMethod: WebAPI.Element.t => option unit> = "focus"
+@get external inputValue: WebAPI.Element.t => option = "value"
+@send external focusElement: WebAPI.Element.t => unit = "focus"
-let isEditable = (element: WebAPI.DOMAPI.element) =>
+let isEditable = (element: WebAPI.Element.t) =>
switch element.tagName {
| "TEXTAREA" | "SELECT" | "INPUT" => true
| _ => element->isContentEditable->Option.getOr(false)
@@ -30,16 +30,17 @@ let restoreFocus = element =>
}
let hasSearchQuery = () =>
- switch document.activeElement {
+ switch WebAPI.DOM.window->WebAPI.Window.document->WebDocument.activeElement {
| Value(element) =>
WebAPI.DOMTokenList.contains(element.classList, "DocSearch-Input") &&
element->inputValue->Option.map(value => value !== "")->Option.getOr(false)
| Null => false
}
-let activateSearch = (~dispatch, ~returnFocus: React.ref>) => {
+let activateSearch = (~dispatch, ~returnFocus: React.ref>) => {
if returnFocus.current->Option.isNone {
- returnFocus.current = document.activeElement->Null.toOption
+ returnFocus.current =
+ WebAPI.DOM.window->WebAPI.Window.document->WebDocument.activeElement->Null.toOption
}
dispatch(Open(React.lazy_(() => import(SearchModal.make))))
}
@@ -51,7 +52,7 @@ let make = () => {
let algoliaConfig = Env.algoliaPublicConfig
let onClose = React.useCallback(() => {
- switch WebAPI.Document.querySelector(document, "body") {
+ switch WebAPI.Document.querySelector(WebAPI.DOM.window->WebAPI.Window.document, "body") {
| Value(body) => WebAPI.DOMTokenList.remove(body.classList, "DocSearch--active")
| Null => ()
}
@@ -65,24 +66,30 @@ let make = () => {
switch algoliaConfig {
| None => None
| Some(_) =>
- let handleGlobalKeyDown = (event: WebAPI.UIEventsAPI.keyboardEvent) => {
+ let handleGlobalKeyDown = event => {
+ let preventDefault = () => event->WebAPI.KeyboardEvent.preventDefault
if event.key === "Escape" && !hasSearchQuery() {
onClose()
} else if event.key === "/" || (event.key === "k" && (event.ctrlKey || event.metaKey)) {
- switch document.activeElement {
+ switch WebAPI.DOM.window->WebAPI.Window.document->WebDocument.activeElement {
| Value(element) if isEditable(element) => ()
| _ =>
activateSearch(~dispatch, ~returnFocus)
- WebAPI.KeyboardEvent.preventDefault(event)
+ preventDefault()
}
}
}
// Read Escape's query before autocomplete clears it at the input.
- WebAPI.Window.addEventListener(window, Keydown, handleGlobalKeyDown, ~options={capture: true})
+ WebAPI.Window.addEventListener(
+ WebAPI.DOM.window,
+ Keydown,
+ handleGlobalKeyDown,
+ ~options={capture: true},
+ )
Some(
() =>
WebAPI.Window.removeEventListener(
- window,
+ WebAPI.DOM.window,
Keydown,
handleGlobalKeyDown,
~options={capture: true},
diff --git a/apps/docs/src/components/SearchModal.res b/apps/docs/src/components/SearchModal.res
index 9101eac9e..ee9603ecf 100644
--- a/apps/docs/src/components/SearchModal.res
+++ b/apps/docs/src/components/SearchModal.res
@@ -17,7 +17,7 @@ let make = (~apiKey, ~appId, ~indexName, ~onClose: unit => unit) => {
hitComponent
onClose
insights=true
- initialScrollY={window.scrollY->Float.toInt}
+ initialScrollY={WebAPI.DOM.window->WebAPI.Window.scrollY->Float.toInt}
searchParameters={
distinct: 3,
hitsPerPage: 20,
diff --git a/apps/docs/src/components/SidebarNav.res b/apps/docs/src/components/SidebarNav.res
index cc2c4ba34..9d75b1022 100644
--- a/apps/docs/src/components/SidebarNav.res
+++ b/apps/docs/src/components/SidebarNav.res
@@ -11,9 +11,9 @@ module Toc = {
onClick={evt => {
evt->ReactEvent.Mouse.preventDefault
WebAPI.Document.getElementById(
- document,
+ WebAPI.DOM.window->WebAPI.Window.document,
href->String.replace("#", ""),
- )->WebAPI.Element.scrollIntoView_alignToTop
+ )->Null.forEach(WebAPI.Element.scrollIntoViewAlignToTop)
onClick()
}}
to={"#" ++ href->Url.normalizeAnchor}
@@ -36,7 +36,7 @@ module Title = {
let make = (~children) => {
let className = "hl-overline text-gray-80 mt-5" //overline
- string)} route={(pathname :> string)} categories activeToc
+ key={pathname :> string} route={pathname :> string} categories activeToc
/>
=?,
~categories: array,
- ~components=MarkdownComponents.default,
~docSearchLvl0=?,
~children,
) => {
@@ -20,5 +19,5 @@ let make = (
let sidebar = children
+ {children}
}
diff --git a/apps/docs/src/layouts/MainLayout.res b/apps/docs/src/layouts/MainLayout.res
index 059e9f8d4..9de35dc42 100644
--- a/apps/docs/src/layouts/MainLayout.res
+++ b/apps/docs/src/layouts/MainLayout.res
@@ -1,11 +1,11 @@
@react.component
-let make = (~components=MarkdownComponents.default, ~children) => {
+let make = (~children) => {
<>
- children
+ {children}
diff --git a/apps/docs/src/layouts/MainLayout.resi b/apps/docs/src/layouts/MainLayout.resi
index e76a5ba10..940ed3d87 100644
--- a/apps/docs/src/layouts/MainLayout.resi
+++ b/apps/docs/src/layouts/MainLayout.resi
@@ -1,2 +1,2 @@
@react.component
-let make: (~components: MarkdownComponents.t=?, ~children: React.element) => React.element
+let make: (~children: React.element) => React.element
diff --git a/apps/docs/src/layouts/SidebarPageLayout.res b/apps/docs/src/layouts/SidebarPageLayout.res
index 8445b4572..a2c95e940 100644
--- a/apps/docs/src/layouts/SidebarPageLayout.res
+++ b/apps/docs/src/layouts/SidebarPageLayout.res
@@ -2,8 +2,6 @@ module Link = ReactRouter.Link
@react.component
let make = (
- ~sidebarState: (bool, (bool => bool) => unit)=(false, _ => ()),
- // (Sidebar, toggleSidebar) ... for toggling sidebar in mobile view
~sidebar: React.element,
~rightSidebar: option=?,
~categories: option>=?,
@@ -45,8 +43,8 @@ let make = (
| None => React.null
}
lesson.content
+ {lesson.content}
}
@@ -348,7 +350,7 @@ module ResultPane = {
}
{React.string(msg)}
- errs
+ {errs}
| Comp(UnexpectedError(msg))
| Conv(UnexpectedError(msg)) =>
@@ -446,20 +448,19 @@ module ResultPane = {
}
module WarningFlagsWidget = {
+ @set external setScrollTop: (WebAPI.HTMLElement.t, float) => unit = "scrollTop"
+
// Inspired by MUI (who got inspired by WAI best practise examples)
// https://github.com/mui-org/material-ui/blob/next/packages/material-ui-lab/src/useAutocomplete/useAutocomplete.js#L327
- let scrollToElement = (
- ~parent: WebAPI.DOMAPI.htmlElement,
- element: WebAPI.DOMAPI.htmlElement,
- ): unit =>
+ let scrollToElement = (~parent: WebAPI.HTMLElement.t, element: WebAPI.HTMLElement.t): unit =>
if parent.scrollHeight > parent.clientHeight {
let scrollBottom = parent.clientHeight + Float.toInt(parent.scrollTop)
let elementBottom = element.offsetTop + element.offsetHeight
if elementBottom > scrollBottom {
- parent.scrollTop = Float.fromInt(elementBottom - parent.clientHeight)
+ parent->setScrollTop(Float.fromInt(elementBottom - parent.clientHeight))
} else if element.offsetTop - element.offsetHeight < Float.toInt(parent.scrollTop) {
- parent.scrollTop = Float.fromInt(element.offsetTop - element.offsetHeight)
+ parent->setScrollTop(Float.fromInt(element.offsetTop - element.offsetHeight))
}
}
@@ -830,7 +831,7 @@ module WarningFlagsWidget = {
- suggestionBox
+ {suggestionBox}
}
}
@@ -1187,12 +1188,12 @@ module ControlPanel = {
?onClick
className="inline-block text-sky hover:cursor-pointer hover:bg-sky hover:text-white-80-tr rounded border active:bg-sky-70 border-sky-70 px-2 py-1 "
>
- children
+ {children}
}
let commandWithKeyboardShortcut = (commandName, ~key) => {
- let userAgent = window.navigator.userAgent
+ let userAgent = WebAPI.DOM.window->WebAPI.Window.navigator->WebAPI.Navigator.userAgent
if userAgent->String.includes("iPhone") || userAgent->String.includes("Android") {
commandName
} else if userAgent->String.includes("Mac") {
@@ -1235,8 +1236,8 @@ module ControlPanel = {
}
}
- WebAPI.Window.addEventListener(window, Keydown, onKeyDown)
- Some(() => WebAPI.Window.removeEventListener(window, Keydown, onKeyDown))
+ WebAPI.Window.addEventListener(WebAPI.DOM.window, Keydown, onKeyDown)
+ Some(() => WebAPI.Window.removeEventListener(WebAPI.DOM.window, Keydown, onKeyDown))
| _ => None
}
}, (state, dispatch, setCurrentTab))
@@ -1289,7 +1290,7 @@ module ControlPanel = {
}
) => {
let initialVersion = switch versions {
| [v] => Some(v) // only single version available. maybe local dev.
- | versions => {
- let lastStableVersion = versions->Array.find(version => version.preRelease->Option.isNone)
- switch Nullable.make(
- searchParams->WebAPI.URLSearchParams.get((CompilerManagerHook.Version :> string)),
- ) {
- | Nullable.Value(version) => version->Semver.parse
- | _ =>
- switch getLocalStorageItem(playgroundVersionStorageKey) {
- | Some(v) => v->Semver.parse
- | None => lastStableVersion
- }
+ | versions =>
+ let lastStableVersion = versions->Array.find(version => version.preRelease->Option.isNone)
+ switch searchParams
+ ->WebAPI.URLSearchParams.get(CompilerManagerHook.Version :> string)
+ ->Null.toOption {
+ | Some(version) => version->Semver.parse
+ | _ =>
+ switch getLocalStorageItem(playgroundVersionStorageKey) {
+ | Some(v) => v->Semver.parse
+ | None => lastStableVersion
}
}
}
- let initialLang = switch Nullable.make(
- searchParams->WebAPI.URLSearchParams.get((CompilerManagerHook.Ext :> string)),
- ) {
- | Nullable.Value("re") => Api.Lang.Reason
+ let initialLang = switch searchParams
+ ->WebAPI.URLSearchParams.get(CompilerManagerHook.Ext :> string)
+ ->Null.toOption {
+ | Some("re") => Api.Lang.Reason
| _ => Api.Lang.Res
}
let initialModuleSystem =
- Nullable.make(searchParams->WebAPI.URLSearchParams.get((Module :> string)))->Nullable.toOption
+ searchParams->WebAPI.URLSearchParams.get(Module :> string)->Null.toOption
- let initialJsxPreserveMode = !(
- Nullable.make(
- searchParams->WebAPI.URLSearchParams.get((JsxPreserve :> string)),
- )->Nullable.isNullable
- )
+ let initialJsxPreserveMode =
+ searchParams->WebAPI.URLSearchParams.get(JsxPreserve :> string)->Null.toOption->Option.isSome
let initialExperimentalFeatures =
- Nullable.make(
- searchParams->WebAPI.URLSearchParams.get((Experiments :> string)),
- )->Nullable.mapOr([], str => str->String.split(",")->Array.map(String.trim))
+ searchParams
+ ->WebAPI.URLSearchParams.get(Experiments :> string)
+ ->Null.mapOr([], str => str->String.split(",")->Array.map(String.trim))
let initialContent = switch (
- Nullable.make(searchParams->WebAPI.URLSearchParams.get((Code :> string))),
+ searchParams->WebAPI.URLSearchParams.get(Code :> string)->Null.toOption,
initialLang,
) {
- | (Nullable.Value(compressedCode), _) =>
- LzString.lzString.decompressFromEncodedURIComponent(compressedCode)
+ | (Some(compressedCode), _) => LzString.lzString.decompressFromEncodedURIComponent(compressedCode)
| (_, Reason) => initialReContent
| (_, Res) =>
switch initialVersion {
@@ -1713,8 +1709,8 @@ let make = (~bundleBaseUrl: string, ~versions: array) => {
setSessionStorageItem(~key=newLightModeToastSeenStorageKey, ~value="true")
}
- let timer = setTimeout(~handler=hideToast, ~timeout=10000)
- Some(() => clearTimeout(timer))
+ let timer = WebAPI.Window.setTimeout(WebAPI.DOM.window, ~handler=hideToast, ~timeout=10000)
+ Some(() => WebAPI.Window.clearTimeout(WebAPI.DOM.window, timer))
}
}, [])
@@ -1741,12 +1737,16 @@ let make = (~bundleBaseUrl: string, ~versions: array) => {
value => {
switch typingTimer.current {
| None => ()
- | Some(timer) => clearTimeout(timer)
+ | Some(timer) => WebAPI.Window.clearTimeout(WebAPI.DOM.window, timer)
}
- let timer = setTimeout(~handler=() => {
- timeoutCompile.current(value)
- typingTimer.current = None
- }, ~timeout=100)
+ let timer = WebAPI.Window.setTimeout(
+ WebAPI.DOM.window,
+ ~handler=() => {
+ timeoutCompile.current(value)
+ typingTimer.current = None
+ },
+ ~timeout=100,
+ )
typingTimer.current = Some(timer)
}
},
@@ -1869,7 +1869,7 @@ let make = (~bundleBaseUrl: string, ~versions: array) => {
let (layout, setLayout) = React.useState(() => Row)
React.useEffect(() => {
- setLayout(_ => window.innerWidth < breakingPoint ? Column : Row)
+ setLayout(_ => WebAPI.DOM.window->WebAPI.Window.innerWidth < breakingPoint ? Column : Row)
None
}, [])
@@ -1883,7 +1883,7 @@ let make = (~bundleBaseUrl: string, ~versions: array) => {
let subPanelRef = React.useRef(Nullable.null)
let onResize = () => {
- let newLayout = window.innerWidth < breakingPoint ? Column : Row
+ let newLayout = WebAPI.DOM.window->WebAPI.Window.innerWidth < breakingPoint ? Column : Row
setLayout(_ => newLayout)
switch panelRef.current->Nullable.toOption {
| Some(element) =>
@@ -1909,8 +1909,8 @@ let make = (~bundleBaseUrl: string, ~versions: array) => {
}
React.useEffect(() => {
- WebAPI.Window.addEventListener(window, Resize, onResize)
- Some(() => WebAPI.Window.removeEventListener(window, Resize, onResize))
+ WebAPI.Window.addEventListener(WebAPI.DOM.window, Resize, onResize)
+ Some(() => WebAPI.Window.removeEventListener(WebAPI.DOM.window, Resize, onResize))
}, [])
// To force CodeMirror render scrollbar on first render
@@ -1995,15 +1995,15 @@ let make = (~bundleBaseUrl: string, ~versions: array) => {
onMove(position)
}
- WebAPI.Window.addEventListener(window, Mousemove, onMouseMove)
- WebAPI.Window.addEventListener(window, Touchmove, onTouchMove)
- WebAPI.Window.addEventListener(window, Mouseup, onMouseUp)
+ WebAPI.Window.addEventListener(WebAPI.DOM.window, Mousemove, onMouseMove)
+ WebAPI.Window.addEventListener(WebAPI.DOM.window, Touchmove, onTouchMove)
+ WebAPI.Window.addEventListener(WebAPI.DOM.window, Mouseup, onMouseUp)
Some(
() => {
- WebAPI.Window.removeEventListener(window, Mousemove, onMouseMove)
- WebAPI.Window.removeEventListener(window, Touchmove, onTouchMove)
- WebAPI.Window.removeEventListener(window, Mouseup, onMouseUp)
+ WebAPI.Window.removeEventListener(WebAPI.DOM.window, Mousemove, onMouseMove)
+ WebAPI.Window.removeEventListener(WebAPI.DOM.window, Touchmove, onTouchMove)
+ WebAPI.Window.removeEventListener(WebAPI.DOM.window, Mouseup, onMouseUp)
},
)
}, [layout])
@@ -2013,7 +2013,7 @@ let make = (~bundleBaseUrl: string, ~versions: array) => {
let hideNewLightModeToast = () => {
setShowNewLightModeToast(_ => false)
WebAPI.Storage.setItem(
- window.sessionStorage,
+ WebAPI.DOM.window->WebAPI.Window.sessionStorage,
~key=newLightModeToastSeenStorageKey,
~value="true",
)
@@ -2040,59 +2040,58 @@ let make = (~bundleBaseUrl: string, ~versions: array) => {
| JavaScript => "JavaScript"->React.string
- | Problems => {
- let problemCounts: {"warnings": int, "errors": int} = switch compilerState {
- | Compiling({state: ready})
- | Ready(ready)
- | Executing({state: ready})
- | SwitchingCompiler(ready, _) => {
- "warnings": switch ready.result {
- | Comp(Success({warnings})) => warnings->Array.length
- | _ => 0
- },
- "errors": switch ready.result {
- | FinalResult.Comp(Fail(result)) =>
- switch result {
- | SyntaxErr(errors) | TypecheckErr(errors) | OtherErr(errors) => errors->Array.length
- | WarningErr(errors) => errors->Array.length
- | WarningFlagErr(_) => 1
- }
- | Conv(Fail({details})) => details->Array.length
- | Comp(Success(_)) => 0
- | Conv(Success(_)) => 0
- | Comp(UnexpectedError(_))
- | Conv(UnexpectedError(_))
- | Comp(Unknown(_))
- | Conv(Unknown(_)) => 1
- | Nothing => 0
- },
- }
-
- | SetupFailed(_) | Init => {
- "warnings": 0,
- "errors": 0,
- }
+ | Problems =>
+ let problemCounts: {"warnings": int, "errors": int} = switch compilerState {
+ | Compiling({state: ready})
+ | Ready(ready)
+ | Executing({state: ready})
+ | SwitchingCompiler(ready, _) => {
+ "warnings": switch ready.result {
+ | Comp(Success({warnings})) => warnings->Array.length
+ | _ => 0
+ },
+ "errors": switch ready.result {
+ | FinalResult.Comp(Fail(result)) =>
+ switch result {
+ | SyntaxErr(errors) | TypecheckErr(errors) | OtherErr(errors) => errors->Array.length
+ | WarningErr(errors) => errors->Array.length
+ | WarningFlagErr(_) => 1
+ }
+ | Conv(Fail({details})) => details->Array.length
+ | Comp(Success(_)) => 0
+ | Conv(Success(_)) => 0
+ | Comp(UnexpectedError(_))
+ | Conv(UnexpectedError(_))
+ | Comp(Unknown(_))
+ | Conv(Unknown(_)) => 1
+ | Nothing => 0
+ },
}
- ) => {
className={`flex ${layout == Column ? "flex-col" : "flex-row"}`}
ref={HtmlRef.elementRef(panelRef)}
>
- // Left Panel
+ /* Left Panel */
children
+ {children}
}
}
@@ -142,10 +142,10 @@ let make = (
className="h-full relative top-0 px-4 w-full block md:top-40 md:sticky border-r border-gray-20 overflow-y-auto pb-24 max-h-[calc(100vh-10rem)] pt-8"
>
-
- preludeSection
+ {preludeSection}
/* Firefox ignores padding in scroll containers, so we need margin
to make a bottom gap for the sidebar.
diff --git a/apps/docs/src/layouts/CommunityLayout.res b/apps/docs/src/layouts/CommunityLayout.res
index f704be1c9..a1dc6310e 100644
--- a/apps/docs/src/layouts/CommunityLayout.res
+++ b/apps/docs/src/layouts/CommunityLayout.res
@@ -15,7 +15,7 @@ let make = (~children, ~categories, ~entries) => {
<>
toplevelNav
+ {toplevelNav}
- previous
- next
+ {previous}
+ {next}
}
| None => React.null
@@ -56,7 +54,7 @@ let make = (
- sidebar
+ {sidebar}
| None => React.null
}}
- children
- pagination
+ {children}
+ {pagination}
{switch rightSidebar {
| Some(ele) => ele
diff --git a/apps/docs/src/layouts/SidebarPageLayout.resi b/apps/docs/src/layouts/SidebarPageLayout.resi
index d9730f135..acf6130f8 100644
--- a/apps/docs/src/layouts/SidebarPageLayout.resi
+++ b/apps/docs/src/layouts/SidebarPageLayout.resi
@@ -1,7 +1,5 @@
@react.component
let make: (
- // (Sidebar, toggleSidebar) ... for toggling sidebar in mobile view
- ~sidebarState: (bool, (bool => bool) => unit)=?,
~sidebar: React.element,
~rightSidebar: React.element=?,
~categories: array=?,
diff --git a/apps/docs/src/markdown/Mdx.res b/apps/docs/src/markdown/Mdx.res
index e17226a6a..1e1e1eb40 100644
--- a/apps/docs/src/markdown/Mdx.res
+++ b/apps/docs/src/markdown/Mdx.res
@@ -68,7 +68,7 @@ let sortSection = mdxPages =>
)
let groupBySection = mdxPages =>
- Array.reduce(mdxPages, (Dict.make() :> Dict.t>), (acc, item) => {
+ Array.reduce(mdxPages, Dict.make() :> Dict.t>, (acc, item) => {
let section = item.section->Option.flatMap(Dict.get(acc, _))
switch section {
// If the section already exists, add this item to it
diff --git a/apps/docs/src/markdown/MdxLegacy.res b/apps/docs/src/markdown/MdxLegacy.res
index 5ee546bd3..46239dc3e 100644
--- a/apps/docs/src/markdown/MdxLegacy.res
+++ b/apps/docs/src/markdown/MdxLegacy.res
@@ -21,15 +21,14 @@ let getType = element => {
if React.isValidElement(element) {
switch props(element).mdxType {
| Some(tag) => tag
- | None => {
- let tag = elementType(element)
- typeof(tag) == #string ? String.make(tag) : "unknown"
- }
+ | None =>
+ let tag = elementType(element)
+ typeof(tag) == #string ? String.make(tag) : "unknown"
}
} else {
"unknown"
}
}
-@get external component: React.element => React.componentLike<'props, React.element> = "type"
+@get external component: React.element => React.component<'props> = "type"
let isComponent = (element, make) => React.isValidElement(element) && component(element) === make
diff --git a/apps/docs/test-utils/TestUtils.res b/apps/docs/test-utils/TestUtils.res
index 1edc1da72..3c0f6c7c3 100644
--- a/apps/docs/test-utils/TestUtils.res
+++ b/apps/docs/test-utils/TestUtils.res
@@ -1,16 +1,18 @@
-external imageFromNode: WebAPI.DOMAPI.node => WebAPI.DOMAPI.htmlImageElement = "%identity"
+external imageFromElement: WebAPI.Element.t => WebAPI.HTMLImageElement.t = "%identity"
let waitForImages = async (selector: string) => {
- let root = switch document->WebAPI.Document.querySelector(selector) {
+ let root = switch WebAPI.DOM.window
+ ->WebAPI.Window.document
+ ->WebAPI.Document.querySelector(selector) {
| Value(root) => root
- | Null => failwith(`expected to find screenshot target ${selector}`)
+ | Null => panic(`expected to find screenshot target ${selector}`)
}
let images = root->WebAPI.Element.querySelectorAll("img")
if images.length > 0 {
for i in 0 to images.length - 1 {
- let image = images->WebAPI.NodeList.item(i)->imageFromNode
+ let image = images->WebAPI.NodeList.item(i)->Null.getOrThrow->imageFromElement
await image->WebAPI.HTMLImageElement.decode
}
}
diff --git a/apps/guide/app/GuideCompilerBridgeHook.res b/apps/guide/app/GuideCompilerBridgeHook.res
index 2b19d1a1b..b64874e6d 100644
--- a/apps/guide/app/GuideCompilerBridgeHook.res
+++ b/apps/guide/app/GuideCompilerBridgeHook.res
@@ -30,11 +30,15 @@ let useCompilerBridge = (
React.useEffect(() => {
switch compilerState {
| Ready({targetLang}) if code !== lastCompiledCode.current =>
- let timer = setTimeout(~handler=() => {
- lastCompiledCode.current = code
- compilerDispatch(CompileCode(targetLang, code))
- }, ~timeout=150)
- Some(() => clearTimeout(timer))
+ let timer = WebAPI.Window.setTimeout(
+ WebAPI.DOM.window,
+ ~handler=() => {
+ lastCompiledCode.current = code
+ compilerDispatch(CompileCode(targetLang, code))
+ },
+ ~timeout=150,
+ )
+ Some(() => WebAPI.Window.clearTimeout(WebAPI.DOM.window, timer))
| _ => None
}
}, (code, compilerState, compilerDispatch))
@@ -59,8 +63,8 @@ let useCompilerBridge = (
| _ => ()
}
}
- WebAPI.Window.addEventListener(window, Custom("message"), cb)
- Some(() => WebAPI.Window.removeEventListener(window, Custom("message"), cb))
+ WebAPI.Window.addEventListener(WebAPI.DOM.window, Custom("message"), cb)
+ Some(() => WebAPI.Window.removeEventListener(WebAPI.DOM.window, Custom("message"), cb))
}, [setOutput])
React.useEffect(() => {
@@ -102,14 +106,15 @@ let useCompilerBridge = (
imports->Dict.mapValues(path =>
path->GuideRuntimeImport.url(~bundleBaseUrl, ~compilerVersion=selected.id)
)
- let timer = setTimeout(
+ let timer = WebAPI.Window.setTimeout(
+ WebAPI.DOM.window,
~handler=() => EvalIFrame.sendOutput(runtimeCode, imports),
~timeout=50,
)
Some(
() => {
isWaitingForRuntimeOutput.current = false
- clearTimeout(timer)
+ WebAPI.Window.clearTimeout(WebAPI.DOM.window, timer)
},
)
| None => None
diff --git a/apps/guide/app/GuideCompilerData.res b/apps/guide/app/GuideCompilerData.res
index d4a32be91..ce7f3cdc5 100644
--- a/apps/guide/app/GuideCompilerData.res
+++ b/apps/guide/app/GuideCompilerData.res
@@ -5,12 +5,13 @@ type t = {
module Env = {
@scope(("process", "env")) external nodeEnv: string = "NODE_ENV"
+
@scope(("process", "env"))
external playgroundBundleEndpoint: option = "PLAYGROUND_BUNDLE_ENDPOINT"
}
let fetchVersions = async versionsBaseUrl => {
- let response = await fetch(versionsBaseUrl ++ "/playground-bundles/versions.json")
+ let response = await WebAPI.Fetch.fetch(versionsBaseUrl ++ "/playground-bundles/versions.json")
let json = await WebAPI.Response.json(response)
json
->JSON.Decode.array
diff --git a/apps/guide/app/GuideDom.res b/apps/guide/app/GuideDom.res
index 406bf1246..90f33b2f7 100644
--- a/apps/guide/app/GuideDom.res
+++ b/apps/guide/app/GuideDom.res
@@ -1,3 +1,3 @@
-external domElementToWebElement: Dom.element => WebAPI.DOMAPI.element = "%identity"
+external domElementToWebElement: Dom.element => WebAPI.Element.t = "%identity"
let toWebElement = domElementToWebElement
diff --git a/apps/guide/app/GuideHome.res b/apps/guide/app/GuideHome.res
index 1462ecde6..0906944aa 100644
--- a/apps/guide/app/GuideHome.res
+++ b/apps/guide/app/GuideHome.res
@@ -1,4 +1,5 @@
-let navigateToDocsIntro = url => window.location->WebAPI.Location.assign(url)
+let navigateToDocsIntro = url =>
+ WebAPI.DOM.window->WebAPI.Window.location->WebAPI.Location.assign(url)
@react.component
let make = (
@@ -39,7 +40,7 @@ let make = (
{React.string(lesson.title)}
-
// for the guide, so storage failures fall back to the current UI state.
let getLocalStorageItem = key => {
try {
- WebAPI.Storage.getItem(window.localStorage, key)->Null.toOption
+ WebAPI.Storage.getItem(WebAPI.DOM.window->WebAPI.Window.localStorage, key)->Null.toOption
} catch {
| JsExn(_) => None
}
@@ -115,7 +115,7 @@ let getLocalStorageItem = key => {
let setLocalStorageItem = (~key, ~value) => {
try {
- WebAPI.Storage.setItem(window.localStorage, ~key, ~value)
+ WebAPI.Storage.setItem(WebAPI.DOM.window->WebAPI.Window.localStorage, ~key, ~value)
} catch {
| JsExn(_) => ()
}
@@ -123,7 +123,7 @@ let setLocalStorageItem = (~key, ~value) => {
let removeLocalStorageItem = key => {
try {
- WebAPI.Storage.removeItem(window.localStorage, key)
+ WebAPI.Storage.removeItem(WebAPI.DOM.window->WebAPI.Window.localStorage, key)
} catch {
| JsExn(_) => ()
}
diff --git a/apps/guide/app/GuideLayoutHook.res b/apps/guide/app/GuideLayoutHook.res
index 211dad3cc..dfc5d137c 100644
--- a/apps/guide/app/GuideLayoutHook.res
+++ b/apps/guide/app/GuideLayoutHook.res
@@ -12,7 +12,9 @@ type t = {
}
let syncThemeColor = theme =>
- switch document->WebAPI.Document.querySelector(`meta[name="theme-color"]`) {
+ switch WebAPI.DOM.window
+ ->WebAPI.Window.document
+ ->WebAPI.Document.querySelector(`meta[name="theme-color"]`) {
| Value(element) =>
WebAPI.Element.setAttribute(
element,
@@ -34,8 +36,8 @@ let useLayout = (): t => {
setTheme(_ => GuideLayout.loadTheme())
setPaneSizes(_ =>
GuideLayout.loadPaneSizes()->GuideLayout.clampPaneSizes(
- ~viewportWidth=window.innerWidth->Int.toFloat,
- ~viewportHeight=window.innerHeight->Int.toFloat,
+ ~viewportWidth=WebAPI.DOM.window->WebAPI.Window.innerWidth->Int.toFloat,
+ ~viewportHeight=WebAPI.DOM.window->WebAPI.Window.innerHeight->Int.toFloat,
)
)
setThemeLoaded(_ => true)
@@ -83,24 +85,24 @@ let useLayout = (): t => {
switch dragTarget.current {
| ResizingColumns =>
let pointerX = event->ReactEvent.Mouse.clientX->Int.toFloat
- let viewportWidth = window.innerWidth->Int.toFloat
+ let viewportWidth = WebAPI.DOM.window->WebAPI.Window.innerWidth->Int.toFloat
let instructionsWidth = GuideLayout.clampInstructionsWidth(~viewportWidth, ~pointerX)
setPaneSizes(previous => {...previous, instructionsWidth: Some(instructionsWidth)})
| ResizingRows =>
let pointerY = event->ReactEvent.Mouse.clientY->Int.toFloat
- let viewportHeight = window.innerHeight->Int.toFloat
+ let viewportHeight = WebAPI.DOM.window->WebAPI.Window.innerHeight->Int.toFloat
let outputHeight = GuideLayout.clampOutputHeight(~viewportHeight, ~pointerY)
setPaneSizes(previous => {...previous, outputHeight})
| NotDragging => ()
}
- WebAPI.Window.addEventListener(window, Mousemove, onMouseMove)
- WebAPI.Window.addEventListener(window, Mouseup, stopDragging)
+ WebAPI.Window.addEventListener(WebAPI.DOM.window, Mousemove, onMouseMove)
+ WebAPI.Window.addEventListener(WebAPI.DOM.window, Mouseup, stopDragging)
Some(
() => {
- WebAPI.Window.removeEventListener(window, Mousemove, onMouseMove)
- WebAPI.Window.removeEventListener(window, Mouseup, stopDragging)
+ WebAPI.Window.removeEventListener(WebAPI.DOM.window, Mousemove, onMouseMove)
+ WebAPI.Window.removeEventListener(WebAPI.DOM.window, Mouseup, stopDragging)
},
)
}, [])
diff --git a/apps/guide/package.json b/apps/guide/package.json
index fd319ca9b..2303154af 100644
--- a/apps/guide/package.json
+++ b/apps/guide/package.json
@@ -21,8 +21,8 @@
"@react-router/node": "^8.3.1",
"@rescript-lang/playground": "workspace:*",
"@rescript-lang/shared": "workspace:*",
- "@rescript/react": "^0.14.2",
- "@rescript/webapi": "0.1.0-experimental-29db5f4",
+ "@rescript/react": "^0.16.0-beta.1",
+ "@rescript/webapi": "alpha",
"isbot": "^5",
"react": "^19.3.0",
"react-dom": "^19.3.0",
@@ -32,7 +32,7 @@
"remark-gfm": "^4.0.1",
"remark-parse": "^11.0.0",
"remark-stringify": "^11.0.0",
- "rescript": "^12.2.0",
+ "rescript": "^13.0.0-alpha.6",
"unified": "^11.0.5",
"vfile-matter": "^5.0.1"
},
diff --git a/apps/guide/rescript.json b/apps/guide/rescript.json
index 3c89889a8..5eb916b23 100644
--- a/apps/guide/rescript.json
+++ b/apps/guide/rescript.json
@@ -7,7 +7,6 @@
"@rescript/react",
"@rescript/webapi"
],
- "compiler-flags": ["-open WebAPI.Global"],
"sources": [
{
"dir": "__tests__",
diff --git a/apps/guide/vite.config.mjs b/apps/guide/vite.config.mjs
index a4e2a4a1d..63f3ccf2c 100644
--- a/apps/guide/vite.config.mjs
+++ b/apps/guide/vite.config.mjs
@@ -19,17 +19,16 @@ const sharedEditorDeps = [
"@codemirror/view",
"@lezer/highlight",
"@replit/codemirror-vim",
- "@rescript/runtime/lib/es6/Belt_Array.js",
- "@rescript/runtime/lib/es6/Primitive_int.js",
- "@rescript/runtime/lib/es6/Primitive_object.js",
- "@rescript/runtime/lib/es6/Primitive_option.js",
- "@rescript/runtime/lib/es6/Primitive_string.js",
- "@rescript/runtime/lib/es6/Stdlib_Array.js",
- "@rescript/runtime/lib/es6/Stdlib_Dict.js",
- "@rescript/runtime/lib/es6/Stdlib_Int.js",
- "@rescript/runtime/lib/es6/Stdlib_JsExn.js",
- "@rescript/runtime/lib/es6/Stdlib_List.js",
- "@rescript/runtime/lib/es6/Stdlib_Option.js",
+ "@rescript/runtime/lib/es6/Primitive_int.mjs",
+ "@rescript/runtime/lib/es6/Primitive_object.mjs",
+ "@rescript/runtime/lib/es6/Primitive_option.mjs",
+ "@rescript/runtime/lib/es6/Primitive_string.mjs",
+ "@rescript/runtime/lib/es6/Stdlib_Array.mjs",
+ "@rescript/runtime/lib/es6/Stdlib_Dict.mjs",
+ "@rescript/runtime/lib/es6/Stdlib_Int.mjs",
+ "@rescript/runtime/lib/es6/Stdlib_JsExn.mjs",
+ "@rescript/runtime/lib/es6/Stdlib_List.mjs",
+ "@rescript/runtime/lib/es6/Stdlib_Option.mjs",
"@tsnobip/rescript-lezer",
"lz-string",
"react-markdown",
diff --git a/package.json b/package.json
index 182786394..2b8c62d84 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
"devDependencies": {
"lefthook": "^2.1.4",
"oxfmt": "^0.46.0",
- "rescript": "^12.2.0"
+ "rescript": "^13.0.0-alpha.6"
},
"resolutions": {
"marked": "4.0.10",
diff --git a/packages/playground/package.json b/packages/playground/package.json
index e6cae5796..77b9bef8c 100644
--- a/packages/playground/package.json
+++ b/packages/playground/package.json
@@ -6,8 +6,8 @@
"dependencies": {
"@babel/parser": "^7.29.2",
"@rescript-lang/shared": "workspace:*",
- "@rescript/react": "^0.14.2",
- "@rescript/webapi": "0.1.0-experimental-29db5f4",
+ "@rescript/react": "^0.16.0-beta.1",
+ "@rescript/webapi": "alpha",
"lz-string": "^1.5.0",
"react": "^19.3.0",
"react-dom": "^19.3.0",
diff --git a/packages/playground/rescript.json b/packages/playground/rescript.json
index 997cde23e..d8fa7b14e 100644
--- a/packages/playground/rescript.json
+++ b/packages/playground/rescript.json
@@ -6,7 +6,6 @@
"@rescript/react",
"@rescript/webapi"
],
- "compiler-flags": ["-open WebAPI.Global"],
"sources": [
{
"dir": "src",
diff --git a/packages/playground/src/CompilerManagerHook.res b/packages/playground/src/CompilerManagerHook.res
index 1b3f35c53..82438f874 100644
--- a/packages/playground/src/CompilerManagerHook.res
+++ b/packages/playground/src/CompilerManagerHook.res
@@ -633,8 +633,13 @@ let useCompilerManager = (
setState(_ => Ready({...state, logs: [], validReactCode: entryPointExists}))
| SetupFailed(_) => ()
| Ready(ready) if syncUrl =>
- let url = createUrl((pathname :> string), ready)
- WebAPI.History.replaceState(history, ~data=JSON.Null, ~unused="", ~url)
+ let url = createUrl(pathname :> string, ready)
+ WebAPI.History.replaceState(
+ WebAPI.DOM.window->WebAPI.Window.history,
+ ~data=JSON.Null,
+ ~unused="",
+ ~url,
+ )
| Ready(_) => ()
}
}
diff --git a/packages/playground/src/ConsolePanel.res b/packages/playground/src/ConsolePanel.res
index 0c9bff4ed..174549768 100644
--- a/packages/playground/src/ConsolePanel.res
+++ b/packages/playground/src/ConsolePanel.res
@@ -3,6 +3,7 @@ type logLevel = [
| #warn
| #error
]
+
type log = {level: logLevel, content: array}
@react.component
@@ -17,8 +18,8 @@ let make = (~logs, ~appendLog) => {
| _ => ()
}
}
- WebAPI.Window.addEventListener(window, Custom("message"), cb)
- Some(() => WebAPI.Window.removeEventListener(window, Custom("message"), cb))
+ WebAPI.Window.addEventListener(WebAPI.DOM.window, Custom("message"), cb)
+ Some(() => WebAPI.Window.removeEventListener(WebAPI.DOM.window, Custom("message"), cb))
}, [appendLog])
shortMsg
+ {shortMsg}
@@ -48,7 +49,7 @@ let make = (~logs, ~appendLog) => {
})
->React.array
-
}
diff --git a/packages/playground/src/EvalIFrame.res b/packages/playground/src/EvalIFrame.res
index aaee8db3d..5de9a5e97 100644
--- a/packages/playground/src/EvalIFrame.res
+++ b/packages/playground/src/EvalIFrame.res
@@ -69,23 +69,24 @@ let srcDoc = `
`
-external asIFrame: WebAPI.DOMAPI.element => WebAPI.DOMAPI.htmliFrameElement = "%identity"
+external asIFrame: WebAPI.Element.t => WebAPI.HTMLIFrameElement.t = "%identity"
let sendOutput = (code, imports) => {
- let frame = document->WebAPI.Document.querySelector("#iframe-eval")
+ let frame =
+ WebAPI.DOM.window->WebAPI.Window.document->WebAPI.Document.querySelector("#iframe-eval")
switch frame {
| Value(element) if element.tagName == "IFRAME" =>
let element = element->asIFrame
switch element.contentWindow {
- | Value({window}) =>
+ | Value(frameWindow) =>
let message = JSON.Object(
dict{
"code": JSON.String(code),
"imports": JSON.Object(imports->Dict.mapValues(v => JSON.String(v))),
},
)
- window->WebAPI.Window.postMessage(~message, ~targetOrigin="*")
+ frameWindow->WebAPI.Window.postMessage(~message, ~targetOrigin="*")
| Null => Console.error("contentWindow not found")
}
| Value(_) | Null => Console.error("iframe not found")
diff --git a/packages/playground/src/Playground.res b/packages/playground/src/Playground.res
index 8897b0047..ee1fec30d 100644
--- a/packages/playground/src/Playground.res
+++ b/packages/playground/src/Playground.res
@@ -47,7 +47,7 @@ let dropdownLabelReleased = "--- Released ---"
let getLocalStorageItem = key => {
try {
- WebAPI.Storage.getItem(window.localStorage, key)->Null.toOption
+ WebAPI.Storage.getItem(WebAPI.DOM.window->WebAPI.Window.localStorage, key)->Null.toOption
} catch {
| JsExn(_) => None
}
@@ -55,7 +55,7 @@ let getLocalStorageItem = key => {
let setLocalStorageItem = (~key, ~value) => {
try {
- WebAPI.Storage.setItem(window.localStorage, ~key, ~value)
+ WebAPI.Storage.setItem(WebAPI.DOM.window->WebAPI.Window.localStorage, ~key, ~value)
} catch {
| JsExn(_) => ()
}
@@ -63,7 +63,7 @@ let setLocalStorageItem = (~key, ~value) => {
let getSessionStorageItem = key => {
try {
- WebAPI.Storage.getItem(window.sessionStorage, key)->Null.toOption
+ WebAPI.Storage.getItem(WebAPI.DOM.window->WebAPI.Window.sessionStorage, key)->Null.toOption
} catch {
| JsExn(_) => None
}
@@ -71,7 +71,7 @@ let getSessionStorageItem = key => {
let setSessionStorageItem = (~key, ~value) => {
try {
- WebAPI.Storage.setItem(window.sessionStorage, ~key, ~value)
+ WebAPI.Storage.setItem(WebAPI.DOM.window->WebAPI.Window.sessionStorage, ~key, ~value)
} catch {
| JsExn(_) => ()
}
@@ -107,7 +107,7 @@ module DropdownSelect = {
disabled
onChange
>
- children
+ {children}
}
}
@@ -174,9 +174,11 @@ module ResultPane = {
module PreWrap = {
@react.component
let make = (~className="", ~children) =>
- content
+ {content}
}}
children+
{children}
}
+
type prefix = [#W | #E]
+
let compactErrorLine = (~highlight=false, ~prefix: prefix, locMsg: Api.LocMsg.t) => {
let {Api.LocMsg.row: row, column, shortMsg} = locMsg
let prefixColor = switch prefix {
@@ -201,7 +203,7 @@ module ResultPane = {
{React.string(` Line ${row->Int.toString}, column ${column->Int.toString}:`)}
-
- elements
+ {elements}
)->Option.getOr(React.null)
@@ -897,7 +898,7 @@ module WarningFlagsWidget = {
- chips
+ {chips}
- deleteButton
+ {deleteButton}
- children
+ {children}
}
}
@@ -1434,7 +1435,7 @@ module OutputPanel = {
let body = Array.mapWithIndex(tabs, ((tab, content), i) => {
let className = currentTab == tab ? "block h-inherit" : "hidden"
- content
+ {content}
})
<> {body->React.array}
@@ -1612,48 +1613,43 @@ let make = (~bundleBaseUrl: string, ~versions: array
- {"Problems"->React.string}
- {if problemCounts["errors"] > 0 {
-
- {problemCounts["errors"]->React.int}
-
- } else {
- React.null
- }}
- {if problemCounts["warnings"] > 0 {
-
- {problemCounts["warnings"]->React.int}
-
- } else {
- React.null
- }}
-
+ | SetupFailed(_) | Init => {
+ "warnings": 0,
+ "errors": 0,
+ }
}
+
+ {"Problems"->React.string}
+ {if problemCounts["errors"] > 0 {
+
+ {problemCounts["errors"]->React.int}
+
+ } else {
+ React.null
+ }}
+ {if problemCounts["warnings"] > 0 {
+
+ {problemCounts["warnings"]->React.int}
+
+ } else {
+ React.null
+ }}
+
+
| Settings => "Settings"->React.string
}
@@ -2121,7 +2120,7 @@ let make = (~bundleBaseUrl: string, ~versions: array) => {
>
- // Separator
+
+ /* Separator */
) => {
{React.string("⣿")}
- // Right Panel
+
+ /* Right Panel */
{
let copy = async () => {
setState(_ => Pending)
- let result = await writeClipboard(window.location.href)
+ let result = await writeClipboard((WebAPI.DOM.window->WebAPI.Window.location).href)
setState(_ =>
switch result {
| Ok() => CopySuccess
diff --git a/packages/shared/package.json b/packages/shared/package.json
index 02291215e..cb536e563 100644
--- a/packages/shared/package.json
+++ b/packages/shared/package.json
@@ -17,8 +17,8 @@
"@codemirror/view": "^6.41.0",
"@lezer/highlight": "^1.2.3",
"@replit/codemirror-vim": "^6.3.0",
- "@rescript/react": "^0.14.2",
- "@rescript/webapi": "0.1.0-experimental-29db5f4",
+ "@rescript/react": "^0.16.0-beta.1",
+ "@rescript/webapi": "alpha",
"@tsnobip/rescript-lezer": "^0.9.0",
"highlight.js": "^11.11.1",
"react": "^19.3.0",
diff --git a/packages/shared/rescript.json b/packages/shared/rescript.json
index 40328e643..a6e880174 100644
--- a/packages/shared/rescript.json
+++ b/packages/shared/rescript.json
@@ -2,7 +2,6 @@
"name": "@rescript-lang/shared",
"namespace": false,
"dependencies": ["@rescript/react", "@rescript/webapi"],
- "compiler-flags": ["-open WebAPI.Global"],
"sources": [
{
"dir": "src",
diff --git a/packages/shared/src/Clipboard.res b/packages/shared/src/Clipboard.res
index af4355463..adf1ecfba 100644
--- a/packages/shared/src/Clipboard.res
+++ b/packages/shared/src/Clipboard.res
@@ -1,21 +1,20 @@
type error = WriteFailed
@send
-external createTextArea: (
- WebAPI.DOMAPI.document,
- @as("textarea") _,
-) => WebAPI.DOMAPI.htmlTextAreaElement = "createElement"
+external createTextArea: (WebAPI.DOM.document, @as("textarea") _) => WebAPI.HTMLTextAreaElement.t =
+ "createElement"
+
+@send external copySelection: (WebAPI.DOM.document, @as("copy") _) => bool = "execCommand"
+@send external focusElement: WebAPI.Element.t => unit = "focus"
-@send external copySelection: (WebAPI.DOMAPI.document, @as("copy") _) => bool = "execCommand"
-@send external focusElement: WebAPI.DOMAPI.element => unit = "focus"
@send
-external getSelection: WebAPI.DOMAPI.document => Null.t = "getSelection"
+external getSelection: WebAPI.DOM.document => Null.t = "getSelection"
let writeWithSelection = text => {
try {
- let textarea = createTextArea(document)
- let activeElement = document.activeElement
- let selection = getSelection(document)->Null.toOption
+ let textarea = createTextArea(WebAPI.DOM.window->WebAPI.Window.document)
+ let activeElement = WebAPI.DOM.window->WebAPI.Window.document->WebDocument.activeElement
+ let selection = getSelection(WebAPI.DOM.window->WebAPI.Window.document)->Null.toOption
let ranges =
selection->Option.mapOr([], selection =>
Array.fromInitializer(~length=selection.rangeCount, index =>
@@ -30,11 +29,13 @@ let writeWithSelection = text => {
~qualifiedName="style",
~value="position: fixed; left: -9999px; top: 0",
)
- document.body
+ WebAPI.DOM.window
+ ->WebAPI.Window.document
+ ->WebDocument.body
->WebAPI.HTMLElement.appendChild(textarea->WebAPI.HTMLTextAreaElement.asNode)
->ignore
textarea->WebAPI.HTMLTextAreaElement.select
- copySelection(document)
+ copySelection(WebAPI.DOM.window->WebAPI.Window.document)
} catch {
| _ => false
}
@@ -54,7 +55,10 @@ let writeWithSelection = text => {
let writeText = async text => {
try {
- await navigator.clipboard->WebAPI.Clipboard.writeText(text)
+ await WebAPI.DOM.window
+ ->WebAPI.Window.navigator
+ ->WebAPI.Navigator.clipboard
+ ->WebAPI.Clipboard.writeText(text)
Ok()
} catch {
| _ => writeWithSelection(text)
diff --git a/packages/shared/src/CodeMirror.res b/packages/shared/src/CodeMirror.res
index 77357b388..2fca1e362 100644
--- a/packages/shared/src/CodeMirror.res
+++ b/packages/shared/src/CodeMirror.res
@@ -12,6 +12,7 @@
module KeyMap = {
type t = Default | Vim
+
let toString = (keyMap: t) =>
switch keyMap {
| Default => "default"
@@ -43,6 +44,7 @@ module Theme = {
module Side = {
@@warning("-37")
+
type t =
| @as(-1) BeforePointer
| @as(1) AfterPointer
@@ -67,6 +69,7 @@ module HoverHint = {
line: int,
col: int,
}
+
let compareLineCol = (pos1, pos2) => {
if pos1.line < pos2.line {
Ordering.less
@@ -81,6 +84,7 @@ module HoverHint = {
Ordering.equal
}
}
+
// let \"<" = (pos1, pos2) => compareLineCol(pos1, pos2) === Ordering.less
let \"<=" = (pos1, pos2) => compareLineCol(pos1, pos2) !== Ordering.greater
// let \">" = (pos1, pos2) => compareLineCol(pos1, pos2) === Ordering.greater
@@ -130,8 +134,10 @@ module CM6 = {
module EditorSelection = {
type t
type range
+
@module("@codemirror/state") @scope("EditorSelection") @val
external single: (int, int) => t = "single"
+
@get external main: t => range = "main"
@get external anchor: range => int = "anchor"
@get external head: range => int = "head"
@@ -142,18 +148,21 @@ module CM6 = {
@module("@codemirror/state") @scope("EditorState")
external create: createConfig => editorState = "create"
+
@get external selection: editorState => EditorSelection.t = "selection"
module ReadOnly = {
@module("@codemirror/state") @scope(("EditorState", "readOnly")) @val
external of_: bool => extension = "of"
}
+
@get external doc: editorState => Text.t = "doc"
}
module Compartment = {
@module("@codemirror/state") @new
external create: unit => compartment = "Compartment"
+
@send external make: (compartment, extension) => extension = "of"
@send external reconfigure: (compartment, extension) => effect = "reconfigure"
}
@@ -161,8 +170,9 @@ module CM6 = {
module EditorView = {
module Tooltip = {
module View = {
- type t = {dom: WebAPI.DOMAPI.element, offset?: {x: int, y: int}}
+ type t = {dom: WebAPI.Element.t, offset?: {x: int, y: int}}
}
+
type t = {
pos: int,
end?: int,
@@ -174,26 +184,30 @@ module CM6 = {
}
}
- type createConfig = {state: editorState, parent: WebAPI.DOMAPI.element}
+ type createConfig = {state: editorState, parent: WebAPI.Element.t}
+
@module("@codemirror/view") @new
external create: createConfig => editorView = "EditorView"
@send external destroy: editorView => unit = "destroy"
@get external state: editorView => editorState = "state"
- @get external dom: editorView => WebAPI.DOMAPI.htmlElement = "dom"
+ @get external dom: editorView => WebAPI.HTMLElement.t = "dom"
type change = {from: int, to: int, insert: string}
type dispatchArg = {changes: change, selection?: EditorSelection.t}
+
@send
external dispatch: (editorView, dispatchArg) => unit = "dispatch"
type dispatchEffectsArg = {effects: effect}
+
@send
external dispatchEffects: (editorView, dispatchEffectsArg) => unit = "dispatch"
module ThemeOptions = {
type t = {dark?: bool}
}
+
@module("@codemirror/view") @scope("EditorView") @val
external theme: (dict>, ~options: ThemeOptions.t=?) => extension = "theme"
@@ -218,6 +232,7 @@ module CM6 = {
module HoverTooltipOptions = {
type t = {hoverTime?: int, hideOnChange?: bool}
}
+
@module("@codemirror/view")
external hoverTooltip: (
(editorView, int, Side.t) => null,
@@ -256,177 +271,263 @@ module CM6 = {
module Language = {
module HighlightStyle = {
type tag
+
module Tags = {
@@warning("-32") // Suppress "unused external" warnings
+
@module("@lezer/highlight") @scope("tags")
external comment: tag = "comment"
+
@module("@lezer/highlight") @scope("tags")
external lineComment: tag = "lineComment"
+
@module("@lezer/highlight") @scope("tags")
external blockComment: tag = "blockComment"
+
@module("@lezer/highlight") @scope("tags")
external docComment: tag = "docComment"
+
@module("@lezer/highlight") @scope("tags")
external name: tag = "name"
+
@module("@lezer/highlight") @scope("tags")
external variableName: tag = "variableName"
+
@module("@lezer/highlight") @scope("tags")
external typeName: tag = "typeName"
+
@module("@lezer/highlight") @scope("tags")
external tagName: tag = "tagName"
+
@module("@lezer/highlight") @scope("tags")
external propertyName: tag = "propertyName"
+
@module("@lezer/highlight") @scope("tags")
external attributeName: tag = "attributeName"
+
@module("@lezer/highlight") @scope("tags")
external className: tag = "className"
+
@module("@lezer/highlight") @scope("tags")
external labelName: tag = "labelName"
+
@module("@lezer/highlight") @scope("tags")
external namespace: tag = "namespace"
+
@module("@lezer/highlight") @scope("tags")
external macroName: tag = "macroName"
+
@module("@lezer/highlight") @scope("tags")
external literal: tag = "literal"
+
@module("@lezer/highlight") @scope("tags")
external string: tag = "string"
+
@module("@lezer/highlight") @scope("tags")
external docString: tag = "docString"
+
@module("@lezer/highlight") @scope("tags")
external character: tag = "character"
+
@module("@lezer/highlight") @scope("tags")
external attributeValue: tag = "attributeValue"
+
@module("@lezer/highlight") @scope("tags")
external number: tag = "number"
+
@module("@lezer/highlight") @scope("tags")
external integer: tag = "integer"
+
@module("@lezer/highlight") @scope("tags")
external float: tag = "float"
+
@module("@lezer/highlight") @scope("tags")
external bool: tag = "bool"
+
@module("@lezer/highlight") @scope("tags")
external regexp: tag = "regexp"
+
@module("@lezer/highlight") @scope("tags")
external escape: tag = "escape"
+
@module("@lezer/highlight") @scope("tags")
external color: tag = "color"
+
@module("@lezer/highlight") @scope("tags")
external url: tag = "url"
+
@module("@lezer/highlight") @scope("tags")
external keyword: tag = "keyword"
+
@module("@lezer/highlight") @scope("tags")
external self: tag = "self"
+
@module("@lezer/highlight") @scope("tags")
external null: tag = "null"
+
@module("@lezer/highlight") @scope("tags")
external atom: tag = "atom"
+
@module("@lezer/highlight") @scope("tags")
external unit: tag = "unit"
+
@module("@lezer/highlight") @scope("tags")
external modifier: tag = "modifier"
+
@module("@lezer/highlight") @scope("tags")
external operatorKeyword: tag = "operatorKeyword"
+
@module("@lezer/highlight") @scope("tags")
external controlKeyword: tag = "controlKeyword"
+
@module("@lezer/highlight") @scope("tags")
external definitionKeyword: tag = "definitionKeyword"
+
@module("@lezer/highlight") @scope("tags")
external moduleKeyword: tag = "moduleKeyword"
+
@module("@lezer/highlight") @scope("tags")
external operator: tag = "operator"
+
@module("@lezer/highlight") @scope("tags")
external derefOperator: tag = "derefOperator"
+
@module("@lezer/highlight") @scope("tags")
external arithmeticOperator: tag = "arithmeticOperator"
+
@module("@lezer/highlight") @scope("tags")
external logicOperator: tag = "logicOperator"
+
@module("@lezer/highlight") @scope("tags")
external bitwiseOperator: tag = "bitwiseOperator"
+
@module("@lezer/highlight") @scope("tags")
external compareOperator: tag = "compareOperator"
+
@module("@lezer/highlight") @scope("tags")
external updateOperator: tag = "updateOperator"
+
@module("@lezer/highlight") @scope("tags")
external definitionOperator: tag = "definitionOperator"
+
@module("@lezer/highlight") @scope("tags")
external typeOperator: tag = "typeOperator"
+
@module("@lezer/highlight") @scope("tags")
external controlOperator: tag = "controlOperator"
+
@module("@lezer/highlight") @scope("tags")
external punctuation: tag = "punctuation"
+
@module("@lezer/highlight") @scope("tags")
external separator: tag = "separator"
+
@module("@lezer/highlight") @scope("tags")
external bracket: tag = "bracket"
+
@module("@lezer/highlight") @scope("tags")
external angleBracket: tag = "angleBracket"
+
@module("@lezer/highlight") @scope("tags")
external squareBracket: tag = "squareBracket"
+
@module("@lezer/highlight") @scope("tags")
external paren: tag = "paren"
+
@module("@lezer/highlight") @scope("tags")
external brace: tag = "brace"
+
@module("@lezer/highlight") @scope("tags")
external content: tag = "content"
+
@module("@lezer/highlight") @scope("tags")
external heading: tag = "heading"
+
@module("@lezer/highlight") @scope("tags")
external heading1: tag = "heading1"
+
@module("@lezer/highlight") @scope("tags")
external heading2: tag = "heading2"
+
@module("@lezer/highlight") @scope("tags")
external heading3: tag = "heading3"
+
@module("@lezer/highlight") @scope("tags")
external heading4: tag = "heading4"
+
@module("@lezer/highlight") @scope("tags")
external heading5: tag = "heading5"
+
@module("@lezer/highlight") @scope("tags")
external heading6: tag = "heading6"
+
@module("@lezer/highlight") @scope("tags")
external contentSeparator: tag = "contentSeparator"
+
@module("@lezer/highlight") @scope("tags")
external list: tag = "list"
+
@module("@lezer/highlight") @scope("tags")
external quote: tag = "quote"
+
@module("@lezer/highlight") @scope("tags")
external emphasis: tag = "emphasis"
+
@module("@lezer/highlight") @scope("tags")
external strong: tag = "strong"
+
@module("@lezer/highlight") @scope("tags")
external link: tag = "link"
+
@module("@lezer/highlight") @scope("tags")
external monospace: tag = "monospace"
+
@module("@lezer/highlight") @scope("tags")
external strikethrough: tag = "strikethrough"
+
@module("@lezer/highlight") @scope("tags")
external inserted: tag = "inserted"
+
@module("@lezer/highlight") @scope("tags")
external deleted: tag = "deleted"
+
@module("@lezer/highlight") @scope("tags")
external changed: tag = "changed"
+
@module("@lezer/highlight") @scope("tags")
external invalid: tag = "invalid"
+
@module("@lezer/highlight") @scope("tags")
external meta: tag = "meta"
+
@module("@lezer/highlight") @scope("tags")
external documentMeta: tag = "documentMeta"
+
@module("@lezer/highlight") @scope("tags")
external annotation: tag = "annotation"
+
@module("@lezer/highlight") @scope("tags")
external processingInstruction: tag = "processingInstruction"
+
@module("@lezer/highlight") @scope("tags")
external definition: tag => tag = "definition"
+
@module("@lezer/highlight") @scope("tags")
external constant: tag => tag = "constant"
+
@module("@lezer/highlight") @scope("tags")
external function: tag => tag = "function"
+
@module("@lezer/highlight") @scope("tags")
external standard: tag => tag = "standard"
+
@module("@lezer/highlight") @scope("tags")
external local: tag => tag = "local"
+
@module("@lezer/highlight") @scope("tags")
external special: tag => tag = "special"
}
+
module TagStyle = {
type t = {
tag: array,
@@ -437,7 +538,9 @@ module CM6 = {
textDecoration?: string,
}
}
+
type t
+
@scope("HighlightStyle") @module("@codemirror/language")
external define: array => t = "define"
@@ -493,6 +596,7 @@ module CM6 = {
}
type t
+
@module("@codemirror/language")
external bracketMatching: unit => extension = "bracketMatching"
@@ -517,6 +621,7 @@ module CM6 = {
parser: LRParser.t,
languageData?: 'a. {..} as 'a,
}
+
@scope("LRLanguage") @module("@codemirror/language")
external define: spec => t = "define"
}
@@ -577,7 +682,7 @@ type editorInstance = {
}
type editorConfig = {
- parent: WebAPI.DOMAPI.element,
+ parent: WebAPI.Element.t,
initialValue: string,
mode: string,
readOnly: bool,
@@ -661,7 +766,7 @@ let createHoverHintExtension = (hoverHints: array) => {
| Some({hint, start, end}) =>
let pos = CM6.Text.line(doc, start.line).from + start.col
let end = CM6.Text.line(doc, end.line).from + end.col
- let dom = WebAPI.Global.document->WebAPI.Document.createElement("div")
+ let dom = WebAPI.DOM.window->WebAPI.Window.document->WebAPI.Document.createElement("div")
dom.textContent = Value(hint)
dom.className = "p-1 border"
Value({
diff --git a/packages/shared/src/CodeMirror.resi b/packages/shared/src/CodeMirror.resi
index 6c55487f0..ee089a2b5 100644
--- a/packages/shared/src/CodeMirror.resi
+++ b/packages/shared/src/CodeMirror.resi
@@ -41,7 +41,7 @@ module HoverHint: {
type editorInstance
type editorConfig = {
- parent: WebAPI.DOMAPI.element,
+ parent: WebAPI.Element.t,
initialValue: string,
mode: string,
readOnly: bool,
diff --git a/packages/shared/src/HtmlRef.res b/packages/shared/src/HtmlRef.res
index d2d2bfbcc..17c4c5b7f 100644
--- a/packages/shared/src/HtmlRef.res
+++ b/packages/shared/src/HtmlRef.res
@@ -1,5 +1,5 @@
/** For refs attached to HTML tags; bridge React's DOM type to WebAPI's HTML type. */
-external fromDom: Dom.element => WebAPI.DOMAPI.htmlElement = "%identity"
+external fromDom: Dom.element => WebAPI.HTMLElement.t = "%identity"
let domRef = ref =>
ReactDOM.Ref.callbackDomRef(element => {
diff --git a/packages/shared/src/ReactRouter.res b/packages/shared/src/ReactRouter.res
index 2edf81b73..409726608 100644
--- a/packages/shared/src/ReactRouter.res
+++ b/packages/shared/src/ReactRouter.res
@@ -6,7 +6,7 @@ type navigate = (string, ~options: navigateOptions=?) => unit
external useNavigate: unit => navigate = "useNavigate"
@module("react-router")
-external useSearchParams: unit => (WebAPI.URLAPI.urlSearchParams, {..} => unit) = "useSearchParams"
+external useSearchParams: unit => (WebAPI.URLSearchParams.t, {..} => unit) = "useSearchParams"
@module("react-router")
external useLoaderData: unit => 'a = "useLoaderData"
@@ -15,7 +15,7 @@ external useLoaderData: unit => 'a = "useLoaderData"
type path = {pathname: Path.t, search?: string, hash?: string}
module Loader = {
- type loaderArgs = {request: WebAPI.FetchAPI.request}
+ type loaderArgs = {request: WebAPI.Request.t}
type t<'a> = loaderArgs => promise<'a>
}
diff --git a/packages/shared/src/WebDocument.res b/packages/shared/src/WebDocument.res
new file mode 100644
index 000000000..41b5227c7
--- /dev/null
+++ b/packages/shared/src/WebDocument.res
@@ -0,0 +1,2 @@
+@get external activeElement: WebAPI.DOM.document => Null.t = "activeElement"
+@get external body: WebAPI.DOM.document => WebAPI.HTMLElement.t = "body"
diff --git a/yarn.lock b/yarn.lock
index a0558cc2c..374b14b69 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1815,8 +1815,8 @@ __metadata:
"@react-router/node": "npm:^8.3.1"
"@rescript-lang/playground": "workspace:*"
"@rescript-lang/shared": "workspace:*"
- "@rescript/react": "npm:^0.14.2"
- "@rescript/webapi": "npm:0.1.0-experimental-29db5f4"
+ "@rescript/react": "npm:^0.16.0-beta.1"
+ "@rescript/webapi": "npm:alpha"
"@responsive-image/core": "npm:2.1.0"
"@responsive-image/vite-plugin": "npm:3.0.1"
"@rolldown/plugin-babel": "npm:^0.2.4"
@@ -1851,7 +1851,7 @@ __metadata:
remark-frontmatter: "npm:^5.0.0"
remark-gfm: "npm:^4.0.1"
remark-validate-links: "npm:^13.1.0"
- rescript: "npm:^12.2.0"
+ rescript: "npm:^13.0.0-alpha.6"
rolldown: "npm:1.2.8"
search-insights: "npm:^2.17.3"
tailwindcss: "npm:^4"
@@ -1881,8 +1881,8 @@ __metadata:
"@react-router/node": "npm:^8.3.1"
"@rescript-lang/playground": "workspace:*"
"@rescript-lang/shared": "workspace:*"
- "@rescript/react": "npm:^0.14.2"
- "@rescript/webapi": "npm:0.1.0-experimental-29db5f4"
+ "@rescript/react": "npm:^0.16.0-beta.1"
+ "@rescript/webapi": "npm:alpha"
"@types/react": "npm:^19.2.14"
"@vitejs/plugin-react": "npm:^6.0.1"
"@vitest/browser-playwright": "npm:^5.0.0"
@@ -1897,7 +1897,7 @@ __metadata:
remark-gfm: "npm:^4.0.1"
remark-parse: "npm:^11.0.0"
remark-stringify: "npm:^11.0.0"
- rescript: "npm:^12.2.0"
+ rescript: "npm:^13.0.0-alpha.6"
unified: "npm:^11.0.5"
vfile-matter: "npm:^5.0.1"
vite: "npm:^8.3.0"
@@ -1914,8 +1914,8 @@ __metadata:
dependencies:
"@babel/parser": "npm:^7.29.2"
"@rescript-lang/shared": "workspace:*"
- "@rescript/react": "npm:^0.14.2"
- "@rescript/webapi": "npm:0.1.0-experimental-29db5f4"
+ "@rescript/react": "npm:^0.16.0-beta.1"
+ "@rescript/webapi": "npm:alpha"
lz-string: "npm:^1.5.0"
react: "npm:^19.3.0"
react-dom: "npm:^19.3.0"
@@ -1940,8 +1940,8 @@ __metadata:
"@codemirror/view": "npm:^6.41.0"
"@lezer/highlight": "npm:^1.2.3"
"@replit/codemirror-vim": "npm:^6.3.0"
- "@rescript/react": "npm:^0.14.2"
- "@rescript/webapi": "npm:0.1.0-experimental-29db5f4"
+ "@rescript/react": "npm:^0.16.0-beta.1"
+ "@rescript/webapi": "npm:alpha"
"@tsnobip/rescript-lezer": "npm:^0.9.0"
highlight.js: "npm:^11.11.1"
react: "npm:^19.3.0"
@@ -1957,63 +1957,64 @@ __metadata:
languageName: unknown
linkType: soft
-"@rescript/darwin-arm64@npm:12.2.0":
- version: 12.2.0
- resolution: "@rescript/darwin-arm64@npm:12.2.0"
+"@rescript/darwin-arm64@npm:13.0.0-alpha.6":
+ version: 13.0.0-alpha.6
+ resolution: "@rescript/darwin-arm64@npm:13.0.0-alpha.6"
conditions: os=darwin & cpu=arm64
languageName: node
linkType: hard
-"@rescript/darwin-x64@npm:12.2.0":
- version: 12.2.0
- resolution: "@rescript/darwin-x64@npm:12.2.0"
+"@rescript/darwin-x64@npm:13.0.0-alpha.6":
+ version: 13.0.0-alpha.6
+ resolution: "@rescript/darwin-x64@npm:13.0.0-alpha.6"
conditions: os=darwin & cpu=x64
languageName: node
linkType: hard
-"@rescript/linux-arm64@npm:12.2.0":
- version: 12.2.0
- resolution: "@rescript/linux-arm64@npm:12.2.0"
+"@rescript/linux-arm64@npm:13.0.0-alpha.6":
+ version: 13.0.0-alpha.6
+ resolution: "@rescript/linux-arm64@npm:13.0.0-alpha.6"
conditions: os=linux & cpu=arm64
languageName: node
linkType: hard
-"@rescript/linux-x64@npm:12.2.0":
- version: 12.2.0
- resolution: "@rescript/linux-x64@npm:12.2.0"
+"@rescript/linux-x64@npm:13.0.0-alpha.6":
+ version: 13.0.0-alpha.6
+ resolution: "@rescript/linux-x64@npm:13.0.0-alpha.6"
conditions: os=linux & cpu=x64
languageName: node
linkType: hard
-"@rescript/react@npm:^0.14.2":
- version: 0.14.2
- resolution: "@rescript/react@npm:0.14.2"
+"@rescript/react@npm:^0.16.0-beta.1":
+ version: 0.16.0-beta.1
+ resolution: "@rescript/react@npm:0.16.0-beta.1"
peerDependencies:
- react: ">=19.1.0"
- react-dom: ">=19.1.0"
- checksum: 10c0/6fbc0614ac4e4e5ad37abe474dcc137dc8cb7c3351dbc9afa4de92f080614e78809278a034c52da1676e89c299ab07154760d8b80f68f0a5cfd284e22035f713
+ "@rescript/runtime": ">=13.0.0-alpha.5"
+ react: ">=19.2.0"
+ react-dom: ">=19.2.0"
+ checksum: 10c0/bcf008bfb91d07a15dbec273de633104c56147c56e84c8deebb14a2f6cc95eea8a0ff90c19be6ce272f0e768e0f1f6122386e8ac348beb04bffff84ee49d4ec4
languageName: node
linkType: hard
-"@rescript/runtime@npm:12.2.0":
- version: 12.2.0
- resolution: "@rescript/runtime@npm:12.2.0"
- checksum: 10c0/59c0194ae52fbbaadc736bbf1cfac1ed6ffde92b2346e36b9f1a29bb136e38b7ef203c780647203912fa657d293eab5c4e208f04dd65ed4bf47d53843980f7e1
+"@rescript/runtime@npm:13.0.0-alpha.6":
+ version: 13.0.0-alpha.6
+ resolution: "@rescript/runtime@npm:13.0.0-alpha.6"
+ checksum: 10c0/8d351bc3ff8e47c7ff9af871da90982aab056955d9990e38618285aa2eb0ecf6ec5094e07e63f1457957d6f273f1167ecfe67439547d5bcfeb547c2b0489129f
languageName: node
linkType: hard
-"@rescript/webapi@npm:0.1.0-experimental-29db5f4":
- version: 0.1.0-experimental-29db5f4
- resolution: "@rescript/webapi@npm:0.1.0-experimental-29db5f4"
- dependencies:
- rescript: "npm:^12.0.0-beta.3"
- checksum: 10c0/0ef8538fe59b2c058217dd17a5e653ac4902a87caad3b78bde2efc8099538c33e8c1fc7cef41595fd385a78de2ca172c60bdd36a100839f8983da7a40ebd9560
+"@rescript/webapi@npm:alpha":
+ version: 0.1.0-alpha-b1d58f9
+ resolution: "@rescript/webapi@npm:0.1.0-alpha-b1d58f9"
+ peerDependencies:
+ rescript: ">=13"
+ checksum: 10c0/4d242fd3deabf511552f936fe2a5dfa141da7932a644e96528e65c7d32f3bfa29ae4e0e548c5912995d0467312aa1c89b00267fc05b1c80ad373d13d3cd7945c
languageName: node
linkType: hard
-"@rescript/win32-x64@npm:12.2.0":
- version: 12.2.0
- resolution: "@rescript/win32-x64@npm:12.2.0"
+"@rescript/win32-x64@npm:13.0.0-alpha.6":
+ version: 13.0.0-alpha.6
+ resolution: "@rescript/win32-x64@npm:13.0.0-alpha.6"
conditions: os=win32 & cpu=x64
languageName: node
linkType: hard
@@ -9121,20 +9122,20 @@ __metadata:
dependencies:
lefthook: "npm:^2.1.4"
oxfmt: "npm:^0.46.0"
- rescript: "npm:^12.2.0"
+ rescript: "npm:^13.0.0-alpha.6"
languageName: unknown
linkType: soft
-"rescript@npm:^12.0.0-beta.3, rescript@npm:^12.2.0":
- version: 12.2.0
- resolution: "rescript@npm:12.2.0"
+"rescript@npm:^13.0.0-alpha.6":
+ version: 13.0.0-alpha.6
+ resolution: "rescript@npm:13.0.0-alpha.6"
dependencies:
- "@rescript/darwin-arm64": "npm:12.2.0"
- "@rescript/darwin-x64": "npm:12.2.0"
- "@rescript/linux-arm64": "npm:12.2.0"
- "@rescript/linux-x64": "npm:12.2.0"
- "@rescript/runtime": "npm:12.2.0"
- "@rescript/win32-x64": "npm:12.2.0"
+ "@rescript/darwin-arm64": "npm:13.0.0-alpha.6"
+ "@rescript/darwin-x64": "npm:13.0.0-alpha.6"
+ "@rescript/linux-arm64": "npm:13.0.0-alpha.6"
+ "@rescript/linux-x64": "npm:13.0.0-alpha.6"
+ "@rescript/runtime": "npm:13.0.0-alpha.6"
+ "@rescript/win32-x64": "npm:13.0.0-alpha.6"
dependenciesMeta:
"@rescript/darwin-arm64":
optional: true
@@ -9148,11 +9149,9 @@ __metadata:
optional: true
bin:
bsc: cli/bsc.js
- bstracing: cli/bstracing.js
rescript: cli/rescript.js
- rescript-legacy: cli/rescript-legacy.js
rescript-tools: cli/rescript-tools.js
- checksum: 10c0/7650a77a66e2f2ba2523eac54fd930f0b70bad922e9b498678e701e842a56c7b6facd0daf1ef9c7b71d344d9483a0293d17db72a67515a22d07856bdfc34fb46
+ checksum: 10c0/8b4a7430444a4db28e2e480b6750f700ceca0d899d3262248c682314e372cb33fb9030962e0628c93bd6dfc6ea07f03143423aa48f2d478c22152496ee211adf
languageName: node
linkType: hard