@codingame/monaco-vscode-update-service-override 30.0.0 → 31.0.0

package/vscode/src/vs/workbench/contrib/update/browser/postUpdateWidget.js

@@ -0,0 +1,219 @@
+
+import { registerCss } from '@codingame/monaco-vscode-api/css';
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { $, append, addDisposableListener } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
+import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
+import { Disposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { isWeb } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { CommandsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands';
+import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
+import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
+import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
+import { ILayoutService } from '@codingame/monaco-vscode-api/vscode/vs/platform/layout/browser/layoutService.service';
+import { openLinkFromMarkdown } from '@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer';
+import { IMarkdownRendererService } from '@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer.service';
+import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
+import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
+import { asTextOrError } from '@codingame/monaco-vscode-api/vscode/vs/platform/request/common/request';
+import { IRequestService } from '@codingame/monaco-vscode-api/vscode/vs/platform/request/common/request.service';
+import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
+import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
+import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
+import { IHostService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service';
+import { ShowCurrentReleaseNotesActionId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/update/common/update';
+import { parseUpdateInfoInput } from '../common/updateInfoParser.js';
+import { getUpdateInfoUrl, isMajorMinorVersionChange } from '../common/updateUtils.js';
+import * as postUpdateWidget from './media/postUpdateWidget.css';
+
+registerCss(postUpdateWidget);
+const LAST_KNOWN_VERSION_KEY = "postUpdateWidget/lastKnownVersion";
+let PostUpdateWidgetContribution = class PostUpdateWidgetContribution extends Disposable {
+    constructor(
+        commandService,
+        configurationService,
+        hostService,
+        hoverService,
+        layoutService,
+        markdownRendererService,
+        openerService,
+        productService,
+        requestService,
+        storageService,
+        telemetryService
+    ) {
+        super();
+        this.commandService = commandService;
+        this.configurationService = configurationService;
+        this.hostService = hostService;
+        this.hoverService = hoverService;
+        this.layoutService = layoutService;
+        this.markdownRendererService = markdownRendererService;
+        this.openerService = openerService;
+        this.productService = productService;
+        this.requestService = requestService;
+        this.storageService = storageService;
+        this.telemetryService = telemetryService;
+        if (isWeb) {
+            return;
+        }
+        this._register(CommandsRegistry.registerCommand(
+            "_update.showUpdateInfo",
+            (_accessor, markdown) => this.showUpdateInfo(markdown)
+        ));
+        void this.tryShowOnStartup();
+    }
+    async tryShowOnStartup() {
+        if (!(await this.hostService.hadLastFocus())) {
+            return;
+        }
+        if (!this.detectVersionChange()) {
+            return;
+        }
+        if (this.configurationService.getValue("update.showPostInstallInfo") === false) {
+            return;
+        }
+        await this.showUpdateInfo();
+    }
+    async showUpdateInfo(markdown) {
+        const info = await this.getUpdateInfo(markdown);
+        if (!info) {
+            return;
+        }
+        const contentDisposables = ( new DisposableStore());
+        const target = this.layoutService.mainContainer;
+        const {
+            clientWidth
+        } = target;
+        const maxWidth = 550;
+        const x = Math.max(clientWidth - maxWidth - 80, 16);
+        this.hoverService.showInstantHover({
+            content: this.buildContent(info, contentDisposables),
+            target: {
+                targetElements: [target],
+                x,
+                y: 40,
+                dispose: () => contentDisposables.dispose()
+            },
+            persistence: {
+                sticky: true
+            },
+            appearance: {
+                showPointer: false,
+                compact: true,
+                maxHeightRatio: 0.8
+            }
+        }, true);
+    }
+    async getUpdateInfo(input) {
+        if (!input) {
+            try {
+                const url = getUpdateInfoUrl(this.productService.version);
+                const context = await this.requestService.request({
+                    url,
+                    callSite: "postUpdateWidget"
+                }, CancellationToken.None);
+                input = await asTextOrError(context);
+            } catch {}
+        }
+        if (!input) {
+            return undefined;
+        }
+        let info = parseUpdateInfoInput(input);
+        if (!info?.buttons?.length) {
+            info = {
+                ...info,
+                buttons: [{
+                    label: ( localize(14961, "Release Notes")),
+                    commandId: ShowCurrentReleaseNotesActionId,
+                    args: [this.productService.version],
+                    style: "secondary"
+                }]
+            };
+        }
+        return info;
+    }
+    buildContent(
+        {
+            markdown,
+            buttons
+        },
+        disposables
+    ) {
+        const container = $(".post-update-widget");
+        const header = append(container, $(".header"));
+        const title = append(header, $(".title"));
+        title.textContent = ( localize(14962, "New in {0}", this.productService.version));
+        const markdownContainer = append(container, $(".update-markdown"));
+        const rendered = disposables.add(this.markdownRendererService.render(( new MarkdownString(markdown, {
+            isTrusted: true,
+            supportHtml: true,
+            supportThemeIcons: true
+        })), {
+            actionHandler: (link, mdStr) => {
+                openLinkFromMarkdown(this.openerService, link, mdStr.isTrusted);
+                this.hoverService.hideHover(true);
+            }
+        }));
+        markdownContainer.appendChild(rendered.element);
+        if (buttons?.length) {
+            const buttonBar = append(container, $(".button-bar"));
+            let seenSecondary = false;
+            for (const {
+                label,
+                style,
+                commandId,
+                args
+            } of buttons) {
+                const button = append(buttonBar, $("button"));
+                button.textContent = label;
+                if (style === "secondary") {
+                    button.classList.add("update-button-secondary");
+                    if (!seenSecondary && buttons.length > 1) {
+                        button.classList.add("update-button-leading-secondary");
+                        seenSecondary = true;
+                    }
+                } else {
+                    button.classList.add("update-button-primary");
+                }
+                disposables.add(addDisposableListener(button, "click", () => {
+                    this.telemetryService.publicLog2("workbenchActionExecuted", {
+                        id: commandId,
+                        from: "postUpdateWidget"
+                    });
+                    void this.commandService.executeCommand(commandId, ...(args ?? []));
+                    this.hoverService.hideHover(true);
+                }));
+            }
+        }
+        return container;
+    }
+    detectVersionChange() {
+        let from;
+        try {
+            from = this.storageService.getObject(LAST_KNOWN_VERSION_KEY, StorageScope.APPLICATION);
+        } catch {}
+        const to = {
+            version: this.productService.version,
+            commit: this.productService.commit,
+            timestamp: Date.now()
+        };
+        if (from?.commit === to.commit) {
+            return false;
+        }
+        this.storageService.store(
+            LAST_KNOWN_VERSION_KEY,
+            JSON.stringify(to),
+            StorageScope.APPLICATION,
+            StorageTarget.MACHINE
+        );
+        if (from) {
+            return isMajorMinorVersionChange(from.version, to.version);
+        }
+        return false;
+    }
+};
+PostUpdateWidgetContribution = ( __decorate([( __param(0, ICommandService)), ( __param(1, IConfigurationService)), ( __param(2, IHostService)), ( __param(3, IHoverService)), ( __param(4, ILayoutService)), ( __param(5, IMarkdownRendererService)), ( __param(6, IOpenerService)), ( __param(7, IProductService)), ( __param(8, IRequestService)), ( __param(9, IStorageService)), ( __param(10, ITelemetryService))], PostUpdateWidgetContribution));
+
+export { PostUpdateWidgetContribution };

package/vscode/src/vs/workbench/contrib/update/browser/releaseNotesEditor.d.ts

@@ -13,8 +13,6 @@ import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/l
 import { SimpleSettingRenderer } from "../../markdown/browser/markdownSettingRenderer.js";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { ICodeEditorService } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/codeEditorService.service";
-import { IUpdateService } from "@codingame/monaco-vscode-api/vscode/vs/platform/update/common/update.service";
-import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
 export declare class ReleaseNotesManager extends Disposable {
     private readonly _environmentService;
     private readonly _keybindingService;
@@ -29,13 +27,11 @@ export declare class ReleaseNotesManager extends Disposable {
     private readonly _extensionService;
     private readonly _productService;
     private readonly _instantiationService;
-    private readonly _updateService;
-    private readonly _commandService;
     private readonly _simpleSettingRenderer;
     private readonly _releaseNotesCache;
     private _currentReleaseNotes;
     private _lastMeta;
-    constructor(_environmentService: IEnvironmentService, _keybindingService: IKeybindingService, _languageService: ILanguageService, _openerService: IOpenerService, _requestService: IRequestService, _configurationService: IConfigurationService, _editorService: IEditorService, _editorGroupService: IEditorGroupsService, _codeEditorService: ICodeEditorService, _webviewWorkbenchService: IWebviewWorkbenchService, _extensionService: IExtensionService, _productService: IProductService, _instantiationService: IInstantiationService, _updateService: IUpdateService, _commandService: ICommandService);
+    constructor(_environmentService: IEnvironmentService, _keybindingService: IKeybindingService, _languageService: ILanguageService, _openerService: IOpenerService, _requestService: IRequestService, _configurationService: IConfigurationService, _editorService: IEditorService, _editorGroupService: IEditorGroupsService, _codeEditorService: ICodeEditorService, _webviewWorkbenchService: IWebviewWorkbenchService, _extensionService: IExtensionService, _productService: IProductService, _instantiationService: IInstantiationService);
     private updateHtml;
     private getBase;
     show(version: string, useCurrentFile: boolean): Promise<boolean>;
@@ -43,8 +39,6 @@ export declare class ReleaseNotesManager extends Disposable {
     private onDidClickLink;
     private addGAParameters;
     private renderBody;
-    private getUpdateAction;
-    private postUpdateAction;
     private onDidChangeConfiguration;
     private onDidChangeActiveWebviewEditor;
     private updateCheckboxWebview;

package/vscode/src/vs/workbench/contrib/update/browser/releaseNotesEditor.js

@@ -34,9 +34,6 @@ import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/netw
 import { ICodeEditorService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/codeEditorService.service';
 import { dirname } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { asWebviewUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webview/common/webview';
-import { StateType } from '@codingame/monaco-vscode-api/vscode/vs/platform/update/common/update';
-import { IUpdateService } from '@codingame/monaco-vscode-api/vscode/vs/platform/update/common/update.service';
-import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 
 let ReleaseNotesManager = class ReleaseNotesManager extends Disposable {
     constructor(
@@ -52,9 +49,7 @@ let ReleaseNotesManager = class ReleaseNotesManager extends Disposable {
         _webviewWorkbenchService,
         _extensionService,
         _productService,
-        _instantiationService,
-        _updateService,
-        _commandService
+        _instantiationService
     ) {
         super();
         this._environmentService = _environmentService;
@@ -70,8 +65,6 @@ let ReleaseNotesManager = class ReleaseNotesManager extends Disposable {
         this._extensionService = _extensionService;
         this._productService = _productService;
         this._instantiationService = _instantiationService;
-        this._updateService = _updateService;
-        this._commandService = _commandService;
         this._releaseNotesCache = ( new Map());
         this._currentReleaseNotes = undefined;
         this._register(TokenizationRegistry.onDidChange(() => {
@@ -83,7 +76,6 @@ let ReleaseNotesManager = class ReleaseNotesManager extends Disposable {
         this._register(
             _webviewWorkbenchService.onDidChangeActiveWebviewEditor(e => this.onDidChangeActiveWebviewEditor(e))
         );
-        this._register(this._updateService.onStateChange(() => this.postUpdateAction()));
         this._simpleSettingRenderer = this._instantiationService.createInstance(SimpleSettingRenderer);
     }
     async updateHtml() {
@@ -112,7 +104,7 @@ let ReleaseNotesManager = class ReleaseNotesManager extends Disposable {
             base
         };
         const html = await this.renderBody(this._lastMeta);
-        const title = ( localize(14801, "Release Notes: {0}", version));
+        const title = ( localize(14963, "Release Notes: {0}", version));
         const activeEditorPane = this._editorService.activeEditorPane;
         if (this._currentReleaseNotes) {
             this._currentReleaseNotes.setWebviewTitle(title);
@@ -146,10 +138,6 @@ let ReleaseNotesManager = class ReleaseNotesManager extends Disposable {
             disposables.add(this._currentReleaseNotes.webview.onMessage(e => {
                 if (e.message.type === "showReleaseNotes") {
                     this._configurationService.updateValue("update.showReleaseNotes", e.message.value);
-                } else if (e.message.type === "updateAction") {
-                    if (e.message.commandId) {
-                        this._commandService.executeCommand(e.message.commandId);
-                    }
                 } else if (e.message.type === "clickSetting") {
                     const x = this._currentReleaseNotes?.webview.container.offsetLeft + e.message.value.x;
                     const y = this._currentReleaseNotes?.webview.container.offsetTop + e.message.value.y;
@@ -172,7 +160,7 @@ let ReleaseNotesManager = class ReleaseNotesManager extends Disposable {
         const versionLabel = match[1].replace(/\./g, "_");
         const baseUrl = "https://code.visualstudio.com/raw";
         const url = `${baseUrl}/v${versionLabel}.md`;
-        const unassigned = ( localize(14802, "unassigned"));
+        const unassigned = ( localize(14964, "unassigned"));
         const escapeMdHtml = text => {
             return escape(text).replace(/\\/g, "\\\\");
         };
@@ -276,7 +264,6 @@ let ReleaseNotesManager = class ReleaseNotesManager extends Disposable {
         const colorMap = TokenizationRegistry.getColorMap();
         const css = colorMap ? generateTokensCSSForColorMap(colorMap) : "";
         const showReleaseNotes = Boolean(this._configurationService.getValue("update.showReleaseNotes"));
-        const updateAction = this.getUpdateAction();
         return `<!DOCTYPE html>
         <html>
             <head>
@@ -537,81 +524,6 @@ let ReleaseNotesManager = class ReleaseNotesManager extends Disposable {
                         }
                     }
 
-                    /* Update action button */
-                    #update-action-btn {
-                        position: fixed;
-                        right: 25px;
-                        top: 25px;
-                        background-color: var(--vscode-button-background);
-                        color: var(--vscode-button-foreground);
-                        border: 1px solid var(--vscode-button-border, transparent);
-                        border-radius: 50%;
-                        width: 40px;
-                        height: 40px;
-                        padding: 0;
-                        cursor: pointer;
-                        font-size: var(--vscode-font-size);
-                        font-family: var(--vscode-font-family);
-                        white-space: nowrap;
-                        box-shadow: 0 2px 8px var(--vscode-widget-shadow);
-                        z-index: 100;
-                        overflow: hidden;
-                        display: flex;
-                        align-items: center;
-                        justify-content: center;
-                    }
-
-                    #update-action-btn .icon {
-                        flex-shrink: 0;
-                        display: flex;
-                        align-items: center;
-                        justify-content: center;
-                        width: 16px;
-                        height: 16px;
-                    }
-
-                    #update-action-btn .icon svg {
-                        width: 16px;
-                        height: 16px;
-                        display: block;
-                    }
-
-                    #update-action-btn .label {
-                        overflow: hidden;
-                        max-width: 0;
-                        opacity: 0;
-                        margin-left: 0;
-                    }
-
-                    #update-action-btn:hover,
-                    #update-action-btn.expanded {
-                        background-color: var(--vscode-button-hoverBackground);
-                        box-shadow: 0 2px 8px var(--vscode-widget-shadow);
-                        width: auto;
-                        height: auto;
-                        max-height: 40px;
-                        border-radius: var(--vscode-cornerRadius-small);
-                        padding: 6px 10px;
-                        line-height: 16px;
-                    }
-
-                    #update-action-btn:hover .label,
-                    #update-action-btn.expanded .label {
-                        max-width: 200px;
-                        opacity: 1;
-                        margin-left: 6px;
-                    }
-
-                    #update-action-btn.expanded {
-                        background-color: var(--vscode-button-background);
-                        box-shadow: 0 2px 8px var(--vscode-widget-shadow);
-                    }
-
-                    body.vscode-high-contrast #update-action-btn {
-                        border-width: 2px;
-                        border-style: solid;
-                        box-shadow: none;
-                    }
                 </style>
             </head>
             <body>
@@ -630,7 +542,7 @@ let ReleaseNotesManager = class ReleaseNotesManager extends Disposable {
 
                     const label = document.createElement('label');
                     label.htmlFor = 'showReleaseNotes';
-                    label.textContent = '${( localize(14803, "Show release notes after an update"))}';
+                    label.textContent = '${( localize(14965, "Show release notes after an update"))}';
                     container.appendChild(label);
 
                     const beforeElement = document.querySelector("body > h1")?.nextElementSibling;
@@ -643,15 +555,6 @@ let ReleaseNotesManager = class ReleaseNotesManager extends Disposable {
                     window.addEventListener('message', event => {
                         if (event.data.type === 'showReleaseNotes') {
                             input.checked = event.data.value;
-                        } else if (event.data.type === 'updateAction') {
-                            if (event.data.label) {
-                                updateActionBtn.querySelector('.label').textContent = event.data.label;
-                                updateActionBtn.dataset.commandId = event.data.commandId;
-                                updateActionBtn.setAttribute('aria-label', event.data.label);
-                                updateActionBtn.style.display = 'flex';
-                            } else {
-                                updateActionBtn.style.display = 'none';
-                            }
                         }
                     });
 
@@ -674,85 +577,10 @@ let ReleaseNotesManager = class ReleaseNotesManager extends Disposable {
                     input.addEventListener('change', event => {
                         vscode.postMessage({ type: 'showReleaseNotes', value: input.checked }, '*');
                     });
-
-                    // Update action button
-                    const updateActionBtn = document.createElement('button');
-                    updateActionBtn.id = 'update-action-btn';
-
-                    // Arrow-circle-down SVG icon
-                    const iconSpan = document.createElement('span');
-                    iconSpan.className = 'icon';
-                    iconSpan.innerHTML = '<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M8 1v9.5M4.5 7.5L8 11l3.5-3.5" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M3 13h10" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"/></svg>';
-                    updateActionBtn.appendChild(iconSpan);
-
-                    const labelSpan = document.createElement('span');
-                    labelSpan.className = 'label';
-                    updateActionBtn.appendChild(labelSpan);
-
-                    const initialAction = ${JSON.stringify(updateAction ?? null)};
-                    if (initialAction) {
-                        labelSpan.textContent = initialAction.label;
-                        updateActionBtn.dataset.commandId = initialAction.commandId;
-                        updateActionBtn.setAttribute('aria-label', initialAction.label);
-                        updateActionBtn.style.display = 'flex';
-                    } else {
-                        updateActionBtn.style.display = 'none';
-                    }
-
-                    document.body.appendChild(updateActionBtn);
-
-                    updateActionBtn.addEventListener('click', () => {
-                        if (updateActionBtn.dataset.commandId) {
-                            vscode.postMessage({ type: 'updateAction', commandId: updateActionBtn.dataset.commandId });
-                        }
-                    });
-
-                    // Expand button when at top of page
-                    function updateExpandedState() {
-                        if (window.scrollY <= 100) {
-                            updateActionBtn.classList.add('expanded');
-                        } else {
-                            updateActionBtn.classList.remove('expanded');
-                        }
-                    }
-                    updateExpandedState();
-                    window.addEventListener('scroll', updateExpandedState);
                 </script>
             </body>
         </html>`;
     }
-    getUpdateAction() {
-        const state = this._updateService.state;
-        switch (state.type) {
-        case StateType.AvailableForDownload:
-            return {
-                label: ( localize(14804, "Download Update")),
-                commandId: "update.downloadNow"
-            };
-        case StateType.Downloaded:
-            return {
-                label: ( localize(14805, "Install Update")),
-                commandId: "update.install"
-            };
-        case StateType.Ready:
-            return {
-                label: ( localize(14806, "Restart to Update")),
-                commandId: "update.restart"
-            };
-        default:
-            return undefined;
-        }
-    }
-    postUpdateAction() {
-        if (this._currentReleaseNotes) {
-            const action = this.getUpdateAction();
-            this._currentReleaseNotes.webview.postMessage({
-                type: "updateAction",
-                label: action?.label ?? "",
-                commandId: action?.commandId ?? ""
-            });
-        }
-    }
     onDidChangeConfiguration(e) {
         if (e.affectsConfiguration("update.showReleaseNotes")) {
             this.updateCheckboxWebview();
@@ -772,7 +600,7 @@ let ReleaseNotesManager = class ReleaseNotesManager extends Disposable {
         }
     }
 };
-ReleaseNotesManager = ( __decorate([( __param(0, IEnvironmentService)), ( __param(1, IKeybindingService)), ( __param(2, ILanguageService)), ( __param(3, IOpenerService)), ( __param(4, IRequestService)), ( __param(5, IConfigurationService)), ( __param(6, IEditorService)), ( __param(7, IEditorGroupsService)), ( __param(8, ICodeEditorService)), ( __param(9, IWebviewWorkbenchService)), ( __param(10, IExtensionService)), ( __param(11, IProductService)), ( __param(12, IInstantiationService)), ( __param(13, IUpdateService)), ( __param(14, ICommandService))], ReleaseNotesManager));
+ReleaseNotesManager = ( __decorate([( __param(0, IEnvironmentService)), ( __param(1, IKeybindingService)), ( __param(2, ILanguageService)), ( __param(3, IOpenerService)), ( __param(4, IRequestService)), ( __param(5, IConfigurationService)), ( __param(6, IEditorService)), ( __param(7, IEditorGroupsService)), ( __param(8, ICodeEditorService)), ( __param(9, IWebviewWorkbenchService)), ( __param(10, IExtensionService)), ( __param(11, IProductService)), ( __param(12, IInstantiationService))], ReleaseNotesManager));
 function processConditionalBlocks(text, activeConditions) {
     return text.replace(
         /<!--\s*%IF\s+(\w+)\s*%([\s\S]*?)%ENDIF\s*%\s*-->/gi,