Skip to content

Commit 36efbe0

Browse files
authored
Fixes typedoc & updates pipelines to test website (#5102)
* Fixes typedoc & updates pipelines to test website * Fixes typedoc * Fixes samples
1 parent 422d19e commit 36efbe0

File tree

6 files changed

+27
-17
lines changed

6 files changed

+27
-17
lines changed

.github/workflows/ci.yml

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -83,14 +83,18 @@ jobs:
8383
- name: Run smoke test
8484
run: npm run smoketest
8585

86-
# - name: Install website node modules
87-
# working-directory: website
88-
# run: yarn install --frozen-lockfile
86+
- name: Install website node modules
87+
working-directory: website
88+
run: npm ci
8989

90-
# - name: Build website
91-
# working-directory: website
92-
# run: yarn run build
90+
- name: Install most recent version of monaco-editor
91+
working-directory: website
92+
run: npm install monaco-editor
9393

94-
# - name: Test website
95-
# working-directory: website
96-
# run: yarn test
94+
- name: Build website
95+
working-directory: website
96+
run: npm run build
97+
98+
- name: Test website
99+
working-directory: website
100+
run: npm run test

.github/workflows/website.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@ jobs:
5252
working-directory: website
5353
run: npm run build
5454

55+
- name: Test website
56+
working-directory: website
57+
run: npm run test
58+
5559
- name: Setup Pages
5660
uses: actions/configure-pages@v5
5761
- name: Upload artifact

website/src/website/data/playground-samples/extending-language-services/configure-javascript-defaults/sample.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
// to the system and how the compiler is told to use ES6 (target=2).
55

66
// validation settings
7-
monaco.languages.typescript.javascriptDefaults.setDiagnosticsOptions({
7+
monaco.typescript.javascriptDefaults.setDiagnosticsOptions({
88
noSemanticValidation: true,
99
noSyntaxValidation: false,
1010
});
1111

1212
// compiler options
13-
monaco.languages.typescript.javascriptDefaults.setCompilerOptions({
14-
target: monaco.languages.typescript.ScriptTarget.ES2015,
13+
monaco.typescript.javascriptDefaults.setCompilerOptions({
14+
target: monaco.typescript.ScriptTarget.ES2015,
1515
allowNonTsExtensions: true,
1616
});
1717

@@ -25,7 +25,7 @@ var libSource = [
2525
"}",
2626
].join("\n");
2727
var libUri = "ts:filename/facts.d.ts";
28-
monaco.languages.typescript.javascriptDefaults.addExtraLib(libSource, libUri);
28+
monaco.typescript.javascriptDefaults.addExtraLib(libSource, libUri);
2929
// When resolving definitions and references, the editor will try to use created models.
3030
// Creating a model for the library allows "peek definition/references" commands to work with the library.
3131
monaco.editor.createModel(libSource, "typescript", monaco.Uri.parse(libUri));

website/src/website/data/playground-samples/extending-language-services/configure-json-defaults/sample.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ var modelUri = monaco.Uri.parse("a://b/foo.json"); // a made up unique URI for o
55
var model = monaco.editor.createModel(jsonCode, "json", modelUri);
66

77
// configure the JSON language support with schemas and schema associations
8-
monaco.languages.json.jsonDefaults.setDiagnosticsOptions({
8+
monaco.json.jsonDefaults.setDiagnosticsOptions({
99
validate: true,
1010
schemas: [
1111
{

website/typedoc/tsconfig.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
{
22
"compilerOptions": {
33
"module": "CommonJS",
4-
"skipLibCheck": true
4+
"skipLibCheck": true,
5+
"forceConsistentCasingInFileNames": true,
6+
"strict": true
57
},
6-
"include": ["../../out/monaco-editor/esm/vs/editor/editor.api.d.ts"],
8+
"include": ["../../out/monaco-editor/esm/vs/editor/editor.main.d.ts"],
79
"exclude": ["theme"]
810
}

website/typedoc/typedoc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://typedoc.org/schema.json",
3-
"entryPoints": ["../../out/monaco-editor/esm/vs/editor/editor.api.d.ts"],
3+
"entryPoints": ["../../out/monaco-editor/esm/vs/editor/editor.main.d.ts"],
44

55
"out": "dist",
66
"theme": "default",

0 commit comments

Comments
 (0)