Skip to content

Commit 3e93952

Browse files
authored
Re-activate angular verification example (#1001)
* Reintroduce Angular verification example * The example now again contains the JSON client that is used in other examples as well. * Implemented review comments
1 parent 1662cf2 commit 3e93952

24 files changed

+7721
-12695
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ dist
33
lib
44
node_modules
55
*.tsbuildinfo
6-
.angular
76
__screenshots__
87
.chrome
98

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,12 @@ Important Project changes and notes about the project's history are found [here]
7272

7373
These are the current versions of packages from this repository and their alignment with **@codingame/monaco-vscode-api** **monaco-editor** and **vscode**:
7474

75-
- **monaco-languageclient**: `10.2.0` (release date: 2025-10-20)
76-
- **@typefox/monaco-editor-react**: `7.2.0` (release date: 2025-10-20)
75+
- **monaco-languageclient**: `10.4.0` (release date: 2025-11-26)
76+
- **@typefox/monaco-editor-react**: `7.4.0` (release date: 2025-11-26)
7777
- Aligned with:
78-
- **@codingame/monaco-vscode-[editor]-api**: `22.1.0`
79-
- **vscode**: `1.105.0`
80-
- **monaco-editor**: `0.54.0`
78+
- **@codingame/monaco-vscode-[editor]-api**: `23.2.2`
79+
- **vscode**: `1.106.2`
80+
- **monaco-editor**: `0.55.1`
8181
- **vscode-ws-jsonrpc**: `3.5.0` (release date: 2025-08-11)
8282

8383
Check find the [full compatibility table](https://github.com/TypeFox/monaco-languageclient/blob/main/docs/versions-and-history.md#monaco-editor--codingamemonaco-vscode-api-compatibility-table) with all previous versions.
@@ -220,7 +220,7 @@ None of the verification examples is part of the npm workspace. Some bring subst
220220

221221
- [Next.js verification example](./verify/next): demonstrates how to use `@typefox/monaco-editor-react` with Next.js, Please do: `cd verify/next && npm run verify`. It serves the client here: <http://localhost:8083>.
222222

223-
- **Currently broken and not usable until repaired:** [Angular verification example](./verify/angular): Before March 2024 this was located in [a separate repository](https://github.com/TypeFox/monaco-languageclient-ng-example). If you want to test it, Please do: `cd verify/angular && npm run verify`. It serves the client here: <http://localhost:4200>.
223+
- [Angular verification example](./verify/angular): Before March 2024 this was located in [a separate repository](https://github.com/TypeFox/monaco-languageclient-ng-example). If you want to test it, Please do: `cd verify/angular && npm run verify`. It serves the client here: <http://localhost:8084>.
224224

225225
### VSCode integration
226226

index.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,8 @@ <h3>Next.js</h3>
8080
Beforehand, start: <b><code>cd verify/next && npm run verify</code></b><br>
8181
Langium DSL example (Next.js Dev Server): [ <a href="http://localhost:8083">Example Page</a> ]
8282
<h3>Angular</h2>
83-
Currently broken and not usable until repaired.
83+
Beforehand, start: <b><code>cd verify/angular && npm run verify</code></b><br>
84+
JSON example (Angular/vite build): [ <a href="http://localhost:8084">Example Page</a> ]
8485
</div>
8586
</body>
8687

packages/examples/src/common/client/extendedClient.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import getKeybindingsServiceOverride from '@codingame/monaco-vscode-keybindings-
88
import * as vscode from 'vscode';
99
// this is required syntax highlighting
1010
import { LogLevel } from '@codingame/monaco-vscode-api';
11-
import '@codingame/monaco-vscode-java-default-extension';
1211
import { EditorApp, type EditorAppConfig } from 'monaco-languageclient/editorApp';
1312
import { LanguageClientWrapper, type LanguageClientConfig } from 'monaco-languageclient/lcwrapper';
1413
import { MonacoVscodeApiWrapper, type MonacoVscodeApiConfig } from 'monaco-languageclient/vscodeApiWrapper';

tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"noUnusedLocals": true,
2828
// Disable type checking of declaration files, enable in packages where it makes sense if any
2929
"skipLibCheck": true,
30-
// Disallow inconsistently-cased references to the same file
30+
// Disallow inconsistently-cased references to the same file
3131
"forceConsistentCasingInFileNames": true,
3232
"noImplicitOverride": true,
3333
"experimentalDecorators": true,

verify/angular/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
.angular
12
bundle
23
dist
34
lib
45
node_modules
56
*.tsbuildinfo
7+
production

verify/angular/README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
# Angular verification example
22

3-
**Currently broken and not usable until repaired.**
4-
5-
It serves on the client here: <http://localhost:4200>.
3+
It serves on the client here: <http://localhost:8084>.

verify/angular/angular.json

Lines changed: 17 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
{
22
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
33
"version": 1,
4+
"cli": {
5+
"packageManager": "npm"
6+
},
47
"newProjectRoot": "projects",
58
"projects": {
69
"ng-mlc": {
@@ -11,48 +14,34 @@
1114
"prefix": "app",
1215
"architect": {
1316
"build": {
14-
"builder": "@angular-builders/custom-esbuild:application",
17+
"builder": "@angular/build:application",
1518
"options": {
16-
"outputPath": "dist/ng-mlc",
17-
"index": "src/index.html",
1819
"browser": "src/main.ts",
1920
"tsConfig": "tsconfig.json",
20-
// "plugins": ["./node_modules/@codingame/esbuild-import-meta-url-plugin/dist/esbuildImportMetaUrlPlugin.js"],
2121
"polyfills": [
2222
"zone.js"
2323
],
24-
"assets": [],
25-
"styles": [],
26-
"scripts": [],
27-
"aot": false,
28-
"optimization": false,
29-
"sourceMap": true,
30-
"namedChunks": false,
31-
"extractLicenses": false,
32-
"allowedCommonJsDependencies": [
33-
"vscode-languageclient",
34-
"vscode-languageserver-protocol",
35-
"vscode-jsonrpc",
36-
"vscode-oniguruma",
37-
"vscode-textmate",
38-
"@vscode/iconv-lite-umd"
24+
"assets": [
25+
{
26+
"glob": "**/*",
27+
"input": "public"
28+
}
3929
]
4030
},
4131
"configurations": {
4232
"production": {
43-
"aot": true,
44-
"optimization": true,
45-
"sourceMap": false,
46-
"namedChunks": false,
47-
"extractLicenses": true
33+
"outputHashing": "all"
4834
},
4935
"development": {
36+
"optimization": false,
37+
"extractLicenses": false,
38+
"sourceMap": true
5039
}
5140
},
52-
"defaultConfiguration": "development"
41+
"defaultConfiguration": "production"
5342
},
5443
"serve": {
55-
"builder": "@angular-builders/custom-esbuild:dev-server",
44+
"builder": "@angular/build:dev-server",
5645
"configurations": {
5746
"production": {
5847
"buildTarget": "ng-mlc:build:production"
@@ -63,13 +52,10 @@
6352
},
6453
"defaultConfiguration": "development"
6554
},
66-
"extract-i18n": {
67-
"builder": "@angular/build:extract-i18n"
55+
"test": {
56+
"builder": "@angular/build:unit-test"
6857
}
6958
}
7059
}
71-
},
72-
"cli": {
73-
"analytics": false
7460
}
7561
}
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
1-
<!doctype html>
1+
<!DOCTYPE html>
22
<html lang="en">
3+
34
<head>
45
<meta charset="utf-8">
5-
<title>HelloWorld</title>
6+
<title>Angular Example</title>
67
<base href="/">
78
<meta name="viewport" content="width=device-width, initial-scale=1">
89
</head>
10+
911
<body>
1012
<app-root></app-root>
13+
<script type="module" src="/src/main.ts"></script>
1114
</body>
15+
1216
</html>

0 commit comments

Comments
 (0)