diff --git a/package.json b/package.json index 2232fd07a..8a2592ae7 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,7 @@ "@semantic-release/commit-analyzer": "13.0.1", "@semantic-release/exec": "7.1.0", "@semantic-release/git": "10.0.1", + "@semantic-release/github": "12.0.6", "@semantic-release/npm": "13.1.5", "@semantic-release/release-notes-generator": "14.1.0", "@weiran.zsd/multi-eslint-rule-config": "0.0.6", @@ -48,8 +49,7 @@ "semantic-release-replace-plugin": "1.2.7", "tar": "7.5.11", "unzipper": "0.12.3", - "wireit": "0.14.12", - "@semantic-release/github": "12.0.6" + "wireit": "0.14.12" }, "lint-staged": { "**/*": "prettier --write --ignore-unknown", diff --git a/patches/monaco-editor.patch b/patches/monaco-editor.patch index 3c3e7b968..7a1744300 100644 --- a/patches/monaco-editor.patch +++ b/patches/monaco-editor.patch @@ -845,23 +845,36 @@ index 9490e25363fb401bfc0dae094012675c1e8a5ba9..adfa224edb41f454732cb16ee66b2998 setTheme: setTheme, remeasureFonts: remeasureFonts, diff --git a/esm/vs/language/common/lspLanguageFeatures.js b/esm/vs/language/common/lspLanguageFeatures.js -index 12a49bd4ac441dcbf3db21a25fb15614294f17d8..85016213666ec595890f20192353a922df09a2cf 100644 +index 12a49bd4ac441dcbf3db21a25fb15614294f17d8..b5087cf444492a8bcabed2a748efcb9561175cde 100644 --- a/esm/vs/language/common/lspLanguageFeatures.js +++ b/esm/vs/language/common/lspLanguageFeatures.js -@@ -138,8 +138,11 @@ class DiagnosticsAdapter { +@@ -133,13 +133,23 @@ class DiagnosticsAdapter { + this._disposables.length = 0; + } + _doValidate(resource, languageId) { ++ // PATCH: Enable workers to communicate that syntax validation is complete for a specific model version ++ const model = editor.getModel(resource); ++ if (!model) { ++ return; ++ } ++ const modelVersionId = model.getVersionId(); + this._worker(resource).then((worker) => { + return worker.doValidation(resource.toString()); }).then((diagnostics) => { ++ // PATCH: Enable workers to communicate that syntax validation is complete for a specific model version ++ // let model = editor.getModel(resource); const markers = diagnostics.map((d) => toDiagnostics(resource, d)); - let model = editor.getModel(resource); +- let model = editor.getModel(resource); - if (model && model.getLanguageId() === languageId) { -+ // PATCH: Gracefully handle the case where the model was disposed during async validation. -+ if (model && !model.isDisposed() && model.getLanguageId() === languageId) { ++ // PATCH: Gracefully handle the case where the model changed or was disposed during async validation. ++ if (model && !model.isDisposed() && model.getLanguageId() === languageId && model.getVersionId() === modelVersionId) { editor.setModelMarkers(model, languageId, markers); + // PATCH: Enable workers to communicate that syntax validation is complete for a specific model version -+ editor.setModelVersionValidated(model, model.getVersionId()); ++ editor.setModelVersionValidated(model, modelVersionId); } }).then(void 0, (err) => { console.error(err); -@@ -482,26 +485,11 @@ class DocumentSymbolAdapter { +@@ -482,26 +492,11 @@ class DocumentSymbolAdapter { if (!items) { return; } @@ -1166,4 +1179,4 @@ index 414405319ded9b3671a070b7405b7150afaa8321..c8b924d17e513acb02b8f8a74b75d8a7 + const element = this.domNode.getRootNode().querySelector(`#${this._list.getElementID(index)}`); if (element) { element.style.width = 'auto'; - const width = element.getBoundingClientRect().width; \ No newline at end of file + const width = element.getBoundingClientRect().width; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2a6d84d8b..90c5d4b10 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -179,7 +179,7 @@ overrides: patchedDependencies: monaco-editor: - hash: a349c13b5a476582889e3c97e001bd21082ce0d9e3b2ac055f829459de60871b + hash: f59469d279a32982eee52771fe02497c25d5db418fbf48378bbc1cf96a4479e5 path: patches/monaco-editor.patch importers: @@ -1130,7 +1130,7 @@ importers: version: 10.2.0(jiti@2.6.1) monaco-editor: specifier: 0.55.1 - version: 0.55.1(patch_hash=a349c13b5a476582889e3c97e001bd21082ce0d9e3b2ac055f829459de60871b) + version: 0.55.1(patch_hash=f59469d279a32982eee52771fe02497c25d5db418fbf48378bbc1cf96a4479e5) postcss: specifier: 'catalog:' version: 8.5.9 @@ -17976,7 +17976,7 @@ snapshots: magicast: 0.5.2 obug: 2.1.1 tinyrainbow: 3.1.0 - vitest: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@25.6.0)(@vitest/browser-playwright@4.1.4)(@vitest/coverage-istanbul@4.1.4)(jsdom@27.1.0)(vite@8.0.6(@types/node@25.6.0)(esbuild@0.27.7)(jiti@2.6.1)(sass@1.97.3)(sugarss@5.0.1(postcss@8.5.10))(terser@5.46.1)(yaml@2.8.3)) + vitest: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@24.9.1)(@vitest/browser-playwright@4.1.4)(@vitest/coverage-istanbul@4.1.4)(jsdom@27.1.0)(vite@8.0.6(@types/node@24.9.1)(esbuild@0.27.7)(jiti@2.6.1)(sass@1.97.3)(sugarss@5.0.1(postcss@8.5.10))(terser@5.46.1)(yaml@2.8.3)) transitivePeerDependencies: - supports-color @@ -22276,7 +22276,7 @@ snapshots: module-details-from-path@1.0.4: {} - monaco-editor@0.55.1(patch_hash=a349c13b5a476582889e3c97e001bd21082ce0d9e3b2ac055f829459de60871b): + monaco-editor@0.55.1(patch_hash=f59469d279a32982eee52771fe02497c25d5db418fbf48378bbc1cf96a4479e5): dependencies: dompurify: 3.2.7 marked: 14.0.0