Fix links

Author: fhammerschmidt

misc_docs/syntax/decorator_gentype.mdx

@@ -8,7 +8,7 @@ category: "decorators"
 
 The `@genType` decorator may be used to export ReScript values and types to JavaScript, and import JavaScript values and types into ReScript. It allows seamless integration of compiled ReScript modules in existing TypeScript, or plain JavaScript codebases, without losing type information across different type systems.
 
-[GenType](/docs/manual/latest/gentype-introduction) is a code generation tool for automatically generating [TypeScript](https://www.typescriptlang.org/) type definitions, and JS runtime converters for non-shared ReScript values. It also features first-class support for [rescript-react](/docs/react/latest/introduction) components.
+[GenType](/docs/manual/latest/typescript-integration) is a code generation tool for automatically generating [TypeScript](https://www.typescriptlang.org/) type definitions, and JS runtime converters for non-shared ReScript values. It also features first-class support for [rescript-react](/docs/react/latest/introduction) components.
 
 ### Example
 
@@ -61,4 +61,4 @@ export const make: React.ComponentType<{
 
 ### References
 
-* [GenType](/docs/manual/latest/gentype-introduction)
+* [TypeScript Integration](/docs/manual/latest/typescript-integration)

next.config.mjs

@@ -104,22 +104,22 @@ const config = {
       },
       {
         source: "/docs/gentype/latest/introduction",
-        destination: "/docs/manual/latest/gentype-introduction",
+        destination: "/docs/manual/latest/typescript-integration",
         permanent: true,
       },
       {
         source: "/docs/gentype/latest/getting-started",
-        destination: "/docs/manual/latest/gentype-introduction",
+        destination: "/docs/manual/latest/typescript-integration",
         permanent: true,
       },
       {
         source: "/docs/gentype/latest/usage",
-        destination: "/docs/manual/latest/gentype-introduction",
+        destination: "/docs/manual/latest/typescript-integration",
         permanent: true,
       },
       {
         source: "/docs/gentype/latest/supported-types",
-        destination: "/docs/manual/latest/gentype-introduction",
+        destination: "/docs/manual/latest/typescript-integration",
         permanent: true,
       },
     ];

pages/docs/manual/latest/build-configuration.mdx

@@ -149,7 +149,6 @@ one of the following:
 - `".res.js"`
 - `".res.mjs"`
 - `".res.cjs"`
-  <<<<<<< HEAD
 
 ### Design Decisions
 
@@ -215,6 +214,7 @@ To enable genType, set `"gentypeconfig"` at top level in the project's `rescript
 `module`: Module format used for the generated `*.gen.tsx` files (supports `"es6"` and `"commonjs"`)
 
 `moduleResolution`: Module resolution strategy used in genType outputs. This may be required for compatibility with TypeScript projects. Specify the value as the same in `tsconfig.json`.
+
 - `"node"`(default): Drop extensions in import paths.
 - `"node16"`: Use TS output's extension. This provides compatibility with projects using `"moduleResolution": "node16"` and ES Modules.
 - `"bundler"`: Use TS input's extension. This provides compatibility with projects using `"moduleResolution": "bundler"` and ES Modules. This also requires TS v5.0+ and `compilerOptions.allowImportingTsExtensions` to `true`

pages/docs/manual/latest/typescript-integration.mdx

@@ -25,9 +25,9 @@ type t = { TAG: "A"; _0: number } | { TAG: "B"; _0: string };
 
 ## A Quick Example
 
-Let's assume we are working on a TypeScript codebase and we want to integrate a single TypeScript function.
+Let's assume we are working on a TypeScript codebase and we want to integrate a single ReScript function.
 
-We want to be able to import the function like any other in our existing TypeScript code, but we also want to preserve all the ReScript types in the TypeScript type system
+We want to be able to import the function like any other one in our existing TypeScript code, but we also want to preserve all the ReScript types in the TypeScript type system.
 
 **That's exactly what genType was made for!**
 
@@ -64,11 +64,13 @@ On a successful compile, `genType` will convert `src/Color.res` to a TypeScript
 /* eslint-disable */
 /* tslint:disable */
 
-import * as ColorJS from './Color.res.js';
+import * as ColorJS from "./Color.res.js";
 
 export type color = "Red" | "Blue";
 
-export const printColorMessage: (color:color) => void = ColorJS.printColorMessage as any;
+export const printColorMessage: (
+  color: color
+) => void = ColorJS.printColorMessage as any;
 ```
 
 genType automatically maps the `color` variant to TS via a string union type `"Red" | "Blue"`.

src/DocsOverview.res

@@ -36,7 +36,7 @@ let default = (~showVersionSelect=true) => {
   let ecosystem = [
     ("Package Index", "/packages"),
     ("rescript-react", "/docs/react/latest/introduction"),
-    ("GenType", "/docs/manual/latest/gentype-introduction"),
+    ("GenType", "/docs/manual/latest/typescript-integration"),
     ("Reanalyze", "https://github.com/reason-association/reanalyze"),
   ]
 

src/common/Constants.res

@@ -20,7 +20,7 @@ let languageManual = version => {
 let ecosystem = [
   ("Package Index", "/packages"),
   ("rescript-react", "/docs/react/latest/introduction"),
-  ("GenType", "/docs/manual/latest/gentype-introduction"),
+  ("GenType", "/docs/manual/latest/typescript-integration"),
   ("Reanalyze", "https://github.com/reason-association/reanalyze"),
 ]
 

src/components/Navigation.res

@@ -190,7 +190,7 @@ module DocsSection = {
         imgSrc: "/static/[email protected]",
         title: "GenType",
         description: "Seamless TypeScript integration",
-        href: "/docs/manual/latest/gentype-introduction",
+        href: "/docs/manual/latest/typescript-integration",
         isActive: url => {
           switch url.fullpath {
           | ["docs", "manual", _, fragment] => fragment->Js.String2.startsWith("gentype")

src/layouts/LandingPageLayout.res

@@ -577,7 +577,7 @@ module CuratedResources = {
       imgSrc: "/static/[email protected]",
       title: React.string("TypeScript Integration"),
       descr: "Learn how to integrate ReScript in your existing TypeScript codebases.",
-      href: "/docs/manual/latest/gentype-introduction",
+      href: "/docs/manual/latest/typescript-integration",
     },
   ]