From 032130e4bb48bb996d6f75f69d151e058f6cf162 Mon Sep 17 00:00:00 2001 From: Aiday Marlen Kyzy Date: Thu, 20 Jun 2024 15:50:46 +0200 Subject: [PATCH 01/15] Adding more detailed steps --- MAINTAINING.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/MAINTAINING.md b/MAINTAINING.md index f2578b96..9249366b 100644 --- a/MAINTAINING.md +++ b/MAINTAINING.md @@ -25,7 +25,9 @@ Make sure every unassigned issue is labeled properly: - API Changes / Breaking Changes / New and noteworthy (use the diff from the compare step) - Add thank you mentions ([use this tool](https://tools.code.visualstudio.com/acknowledgement) and select only the monaco-editor) - Commit & Create PR -- [Trigger build](https://dev.azure.com/monacotools/Monaco/_build?definitionId=416) once merged +- [Trigger build](https://dev.azure.com/monacotools/Monaco/_build?definitionId=416) once merged. Tick the following checkboxes: + - Publish Monaco Editor Core + - Publish Monaco Editor #### Publish new webpack plugin From 333adbbe6b0f229da219721646468912370a407e Mon Sep 17 00:00:00 2001 From: Scott Carda Date: Mon, 1 Jul 2024 13:59:44 -0700 Subject: [PATCH 02/15] Add keywords `import`, `export`, and `struct`. --- src/basic-languages/qsharp/qsharp.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/basic-languages/qsharp/qsharp.ts b/src/basic-languages/qsharp/qsharp.ts index f89f4437..420ea59d 100644 --- a/src/basic-languages/qsharp/qsharp.ts +++ b/src/basic-languages/qsharp/qsharp.ts @@ -33,12 +33,15 @@ export const language = { keywords: [ 'namespace', 'open', + 'import', + 'export', 'as', 'operation', 'function', 'body', 'adjoint', 'newtype', + 'struct', 'controlled', 'if', 'elif', @@ -141,7 +144,6 @@ export const language = { 'stackalloc', 'static', 'string', - 'struct', 'switch', 'this', 'throw', From 2f8db3f6f89744881474248d0ced079d26431e10 Mon Sep 17 00:00:00 2001 From: Scott Carda Date: Mon, 1 Jul 2024 16:43:28 -0700 Subject: [PATCH 03/15] update tokenizer and tests --- src/basic-languages/qsharp/qsharp.test.ts | 116 +++++++++++++--------- src/basic-languages/qsharp/qsharp.ts | 20 +++- 2 files changed, 88 insertions(+), 48 deletions(-) diff --git a/src/basic-languages/qsharp/qsharp.test.ts b/src/basic-languages/qsharp/qsharp.test.ts index c2889067..e6abc780 100644 --- a/src/basic-languages/qsharp/qsharp.test.ts +++ b/src/basic-languages/qsharp/qsharp.test.ts @@ -6,7 +6,6 @@ import { testTokenization } from '../test/testRunner'; testTokenization('qsharp', [ - // Generated from sample: https://github.com/microsoft/Quantum/blob/main/samples/azure-quantum/parallel-qrng/ParallelQrng.ipynb [ { line: 'open Microsoft.Quantum.Arrays;', @@ -21,19 +20,6 @@ testTokenization('qsharp', [ { startIndex: 29, type: 'delimiter.qsharp' } ] }, - { - line: 'open Microsoft.Quantum.Measurement;', - tokens: [ - { startIndex: 0, type: 'keyword.open.qsharp' }, - { startIndex: 4, type: 'white.qsharp' }, - { startIndex: 5, type: 'namespace.qsharp' }, - { startIndex: 14, type: 'delimiter.qsharp' }, - { startIndex: 15, type: 'namespace.qsharp' }, - { startIndex: 22, type: 'delimiter.qsharp' }, - { startIndex: 23, type: 'namespace.qsharp' }, - { startIndex: 34, type: 'delimiter.qsharp' } - ] - }, { line: '', tokens: [] @@ -67,20 +53,6 @@ testTokenization('qsharp', [ { startIndex: 1, type: 'comment.qsharp' } ] }, - { - line: ' // superposition state, such that when we measure,', - tokens: [ - { startIndex: 0, type: 'white.qsharp' }, - { startIndex: 1, type: 'comment.qsharp' } - ] - }, - { - line: ' // all bitstrings occur with equal probability.', - tokens: [ - { startIndex: 0, type: 'white.qsharp' }, - { startIndex: 1, type: 'comment.qsharp' } - ] - }, { line: ' use register = Qubit[nQubits] {', tokens: [ @@ -99,13 +71,6 @@ testTokenization('qsharp', [ { startIndex: 31, type: 'delimiter.curly.qsharp' } ] }, - { - line: ' // Set qubits in superposition.', - tokens: [ - { startIndex: 0, type: 'white.qsharp' }, - { startIndex: 2, type: 'comment.qsharp' } - ] - }, { line: ' ApplyToEachA(H, register);', tokens: [ @@ -120,17 +85,6 @@ testTokenization('qsharp', [ { startIndex: 27, type: 'delimiter.qsharp' } ] }, - { - line: '', - tokens: [] - }, - { - line: ' // Measure all qubits and return.', - tokens: [ - { startIndex: 0, type: 'white.qsharp' }, - { startIndex: 2, type: 'comment.qsharp' } - ] - }, { line: ' return ForEach(MResetZ, register);', tokens: [ @@ -157,6 +111,76 @@ testTokenization('qsharp', [ { line: '}', tokens: [{ startIndex: 0, type: 'delimiter.curly.qsharp' }] + }, + { + line: 'struct Foo { First : Int, Second : Int }', + tokens: [ + { startIndex: 0, type: 'keyword.qsharp' }, + { startIndex: 6, type: 'white.qsharp' }, + { startIndex: 7, type: 'identifier.qsharp' }, + { startIndex: 10, type: 'white.qsharp' }, + { startIndex: 11, type: 'delimiter.curly.qsharp' }, + { startIndex: 12, type: 'white.qsharp' }, + { startIndex: 13, type: 'identifier.qsharp' }, + { startIndex: 18, type: 'white.qsharp' }, + { startIndex: 19, type: 'operator.qsharp' }, + { startIndex: 20, type: 'white.qsharp' }, + { startIndex: 21, type: 'type.qsharp' }, + { startIndex: 24, type: 'delimiter.qsharp' }, + { startIndex: 25, type: 'white.qsharp' }, + { startIndex: 26, type: 'identifier.qsharp' }, + { startIndex: 32, type: 'white.qsharp' }, + { startIndex: 33, type: 'operator.qsharp' }, + { startIndex: 34, type: 'white.qsharp' }, + { startIndex: 35, type: 'type.qsharp' }, + { startIndex: 38, type: 'white.qsharp' }, + { startIndex: 39, type: 'delimiter.curly.qsharp' } + ] + }, + { + line: 'Foo.First', + tokens: [ + { startIndex: 0, type: 'identifier.qsharp' }, + { startIndex: 3, type: 'operator.qsharp' }, + { startIndex: 4, type: 'identifier.qsharp' } + ] + }, + { + line: 'import Microsoft.Quantum.Math, Microsoft.Quantum.Diagnostics.*;', + tokens: [ + { startIndex: 0, type: 'keyword.import.qsharp' }, + { startIndex: 6, type: 'white.qsharp' }, + { startIndex: 7, type: 'namespace.qsharp' }, + { startIndex: 16, type: 'delimiter.qsharp' }, + { startIndex: 17, type: 'namespace.qsharp' }, + { startIndex: 24, type: 'delimiter.qsharp' }, + { startIndex: 25, type: 'identifier.qsharp' }, + { startIndex: 29, type: 'delimiter.qsharp' }, + { startIndex: 30, type: 'white.qsharp' }, + { startIndex: 31, type: 'namespace.qsharp' }, + { startIndex: 40, type: 'delimiter.qsharp' }, + { startIndex: 41, type: 'namespace.qsharp' }, + { startIndex: 48, type: 'delimiter.qsharp' }, + { startIndex: 49, type: 'namespace.qsharp' }, + { startIndex: 60, type: 'delimiter.qsharp' }, + { startIndex: 61, type: 'wildcard.qsharp' }, + { startIndex: 62, type: 'delimiter.qsharp' } + ] + }, + { + line: 'export A, B, C;', + tokens: [ + { startIndex: 0, type: 'keyword.qsharp' }, + { startIndex: 6, type: 'white.qsharp' }, + { startIndex: 7, type: 'identifier.qsharp' }, + { startIndex: 8, type: 'delimiter.qsharp' }, + { startIndex: 9, type: 'white.qsharp' }, + { startIndex: 10, type: 'identifier.qsharp' }, + { startIndex: 11, type: 'delimiter.qsharp' }, + { startIndex: 12, type: 'white.qsharp' }, + { startIndex: 13, type: 'identifier.qsharp' }, + { startIndex: 14, type: 'delimiter.qsharp' } + ] } ] ]); diff --git a/src/basic-languages/qsharp/qsharp.ts b/src/basic-languages/qsharp/qsharp.ts index 420ea59d..1c12de23 100644 --- a/src/basic-languages/qsharp/qsharp.ts +++ b/src/basic-languages/qsharp/qsharp.ts @@ -204,6 +204,7 @@ export const language = { '^=', ':', '::', + '.', '..', '==', '...', @@ -243,6 +244,8 @@ export const language = { namespaceFollows: ['namespace', 'open'], + importsFollows: ['import'], + symbols: /[=>{ token: 'keyword.$0', next: '@namespace' }, + '@importsFollows': { + token: 'keyword.$0', + next: '@imports' + }, '@typeKeywords': 'type', '@keywords': 'keyword', '@constants': 'constant', @@ -284,7 +291,7 @@ export const language = { [/[;,.]/, 'delimiter'], // strings - //[/"([^"\\]|\\.)*$/, 'string.invalid' ], // non-teminated string + //[/"([^"\\]|\\.)*$/, 'string.invalid' ], // non-terminated string [/"/, { token: 'string.quote', bracket: '@open', next: '@string' }] ], @@ -297,7 +304,16 @@ export const language = { namespace: [ { include: '@whitespace' }, [/[A-Za-z]\w*/, 'namespace'], - [/[\.=]/, 'delimiter'], + [/[\.]/, 'delimiter'], + ['', '', '@pop'] + ], + + imports: [ + { include: '@whitespace' }, + [/[A-Za-z]\w*(?=\.)/, 'namespace'], + [/[A-Za-z]\w*/, 'identifier'], + [/\*/, 'wildcard'], + [/[\.,]/, 'delimiter'], ['', '', '@pop'] ], From 5181be10113258320a59d7c2ca0c478d6c26a7a6 Mon Sep 17 00:00:00 2001 From: Henning Dieterichs Date: Tue, 16 Jul 2024 19:27:14 +0200 Subject: [PATCH 04/15] website: monaco loading improvements --- website/src/monaco-loader.ts | 4 ++++ website/src/website/components/monaco/MonacoEditor.tsx | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/website/src/monaco-loader.ts b/website/src/monaco-loader.ts index 898b08d7..1c3184fc 100644 --- a/website/src/monaco-loader.ts +++ b/website/src/monaco-loader.ts @@ -62,6 +62,10 @@ async function _loadMonaco(setup: IMonacoSetup): Promise { return new Promise((res) => { // First load editor.main. If it inlines the plugins, we don't want to try to load them from the server. req(["vs/editor/editor.main"], () => { + if ((setup as any).onlyCore) { + res(monaco); + return; + } req( [ "vs/basic-languages/monaco.contribution", diff --git a/website/src/website/components/monaco/MonacoEditor.tsx b/website/src/website/components/monaco/MonacoEditor.tsx index 57e47761..9546ce93 100644 --- a/website/src/website/components/monaco/MonacoEditor.tsx +++ b/website/src/website/components/monaco/MonacoEditor.tsx @@ -17,6 +17,10 @@ export class ControlledMonacoEditor extends React.Component<{ private lastSubscription: monaco.IDisposable | undefined; + componentDidMount(): void { + this.componentDidUpdate({ value: "" }); + } + componentDidUpdate(lastProps: this["props"]) { const newOnDidValueChange = this.props.onDidValueChange; if (newOnDidValueChange !== lastProps.onDidValueChange) { From d4bb0a8224ab33ef7e0a4ffc669c7c2c180331bf Mon Sep 17 00:00:00 2001 From: Henning Dieterichs Date: Fri, 26 Jul 2024 13:26:48 +0200 Subject: [PATCH 05/15] Fixes tests --- package-lock.json | 14 +++++++------- package.json | 2 +- test/unit/setup.js | 3 +++ 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index c0bb2fe7..a3d016df 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25,7 +25,7 @@ "jsdom": "^19.0.0", "jsonc-parser": "^3.0.0", "mocha": "^9.2.0", - "monaco-editor-core": "0.50.0-rc", + "monaco-editor-core": "0.51.0-dev-20240725", "parcel": "^2.7.0", "pin-github-action": "^1.8.0", "playwright": "^1.32.2", @@ -5394,9 +5394,9 @@ "dev": true }, "node_modules/monaco-editor-core": { - "version": "0.50.0-rc", - "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.50.0-rc.tgz", - "integrity": "sha512-DM/rRS4/dxWvHnszmSA81hpAhy8k5k1zE/aYc+lvH+4SxEJNsdHhindo8xM7VavawujvGhs+X3SPbi3ytl3rJQ==", + "version": "0.51.0-dev-20240725", + "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.51.0-dev-20240725.tgz", + "integrity": "sha512-N/ukRZDRZ31CmVY9iUgmPnjT9kYXVEFhqc6I9/YWCAV8WpgArQXUB3iaMB0QnmQ08yo3D5XgsoHqf+komUj8nA==", "dev": true }, "node_modules/mri": { @@ -11150,9 +11150,9 @@ } }, "monaco-editor-core": { - "version": "0.50.0-rc", - "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.50.0-rc.tgz", - "integrity": "sha512-DM/rRS4/dxWvHnszmSA81hpAhy8k5k1zE/aYc+lvH+4SxEJNsdHhindo8xM7VavawujvGhs+X3SPbi3ytl3rJQ==", + "version": "0.51.0-dev-20240725", + "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.51.0-dev-20240725.tgz", + "integrity": "sha512-N/ukRZDRZ31CmVY9iUgmPnjT9kYXVEFhqc6I9/YWCAV8WpgArQXUB3iaMB0QnmQ08yo3D5XgsoHqf+komUj8nA==", "dev": true }, "mri": { diff --git a/package.json b/package.json index d02fab4e..a14480f1 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "jsdom": "^19.0.0", "jsonc-parser": "^3.0.0", "mocha": "^9.2.0", - "monaco-editor-core": "0.50.0-rc", + "monaco-editor-core": "0.51.0-dev-20240725", "parcel": "^2.7.0", "pin-github-action": "^1.8.0", "playwright": "^1.32.2", diff --git a/test/unit/setup.js b/test/unit/setup.js index f06bf323..1ea4ef48 100644 --- a/test/unit/setup.js +++ b/test/unit/setup.js @@ -21,6 +21,9 @@ define('vs/nls', [], { localize: function () { return 'NO_LOCALIZATION_FOR_YOU'; }, + localize2: function (key, message) { + return { value: 'NO_LOCALIZATION_FOR_YOU', original: message }; + }, load: function (name, req, load) { load({}); } From 93a0a2df32926aa86f7e11bc71a43afaea581a09 Mon Sep 17 00:00:00 2001 From: Henning Dieterichs Date: Fri, 26 Jul 2024 15:19:05 +0200 Subject: [PATCH 06/15] Fixes CI --- test/smoke/amd/index.html | 1 + test/smoke/smoke.test.js | 20 +++++++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/test/smoke/amd/index.html b/test/smoke/amd/index.html index a50ce51d..5d22f321 100644 --- a/test/smoke/amd/index.html +++ b/test/smoke/amd/index.html @@ -8,6 +8,7 @@ - - From b31d22b9ee8e8081751069dc72d397f782cf8eb5 Mon Sep 17 00:00:00 2001 From: Henning Dieterichs Date: Thu, 29 Aug 2024 17:52:51 +0200 Subject: [PATCH 11/15] Updates nvm to align with vscode nvm file. (#4665) --- .nvmrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.nvmrc b/.nvmrc index bcaa3377..48b14e6b 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -18.17 \ No newline at end of file +20.14.0 From f262e8f93182869139f6789070607c928b91e8bb Mon Sep 17 00:00:00 2001 From: Henning Dieterichs Date: Thu, 29 Aug 2024 17:45:22 +0200 Subject: [PATCH 12/15] Defines setInterval/setTimeout on faked globalThis in unit test --- package-lock.json | 14 +++++++------- package.json | 2 +- test/unit/all.js | 4 +++- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index bb8d78a7..419bd7ca 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25,7 +25,7 @@ "jsdom": "^19.0.0", "jsonc-parser": "^3.0.0", "mocha": "^9.2.0", - "monaco-editor-core": "0.51.0-rc3", + "monaco-editor-core": "0.52.0-dev-20240826", "parcel": "^2.7.0", "pin-github-action": "^1.8.0", "playwright": "^1.32.2", @@ -5394,9 +5394,9 @@ "dev": true }, "node_modules/monaco-editor-core": { - "version": "0.51.0-rc3", - "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.51.0-rc3.tgz", - "integrity": "sha512-2CrhqO3ZdUXhMjNeq851FfulE04GBSn1/HBy02qnR4N4ONG5S8HuQKCkQxxzEeK3E8FGqDoIXH5nyDXpLmDJHg==", + "version": "0.52.0-dev-20240826", + "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.52.0-dev-20240826.tgz", + "integrity": "sha512-m5KQg1/SYSIWegxQlCloAeFcsfQUEeHlCGvj0+5wmYOFEruEOqf36f/wOlE9EoSXCTExM4gEOdBBZw/jZVKoIg==", "dev": true }, "node_modules/mri": { @@ -11150,9 +11150,9 @@ } }, "monaco-editor-core": { - "version": "0.51.0-rc3", - "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.51.0-rc3.tgz", - "integrity": "sha512-2CrhqO3ZdUXhMjNeq851FfulE04GBSn1/HBy02qnR4N4ONG5S8HuQKCkQxxzEeK3E8FGqDoIXH5nyDXpLmDJHg==", + "version": "0.52.0-dev-20240826", + "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.52.0-dev-20240826.tgz", + "integrity": "sha512-m5KQg1/SYSIWegxQlCloAeFcsfQUEeHlCGvj0+5wmYOFEruEOqf36f/wOlE9EoSXCTExM4gEOdBBZw/jZVKoIg==", "dev": true }, "mri": { diff --git a/package.json b/package.json index b13152db..e37721c1 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "jsdom": "^19.0.0", "jsonc-parser": "^3.0.0", "mocha": "^9.2.0", - "monaco-editor-core": "0.51.0-rc3", + "monaco-editor-core": "0.52.0-dev-20240826", "parcel": "^2.7.0", "pin-github-action": "^1.8.0", "playwright": "^1.32.2", diff --git a/test/unit/all.js b/test/unit/all.js index 2cb2b0f7..28d1d9f9 100644 --- a/test/unit/all.js +++ b/test/unit/all.js @@ -35,7 +35,9 @@ global.window = { matches: false, addEventListener: function () {} }; - } + }, + setInterval: function () {}, + setTimeout: function () {} }; requirejs( From 3c7eb57085d23d24c3b5527c45324440ea55c865 Mon Sep 17 00:00:00 2001 From: Aiday Marlen Kyzy Date: Wed, 18 Sep 2024 12:50:03 +0200 Subject: [PATCH 13/15] undo the package upgrade change --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 419bd7ca..bb8d78a7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25,7 +25,7 @@ "jsdom": "^19.0.0", "jsonc-parser": "^3.0.0", "mocha": "^9.2.0", - "monaco-editor-core": "0.52.0-dev-20240826", + "monaco-editor-core": "0.51.0-rc3", "parcel": "^2.7.0", "pin-github-action": "^1.8.0", "playwright": "^1.32.2", @@ -5394,9 +5394,9 @@ "dev": true }, "node_modules/monaco-editor-core": { - "version": "0.52.0-dev-20240826", - "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.52.0-dev-20240826.tgz", - "integrity": "sha512-m5KQg1/SYSIWegxQlCloAeFcsfQUEeHlCGvj0+5wmYOFEruEOqf36f/wOlE9EoSXCTExM4gEOdBBZw/jZVKoIg==", + "version": "0.51.0-rc3", + "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.51.0-rc3.tgz", + "integrity": "sha512-2CrhqO3ZdUXhMjNeq851FfulE04GBSn1/HBy02qnR4N4ONG5S8HuQKCkQxxzEeK3E8FGqDoIXH5nyDXpLmDJHg==", "dev": true }, "node_modules/mri": { @@ -11150,9 +11150,9 @@ } }, "monaco-editor-core": { - "version": "0.52.0-dev-20240826", - "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.52.0-dev-20240826.tgz", - "integrity": "sha512-m5KQg1/SYSIWegxQlCloAeFcsfQUEeHlCGvj0+5wmYOFEruEOqf36f/wOlE9EoSXCTExM4gEOdBBZw/jZVKoIg==", + "version": "0.51.0-rc3", + "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.51.0-rc3.tgz", + "integrity": "sha512-2CrhqO3ZdUXhMjNeq851FfulE04GBSn1/HBy02qnR4N4ONG5S8HuQKCkQxxzEeK3E8FGqDoIXH5nyDXpLmDJHg==", "dev": true }, "mri": { diff --git a/package.json b/package.json index e37721c1..b13152db 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "jsdom": "^19.0.0", "jsonc-parser": "^3.0.0", "mocha": "^9.2.0", - "monaco-editor-core": "0.52.0-dev-20240826", + "monaco-editor-core": "0.51.0-rc3", "parcel": "^2.7.0", "pin-github-action": "^1.8.0", "playwright": "^1.32.2", From 7959d5c66eff5d904852579c6c4718efebb8363d Mon Sep 17 00:00:00 2001 From: Aiday Marlen Kyzy Date: Thu, 19 Sep 2024 12:28:03 +0200 Subject: [PATCH 14/15] update pacakge.json --- package-lock.json | 18 +++++++++--------- package.json | 6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index bb8d78a7..3b9fd075 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "monaco-editor", - "version": "0.51.0", + "version": "0.52.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "monaco-editor", - "version": "0.51.0", + "version": "0.52.0", "hasInstallScript": true, "license": "MIT", "devDependencies": { @@ -25,7 +25,7 @@ "jsdom": "^19.0.0", "jsonc-parser": "^3.0.0", "mocha": "^9.2.0", - "monaco-editor-core": "0.51.0-rc3", + "monaco-editor-core": "0.52.0-rc2", "parcel": "^2.7.0", "pin-github-action": "^1.8.0", "playwright": "^1.32.2", @@ -5394,9 +5394,9 @@ "dev": true }, "node_modules/monaco-editor-core": { - "version": "0.51.0-rc3", - "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.51.0-rc3.tgz", - "integrity": "sha512-2CrhqO3ZdUXhMjNeq851FfulE04GBSn1/HBy02qnR4N4ONG5S8HuQKCkQxxzEeK3E8FGqDoIXH5nyDXpLmDJHg==", + "version": "0.52.0-rc2", + "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.52.0-rc2.tgz", + "integrity": "sha512-buoH7pURwcTnmnO+aQ69jlbJ1Nop7w3sQm1pmBJ6pr/M9/WhAD2GsgL/bOf7kK+Vzd9FlzitlThImezQ28s9+g==", "dev": true }, "node_modules/mri": { @@ -11150,9 +11150,9 @@ } }, "monaco-editor-core": { - "version": "0.51.0-rc3", - "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.51.0-rc3.tgz", - "integrity": "sha512-2CrhqO3ZdUXhMjNeq851FfulE04GBSn1/HBy02qnR4N4ONG5S8HuQKCkQxxzEeK3E8FGqDoIXH5nyDXpLmDJHg==", + "version": "0.52.0-rc2", + "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.52.0-rc2.tgz", + "integrity": "sha512-buoH7pURwcTnmnO+aQ69jlbJ1Nop7w3sQm1pmBJ6pr/M9/WhAD2GsgL/bOf7kK+Vzd9FlzitlThImezQ28s9+g==", "dev": true }, "mri": { diff --git a/package.json b/package.json index b13152db..5e52ca55 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "monaco-editor", - "version": "0.51.0", - "vscodeRef": "1dffd5cef7f833b16c0588fb5b9cfa95063af7cf", + "version": "0.52.0", + "vscodeRef": "493330cdc6475247184ea459c66776c3da12cd2d", "private": true, "description": "A browser based code editor", "homepage": "https://github.com/microsoft/monaco-editor", @@ -52,7 +52,7 @@ "jsdom": "^19.0.0", "jsonc-parser": "^3.0.0", "mocha": "^9.2.0", - "monaco-editor-core": "0.51.0-rc3", + "monaco-editor-core": "0.52.0-rc2", "parcel": "^2.7.0", "pin-github-action": "^1.8.0", "playwright": "^1.32.2", From 53e8e1ce30a0b1e5c4ec57ebd67fa17a3ec007ef Mon Sep 17 00:00:00 2001 From: Aiday Marlen Kyzy Date: Thu, 19 Sep 2024 12:32:04 +0200 Subject: [PATCH 15/15] adding changelog md change --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e474bfaa..ac405998 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Monaco Editor Changelog +## [0.52.0] + +- Comment added inside of `IModelContentChangedEvent` + ## [0.51.0] - New fields `IEditorOptions.placeholder` and `IEditorOptions.compactMode`