chore: change extension/prettier worker to esmodules for xml prettify

Author: abose

.eslintrc.js

@@ -97,7 +97,7 @@ module.exports = {
         "worker": true
     },
     "parserOptions": {
-        "ecmaVersion": 2019,
+        "ecmaVersion": 2020,
         "sourceType": "module",
         "ecmaFeatures": {
             "arrowFunctions": true,

docs/generatedApiDocs/GitHub-API-Index.md

@@ -14,6 +14,5 @@ The list of all APIs for phoenix.
 1. [utils/Metrics](Metrics-API)
 1. [utils/StringUtils](StringUtils-API)
 1. [widgets/NotificationUI](NotificationUI-API)
-1. [worker/ExtensionsWorker](ExtensionsWorker-API)
 1. [worker/IndexingWorker](IndexingWorker-API)
 1. [worker/WorkerComm](WorkerComm-API)

docs/generatedApiDocs/worker/ExtensionsWorker-API.md

@@ -177,6 +177,7 @@ Type: [function][1]
 ### Parameters
 
 *   `scriptURL` **[string][2]** the Full url to load.
+*   `isModule` **[boolean][5]** if the url is a module url
 
 ### Examples
 
@@ -188,6 +189,8 @@ WorkerComm.createWorkerComm(_myWorker, exports);
 let ExtensionUtils = brackets.getModule("utils/ExtensionUtils");
 let addWorkerScriptPath = ExtensionUtils.getModulePath(module, "add_worker_Script.js")
 await exports.loadScriptInWorker(addWorkerScriptPath);
+// if the worker is an es-module, then set optional isModule to true
+// Eg.loadScriptInWorker(addWorkerScriptPath, true);
 ```
 
 ## EVENT_WORKER_COMM_INIT_COMPLETE
@@ -201,3 +204,5 @@ Raised on main thread when WorkerComm is loaded in the web-worker and is ready.
 [3]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object
 
 [4]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Promise
+
+[5]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean

docs/generatedApiDocs/worker/WorkerComm-API.md

@@ -353,7 +353,8 @@ function _listFilesInDir(dir) {
     });
 }
 
-const ALLOWED_EXTENSIONS_TO_CACHE = ["js", "html", "htm", "xml", "xhtml", "css", "less", "scss", "ttf", "woff", "woff2", "eot",
+const ALLOWED_EXTENSIONS_TO_CACHE = ["js", "html", "htm", "xml", "xhtml", "mjs",
+    "css", "less", "scss", "ttf", "woff", "woff2", "eot",
     "txt", "otf",
     "json", "config",
     "zip",

gulpfile.js/index.js

@@ -162,6 +162,9 @@ let copyThirdPartyLibs = series(
     copyFiles.bind(copyFiles, ['node_modules/@prettier/plugin-php/*.js'],
         'src/thirdparty/prettier/php'),
     copyLicence.bind(copyLicence, 'node_modules/@prettier/plugin-php/LICENSE', 'prettier-php'),
+    copyFiles.bind(copyFiles, ['node_modules/@prettier/plugin-xml/src/*.js'],
+        'src/thirdparty/prettier/xml'),
+    copyLicence.bind(copyLicence, 'node_modules/@prettier/plugin-xml/LICENSE', 'prettier-xml'),
     // font-awesome
     copyFiles.bind(copyFiles, ['node_modules/@fortawesome/fontawesome-free/css/all.min.css'],
         'src/thirdparty/fontawesome/css'),

gulpfile.js/thirdparty-lib-copy.js

@@ -92,6 +92,7 @@
         "@phcode/fs": "^3.0.0",
         "@pixelbrackets/gfm-stylesheet": "^1.1.0",
         "@prettier/plugin-php": "^0.22.2",
+        "@prettier/plugin-xml": "^3.3.1",
         "@uiw/file-icons": "^1.3.2",
         "bootstrap": "^5.1.3",
         "browser-mime": "^1.0.1",

package-lock.json

@@ -216,7 +216,6 @@ define(function (require, exports, module) {
         return new Promise((resolve, reject)=>{
             let filepath = editor.document.file.fullPath;
             let languageId = LanguageManager.getLanguageForPath(filepath).getId();
-            _loadPlugins(languageId);
             console.log("Beautifying with language id: ", languageId);
 
             let selection = editor.getSelections();
@@ -228,12 +227,13 @@ define(function (require, exports, module) {
 
             let options = prefs.get("options");
             let indentWithTabs = Editor.getUseTabChar(filepath);
+            options._usePlugin = parsersForLanguage[languageId];
             Object.assign(options, {
                 parser: parsersForLanguage[languageId],
                 tabWidth: indentWithTabs ? Editor.getTabSize() : Editor.getSpaceUnits(),
                 useTabs: indentWithTabs,
                 filepath: filepath,
-                endOfLine: Phoenix.platform === 'win' ? "crlf": "lf"
+                endOfLine: "lf" // codemirror always does lf and only crlf before disk write in windows.
             });
             let prettierParams ={
                 text: editor.document.getText(),
@@ -264,28 +264,18 @@ define(function (require, exports, module) {
         });
     }
 
-    let loadedPlugins = {};
-    function _loadPlugins(languageId) {
-        if(!loadedPlugins[languageId] && parsersForLanguage[languageId]){
-            ExtensionsWorker.execPeer("loadPrettierPlugin", parsersForLanguage[languageId]).catch(err=>{
-                console.error("Error Loading Prettier Plugin", err);
-            });
-        }
-        loadedPlugins[languageId] = true;
-    }
-
     AppInit.appReady(function () {
-        ExtensionsWorker.loadScriptInWorker(`${module.uri}/../worker/prettier-helper.js`);
+        ExtensionsWorker.loadScriptInWorker(`${module.uri}/../worker/prettier-helper.js`, true);
         BeautificationManager.registerBeautificationProvider(exports, Object.keys(parsersForLanguage));
     });
 
     function beautifyTextProvider(textToBeautify, filePathOrFileName) {
         return new Promise((resolve, reject)=>{
             let languageId = LanguageManager.getLanguageForPath(filePathOrFileName).getId();
-            _loadPlugins(languageId);
             console.log("Beautifying text with language id: ", languageId);
             let options = prefs.get("options");
             let indentWithTabs = Editor.getUseTabChar(filePathOrFileName);
+            options._usePlugin = parsersForLanguage[languageId];
             Object.assign(options, {
                 parser: parsersForLanguage[languageId],
                 tabWidth: indentWithTabs ? Editor.getTabSize() : Editor.getSpaceUnits(),