Skip to content

Commit 613b7b9

Browse files
authored
Update playground to monaco-languageclient 11 (#783)
Signed-off-by: Mark Sujew <mark.sujew@typefox.io>
1 parent 69978b0 commit 613b7b9

7 files changed

Lines changed: 601 additions & 490 deletions

File tree

packages/playground/package.json

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,31 @@
99
"scripts": {
1010
"clean": "shx rm -fr *.tsbuildinfo out",
1111
"copy:extensions": "shx cp ../vscode-extension/pli-language-support.vsix ./pli-language-support.vsix",
12-
"build": "pnpm copy:extensions && vite -c vite.config.ts build",
12+
"build": "pnpm build:production:main",
13+
"build:production:main": "pnpm copy:extensions && vite -c vite.config.ts build",
1314
"serve": "vite -c vite.config.ts serve",
14-
"preview": "vite -c vite.config.ts preview",
15+
"preview": "vite -c vite.config.preview.ts preview",
1516
"build:clean": "pnpm clean && pnpm build",
1617
"dev": "vite -c vite.config.ts",
1718
"dev:debug": "vite -c vite.config.ts --debug --force"
1819
},
1920
"dependencies": {
20-
"@codingame/monaco-vscode-api": "^25.1.2",
21-
"@codingame/monaco-vscode-explorer-service-override": "^25.1.2",
22-
"@codingame/monaco-vscode-files-service-override": "^25.1.2",
23-
"@codingame/monaco-vscode-keybindings-service-override": "^25.1.2",
24-
"@codingame/monaco-vscode-markers-service-override": "^25.1.2",
25-
"@codingame/monaco-vscode-outline-service-override": "^25.1.2",
26-
"@codingame/monaco-vscode-views-service-override": "^25.1.2",
21+
"@codingame/monaco-vscode-api": "^35.0.1",
22+
"@codingame/monaco-vscode-editor-api": "^35.0.1",
23+
"@codingame/monaco-vscode-explorer-service-override": "^35.0.1",
24+
"@codingame/monaco-vscode-files-service-override": "^35.0.1",
25+
"@codingame/monaco-vscode-keybindings-service-override": "^35.0.1",
26+
"@codingame/monaco-vscode-markers-service-override": "^35.0.1",
27+
"@codingame/monaco-vscode-outline-service-override": "^35.0.1",
28+
"@codingame/monaco-vscode-views-service-override": "^35.0.1",
29+
"@codingame/monaco-vscode-textmate-service-override": "^35.0.1",
2730
"lz-string": "^1.5.0",
28-
"monaco-languageclient": "~10.7.0",
29-
"vscode": "npm:@codingame/monaco-vscode-extension-api@^25.1.2",
30-
"vscode-json-languageservice": "~5.4.4"
31+
"monaco-languageclient": "11.0.0-next.1",
32+
"vscode": "npm:@codingame/monaco-vscode-extension-api@^35.0.1",
33+
"vscode-json-languageservice": "^5.7.2"
3134
},
3235
"devDependencies": {
33-
"@codingame/monaco-vscode-rollup-vsix-plugin": "^25.1.2",
34-
"vite": "^8.0.16"
36+
"@codingame/monaco-vscode-rollup-vsix-plugin": "^35.0.1",
37+
"vite": "^8.1.5"
3538
}
3639
}

packages/playground/src/config.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
*
1010
*/
1111

12-
import * as vscode from "vscode";
1312
import { LogLevel } from "@codingame/monaco-vscode-api";
13+
import getExplorerServiceOverride from "@codingame/monaco-vscode-explorer-service-override";
1414
import getKeybindingsServiceOverride from "@codingame/monaco-vscode-keybindings-service-override";
1515
import getMarkersServiceOverride from "@codingame/monaco-vscode-markers-service-override";
16-
import getExplorerServiceOverride from "@codingame/monaco-vscode-explorer-service-override";
1716
import getOutlineServiceOverride from "@codingame/monaco-vscode-outline-service-override";
18-
import { configureDefaultWorkerFactory } from "monaco-languageclient/workerFactory";
1917
import type { MonacoVscodeApiConfig } from "monaco-languageclient/vscodeApiWrapper";
18+
import { configureDefaultWorkerFactory } from "monaco-languageclient/workerFactory";
19+
import * as vscode from "vscode";
2020

2121
// Load the PL/I extension directly - no need to load the worker
2222
import "../pli-language-support.vsix";
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
import vsixPlugin from "@codingame/monaco-vscode-rollup-vsix-plugin";
2+
import path from "node:path";
3+
import type { UserConfig } from "vite";
4+
5+
/// <reference lib="rolldown-vite/config" />
6+
7+
export const buildBaseConfig: () => UserConfig = () => {
8+
return {
9+
base: "./",
10+
build: {
11+
rolldownOptions: {
12+
input: {
13+
index: path.resolve(__dirname, "index.html"),
14+
},
15+
},
16+
emptyOutDir: true,
17+
outDir: path.resolve(__dirname, "out"),
18+
assetsInlineLimit: 0,
19+
},
20+
worker: {
21+
format: "es",
22+
},
23+
plugins: [vsixPlugin()],
24+
server: {
25+
port: 5173,
26+
host: "0.0.0.0",
27+
cors: {
28+
origin: "*",
29+
},
30+
headers: {
31+
"Cross-Origin-Opener-Policy": "same-origin",
32+
"Cross-Origin-Embedder-Policy": "require-corp",
33+
},
34+
},
35+
};
36+
};
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
import { defineConfig } from "vite";
2+
import { buildBaseConfig } from "./vite.config.base";
3+
4+
/// <reference lib="rolldown-vite/config" />
5+
6+
export default defineConfig(() => {
7+
const previewConfig = buildBaseConfig();
8+
previewConfig.preview = {
9+
port: 4173,
10+
host: "0.0.0.0",
11+
cors: {
12+
origin: "*",
13+
},
14+
headers: {
15+
"Cross-Origin-Opener-Policy": "same-origin",
16+
"Cross-Origin-Embedder-Policy": "require-corp",
17+
},
18+
};
19+
return previewConfig;
20+
});

packages/playground/vite.config.ts

Lines changed: 7 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,8 @@
1-
import path from "path";
2-
import vsixPlugin from "@codingame/monaco-vscode-rollup-vsix-plugin";
3-
import type { UserConfig } from "vite";
1+
import { defineConfig } from "vite";
2+
import { buildBaseConfig } from "./vite.config.base";
43

5-
const config: UserConfig = {
6-
base: "",
7-
build: {
8-
target: "es2024",
9-
rollupOptions: {
10-
input: {
11-
index: path.resolve(__dirname, "index.html"),
12-
},
13-
},
14-
emptyOutDir: false,
15-
assetsInlineLimit: 0,
16-
outDir: path.resolve(__dirname, "out"),
17-
},
18-
worker: {
19-
format: "es",
20-
},
21-
esbuild: {
22-
minifySyntax: false,
23-
},
24-
plugins: [vsixPlugin()],
25-
};
26-
export default config;
4+
/// <reference lib="rolldown-vite/config" />
5+
6+
export default defineConfig(() => {
7+
return buildBaseConfig();
8+
});

0 commit comments

Comments
 (0)