From 36efbe07d929083932bef67f8ff86c3d144af3f6 Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Fri, 7 Nov 2025 17:57:18 +0100
Subject: [PATCH] Fixes typedoc & updates pipelines to test website (#5102)

* Fixes typedoc & updates pipelines to test website

* Fixes typedoc

* Fixes samples
---
 .github/workflows/ci.yml                      | 22 +++++++++++--------
 .github/workflows/website.yml                 |  4 ++++
 .../configure-javascript-defaults/sample.js   |  8 +++----
 .../configure-json-defaults/sample.js         |  2 +-
 website/typedoc/tsconfig.json                 |  6 +++--
 website/typedoc/typedoc.json                  |  2 +-
 6 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6dd7dd28..1abda5f1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -83,14 +83,18 @@ jobs:
       - name: Run smoke test
         run: npm run smoketest
 
-      # - name: Install website node modules
-      #   working-directory: website
-      #   run: yarn install --frozen-lockfile
+      - name: Install website node modules
+        working-directory: website
+        run: npm ci
 
-      # - name: Build website
-      #   working-directory: website
-      #   run: yarn run build
+      - name: Install most recent version of monaco-editor
+        working-directory: website
+        run: npm install monaco-editor
 
-      # - name: Test website
-      #   working-directory: website
-      #   run: yarn test
+      - name: Build website
+        working-directory: website
+        run: npm run build
+
+      - name: Test website
+        working-directory: website
+        run: npm run test
diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml
index af4855af..256fba5d 100644
--- a/.github/workflows/website.yml
+++ b/.github/workflows/website.yml
@@ -52,6 +52,10 @@ jobs:
         working-directory: website
         run: npm run build
 
+      - name: Test website
+        working-directory: website
+        run: npm run test
+
       - name: Setup Pages
         uses: actions/configure-pages@v5
       - name: Upload artifact
diff --git a/website/src/website/data/playground-samples/extending-language-services/configure-javascript-defaults/sample.js b/website/src/website/data/playground-samples/extending-language-services/configure-javascript-defaults/sample.js
index 7fc04f45..c8cd0d81 100644
--- a/website/src/website/data/playground-samples/extending-language-services/configure-javascript-defaults/sample.js
+++ b/website/src/website/data/playground-samples/extending-language-services/configure-javascript-defaults/sample.js
@@ -4,14 +4,14 @@
 // to the system and how the compiler is told to use ES6 (target=2).
 
 // validation settings
-monaco.languages.typescript.javascriptDefaults.setDiagnosticsOptions({
+monaco.typescript.javascriptDefaults.setDiagnosticsOptions({
 	noSemanticValidation: true,
 	noSyntaxValidation: false,
 });
 
 // compiler options
-monaco.languages.typescript.javascriptDefaults.setCompilerOptions({
-	target: monaco.languages.typescript.ScriptTarget.ES2015,
+monaco.typescript.javascriptDefaults.setCompilerOptions({
+	target: monaco.typescript.ScriptTarget.ES2015,
 	allowNonTsExtensions: true,
 });
 
@@ -25,7 +25,7 @@ var libSource = [
 	"}",
 ].join("\n");
 var libUri = "ts:filename/facts.d.ts";
-monaco.languages.typescript.javascriptDefaults.addExtraLib(libSource, libUri);
+monaco.typescript.javascriptDefaults.addExtraLib(libSource, libUri);
 // When resolving definitions and references, the editor will try to use created models.
 // Creating a model for the library allows "peek definition/references" commands to work with the library.
 monaco.editor.createModel(libSource, "typescript", monaco.Uri.parse(libUri));
diff --git a/website/src/website/data/playground-samples/extending-language-services/configure-json-defaults/sample.js b/website/src/website/data/playground-samples/extending-language-services/configure-json-defaults/sample.js
index 34bd2e30..3e12f2a5 100644
--- a/website/src/website/data/playground-samples/extending-language-services/configure-json-defaults/sample.js
+++ b/website/src/website/data/playground-samples/extending-language-services/configure-json-defaults/sample.js
@@ -5,7 +5,7 @@ var modelUri = monaco.Uri.parse("a://b/foo.json"); // a made up unique URI for o
 var model = monaco.editor.createModel(jsonCode, "json", modelUri);
 
 // configure the JSON language support with schemas and schema associations
-monaco.languages.json.jsonDefaults.setDiagnosticsOptions({
+monaco.json.jsonDefaults.setDiagnosticsOptions({
 	validate: true,
 	schemas: [
 		{
diff --git a/website/typedoc/tsconfig.json b/website/typedoc/tsconfig.json
index 009a0396..fb7a7206 100644
--- a/website/typedoc/tsconfig.json
+++ b/website/typedoc/tsconfig.json
@@ -1,8 +1,10 @@
 {
 	"compilerOptions": {
 		"module": "CommonJS",
-		"skipLibCheck": true
+		"skipLibCheck": true,
+		"forceConsistentCasingInFileNames": true,
+		"strict": true
 	},
-	"include": ["../../out/monaco-editor/esm/vs/editor/editor.api.d.ts"],
+	"include": ["../../out/monaco-editor/esm/vs/editor/editor.main.d.ts"],
 	"exclude": ["theme"]
 }
diff --git a/website/typedoc/typedoc.json b/website/typedoc/typedoc.json
index 9edb625c..596fbe8f 100644
--- a/website/typedoc/typedoc.json
+++ b/website/typedoc/typedoc.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://typedoc.org/schema.json",
-	"entryPoints": ["../../out/monaco-editor/esm/vs/editor/editor.api.d.ts"],
+	"entryPoints": ["../../out/monaco-editor/esm/vs/editor/editor.main.d.ts"],
 
 	"out": "dist",
 	"theme": "default",