diff --git a/extensions/markdown-language-features/markdown-editor-src/editor.ts b/extensions/markdown-language-features/markdown-editor-src/editor.ts index 501b09a0c60657..5d8e460617659b 100644 --- a/extensions/markdown-language-features/markdown-editor-src/editor.ts +++ b/extensions/markdown-language-features/markdown-editor-src/editor.ts @@ -248,11 +248,14 @@ class Editor extends Disposable { #createView(host: HTMLElement, content: string): void { const model = this.model; const scriptNonce = document.querySelector('meta[name="vscode-markdown-editor-script-nonce"]')?.content; + const iframeBootstrapUrl = new URL(location.href); + // Nested frames must use the empty webview bootstrap, not the restricted index.html entrypoint. + iframeBootstrapUrl.pathname = '/fake.html'; const embeddedCodeEditorFactory = this._register(new VirtualizedIframeEmbeddedEditorFactory({ providers: this.#createIframeProviders(this.#codeBlockEditorProviders), scriptNonce, themeCss: () => `:root { ${document.documentElement.getAttribute('style') ?? ''} }`, - iframeBootstrapUrl: location.href, + iframeBootstrapUrl: iframeBootstrapUrl.href, onAmbiguous: (language, providers) => this.#vscode.postMessage({ type: 'codeBlockEditorDiagnostic', message: `Ambiguous providers for ${language}: ${providers.map(provider => provider.id).join(', ')}`, diff --git a/extensions/markdown-language-features/package-lock.json b/extensions/markdown-language-features/package-lock.json index 5a14bcc4bada2f..9c9cb70cafc09d 100644 --- a/extensions/markdown-language-features/package-lock.json +++ b/extensions/markdown-language-features/package-lock.json @@ -10,7 +10,7 @@ "license": "MIT", "dependencies": { "@vscode/extension-telemetry": "^0.9.8", - "@vscode/markdown-editor": "^0.0.2-88", + "@vscode/markdown-editor": "^0.0.2-90", "@vscode/observables": "^0.1.1-0", "dompurify": "^3.4.10", "highlight.js": "^11.8.0", @@ -633,9 +633,9 @@ "integrity": "sha512-ukOMWnCg1tCvT7WnDfsUKQOFDQGsyR5tNgRpwmqi+5/vzU3ghdDXzvIM4IOPdSb3OeSsBNvmSL8nxIVOqi2WXA==" }, "node_modules/@vscode/markdown-editor": { - "version": "0.0.2-88", - "resolved": "https://registry.npmjs.org/@vscode/markdown-editor/-/markdown-editor-0.0.2-88.tgz", - "integrity": "sha512-vN4vtf1QRF79BKZBA3ufuluFgqeb3uASOnsNcmm2bDHxZjgeRLiji+fgTkP//I+Qg/A68lelk/8K6SMQ933bTA==", + "version": "0.0.2-90", + "resolved": "https://registry.npmjs.org/@vscode/markdown-editor/-/markdown-editor-0.0.2-90.tgz", + "integrity": "sha512-qbiADnvlakn+vlMJRM/0Y9+HhmQLrPUaI1QJIW0qZCShP5p+NjOaquKTqP5dxF28uBfngA0nLMGNdzGXAL+AtQ==", "license": "MIT", "dependencies": { "@vscode/codicons": "0.0.46-36", diff --git a/extensions/markdown-language-features/package.json b/extensions/markdown-language-features/package.json index c51f87715c44ef..5d53ed24343381 100644 --- a/extensions/markdown-language-features/package.json +++ b/extensions/markdown-language-features/package.json @@ -1791,7 +1791,7 @@ }, "dependencies": { "@vscode/extension-telemetry": "^0.9.8", - "@vscode/markdown-editor": "^0.0.2-88", + "@vscode/markdown-editor": "^0.0.2-90", "@vscode/observables": "^0.1.1-0", "dompurify": "^3.4.10", "highlight.js": "^11.8.0",