diff --git a/src/htmlContent/deprecated-extensions-dialog.html b/src/htmlContent/deprecated-extensions-dialog.html new file mode 100644 index 0000000000..eb6792f73e --- /dev/null +++ b/src/htmlContent/deprecated-extensions-dialog.html @@ -0,0 +1,35 @@ +
+
+

{{Strings.DEPRECATED_EXTENSIONS_TITLE}}

+
+
+

{{Strings.DEPRECATED_EXTENSIONS_MESSAGE}}

+ +
+ {{#extensions}} +
+
+
+ + {{name}} +
+
+ + {{Strings.DEPRECATED_EXTENSIONS_LEARN_MORE}} + + +
+
+
+ +
+
+ {{/extensions}} +
+
+
+ +
+
diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js index 63f9db31ed..e6c14a3ada 100644 --- a/src/nls/root/strings.js +++ b/src/nls/root/strings.js @@ -804,6 +804,8 @@ define({ "EXTENSION_VERIFIED_SORT": "Verified", "EXTENSION_STAR": "Star", "EXTENSION_STAR_SORT": "Star Rating", + "ERROR_UNINSTALLING_EXTENSION_TITLE": "Error Uninstalling Extension", + "ERROR_UNINSTALLING_EXTENSION_MESSAGE": "Failed to uninstall extension {0}", // For NOT_FOUND_ERR, see generic strings above "EXTENSION_MANAGER_TITLE": "Extension Manager", "EXTENSION_MANAGER_ERROR_LOAD": "Unable to access the extension registry. Please try again later.", @@ -1171,10 +1173,12 @@ define({ "DOWNLOAD_ERROR": "Error occurred while downloading.", "NETWORK_SLOW_OR_DISCONNECTED": "Network is disconnected or too slow.", "RESTART_BUTTON": "Restart", + "RESTART_APP_BUTTON": "Restart {APP_NAME}", "LATER_BUTTON": "Later", "DESCRIPTION_AUTO_UPDATE": "Enable/disable {APP_NAME} Auto-update", "AUTOUPDATE_ERROR": "Error!", "AUTOUPDATE_IN_PROGRESS": "An update is already in progress.", + "REMOVING": "Removing\u2026", "NUMBER_WITH_PERCENTAGE": "{0}%", // Strings for Related Files @@ -1723,6 +1727,10 @@ define({ "LICENSE_ACTIVATE_FAIL_APPLY": "'Failed to apply license to device'", "LICENSE_ENTER_KEY": "Please enter a license key", "LICENSE_REAPPLY_TO_DEVICE": "Already activated? Reapply system-wide", + // Deprecated Extensions Dialog + "DEPRECATED_EXTENSIONS_TITLE": "Deprecated Extensions Detected", + "DEPRECATED_EXTENSIONS_MESSAGE": "The following installed extensions are now natively supported by {APP_NAME} and can be safely uninstalled from the Extension Manager:", + "DEPRECATED_EXTENSIONS_LEARN_MORE": "Now built-in — learn more", // AI CONTROL "AI_LOGIN_DIALOG_TITLE": "Sign In to Use AI Edits", "AI_LOGIN_DIALOG_MESSAGE": "Please log in to use AI-powered edits", diff --git a/src/styles/brackets_patterns_override.less b/src/styles/brackets_patterns_override.less index 1c69fab684..b6359abeab 100644 --- a/src/styles/brackets_patterns_override.less +++ b/src/styles/brackets_patterns_override.less @@ -2619,3 +2619,7 @@ code { margin-top: 2px; } } + +.striked { + text-decoration: line-through; +} diff --git a/src/utils/ExtensionLoader.js b/src/utils/ExtensionLoader.js index 35d793436c..01f5c2e4cd 100644 --- a/src/utils/ExtensionLoader.js +++ b/src/utils/ExtensionLoader.js @@ -54,11 +54,22 @@ define(function (require, exports, module) { UrlParams = require("utils/UrlParams").UrlParams, NodeUtils = require("utils/NodeUtils"), PathUtils = require("thirdparty/path-utils/path-utils"), - DefaultExtensions = JSON.parse(require("text!extensions/default/DefaultExtensions.json")); + DefaultExtensions = JSON.parse(require("text!extensions/default/DefaultExtensions.json")), + Dialogs = require("widgets/Dialogs"), + PreferencesManager = require("preferences/PreferencesManager"), + Mustache = require("thirdparty/mustache/mustache"), + Strings = require("strings"), + StringUtils = require("utils/StringUtils"), + Metrics = require("utils/Metrics"), + DeprecatedExtensionsTemplate = require("text!htmlContent/deprecated-extensions-dialog.html"), + CommandManager = require("command/CommandManager"); // takedown/dont load extensions that are compromised at app start - start const EXTENSION_TAKEDOWN_LOCALSTORAGE_KEY = "PH_EXTENSION_TAKEDOWN_LIST"; + // deprecated extensions dialog state key + const STATE_DEPRECATED_EXTENSIONS_DIALOG_SHOWN = "deprecatedExtensionsDialogShown"; + function _getTakedownListLS() { try{ let list = localStorage.getItem(EXTENSION_TAKEDOWN_LOCALSTORAGE_KEY); @@ -74,7 +85,7 @@ define(function (require, exports, module) { return []; } - const loadedExtensionIDs = new Set(); + const loadedExtensionIDs = new Map(); let takedownExtensionList = new Set(_getTakedownListLS()); const EXTENSION_TAKEDOWN_URL = brackets.config.extensionTakedownURL; @@ -88,16 +99,16 @@ define(function (require, exports, module) { if (takedownExtensionList.size < loadedExtensionIDs.size) { smaller = takedownExtensionList; - larger = loadedExtensionIDs; + larger = Array.from(loadedExtensionIDs.keys()); } else { - smaller = loadedExtensionIDs; + smaller = Array.from(loadedExtensionIDs.keys()); larger = takedownExtensionList; } const matches = []; for (const id of smaller) { - if (larger.has(id)) { + if (larger.has ? larger.has(id) : larger.includes(id)) { matches.push(id); } } @@ -513,7 +524,11 @@ define(function (require, exports, module) { } if(metadata.name) { - loadedExtensionIDs.add(metadata.name); + loadedExtensionIDs.set(metadata.name, { + loadedFromDisc: !!config.nativeDir, + extensionPath: config.nativeDir || config.baseUrl, + extensionName: metadata.title || metadata.name + }); } // No special handling for themes... Let the promise propagate into the ExtensionManager @@ -1018,6 +1033,8 @@ define(function (require, exports, module) { promise.always(function () { _init = true; + // Check for deprecated extensions after all extensions have loaded + _checkAndShowDeprecatedExtensionsDialog(); }); return promise; @@ -1032,6 +1049,128 @@ define(function (require, exports, module) { return takedownExtensionList.has(extensionID); } + /** + * Uninstall a deprecated extension + * @param {string} extensionID - The ID of the extension to uninstall + * @return {Promise} A promise that resolves when the extension is uninstalled successfully + */ + async function uninstallExtension(extensionID) { + const extensionInfo = loadedExtensionIDs.get(extensionID); + + if (!extensionInfo) { + throw new Error(`Extension ${extensionID} not found in loaded extensions`); + } + + if (!extensionInfo.loadedFromDisc) { + throw new Error(`Cannot uninstall built-in extension: ${extensionID}`); + } + + const extensionDir = FileSystem.getDirectoryForPath(extensionInfo.extensionPath); + await extensionDir.unlinkAsync(); + } + + /** + * Check if any deprecated extensions are installed and show a dialog once per extension + * @private + */ + function _checkAndShowDeprecatedExtensionsDialog() { + // Get deprecated extensions config + let needsRestart = false; + const deprecatedExtensionsConfig = DefaultExtensions.deprecatedExtensions; + if (!deprecatedExtensionsConfig || !deprecatedExtensionsConfig.extensionIDsAndDocs) { + return; + } + + const deprecatedExtensionIDs = deprecatedExtensionsConfig.extensionIDsAndDocs; + + // Get the state object that tracks which deprecated extensions we've already shown + let shownDeprecatedExtensions = PreferencesManager.stateManager.get(STATE_DEPRECATED_EXTENSIONS_DIALOG_SHOWN); + if (!shownDeprecatedExtensions || typeof shownDeprecatedExtensions !== 'object') { + shownDeprecatedExtensions = {}; + } + + // Check which deprecated extensions are loaded and not yet shown + const deprecatedExtensionsFound = []; + for (const extensionID of loadedExtensionIDs.keys()) { + if (deprecatedExtensionIDs[extensionID] && !shownDeprecatedExtensions[extensionID]) { + const extensionInfo = loadedExtensionIDs.get(extensionID); + const extensionName = extensionInfo && extensionInfo.extensionName; + deprecatedExtensionsFound.push({ + id: extensionID, + name: extensionName || extensionID, + docUrl: deprecatedExtensionIDs[extensionID] + }); + } + } + + // If no new deprecated extensions found, return + if (deprecatedExtensionsFound.length === 0) { + return; + } + + // Show the dialog + const templateVars = { + extensions: deprecatedExtensionsFound, + Strings: Strings + }; + + const $template = $(Mustache.render(DeprecatedExtensionsTemplate, templateVars)); + const dialog = Dialogs.showModalDialogUsingTemplate($template, false); // autoDismiss = false + + // Wire up uninstall button click handlers + $template.on('click', '.uninstall-extension-btn', async function() { + const $button = $(this); + const extensionID = $button.data('extension-id'); + const $extensionItem = $button.closest('.deprecated-extension-item'); + + // Disable button during uninstall + $button.prop('disabled', true); + $button.text(Strings.REMOVING); + + try { + Metrics.countEvent(Metrics.EVENT_TYPE.EXTENSIONS, "removeDep", extensionID); + await uninstallExtension(extensionID); + + // Update the OK button to "Restart App" + const $okButton = $template.find('[data-button-id="ok"]'); + $okButton.text(Strings.RESTART_APP_BUTTON); + + // Strike through the extension name and disable/strike the uninstall button + $extensionItem.find('.extension-info strong').addClass('striked'); + $button.remove(); + needsRestart = true; + } catch (err) { + Metrics.countEvent(Metrics.EVENT_TYPE.EXTENSIONS, "removeDep", "fail"); + logger.reportError(err, 'Failed to uninstall deprecated extension:' + extensionID); + + // Show error dialog + const message = StringUtils.format(Strings.ERROR_UNINSTALLING_EXTENSION_MESSAGE, extensionID); + Dialogs.showErrorDialog(Strings.ERROR_UNINSTALLING_EXTENSION_TITLE, message); + + // Re-enable button + $button.prop('disabled', false); + $button.text(Strings.REMOVE); + } + }); + + // Handle OK button click + $template.on('click', '[data-button-id="ok"]', function() { + if (needsRestart) { + // Reload the app to complete uninstallation + CommandManager.execute("debug.refreshWindow"); + } else { + // Just close the dialog + dialog.close(); + } + }); + + // Mark each extension as shown + for (const ext of deprecatedExtensionsFound) { + shownDeprecatedExtensions[ext.id] = true; + } + PreferencesManager.stateManager.set(STATE_DEPRECATED_EXTENSIONS_DIALOG_SHOWN, shownDeprecatedExtensions); + } + EventDispatcher.makeEventDispatcher(exports); @@ -1056,6 +1195,7 @@ define(function (require, exports, module) { exports.loadAllExtensionsInNativeDirectory = loadAllExtensionsInNativeDirectory; exports.loadExtensionFromNativeDirectory = loadExtensionFromNativeDirectory; exports.isExtensionTakenDown = isExtensionTakenDown; + exports.uninstallExtension = uninstallExtension; exports.testAllExtensionsInNativeDirectory = testAllExtensionsInNativeDirectory; exports.testAllDefaultExtensions = testAllDefaultExtensions; exports.EVENT_EXTENSION_LOADED = EVENT_EXTENSION_LOADED;