deploy: 84352e3

Author: phoenixide

appConfig.js

@@ -24,7 +24,7 @@ window.AppConfig = {
         "app_notification_url": "assets/notifications/dev/",
         "app_update_url": "https://updates.phcode.io/tauri/update-latest-experimental-build.json",
         "linting.enabled_by_default": true,
-        "build_timestamp": "2024-03-21T09:55:50.538Z",
+        "build_timestamp": "2024-03-23T05:30:58.578Z",
         "googleAnalyticsID": "G-P4HJFPDB76",
         "googleAnalyticsIDDesktop": "G-VE5BXWJ0HF",
         "mixPanelID": "49c4d164b592be2350fc7af06a259bf3",
@@ -36,8 +36,8 @@ window.AppConfig = {
         "bugsnagEnv": "development"
     },
     "name": "Phoenix Code",
-    "version": "3.4.9-20040",
-    "apiVersion": "3.4.9",
+    "version": "3.5.2-20051",
+    "apiVersion": "3.5.2",
     "homepage": "https://core.ai",
     "issues": {
         "url": "https://github.com/phcode-dev/phoenix/issues"

assets/default-project/en.zip

@@ -39050,6 +39050,8 @@ define("extensionsIntegrated/RemoteFileAdapter/main", function (require, exports
 define("extensionsIntegrated/appUpdater/main", function (require, exports, module) {
     const AppInit = require("utils/AppInit"),
         Metrics = require("utils/Metrics"),
+        FileSystem    = require("filesystem/FileSystem"),
+        FileUtils   = require("file/FileUtils"),
         Commands = require("command/Commands"),
         CommandManager  = require("command/CommandManager"),
         Menus = require("command/Menus"),
@@ -39358,13 +39360,56 @@ define("extensionsIntegrated/appUpdater/main", function (require, exports, modul
         return null;
     }
 
+    async function _extractMacInstaller() {
+        const appdataDir = window._tauriBootVars.appLocalDir;
+        let extractPlatformPath = path.join(appdataDir, 'installer', "extracted");
+        // extract the .app file
+        const extractCommand = new window.__TAURI__.shell
+            .Command(`tar-unix`, ['-xzf', installerLocation, "-C", extractPlatformPath]);
+        let result = await extractCommand.execute();
+        if(result.code !== 0){
+            console.error("Could not extract installer at", installerLocation, "to", extractPlatformPath);
+            throw new Error("Could not extract installer at " + installerLocation + " to " + extractPlatformPath);
+        }
+        // remove the quarantine flag
+        const removeAttrCommand = new window.__TAURI__.shell
+            .Command(`mac-remove-quarantine`, ["-rd", "com.apple.quarantine", extractPlatformPath]);
+        result = await removeAttrCommand.execute();
+        if(result.code !== 0){
+            console.error("Could not remove quarantine attribute for", extractPlatformPath, "ignoring...");
+            // we can ignore this failure as the user will be asked for permission by os on clicking anyway.
+        }
+        // now get the .app path from extracted path
+        const extractedVirtualPath = window.fs.getTauriVirtualPath(extractPlatformPath);
+        let directory = FileSystem.getDirectoryForPath(extractedVirtualPath);
+        const {entries} = await directory.getContentsAsync();
+        if(entries.length !== 1 || !entries[0].fullPath.includes(".app")){
+            throw new Error("Could not resolve .app to update from extracted folder" + extractedVirtualPath);
+        }
+        installerLocation = FileUtils.stripTrailingSlash(
+            window.fs.getTauriPlatformPath(entries[0].fullPath));
+    }
+
+    function _cleanExtractedFolderSilent() {
+        return new Promise(resolve=>{
+            const appdataDir = window._tauriBootVars.appLocalDir;
+            let extractPlatformPath = path.join(appdataDir, 'installer', "extracted");
+            const extractedVirtualPath = window.fs.getTauriVirtualPath(extractPlatformPath);
+            let directory = FileSystem.getDirectoryForPath(extractedVirtualPath);
+            directory.unlinkAsync()
+                .catch(console.error)
+                .finally(resolve);
+        });
+    }
+
     async function doMacUpdate() {
+        await _extractMacInstaller();
         const currentAppPath = await getCurrentMacAppPath();
         if(!currentAppPath || !installerLocation || !currentAppPath.endsWith(".app") ||
             !installerLocation.endsWith(".app")){
             throw new Error("Cannot resolve .app location to copy.");
         }
-        const removeCommand = new window.__TAURI__.shell
+        let removeCommand = new window.__TAURI__.shell
             .Command(`recursive-rm-unix`, ['-r', currentAppPath]);
         let result = await removeCommand.execute();
         if(result.code !== 0){
@@ -39377,13 +39422,19 @@ define("extensionsIntegrated/appUpdater/main", function (require, exports, modul
         if(result.code !== 0){
             throw new Error("Update script exit with non-0 exit code: " + result.code);
         }
+        // now remove the original .app
+        await _cleanExtractedFolderSilent();
     }
 
     let installerLocation;
     async function quitTimeAppUpdateHandler() {
         if(!installerLocation){
             return;
         }
+        // at this time, the node process have exited and we need to force use tauri apis. This would
+        // normally happen as node responds as terminated, but for updates, this is at quit time and we
+        // cant wait any longer.
+        window.fs.forceUseNodeWSEndpoint(false);
         console.log("Installing update from: ", installerLocation);
         return new Promise(resolve=>{
             // this should never reject as it happens in app quit. rejecting wont affect quit, but its unnecessary.
@@ -39437,6 +39488,19 @@ define("extensionsIntegrated/appUpdater/main", function (require, exports, modul
             // app updates are only for desktop builds
             return;
         }
+        if (brackets.platform === "mac") {
+            // in mac, the `update.app.tar.gz` is downloaded, and only extracted on app quit.
+            // we do this only in mac as the `.app` file is extracted only at app quit and deleted
+            // and if we see the `extracted file` at app boot, it means the update was broken,and we clear
+            // the updated folder. if not, the extracted app may be corrupt, or mac will show that app
+            // too in the finder `open with` section.
+            // in windows, the `setup.exe.zip` is downloaded and extracted to `setup.exe`. The exe is executed
+            // only on app quit. so if we do this in windows, the extracted installer.exe will be
+            // deleted on new widow create and the final update will fail if other windows were opened
+            // after the installer was downloaded and extracted.
+            // in Linux, it is an online installer, nothing is downloaded.
+            _cleanExtractedFolderSilent();
+        }
         updaterWindow = window.__TAURI__.window.WebviewWindow.getByLabel(TAURI_UPDATER_WINDOW_LABEL);
         window.__TAURI__.event.listen("updater-event", (receivedEvent)=> {
             console.log("received Event updater-event", receivedEvent);

assets/sample-projects/HTML5.zip

@@ -1,6 +1,6 @@
 {
-  "appConfig.js": "1563889d09d19cfbc8f1e18f5fce8325e3b1292f238b292691cc308c48365589",
-  "assets/default-project/en.zip": "4668db031a74e382acbc455eac9062bd9b9f583711d828f8e7b62c32925bb304",
+  "appConfig.js": "6dc53606ef3c8011755b102fd2508940780f6ceca0e11cf8d4a13cdc6e4e6c63",
+  "assets/default-project/en.zip": "90d9072bb7b3f1da4eb01f72f2f01c86278f89a9e852015ef61874e5de9265e7",
   "assets/default-project/en/images/cloud1.svg": "527399dadfa3357c3ee1a63d6c1c7dda81ecebb832f7383db26f1aaeaf722a8d",
   "assets/default-project/en/images/cloud2.svg": "8127c63c0987bc674e2d25f7d24ead017853326c1e43d07706fec46091904418",
   "assets/default-project/en/images/cloud3.svg": "15de53aa41dea3b0f685292814563f97213a9736c3cec2f8e17b5d9d45b3ae3d",
@@ -124,7 +124,7 @@
   "assets/pwa/32x32.png": "4f8f75bfcdb6efbbed1732f49edab4e292274cdeb1841e285ccc8194f4c9d8ac",
   "assets/pwa/phoenix.png": "d292bf76d6d61fdece2f97fb4cd71b8b0060d1058e9c1d02c94bfb20da8b7f0d",
   "assets/pwa/Square284x284Logo.png": "9887c2967039b4fae1214817925f1fb4f9227cba12d37612457c1c8ee1110c67",
-  "assets/sample-projects/bootstrap-blog.zip": "57948ba242b4131f73bc8921cdf8066f3b022ee9c5e3ba71618d4722b70ce89f",
+  "assets/sample-projects/bootstrap-blog.zip": "c53ca5c6cdc4f0814a52f3e81ead3796a979aac3f0ee0bcfd2360aa9a6d426ac",
   "assets/sample-projects/bootstrap-blog/assets/brand/bootstrap-logo-white.svg": "203d56e7e5e15d8203e596d4a711cec986f6380064591de21850f4563fb840bf",
   "assets/sample-projects/bootstrap-blog/assets/brand/bootstrap-logo.svg": "df11d37a123e36a768f2a6064973c4c6ab17d1e3c6501c8bf434ca5c0134c9a2",
   "assets/sample-projects/bootstrap-blog/assets/dist/css/bootstrap.min.css": "fb1763b59f9f5764294b5af9fa5250835ae608282fe6f2f2213a5952aacf1fbf",
@@ -134,7 +134,7 @@
   "assets/sample-projects/bootstrap-blog/blog.rtl.css": "33f49d02bbcb2e78f019b7582408fad2b5a76a2ecf79fe09d5b3c08c6ee3872b",
   "assets/sample-projects/bootstrap-blog/index-rtl.html": "c582278884060098ff51b9d350b0739e1a0396debdc76772c62b6ec375b6efcb",
   "assets/sample-projects/bootstrap-blog/index.html": "f4716c2affa299a27ab6f8c74c22fe67564f1b1d36ff2f0b322672bf0479d739",
-  "assets/sample-projects/dashboard.zip": "383a5df9eac5324c51e3eaee5e3c1cdeb586a6cf2b15813ca854262133ca5525",
+  "assets/sample-projects/dashboard.zip": "09ab5de2d79434b90f96b9ab4193d6826b2e09dd54473bf08bdf4bcfb7edc657",
   "assets/sample-projects/dashboard/assets/brand/bootstrap-logo-white.svg": "203d56e7e5e15d8203e596d4a711cec986f6380064591de21850f4563fb840bf",
   "assets/sample-projects/dashboard/assets/brand/bootstrap-logo.svg": "df11d37a123e36a768f2a6064973c4c6ab17d1e3c6501c8bf434ca5c0134c9a2",
   "assets/sample-projects/dashboard/assets/dist/css/bootstrap.min.css": "fb1763b59f9f5764294b5af9fa5250835ae608282fe6f2f2213a5952aacf1fbf",
@@ -146,7 +146,7 @@
   "assets/sample-projects/dashboard/index.html": "1fb0c934f816d728cad85e180f78369679dc9edb1eca2d5c625b9360e6264235",
   "assets/sample-projects/dashboard/signin.css": "083bef710a6170a5112ce257c2ecf8580ca97ce19136d770f10460e5b85862de",
   "assets/sample-projects/dashboard/signin.html": "8c602e656631aeee624673397c0dc00c339498914ed930ab177478c4662a8d26",
-  "assets/sample-projects/explore.zip": "c9f9060ec6c780c24b7265bfc35ec2574c0e5b42673f450c27378548f0895883",
+  "assets/sample-projects/explore.zip": "da08c71d0d80046ad7ffbdff9f97cade77e9784890d64ab401dedfea4c9b535a",
   "assets/sample-projects/explore/A-tribute-page.html": "bd510c60f444058b7fcb71d83841f32b1cb5193c1a39421d7739bd6af9fef248",
   "assets/sample-projects/explore/adjustable-fireworks.html": "11e69bb2dd8708ed8fbf1acc62b0aaaf88c7ffec859ee958dc1ae51cd53ddac8",
   "assets/sample-projects/explore/ant_colony.html": "bc9435ed1b9868f2fbc7212d526f7532c533a5fdf45da988fa5e575bc5f363b7",
@@ -236,7 +236,7 @@
   "assets/sample-projects/explore/watermelon-pixel.html": "765a3fbffb5db97910512fbabaa7c55c0b52dc8eedfcc630811be39d0af98663",
   "assets/sample-projects/explore/webmine.html": "6b808f52812dc03db28483411500c04daf8ee0226f535c600a36999d6b7837c0",
   "assets/sample-projects/explore/whack-a-mole.html": "25be94a3640553b4801f80edd49998bae3a360988e8a26ff3bdfdc2a76b77191",
-  "assets/sample-projects/home-pages.zip": "d6576ad73d3875a4d6255c9f5c53a12d8c2b16be9f30cf3dd427b87097b945f2",
+  "assets/sample-projects/home-pages.zip": "0b887e99e210f6eca38b00ce90fa2f6d9f3509646fe19c71da192fa33b3721b3",
   "assets/sample-projects/home-pages/album/index.html": "e29a1e96644bc17bab1a7e3724e822d65a479e10df182725ee1afa916efbfdc1",
   "assets/sample-projects/home-pages/assets/brand/bootstrap-logo-white.svg": "203d56e7e5e15d8203e596d4a711cec986f6380064591de21850f4563fb840bf",
   "assets/sample-projects/home-pages/assets/brand/bootstrap-logo.svg": "df11d37a123e36a768f2a6064973c4c6ab17d1e3c6501c8bf434ca5c0134c9a2",
@@ -248,19 +248,19 @@
   "assets/sample-projects/home-pages/carousel/index.html": "235d650043a09f2954f24e4659f64d99ef3988858567fb2221fb1cf34df057e6",
   "assets/sample-projects/home-pages/cover/cover.css": "2fbb596077c570cad7ee9e98fb88f5665e0ecfc11e7085c3e04639ad03f7bc10",
   "assets/sample-projects/home-pages/cover/index.html": "759214701ff759432711b3421d80aca692c7a2b4c978c516a0bcd0c81a43f381",
-  "assets/sample-projects/HTML5.zip": "708a4341579aed9e788bb78f5f7915237bf9f65d0f2c95768b762bbaf66f817a",
+  "assets/sample-projects/HTML5.zip": "c8256ac39817ddcc381aa9e44cfe9e3436838679cb48d0705d3ae5e202b92726",
   "assets/sample-projects/HTML5/index.html": "2dc94c7d3e33aeeb44ec4f75bc7df86a5fd19f3121f2fd3638636fbf7c476c6a",
   "assets/sample-projects/HTML5/script.js": "c49e4b01cded4defbc21f5d5d0102719ce4cccbe1b9cb19f9232c5a05df658da",
   "assets/sample-projects/HTML5/styles.css": "744b85a9c31affbb00976694c4b9c9149b31e575ed9efdec386231d062ae93f2",
   "assets/sample-projects/new-project-list.json": "be1c907279163610779b000aa9ea6e4b035e07429203f16445a914c7045f2d64",
   "assets/sample-projects/zips/bootstrap.zip": "6f10407c00ce5d598e77f890528743dc645bc28014335483992b481e63fd7b97",
   "base-config/keyboard.json": "fc032682675e1f7d576374b080b97aaaa48a69ab47f15dab1c7f112853024f3d",
   "base-config/readme-keyboard.md": "27e98128176dbd060e93b1f321a4ddcd609571b7b8eb8c9112588f4767d08a03",
-  "brackets-min.js": "55c7b87690b74fd21474ea186384e36c31261a6f6ed0b574fec099cdd1898bce",
+  "brackets-min.js": "9fe22d0a3ab45b59ff6f3bb3b527928a840997b30ea1e44437c2c097082f9148",
   "brackets.config.dist.json": "8faa5c0a82bb4f49784e93d1225dbd5e1fd8ec6ab07b95f5f874c7c7bd7bb234",
   "brackets.config.staging.json": "c0e1f22c772c80f4f5756ab947e40538bcaf7fb7f8925834cfd4ef57c55e477a",
   "brackets.js": "5cfda5788870e89d590dd6b080e5a48f913eb29aaebbeef4a2a0db7a87870d4d",
-  "cacheManifest.json": "101169b476002009785cd8256cb35a0107b1b2796d73d13c90aa81567776f231",
+  "cacheManifest.json": "bc869c8cc8e9ddc4d85ba4be5fd7c390b3b46fb87de1d1d9c93da0d1787e2a5b",
   "command/ChangeShortcutTemplate.html": "345d682d8bde29380822824778cf09acc79affae6e82b9db00c6205b2b3dd2ee",
   "command/CommandManager.js": "0600518322584495bbbfae76ed2bb39e416de3735ee65b12c63a2b3e6b3423ca",
   "command/Commands.js": "46217a4558df267cb6a4ac8d1bd528158c9301ca0c2b8c070b83ebcafcdba8c6",
@@ -269,7 +269,7 @@
   "command/KeyboardOverlayMode.js": "330c879131057b24b340cf29f16aa39845c104e2ec866c5b580d9d619f33fafe",
   "command/Keys.js": "31cd87a01ce41de28e56ccbdd4fa14866cccc2b7bcde61c5134095adaa5cb674",
   "command/Menus.js": "c31266bdd68f4c83e2aed71a6a89551d51bc63b3ed66e67dec94e1d9ae77859f",
-  "config.json": "87506f9484e9ee735fd3809e53bcfa24f500e1cfc82a0cbd93dfe0cd6f553cf9",
+  "config.json": "e68de7984b18880397192b7a60e548667228838a1fcd9198b41ec485ebbf9547",
   "desktop-metrics.html": "ca46d36aec85f715746d1b90af09664c98e17b8262e5b141eee69bdb9d2b1c89",
   "devEnable.html": "44aa1a496a8be413299f651e6b0c3e62ac50cd5d40126ad1bb6b70b9b2b818c4",
   "document/ChangedDocumentTracker.js": "03b0eaf0995fee6d27c782a8028a1314f61214e383f5f5e198320b2faac4cf40",
@@ -278,6 +278,7 @@
   "document/DocumentManager.js": "d010497d0e190b21fd0c66092e3997331ba58485992d32fd6a913632be8050eb",
   "document/InMemoryFile.js": "7ae9dbae506e8cfd8d6db74c3c65bf07e93779e8a5a503cb0031841209c15fda",
   "document/TextRange.js": "6e5312ca03ed80864092da7347de08a5db17b659ab08fab72cb4786c07abe157",
+  "download/index.html": "15bb74a61d9d2146f1e511dabef0d5d259517310d50eba4115ca6fa507e788b1",
   "editor/CodeHintList.js": "6096c899dadeefe3ea832a30eaad4237748cf21d3847c680085b6bbd39958c31",
   "editor/CodeHintManager.js": "265143b195925dbff8e34ccee321530c0bd491d3185e0cbf707bbdd1cef5e070",
   "editor/CSSInlineEditor.js": "20329138aea67b56f34a8d0772caab6a9a944db6ef7ac491a4be4cd8ed89c4cd",
@@ -534,7 +535,7 @@
   "extensions/samples/LocalizationExample/strings.js": "8f409ada5111ea813452b73247e602ad05acff05788a8bb67c051389ca4c66d9",
   "extensions/samples/README.md": "381c6647cc6f90bd8c609b5896cfcdf78bcae2b3a9660c204d8b744a21436df6",
   "extensions/samples/TypingSpeedLogger/main.js": "87327584d6ebaa4e69ee7a8b4972951baeb01869f22b7c971736524cecd3137f",
-  "extensionsIntegrated/appUpdater/main.js": "56283f9cd32bfcfdae506ce7995f0443550b955ea0ea97bdac4b4127470fb184",
+  "extensionsIntegrated/appUpdater/main.js": "f369995f790dbce55779cae3bd739ebc2e8ba2f20caffe353dc3103748972310",
   "extensionsIntegrated/DisplayShortcuts/main.js": "7e1da43b8bb17a8de1372c0df54a968190231eacc1ac9274b8da174c0082f4ce",
   "extensionsIntegrated/DisplayShortcuts/package.json": "385efa285cafdd7695557c66ac1d7a925aab824362a2a8f6e60dbf195d3239dd",
   "extensionsIntegrated/DisplayShortcuts/templates/bottom-panel.html": "bcb54e703c4153122500df098190afaaf885d03524eb52f8e0d57513641985de",
@@ -627,7 +628,7 @@
   "htmlContent/update-dialog.html": "1439bdbf5e74d28edac7fb5ca95eb5d78b7062f2a9f32ac29b47260d43e07fdd",
   "htmlContent/update-list.html": "e4e0179e5e5c667e7adc3d5628bfc0f14409c45c935040d0639410de33ed75ad",
   "htmlContent/working-set.html": "98b44358fcc4165f464e3f6b8c5ca1b48f9f80c231b05b1174a53428ebc8a2f3",
-  "index.html": "d4676b76f18e4fe8564cee3b62c96abd03c7ae04a19d5c954f50b5cfaae03b49",
+  "index.html": "fc7bdb5353735a5028273514669ea268f4b6703289b6186b01bbcae8934ccaa7",
   "JSUtils/HintUtils.js": "22066319a80e889b524eb8b102063c0114c06b28a1787e8d87755dd1100e0cfc",
   "JSUtils/MessageIds.json": "b6245e8da247f0ad6d29cea3a8564a4d0e8099f5aba3a6999322f5407c6ac210",
   "JSUtils/package.json": "43b37b698223d0c641d9d6b4705f08cd5fd8cf007d8bf746578e0f3d70b90c68",
@@ -903,7 +904,7 @@
   "search/SearchModel.js": "307d9f70686f7cb90104c60b1b7dd27096449a7bda15b1148206ffceff5fc28c",
   "search/SearchResultsView.js": "82c0b38b6913beec1d5aae185a3c34472b13dd4a2833838c867c23bba989d2b1",
   "search/worker/search.js": "00d7411e197d8efe7bda77df31e2a141f7c7e5b4d4ab325c24a7a958ef100af1",
-  "sitemap-phcode.xml": "55f37ed9b049d486733679b2dd5826076e9cb040f50599919094a7a282a12a66",
+  "sitemap-phcode.xml": "9a4c5fa804a34fa09075f8d817eb861f7794466fa81c323d2532560466adb60a",
   "storage.js": "980f39b4a7ffb772205629feb0c356fb9d962459f367d2b0db4ecd9bf912b7fd",
   "strings.js": "cfd950f720d6b65c4125f98432f323a2ce42b2d73158ac54dbc009ca96f7a3b4",
   "styles/bootstrap/accordion.less": "3a6c3293afe861b75fd205f7c7a22e4e1607a15f63b9b2ef1cec1de2192a15f9",

assets/sample-projects/bootstrap-blog.zip

@@ -23,7 +23,7 @@
         "app_notification_url": "assets/notifications/dev/",
         "app_update_url": "https://updates.phcode.io/tauri/update-latest-experimental-build.json",
         "linting.enabled_by_default": true,
-        "build_timestamp": "2024-03-21T09:55:50.538Z",
+        "build_timestamp": "2024-03-23T05:30:58.578Z",
         "googleAnalyticsID": "G-P4HJFPDB76",
         "googleAnalyticsIDDesktop": "G-VE5BXWJ0HF",
         "mixPanelID": "49c4d164b592be2350fc7af06a259bf3",
@@ -35,8 +35,8 @@
         "bugsnagEnv": "development"
     },
     "name": "Phoenix Code",
-    "version": "3.4.9-20040",
-    "apiVersion": "3.4.9",
+    "version": "3.5.2-20051",
+    "apiVersion": "3.5.2",
     "homepage": "https://core.ai",
     "issues": {
         "url": "https://github.com/phcode-dev/phoenix/issues"