diff --git a/next.config.mjs b/next.config.mjs index 2a277a35f..48a6a0287 100644 --- a/next.config.mjs +++ b/next.config.mjs @@ -17,7 +17,7 @@ const bsconfig = JSON.parse( const { ProvidePlugin } = webpack; -const transpileModules = ["rescript"].concat(bsconfig["bs-dependencies"]); +const transpileModules = ["rescript"].concat(bsconfig["dependencies"]); /** @type {import("next").NextConfig} */ const config = { diff --git a/package-lock.json b/package-lock.json index 6b4d96163..2a8a6bd19 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,13 +16,12 @@ "@headlessui/react": "^2.2.4", "@mdx-js/loader": "^3.1.0", "@rescript/react": "^0.14.0-rc.1", - "@rescript/webapi": "^0.1.0-experimental-03eae8b", + "@rescript/webapi": "^0.1.0-experimental-0b87498", "codemirror": "^5.54.0", "docson": "^2.1.0", "escodegen": "^2.1.0", "eslint-config-next": "^13.1.1", "fuse.js": "^6.4.3", - "gentype": "^3.44.0", "glob": "^7.1.4", "highlight.js": "^11.9.0", "highlightjs-rescript": "^0.2.2", @@ -42,7 +41,7 @@ "remark-rehype": "^11.1.1", "remark-stringify": "^11.0.0", "request": "^2.88.0", - "rescript": "^12.0.0-alpha.14", + "rescript": "^12.0.0-beta.6", "stringify-object": "^3.3.0", "unified": "^11.0.5", "vfile-matter": "^5.0.0" @@ -2288,9 +2287,9 @@ } }, "node_modules/@rescript/darwin-arm64": { - "version": "12.0.0-alpha.14", - "resolved": "https://registry.npmjs.org/@rescript/darwin-arm64/-/darwin-arm64-12.0.0-alpha.14.tgz", - "integrity": "sha512-yrScC0FvAjQ2B1EnC8EbwRZX8tTEtyiRXLNCOlqOPcmTKXBr7KHknV2MsKqsn4kgmm29/ERZ0zyP4xHh2ookAw==", + "version": "12.0.0-beta.6", + "resolved": "https://registry.npmjs.org/@rescript/darwin-arm64/-/darwin-arm64-12.0.0-beta.6.tgz", + "integrity": "sha512-/uKnelk0zfTLeckZXS+zIDV7QNSZ1gFEov57AIdNwFBUwaVxrNDheU9kwN4Dqk3Nv3fXuSkOoniLn8vdQE2zlw==", "cpu": [ "arm64" ], @@ -2303,9 +2302,9 @@ } }, "node_modules/@rescript/darwin-x64": { - "version": "12.0.0-alpha.14", - "resolved": "https://registry.npmjs.org/@rescript/darwin-x64/-/darwin-x64-12.0.0-alpha.14.tgz", - "integrity": "sha512-O2pyYtyZFfPXq4U5PCe0hwAdQwdAjjQMY0rAoAqcoI/DIcRIpEc4y/7z6rK9Izig4qBZuQl0z33KKAYPuq6l5g==", + "version": "12.0.0-beta.6", + "resolved": "https://registry.npmjs.org/@rescript/darwin-x64/-/darwin-x64-12.0.0-beta.6.tgz", + "integrity": "sha512-2W7EYHESETClXVhYan2pvEw2OsOEBZEEXmGuOSVYDhf/Pmi+z9ksKmf+omeJRlrV6SFyBzJ0opvAUwzMCietnw==", "cpu": [ "x64" ], @@ -2318,9 +2317,9 @@ } }, "node_modules/@rescript/linux-arm64": { - "version": "12.0.0-alpha.14", - "resolved": "https://registry.npmjs.org/@rescript/linux-arm64/-/linux-arm64-12.0.0-alpha.14.tgz", - "integrity": "sha512-pd3LKwojp02wrq9x32ALiIMlfbcTYedQahiaLCIPLVhOb03YEANd1NHwEyyqm81LdpIK190yA3yiJ3Mi1afWFA==", + "version": "12.0.0-beta.6", + "resolved": "https://registry.npmjs.org/@rescript/linux-arm64/-/linux-arm64-12.0.0-beta.6.tgz", + "integrity": "sha512-J9hhbU1gwVkqXQMFv9tmmizZmry8u2JI8qep1i2g5fK5w8ijkB6YCOdIIk0aUzVJ5U7uNCPuTLAdf6GNb6T/ug==", "cpu": [ "arm64" ], @@ -2333,9 +2332,9 @@ } }, "node_modules/@rescript/linux-x64": { - "version": "12.0.0-alpha.14", - "resolved": "https://registry.npmjs.org/@rescript/linux-x64/-/linux-x64-12.0.0-alpha.14.tgz", - "integrity": "sha512-vgXn4WiP1JJVvzGxWihxUPfiCYp8y5uvBO/DxDh+yQ2hivkZYkxTQjG6psd9oRbtoY2OPxl7J9S/7abhUznAOQ==", + "version": "12.0.0-beta.6", + "resolved": "https://registry.npmjs.org/@rescript/linux-x64/-/linux-x64-12.0.0-beta.6.tgz", + "integrity": "sha512-vRnGVNYXJ0vNJRf1IbSVss3HGAxLqGrrNSzWdlVCAYp4wy03M2XET1cLaoPzsES6zxhCfzkGlPwJTKxGf3zlug==", "cpu": [ "x64" ], @@ -2358,18 +2357,18 @@ } }, "node_modules/@rescript/webapi": { - "version": "0.1.0-experimental-03eae8b", - "resolved": "https://registry.npmjs.org/@rescript/webapi/-/webapi-0.1.0-experimental-03eae8b.tgz", - "integrity": "sha512-0McQ9XQlbF+/BWs70P2XJZ3wP6us7/HnNWAFnDYSnA9+Rvp6IQAuKCXfhbqJgTIge4YfiY5j+SqDt+OLfsSUTA==", + "version": "0.1.0-experimental-0b87498", + "resolved": "https://registry.npmjs.org/@rescript/webapi/-/webapi-0.1.0-experimental-0b87498.tgz", + "integrity": "sha512-S5Mnp8S9muR8lSXQPcKD1F7gsVM+m6GbJptJZUHCjobQhEYhqcwS2elzgWkOcynsPNYMDXKJmtW/mtcjaGarPA==", "license": "MIT", "dependencies": { - "rescript": "^12.0.0-alpha.13" + "rescript": "^12.0.0-beta.3" } }, "node_modules/@rescript/win32-x64": { - "version": "12.0.0-alpha.14", - "resolved": "https://registry.npmjs.org/@rescript/win32-x64/-/win32-x64-12.0.0-alpha.14.tgz", - "integrity": "sha512-iEnGhXiJhb7Nf8d6QDswCMlEubeh/YO4I5e022u4lm1t9aaBw/r89flDRsewe4b49i6KkSuoWzNG1uFtxIEwdA==", + "version": "12.0.0-beta.6", + "resolved": "https://registry.npmjs.org/@rescript/win32-x64/-/win32-x64-12.0.0-beta.6.tgz", + "integrity": "sha512-aDNH0Q5j7GwXJpb3nF7PAriUjuzW0G2CT3X4SIxsJm51Yzc1T1p40VBKLOWFjQbE6o6kDNiGlUN1bYR6RvXRxw==", "cpu": [ "x64" ], @@ -3754,9 +3753,10 @@ } }, "node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", + "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", + "license": "MIT", "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -6099,15 +6099,6 @@ "node": ">=10" } }, - "node_modules/gentype": { - "version": "3.50.0", - "resolved": "https://registry.npmjs.org/gentype/-/gentype-3.50.0.tgz", - "integrity": "sha512-EKZzbS4HBuw80zDm5ZJxDdfoGw4nYClTgkv4vp8/db1MXmvCdJSA2NuvxNBYF8i5VqYccdQWzNGClmhWpTFWFQ==", - "hasInstallScript": true, - "bin": { - "gentype": "gentype.exe" - } - }, "node_modules/get-caller-file": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", @@ -18978,9 +18969,9 @@ } }, "node_modules/rescript": { - "version": "12.0.0-alpha.14", - "resolved": "https://registry.npmjs.org/rescript/-/rescript-12.0.0-alpha.14.tgz", - "integrity": "sha512-1Cxy0BHi3T1Yq+whl5sVOSMRsB6+NdnX7RbQ0jeXQOBvo3rGHsJ/hXoOqZPacbTDIsBNJNuTyBK74CYrEJynLg==", + "version": "12.0.0-beta.6", + "resolved": "https://registry.npmjs.org/rescript/-/rescript-12.0.0-beta.6.tgz", + "integrity": "sha512-y6xc09gIP/YRNNKvOgOACE+H1mE/MbP6GlIvjMol/U7rQ2VQWYWkxFs+UsAUdcHaHkPaY/ZyusL7EFGFIuO92A==", "license": "SEE LICENSE IN LICENSE", "workspaces": [ "packages/*", @@ -18996,18 +18987,18 @@ "bsc": "cli/bsc.js", "bstracing": "cli/bstracing.js", "rescript": "cli/rescript.js", - "rescript-tools": "cli/rescript-tools.js", - "rewatch": "cli/rewatch.js" + "rescript-legacy": "cli/rescript-legacy.js", + "rescript-tools": "cli/rescript-tools.js" }, "engines": { "node": ">=20.11.0" }, "optionalDependencies": { - "@rescript/darwin-arm64": "12.0.0-alpha.14", - "@rescript/darwin-x64": "12.0.0-alpha.14", - "@rescript/linux-arm64": "12.0.0-alpha.14", - "@rescript/linux-x64": "12.0.0-alpha.14", - "@rescript/win32-x64": "12.0.0-alpha.14" + "@rescript/darwin-arm64": "12.0.0-beta.6", + "@rescript/darwin-x64": "12.0.0-beta.6", + "@rescript/linux-arm64": "12.0.0-beta.6", + "@rescript/linux-x64": "12.0.0-beta.6", + "@rescript/win32-x64": "12.0.0-beta.6" } }, "node_modules/resolve": { diff --git a/package.json b/package.json index 6a16449f0..f43a0fbbc 100644 --- a/package.json +++ b/package.json @@ -16,13 +16,12 @@ "@headlessui/react": "^2.2.4", "@mdx-js/loader": "^3.1.0", "@rescript/react": "^0.14.0-rc.1", - "@rescript/webapi": "^0.1.0-experimental-03eae8b", + "@rescript/webapi": "^0.1.0-experimental-0b87498", "codemirror": "^5.54.0", "docson": "^2.1.0", "escodegen": "^2.1.0", "eslint-config-next": "^13.1.1", "fuse.js": "^6.4.3", - "gentype": "^3.44.0", "glob": "^7.1.4", "highlight.js": "^11.9.0", "highlightjs-rescript": "^0.2.2", @@ -42,7 +41,7 @@ "remark-rehype": "^11.1.1", "remark-stringify": "^11.0.0", "request": "^2.88.0", - "rescript": "^12.0.0-alpha.14", + "rescript": "^12.0.0-beta.6", "stringify-object": "^3.3.0", "unified": "^11.0.5", "vfile-matter": "^5.0.0" diff --git a/rescript.json b/rescript.json index 84bf239bd..b4350b6de 100644 --- a/rescript.json +++ b/rescript.json @@ -4,8 +4,8 @@ "jsx": { "version": 4 }, - "bs-dependencies": ["@rescript/react", "@rescript/webapi"], - "bsc-flags": ["-open WebAPI.Global"], + "dependencies": ["@rescript/react", "@rescript/webapi"], + "compiler-flags": ["-open WebAPI.Global"], "sources": [ { "dir": "src", @@ -13,8 +13,7 @@ }, { "dir": "scripts", - "subdirs": true, - "type": "dev" + "subdirs": true } ], "package-specs": { diff --git a/scripts/gendocs.res b/scripts/gendocs.res index 482aa3c32..b2660f93e 100644 --- a/scripts/gendocs.res +++ b/scripts/gendocs.res @@ -18,7 +18,7 @@ node scripts/gendocs.mjs path/to/rescript-compiler latest true open Node module Docgen = RescriptTools.Docgen -let args = Process.argv->Array.sliceToEnd(~start=2) +let args = Process.argv->Array.slice(~start=2) let dirname = url ->URL.fileURLToPath diff --git a/src/ApiDocs.res b/src/ApiDocs.res index cbae970c1..807193122 100644 --- a/src/ApiDocs.res +++ b/src/ApiDocs.res @@ -290,7 +290,7 @@ module DocstringsStylize = { [Rehype.WithOptions([Plugin(Rehype.slug), SlugOption({prefix: slugPrefix ++ "-"})])]->Some let content = switch docstrings->Array.length > 1 { - | true => docstrings->Array.sliceToEnd(~start=1) + | true => docstrings->Array.slice(~start=1) | false => docstrings }->Array.join("\n") diff --git a/src/Blog.res b/src/Blog.res index 8314d8d1c..392f7fc3e 100644 --- a/src/Blog.res +++ b/src/Blog.res @@ -218,7 +218,7 @@ let default = (props: props): React.element => { | 0 =>
{React.string("No posts for this category available...")}
| _ => let first = Belt.Array.getExn(posts, 0) - let rest = Array.sliceToEnd(posts, ~start=1) + let rest = Array.slice(posts, ~start=1) let featureBox =
diff --git a/src/Playground.res b/src/Playground.res index b90791c39..f20a1f633 100644 --- a/src/Playground.res +++ b/src/Playground.res @@ -1478,10 +1478,6 @@ let make = (~versions: array) => { (), ) - let overlayState = React.useState(() => false) - - let windowWidth = CodeMirror.useWindowWidth() - let (keyMap, setKeyMap) = React.useState(() => { Dom.Storage2.localStorage ->Dom.Storage2.getItem("vimMode") diff --git a/src/common/CompilerManagerHook.res b/src/common/CompilerManagerHook.res index 9a55434fc..6484eb8f1 100644 --- a/src/common/CompilerManagerHook.res +++ b/src/common/CompilerManagerHook.res @@ -148,7 +148,7 @@ let wrapReactApp = code => let capitalizeFirstLetter = string => { let firstLetter = string->String.charAt(0)->String.toUpperCase - `${firstLetter}${string->String.sliceToEnd(~start=1)}` + `${firstLetter}${string->String.slice(~start=1)}` } type error = @@ -548,11 +548,11 @@ let useCompilerManager = ( let ast = Parser.parse(jsCode, {sourceType: "module"}) let {entryPointExists, code, imports} = PlaygroundValidator.validate(ast) let imports = imports->Dict.mapValues(path => { - let filename = path->String.sliceToEnd(~start=9) // the part after "./stdlib/" + let filename = path->String.slice(~start=9) // the part after "./stdlib/" let filename = switch state.selected.id { | {major: 12, minor: 0, patch: 0, preRelease: Some(Alpha(alpha))} if alpha < 8 => let filename = if filename->String.startsWith("core__") { - filename->String.sliceToEnd(~start=6) + filename->String.slice(~start=6) } else { filename } diff --git a/src/common/MetaTagsApi.res b/src/common/MetaTagsApi.res index dc0fb3b67..7f3655d02 100644 --- a/src/common/MetaTagsApi.res +++ b/src/common/MetaTagsApi.res @@ -27,18 +27,9 @@ let extractMetaTags = async (url: string) => { } let metaTags = elements->Array.reduce(Dict.fromArray([]), (tags, meta) => { - let name = - meta - ->WebAPI.Element.getAttribute("name") - ->Null.make - let property = - meta - ->WebAPI.Element.getAttribute("property") - ->Null.make - let itemprop = - meta - ->WebAPI.Element.getAttribute("itemprop") - ->Null.make + let name = meta->WebAPI.Element.getAttribute("name") + let property = meta->WebAPI.Element.getAttribute("property") + let itemprop = meta->WebAPI.Element.getAttribute("itemprop") let name = switch (name, property, itemprop) { | (Value(name), _, _) => Some(name) @@ -47,14 +38,10 @@ let extractMetaTags = async (url: string) => { | _ => None } - let content = - meta - ->WebAPI.Element.getAttribute("content") - ->Nullable.make - ->Nullable.toOption + let content = meta->WebAPI.Element.getAttribute("content") switch (name, content) { - | (Some(name), Some(content)) => tags->Dict.set(name, content) + | (Some(name), Value(content)) => tags->Dict.set(name, content) | _ => () } diff --git a/src/components/CodeMirror.res b/src/components/CodeMirror.res index fe726e5e4..ecb80ec7a 100644 --- a/src/components/CodeMirror.res +++ b/src/components/CodeMirror.res @@ -253,7 +253,7 @@ type state = {mutable marked: array, mutable hoverHints: array< let isSpanToken = (element: WebAPI.DOMAPI.element) => element.tagName->String.toUpperCase === "SPAN" && - element->WebAPI.Element.getAttribute("role") !== "presentation" + element->WebAPI.Element.getAttribute("role") !== Value("presentation") let useHoverTooltip = (~cmStateRef: React.ref, ~cmRef: React.ref>, ()) => { let stateRef = React.useRef(HoverTooltip.Hidden) @@ -273,7 +273,7 @@ let useHoverTooltip = (~cmStateRef: React.ref, ~cmRef: React.ref { let isToken = element.tagName->String.toUpperCase === "SPAN" && - element->WebAPI.Element.getAttribute("role") !== "presentation" + element->WebAPI.Element.getAttribute("role") !== Value("presentation") isToken && RegExp.test(/CodeMirror-hover-hint-marker/, element.className) } diff --git a/src/components/Search.res b/src/components/Search.res index aac2f2f16..5addb2647 100644 --- a/src/components/Search.res +++ b/src/components/Search.res @@ -5,11 +5,11 @@ let appId = "S32LNEY41T" type state = Active | Inactive let hit = ({hit, children}: DocSearch.hitComponent) => { - let toTitle = str => str->String.charAt(0)->String.toUpperCase ++ String.sliceToEnd(str, ~start=1) + let toTitle = str => str->String.charAt(0)->String.toUpperCase ++ String.slice(str, ~start=1) let description = switch hit.url ->String.split("/") - ->Array.sliceToEnd(~start=1) + ->Array.slice(~start=1) ->List.fromArray { | list{"blog" as r | "community" as r, ..._} => r->toTitle | list{"docs", doc, version, ...rest} => diff --git a/src/layouts/ApiLayout.res b/src/layouts/ApiLayout.res index 90724a724..0d1f77be5 100644 --- a/src/layouts/ApiLayout.res +++ b/src/layouts/ApiLayout.res @@ -46,7 +46,7 @@ let makeBreadcrumbs = (~prefix: Url.breadcrumb, route: string): listUrl.parse let (_, rest) = // Strip the "api" part of the url before creating the rest of the breadcrumbs - Array.sliceToEnd(url.pagepath, ~start=1)->Array.reduce((prefix.href, []), (acc, path) => { + Array.slice(url.pagepath, ~start=1)->Array.reduce((prefix.href, []), (acc, path) => { let (baseHref, ret) = acc let href = baseHref ++ ("/" ++ path)