Merge remote-tracking branch 'origin/master' into codex/pr-1231-docsearch-plan

# Conflicts:
#	.gitignore
#	apps/docs/__tests__/AlgoliaConfig_.test.res
#	apps/docs/__tests__/AlgoliaEnvStatus_.test.res
#	apps/docs/__tests__/Meta_.test.res
#	apps/docs/__tests__/Search_.test.res
#	apps/docs/__tests__/Sitemap_.test.res
#	apps/docs/__tests__/Url_.test.res
#	apps/docs/__tests__/__screenshots__/Search_.test.jsx/markdownToHtml-combined-transformations-bold-inside-code-stays-as-is--code-matched-first--1.png
#	apps/docs/__tests__/__screenshots__/Search_.test.jsx/markdownToHtml-markdown-link-stripping-handles-link-with-empty-text-1.png
#	apps/docs/__tests__/__screenshots__/Url_.test.jsx/Url-parse-version-detection-parses-next-keyword-1.png
#	apps/docs/__tests__/__screenshots__/Url_.test.jsx/Url-parse-version-detection-parses-version-without-v-prefix--PR--1231--1.png
#	apps/docs/scripts/LogAlgoliaEnvStatus.res
#	apps/docs/scripts/generate_sitemap.res
#	apps/docs/src/common/AlgoliaConfig.res
#	apps/docs/src/common/AlgoliaEnvStatus.res
#	apps/docs/src/common/Sitemap.res
#	package.json

Author: jderochervlk

.github/workflows/deploy-fork-preview.yml

@@ -78,6 +78,7 @@ jobs:
         with:
           apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
           accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+          workingDirectory: apps/docs
           command: pages deploy out --project-name=rescript-lang-org
           gitHubToken: ${{ secrets.GITHUB_TOKEN }}
           wranglerVersion: 4.61.1

.github/workflows/deploy.yml

@@ -62,6 +62,7 @@ jobs:
         with:
           apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
           accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+          workingDirectory: apps/docs
           command: pages deploy out --project-name=rescript-lang-org --branch=${{ env.SAFE_BRANCH }}
           gitHubToken: ${{ secrets.GITHUB_TOKEN }}
           wranglerVersion: 4.63.0
@@ -119,5 +120,6 @@ jobs:
         uses: cypress-io/github-action@v7
         with:
           install: false
+          working-directory: apps/docs
           browser: chrome
           config: baseUrl=${{ steps.cypress-base-url.outputs.url }}

.gitignore

@@ -3,56 +3,64 @@
 *.swo
 .worktrees/
 
-# Generated via update-index script
-public/blog/feed.xml
+# Generated via docs update-index script
+apps/docs/public/blog/feed.xml
 
 node_modules/
 .next/
 out/
+apps/docs/out/
 index_data/*.json
+apps/docs/index_data/*.json
 
-# Generated via test examples script
+# Generated via docs test examples script
 temp
 temp-js-output
 temp-jsx-preserve
+apps/docs/temp
+apps/docs/temp-js-output
+apps/docs/temp-jsx-preserve
 
 .bsb.lock
 .merlin
 lib/
+apps/docs/lib/
 
 .vercel
 
-src/**/*.mjs
-src/**/*.jsx
-scripts/gendocs.mjs
-scripts/generate_*.mjs
-scripts/gendocs.jsx
-scripts/generate_*.jsx
-scripts/LogAlgoliaEnvStatus.jsx
+apps/docs/src/**/*.mjs
+apps/docs/src/**/*.jsx
+apps/docs/scripts/gendocs.mjs
+apps/docs/scripts/generate_*.mjs
+apps/docs/scripts/gendocs.jsx
+apps/docs/scripts/generate_*.jsx
+apps/docs/scripts/LogAlgoliaEnvStatus.jsx
 
 # Generated via generate-llms script
-public/llms/manual/**/llm*.txt
-public/llms/react/**/llm*.txt
-pages/docs/**/**/llms.mdx
-
-public/playground-bundles/
-!public/_redirects
+apps/docs/public/llms/manual/**/llm*.txt
+apps/docs/public/llms/react/**/llm*.txt
+apps/docs/markdown-pages/docs/**/**/llms.mdx
 
+apps/docs/public/playground-bundles/
+!apps/docs/public/_redirects
 
 dist
 build
