From 2c0102cd6a11d14669e0774a27ec79bd3e579688 Mon Sep 17 00:00:00 2001 From: Kai Salmen Date: Wed, 6 Apr 2022 16:59:44 +0200 Subject: [PATCH] Implemented changes from first review feedback --- README.md | 2 +- index.html | 5 ++-- package-lock.json | 40 +++++++++++++------------- packages/client/package.json | 6 ++-- packages/examples/browser/package.json | 4 +-- packages/examples/client/package.json | 4 +-- vite.config.ts | 7 ++--- 7 files changed, 34 insertions(+), 34 deletions(-) diff --git a/README.md b/README.md index ee00fca9..1b8bccb8 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ ### Project Modernization -From release 0.19.0 onward the project switched to npm workspaces. We no longer require yarn, lerna and webpack. Mostly therefore we the list of `devDependencies` is substantially shorter. All code has been moved to [./packages](./packages) directory. +From release 0.19.0 onward the project switched to npm workspaces. We no longer require yarn, lerna and webpack. Mostly therefore the list of `devDependencies` is substantially shorter. All code has been moved to [./packages](./packages) directory. As before the library code is just compiled with the TypeScript compiler and the library is now packaged with npm. The need for bundling does no longer exist for the example. The compiled code is either executed by node or the web/client related code/pages are served with [vite.js](https://vitejs.dev/). diff --git a/index.html b/index.html index faad75d0..54d403a6 100644 --- a/index.html +++ b/index.html @@ -2,8 +2,9 @@ - - + + + monaco-languageclient Examples diff --git a/package-lock.json b/package-lock.json index a7076ff0..eb7d301d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -108,9 +108,9 @@ } }, "node_modules/@types/vscode": { - "version": "1.65.0", - "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.65.0.tgz", - "integrity": "sha512-wQhExnh2nEzpjDMSKhUvnNmz3ucpd3E+R7wJkOhBNK3No6fG3VUdmVmMOKD0A8NDZDDDiQcLNxe3oGmX5SjJ5w==", + "version": "1.66.0", + "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.66.0.tgz", + "integrity": "sha512-ZfJck4M7nrGasfs4A4YbUoxis3Vu24cETw3DERsNYtDZmYSYtk6ljKexKFKhImO/ZmY6ZMsmegu2FPkXoUFImA==", "dev": true }, "node_modules/@types/ws": { @@ -1563,21 +1563,21 @@ "glob-to-regexp": "^0.4.1", "vscode-jsonrpc": "6.0.0", "vscode-languageclient": "7.0.0", - "vscode-languageserver-textdocument": "^1.0.4", - "vscode-uri": "^3.0.3" + "vscode-languageserver-textdocument": "1.0.4", + "vscode-uri": "3.0.3" }, "devDependencies": { "@types/glob-to-regexp": "^0.4.1", "@types/node": "^16.11.7", - "@types/vscode": "1.65.0" + "@types/vscode": "1.66.0" } }, "packages/examples/browser": { "name": "browser-example", "version": "0.19.0-next.0", "dependencies": { - "monaco-editor": "^0.33.0", - "monaco-editor-workers": "^0.33.0-next.2", + "monaco-editor": "0.33.0", + "monaco-editor-workers": "0.33.0-next.2", "monaco-languageclient": "../../client", "vscode-json-languageservice": "^4.2.1" } @@ -1587,8 +1587,8 @@ "version": "0.19.0-next.0", "dependencies": { "@codingame/monaco-jsonrpc": "^0.3.1", - "monaco-editor": "^0.33.0", - "monaco-editor-workers": "^0.33.0-next.2", + "monaco-editor": "0.33.0", + "monaco-editor-workers": "0.33.0-next.2", "monaco-languageclient": "../../client", "normalize-url": "^7.0.3" } @@ -1704,9 +1704,9 @@ } }, "@types/vscode": { - "version": "1.65.0", - "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.65.0.tgz", - "integrity": "sha512-wQhExnh2nEzpjDMSKhUvnNmz3ucpd3E+R7wJkOhBNK3No6fG3VUdmVmMOKD0A8NDZDDDiQcLNxe3oGmX5SjJ5w==", + "version": "1.66.0", + "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.66.0.tgz", + "integrity": "sha512-ZfJck4M7nrGasfs4A4YbUoxis3Vu24cETw3DERsNYtDZmYSYtk6ljKexKFKhImO/ZmY6ZMsmegu2FPkXoUFImA==", "dev": true }, "@types/ws": { @@ -1765,8 +1765,8 @@ "browser-example": { "version": "file:packages/examples/browser", "requires": { - "monaco-editor": "^0.33.0", - "monaco-editor-workers": "^0.33.0-next.2", + "monaco-editor": "0.33.0", + "monaco-editor-workers": "0.33.0-next.2", "monaco-languageclient": "../../client", "vscode-json-languageservice": "^4.2.1" } @@ -2032,8 +2032,8 @@ "version": "file:packages/examples/client", "requires": { "@codingame/monaco-jsonrpc": "^0.3.1", - "monaco-editor": "^0.33.0", - "monaco-editor-workers": "^0.33.0-next.2", + "monaco-editor": "0.33.0", + "monaco-editor-workers": "0.33.0-next.2", "monaco-languageclient": "../../client", "normalize-url": "^7.0.3" } @@ -2281,12 +2281,12 @@ "requires": { "@types/glob-to-regexp": "^0.4.1", "@types/node": "^16.11.7", - "@types/vscode": "1.65.0", + "@types/vscode": "1.66.0", "glob-to-regexp": "^0.4.1", "vscode-jsonrpc": "6.0.0", "vscode-languageclient": "7.0.0", - "vscode-languageserver-textdocument": "^1.0.4", - "vscode-uri": "^3.0.3" + "vscode-languageserver-textdocument": "1.0.4", + "vscode-uri": "3.0.3" } }, "ms": { diff --git a/packages/client/package.json b/packages/client/package.json index 43291a26..534ec0e2 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -35,11 +35,11 @@ "glob-to-regexp": "^0.4.1", "vscode-jsonrpc": "6.0.0", "vscode-languageclient": "7.0.0", - "vscode-languageserver-textdocument": "^1.0.4", - "vscode-uri": "^3.0.3" + "vscode-languageserver-textdocument": "1.0.4", + "vscode-uri": "3.0.3" }, "devDependencies": { - "@types/vscode": "1.65.0", + "@types/vscode": "1.66.0", "@types/node": "^16.11.7", "@types/glob-to-regexp": "^0.4.1" }, diff --git a/packages/examples/browser/package.json b/packages/examples/browser/package.json index 1112b394..01abe847 100644 --- a/packages/examples/browser/package.json +++ b/packages/examples/browser/package.json @@ -3,8 +3,8 @@ "name": "browser-example", "version": "0.19.0-next.0", "dependencies": { - "monaco-editor": "^0.33.0", - "monaco-editor-workers": "^0.33.0-next.2", + "monaco-editor": "0.33.0", + "monaco-editor-workers": "0.33.0-next.2", "monaco-languageclient": "../../client", "vscode-json-languageservice": "^4.2.1" }, diff --git a/packages/examples/client/package.json b/packages/examples/client/package.json index 5f3cea34..39dfc03c 100644 --- a/packages/examples/client/package.json +++ b/packages/examples/client/package.json @@ -3,8 +3,8 @@ "private": true, "version": "0.19.0-next.0", "dependencies": { - "monaco-editor": "^0.33.0", - "monaco-editor-workers": "^0.33.0-next.2", + "monaco-editor": "0.33.0", + "monaco-editor-workers": "0.33.0-next.2", "monaco-languageclient": "../../client", "@codingame/monaco-jsonrpc": "^0.3.1", "normalize-url": "^7.0.3" diff --git a/vite.config.ts b/vite.config.ts index 4c4155f4..3fd01a8b 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -18,10 +18,9 @@ export default defineConfig({ build: { rollupOptions: { input: { - client: path.resolve(__dirname, '/packages/examples/client/index.html') - }, - plugins: [ - ] + client: path.resolve(__dirname, '/packages/examples/client/index.html'), + browser: path.resolve(__dirname, '/packages/examples/browser/index.html') + } } }, server: {