Skip to content

Commit 198656d

Browse files
phoenixidephoenixide
committed
deploy: 8a905e4 
1 parent c13fcc9 commit 198656d

File tree

27 files changed

+238
-50
lines changed

27 files changed

+238
-50
lines changed

‎appConfig.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ window.AppConfig = {
1111
"glob_help_url": "https://github.com/adobe/brackets/wiki/Using-File-Filters",
1212
"release_notes_url": "https://github.com/adobe/brackets/wiki/Release-Notes",
1313
"homepage_url": "https://phcode.io",
14+
"update_download_page": "https://phcode.io/downloads",
1415
"twitter_url": "https://twitter.com/phcodedev",
1516
"troubleshoot_url": "https://github.com/adobe/brackets/wiki/Troubleshooting#wiki-livedev",
1617
"twitter_name": "@phcodedev",
@@ -24,7 +25,7 @@ window.AppConfig = {
2425
"app_notification_url": "assets/notifications/dev/",
2526
"app_update_url": "https://updates.phcode.io/tauri/update-latest-experimental-build.json",
2627
"linting.enabled_by_default": true,
27-
"build_timestamp": "2024-02-23T05:49:19.050Z",
28+
"build_timestamp": "2024-02-23T07:23:59.308Z",
2829
"googleAnalyticsID": "G-P4HJFPDB76",
2930
"googleAnalyticsIDDesktop": "G-VE5BXWJ0HF",
3031
"mixPanelID": "49c4d164b592be2350fc7af06a259bf3",
@@ -36,7 +37,7 @@ window.AppConfig = {
3637
"bugsnagEnv": "development"
3738
},
3839
"name": "Phoenix",
39-
"version": "3.3.10-19927",
40+
"version": "3.3.10-19931",
4041
"apiVersion": "3.3.10",
4142
"homepage": "https://core.ai",
4243
"issues": {

‎assets/default-project/en.zip‎

0 Bytes
Binary file not shown.

‎assets/sample-projects/HTML5.zip‎

0 Bytes
Binary file not shown.

‎assets/sample-projects/bootstrap-blog.zip‎

0 Bytes
Binary file not shown.

‎assets/sample-projects/dashboard.zip‎

0 Bytes
Binary file not shown.

‎assets/sample-projects/explore.zip‎

0 Bytes
Binary file not shown.

‎assets/sample-projects/home-pages.zip‎

0 Bytes
Binary file not shown.

‎brackets-min.js‎

Lines changed: 50 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38979,7 +38979,7 @@ define("extensionsIntegrated/RemoteFileAdapter/main", function (require, exports
3897938979
*
3898038980
*/
3898138981

38982-
/*global logger*/
38982+
/*global logger, path*/
3898338983

3898438984
// this file uses tauri APIs directly and is probably the only place where tauri apis are used outside of the
3898538985
// shell.js file. This is app updates are pretty core level even though we do it as an extension here.
@@ -39278,6 +39278,43 @@ define("extensionsIntegrated/appUpdater/main", function (require, exports, modul
3927839278
}
3927939279
}
3928039280

39281+
async function getCurrentMacAppPath() {
39282+
const cliArgs = await window.__TAURI__.invoke('_get_commandline_args');
39283+
let fullPath = cliArgs[0]; // something like /Applications/editor.app/contents/.../Phoenix code
39284+
const normalizedPath = path.normalize(fullPath);
39285+
const parts = normalizedPath.split(path.sep);
39286+
const appIndex = parts.findIndex(part => part.endsWith('.app'));
39287+
39288+
// Reconstruct the path up to the .app part
39289+
if (appIndex !== -1) {
39290+
const appPathParts = parts.slice(0, appIndex + 1);
39291+
return appPathParts.join(path.sep); // returns /Applications/editor.app
39292+
}
39293+
// .app part is found
39294+
return null;
39295+
}
39296+
39297+
async function doMacUpdate() {
39298+
const currentAppPath = await getCurrentMacAppPath();
39299+
if(!currentAppPath || !installerLocation || !currentAppPath.endsWith(".app") ||
39300+
!installerLocation.endsWith(".app")){
39301+
throw new Error("Cannot resolve .app location to copy.");
39302+
}
39303+
const removeCommand = new window.__TAURI__.shell
39304+
.Command(`recursive-rm-unix`, ['-r', currentAppPath]);
39305+
let result = await removeCommand.execute();
39306+
if(result.code !== 0){
39307+
console.error("Could not remove old app: ", currentAppPath);
39308+
throw new Error("Could not remove old app: " + currentAppPath);
39309+
}
39310+
const copyCommand = new window.__TAURI__.shell
39311+
.Command(`recursive-copy-unix`, ['-r', installerLocation, currentAppPath]);
39312+
result = await copyCommand.execute();
39313+
if(result.code !== 0){
39314+
throw new Error("Update script exit with non-0 exit code: " + result.code);
39315+
}
39316+
}
39317+
3928139318
let installerLocation;
3928239319
async function quitTimeAppUpdateHandler() {
3928339320
if(!installerLocation){
@@ -39290,8 +39327,12 @@ define("extensionsIntegrated/appUpdater/main", function (require, exports, modul
3929039327
function failUpdateDialogAndExit(err) {
3929139328
console.error("error updating: ", err);
3929239329
dialog && dialog.close();
39293-
Dialogs.showInfoDialog(Strings.UPDATE_FAILED_TITLE, Strings.UPDATE_FAILED_MESSAGE)
39294-
.done(resolve);
39330+
Dialogs.showInfoDialog(Strings.UPDATE_FAILED_TITLE, Strings.UPDATE_FAILED_VISIT_SITE_MESSAGE)
39331+
.done(()=>{
39332+
NativeApp.openURLInDefaultBrowser(Phoenix.config.update_download_page)
39333+
.catch(console.error)
39334+
.finally(resolve);
39335+
});
3929539336
}
3929639337
if (brackets.platform === "win") {
3929739338
launchWindowsInstaller()
@@ -39316,6 +39357,10 @@ define("extensionsIntegrated/appUpdater/main", function (require, exports, modul
3931639357
launchLinuxUpdater()
3931739358
.then(resolve)
3931839359
.catch(failUpdateDialogAndExit);
39360+
} else if (brackets.platform === "mac") {
39361+
doMacUpdate()
39362+
.then(resolve)
39363+
.catch(failUpdateDialogAndExit);
3931939364
} else {
3932039365
resolve();
3932139366
}
@@ -83551,6 +83596,7 @@ define("nls/root/strings", {
8355183596
"UPDATE_INSTALLING": "Installing Update\u2026",
8355283597
"UPDATE_INSTALLING_MESSAGE": "Update Installation in Progress: {APP_NAME} is currently installing the latest updates. The application will automatically close once the installation is complete.",
8355383598
"UPDATE_FAILED_MESSAGE": "Please close all {APP_NAME} app windows and reopen the application to attempt the update again.",
83599+
"UPDATE_FAILED_VISIT_SITE_MESSAGE": "To retry, please exit all instances of {APP_NAME} and restart the application. <br>You will be directed to our download page shortly, where you can manually download the latest version.",
8355483600
"UPDATE_UP_TO_DATE": "{APP_NAME} is up to date.",
8355583601
"UPDATE_MESSAGE": "Hey, there's a new build of {APP_NAME} available. Here are some of the new features:",
8355683602
"GET_IT_NOW": "Get it now!",
@@ -136916,7 +136962,7 @@ define("utils/NativeApp", function (require, exports, module) {
136916136962
* in browser. Doesn't do anything in tauri.
136917136963
*/
136918136964
function openURLInDefaultBrowser(url, tabIdentifier) {
136919-
brackets.app.openURLInDefaultBrowser(url, tabIdentifier);
136965+
return brackets.app.openURLInDefaultBrowser(url, tabIdentifier);
136920136966
}
136921136967

136922136968
function getApplicationSupportDirectory() {

‎cacheManifest.json‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"appConfig.js": "156604164d0b915c4420d63c88b66f3d",
3-
"assets/default-project/en.zip": "105c6f7dcaee8d1d2128ec52087a7f1b",
2+
"appConfig.js": "d047d45ff3c14ec974840c29423ee2e2",
3+
"assets/default-project/en.zip": "be22bd3c16aa5dfb7672bd74abe44fd8",
44
"assets/default-project/en/images/cloud1.svg": "aca7bba84a2237f1c1988caea54a67a9",
55
"assets/default-project/en/images/cloud2.svg": "02880216ac461f1578ac8a18f158ce28",
66
"assets/default-project/en/images/cloud3.svg": "7a78bb29bd895ead8c171001244d9b7d",
@@ -120,7 +120,7 @@
120120
"assets/phoenix-splash/live-preview-error.html": "98b11e5ae0c9341ab1450e029065ac7b",
121121
"assets/phoenix-splash/no-preview.html": "2c51d14109552b59976145fe9ac33236",
122122
"assets/phoenix-splash/styles.css": "6809a039001526eeec64eeef1f0ad807",
123-
"assets/sample-projects/bootstrap-blog.zip": "d39edbe0777e148f1786ff1a5757bfac",
123+
"assets/sample-projects/bootstrap-blog.zip": "ef2e5d3e5a6ca8bda5ac637389ef343e",
124124
"assets/sample-projects/bootstrap-blog/assets/brand/bootstrap-logo-white.svg": "2e642df55357162ad28519305c8fd4fe",
125125
"assets/sample-projects/bootstrap-blog/assets/brand/bootstrap-logo.svg": "88eef7f3c2bcf988457a0e6d123c3f1d",
126126
"assets/sample-projects/bootstrap-blog/assets/dist/css/bootstrap.min.css": "6d9c6fda1e7087224431cc8068bb998f",
@@ -130,7 +130,7 @@
130130
"assets/sample-projects/bootstrap-blog/blog.rtl.css": "c6c275bf0b804d3dec264ec7fb3d7677",
131131
"assets/sample-projects/bootstrap-blog/index-rtl.html": "506e2d3fd1c4bb3651377144a62d5e82",
132132
"assets/sample-projects/bootstrap-blog/index.html": "dd8824ad3c9520dc0a825176d20eb694",
133-
"assets/sample-projects/dashboard.zip": "6252bc9765b5de0b4e5b88342ea99517",
133+
"assets/sample-projects/dashboard.zip": "3c4d29e4f5d9aacdbda9431e40474c67",
134134
"assets/sample-projects/dashboard/assets/brand/bootstrap-logo-white.svg": "2e642df55357162ad28519305c8fd4fe",
135135
"assets/sample-projects/dashboard/assets/brand/bootstrap-logo.svg": "88eef7f3c2bcf988457a0e6d123c3f1d",
136136
"assets/sample-projects/dashboard/assets/dist/css/bootstrap.min.css": "6d9c6fda1e7087224431cc8068bb998f",
@@ -142,7 +142,7 @@
142142
"assets/sample-projects/dashboard/index.html": "ddfda6ea9dfc8e12a8dcbbf065c804de",
143143
"assets/sample-projects/dashboard/signin.css": "a71ff2b493f230e0d6585793c2115809",
144144
"assets/sample-projects/dashboard/signin.html": "b108c183dfa7e2da3d88ec79bee79509",
145-
"assets/sample-projects/explore.zip": "44340f572bd349ef9849563ab2d4f5ea",
145+
"assets/sample-projects/explore.zip": "62b373fe0a95580dd68e84a4d275e881",
146146
"assets/sample-projects/explore/A-tribute-page.html": "007699e85177db3d1cd87d0d47440b36",
147147
"assets/sample-projects/explore/adjustable-fireworks.html": "706a0995d00d8ae009b5426cf7ee69be",
148148
"assets/sample-projects/explore/ant_colony.html": "d0885229e57caecc83049b50ee98560c",
@@ -232,7 +232,7 @@
232232
"assets/sample-projects/explore/watermelon-pixel.html": "6f6754e8073436bb823807a10a0446ea",
233233
"assets/sample-projects/explore/webmine.html": "9879458a48c757dc6671d408e940da4d",
234234
"assets/sample-projects/explore/whack-a-mole.html": "827f15c53657350b9c898fa27ecf15ac",
235-
"assets/sample-projects/home-pages.zip": "37d8d2809486ca2add3d4bc49809d120",
235+
"assets/sample-projects/home-pages.zip": "b14aad4cfbd40e9aadb99da5d40d8814",
236236
"assets/sample-projects/home-pages/album/index.html": "df20e4a479659463ab9d3f6b4ca4dbd1",
237237
"assets/sample-projects/home-pages/assets/brand/bootstrap-logo-white.svg": "2e642df55357162ad28519305c8fd4fe",
238238
"assets/sample-projects/home-pages/assets/brand/bootstrap-logo.svg": "88eef7f3c2bcf988457a0e6d123c3f1d",
@@ -244,19 +244,19 @@
244244
"assets/sample-projects/home-pages/carousel/index.html": "fc5bf7b2d8640a2c393f465294210e7c",
245245
"assets/sample-projects/home-pages/cover/cover.css": "3738586a82dd90263617020e7f1db82e",
246246
"assets/sample-projects/home-pages/cover/index.html": "a0ae1a11224672532b3466df93ce0821",
247-
"assets/sample-projects/HTML5.zip": "e76516afbc49e58334f15f6f15e14799",
247+
"assets/sample-projects/HTML5.zip": "2c067628d33ea19748515849d9211041",
248248
"assets/sample-projects/HTML5/index.html": "ca318e370d63b3e083d3bd63052b8252",
249249
"assets/sample-projects/HTML5/script.js": "47de56d88cd6d866c4f77027128c0dd7",
250250
"assets/sample-projects/HTML5/styles.css": "8c798c8b3bba7e4d49dfe99b4deccd47",
251251
"assets/sample-projects/new-project-list.json": "52493b6373285d18a51a7e0319d812c2",
252252
"assets/sample-projects/zips/bootstrap.zip": "47b3132b5dbf324d6396188cf68ecae1",
253253
"base-config/keyboard.json": "397585f99c96c29c2cc45018a517e02e",
254254
"base-config/readme-keyboard.md": "4a35b329e66feff11a3f080e25695f68",
255-
"brackets-min.js": "f38957d803982d1660e12848de30d509",
255+
"brackets-min.js": "66897cc8478df5c3122c0f53fb0c3a70",
256256
"brackets.config.dist.json": "dfb6c779721fd40e82349801d4cc55f9",
257257
"brackets.config.staging.json": "be1feb831c8f54a29e4af91220c851e4",
258258
"brackets.js": "8c5ce23dd12cec77e73ebee3bc606b36",
259-
"cacheManifest.json": "6506f6e93065e0b9154ba57640474824",
259+
"cacheManifest.json": "b216e1525afc534f3ac70d995d1d42ca",
260260
"command/ChangeShortcutTemplate.html": "e842dfbc58589b3ce1ab1964e13be5cd",
261261
"command/CommandManager.js": "8763fce16883bbef252604330ac3bf49",
262262
"command/Commands.js": "134461b8bfd65167c7054f7a8bbd1bc6",
@@ -265,7 +265,7 @@
265265
"command/KeyboardOverlayMode.js": "8eb29a228b69fe9e299e88af31a0d541",
266266
"command/Keys.js": "1197df29f8ffa01c62cd2700df9ad216",
267267
"command/Menus.js": "a620c28bdccc72d13022b6474a8487f2",
268-
"config.json": "baf447fe25958fd156b9f570887fa728",
268+
"config.json": "0934d203de58f040939eb83ae7c93eae",
269269
"desktop-metrics.html": "203d9a21baede986f0927d61578c3c4b",
270270
"devEnable.html": "5c494d5e246bdb4260557c03b73eea32",
271271
"document/ChangedDocumentTracker.js": "8763dbbd784b9e8a3614a8ee723d5273",
@@ -530,7 +530,7 @@
530530
"extensions/samples/LocalizationExample/strings.js": "165955f19e3f2f55dc717726a4d8e251",
531531
"extensions/samples/README.md": "b42dce1f893127cc677bad4c308adec1",
532532
"extensions/samples/TypingSpeedLogger/main.js": "77e5dc1f043cefd551a7dcc644668644",
533-
"extensionsIntegrated/appUpdater/main.js": "48035bdef4da28c4b94313bfc29be374",
533+
"extensionsIntegrated/appUpdater/main.js": "fe6d537287b69cfff937e642d7f2f18e",
534534
"extensionsIntegrated/DisplayShortcuts/main.js": "36bc9de27fb036b4e301e0667fd9f630",
535535
"extensionsIntegrated/DisplayShortcuts/package.json": "3a7cd9ed7cdf6e5ac56adcd4e6d649bf",
536536
"extensionsIntegrated/DisplayShortcuts/templates/bottom-panel.html": "a41396d82a31ce934992542814e7936e",
@@ -811,7 +811,7 @@
811811
"nls/ro/lastTranslatedLocale.json": "cfd80ced517c0ffa82285614cd1c5c9e",
812812
"nls/ro/strings.js": "e1580c95ace6f4d5f7ebb386c2e111d2",
813813
"nls/root/strings-app.js": "37fb6ea3db612dd5260ce00202d7c364",
814-
"nls/root/strings.js": "fce236acf1f7e2610f2892af774b2fc5",
814+
"nls/root/strings.js": "408eccfb0dcf3dcf0ed59c3675f0f8eb",
815815
"nls/root/urls.js": "2c5e2a12c3412c1efe22c686aa78bce0",
816816
"nls/ru/expertTranslations.json": "89cf849840b48e07ca9397092df1d15e",
817817
"nls/ru/lastTranslated.json": "87d3e9cded5b39a554a6a5c706735bec",
@@ -1710,7 +1710,7 @@
17101710
"utils/KeyEvent.js": "a4a7879171111b7879510cef74e105af",
17111711
"utils/LocalizationUtils.js": "cca02786433e21490168a50d54aa1227",
17121712
"utils/Metrics.js": "e4844a3a8c283acd3ddb2eab4ab3d936",
1713-
"utils/NativeApp.js": "8cdde054186e078663600aca4d604e83",
1713+
"utils/NativeApp.js": "ad314fbf2cfb3a8a473130f8440ed482",
17141714
"utils/NodeConnection.js": "30e08d9548eec5381ea15474ddd940ba",
17151715
"utils/NodeDomain.js": "b6006a9edd27d3f06db7a21a866f3d36",
17161716
"utils/NodeUtils.js": "f19402497706f23f61ccec6f5a0f747d",

‎config.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"glob_help_url": "https://github.com/adobe/brackets/wiki/Using-File-Filters",
1111
"release_notes_url": "https://github.com/adobe/brackets/wiki/Release-Notes",
1212
"homepage_url": "https://phcode.io",
13+
"update_download_page": "https://phcode.io/downloads",
1314
"twitter_url": "https://twitter.com/phcodedev",
1415
"troubleshoot_url": "https://github.com/adobe/brackets/wiki/Troubleshooting#wiki-livedev",
1516
"twitter_name": "@phcodedev",
@@ -23,7 +24,7 @@
2324
"app_notification_url": "assets/notifications/dev/",
2425
"app_update_url": "https://updates.phcode.io/tauri/update-latest-experimental-build.json",
2526
"linting.enabled_by_default": true,
26-
"build_timestamp": "2024-02-23T05:49:19.050Z",
27+
"build_timestamp": "2024-02-23T07:23:59.308Z",
2728
"googleAnalyticsID": "G-P4HJFPDB76",
2829
"googleAnalyticsIDDesktop": "G-VE5BXWJ0HF",
2930
"mixPanelID": "49c4d164b592be2350fc7af06a259bf3",
@@ -35,7 +36,7 @@
3536
"bugsnagEnv": "development"
3637
},
3738
"name": "Phoenix",
38-
"version": "3.3.10-19927",
39+
"version": "3.3.10-19931",
3940
"apiVersion": "3.3.10",
4041
"homepage": "https://core.ai",
4142
"issues": {

0 commit comments

Comments
 (0)