+apps/docs/dist
+apps/docs/build
 .react-router
-.worktrees/
+apps/docs/.react-router
 mdx-manifest.json
-
-app/**/*.mjs
-app/**/*.jsx
-functions/**/*.mjs
-functions/**/*.jsx
-__tests__/**/*.mjs
-__tests__/**/*.jsx
-e2e/**/*.mjs
-e2e/**/*.jsx
+apps/docs/mdx-manifest.json
+
+apps/docs/app/**/*.mjs
+apps/docs/app/**/*.jsx
+apps/docs/functions/**/*.mjs
+apps/docs/functions/**/*.jsx
+apps/docs/__tests__/**/*.mjs
+apps/docs/__tests__/**/*.jsx
+apps/docs/e2e/**/*.mjs
+apps/docs/e2e/**/*.jsx
 !_shims.mjs
 !_shims.jsx
 
@@ -66,16 +74,20 @@ e2e/**/*.jsx
 
 # wrangler
 .wrangler
+apps/docs/.wrangler
 
-# Scripts generated from rolldown to convert them from .jsx files to .mjs files
+# Scripts generated from tsdown to convert them from .jsx files to .mjs files
 _scripts
+apps/docs/_scripts
 
 # Local env files
 .env.local
+apps/docs/.env.local
 
 # Local git worktrees
 .worktrees
 
 # Vitest screenshots
-!__tests__/__screenshots__/**/*
+!apps/docs/__tests__/__screenshots__/**/*
 .vitest-attachments
+apps/docs/.vitest-attachments

.oxfmtrc.json

@@ -4,22 +4,22 @@
   "sortPackageJson": false,
   "ignorePatterns": [
     "!_shims.mjs",
-    "!public/_redirects",
+    "!apps/docs/public/_redirects",
     ".DS_Store",
     ".worktrees/",
     ".next/",
     ".react-router",
     "*.swo",
     "*.swp",
-    "app/**/*.mjs",
+    "apps/docs/app/**/*.mjs",
     "build",
-    "data/api/**/*.json",
+    "apps/docs/data/api/**/*.json",
     "dist",
-    "index_data/*.json",
+    "apps/docs/index_data/*.json",
     "node_modules/",
-    "out/",
-    "public/playground-bundles/",
-    "public/blog/feed.xml",
+    "apps/docs/out/",
+    "apps/docs/public/playground-bundles/",
+    "apps/docs/public/blog/feed.xml",
     "_tempFile.cmi",
     "_tempFile.cmj",
     "_tempFile.cmt",
@@ -28,15 +28,16 @@
     ".bsb.lock",
     ".merlin",
     "lib/",
+    "apps/docs/lib/",
     ".vercel",
-    "src/**/*.mjs",
-    "scripts/gendocs.mjs",
-    "scripts/generate_*.mjs",
-    "public/llms/manual/**/llm*.txt",
-    "public/llms/react/**/llm*.txt",
-    "pages/docs/**/**/llms.mdx",
-    "markdown-pages/docs/manual/installation.mdx",
+    "apps/docs/src/**/*.mjs",
+    "apps/docs/scripts/gendocs.mjs",
+    "apps/docs/scripts/generate_*.mjs",
+    "apps/docs/public/llms/manual/**/llm*.txt",
+    "apps/docs/public/llms/react/**/llm*.txt",
+    "apps/docs/markdown-pages/docs/**/**/llms.mdx",
+    "apps/docs/markdown-pages/docs/manual/installation.mdx",
     ".yarn/releases/yarn-4.12.0.cjs",
-    "data/api/*"
+    "apps/docs/data/api/*"
   ]
 }

Makefile

@@ -2,11 +2,11 @@ SHELL = /bin/bash
 
 node_modules/.bin/rescript:
 	yarn install
-	yarn update-index
 
-build: node_modules/.bin/rescript	
-	node_modules/.bin/rescript
-	yarn update-index
+build: node_modules/.bin/rescript
+	yarn build:res
+	yarn build:scripts
+	yarn build:update-index
 
 dev: build
 	yarn dev
@@ -15,7 +15,7 @@ test: build
 	yarn test
 
 clean:
-	rm -r node_modules lib
+	rm -r node_modules apps/docs/lib apps/docs/build apps/docs/out
 
 .DEFAULT_GOAL := build