Skip to content

Commit df92bc3

Browse files
phoenixidephoenixide
committed
deploy: 606b7d0 
1 parent 09113f2 commit df92bc3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+324
-92
lines changed

‎appConfig.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ window.AppConfig = {
2424
"app_notification_url": "assets/notifications/dev/",
2525
"app_update_url": "https://updates.phcode.io/tauri/update-latest-experimental-build.json",
2626
"linting.enabled_by_default": true,
27-
"build_timestamp": "2024-04-25T10:31:36.958Z",
27+
"build_timestamp": "2024-04-25T14:00:32.269Z",
2828
"googleAnalyticsID": "G-P4HJFPDB76",
2929
"googleAnalyticsIDDesktop": "G-VE5BXWJ0HF",
3030
"mixPanelID": "49c4d164b592be2350fc7af06a259bf3",
@@ -36,7 +36,7 @@ window.AppConfig = {
3636
"bugsnagEnv": "development"
3737
},
3838
"name": "Phoenix Code",
39-
"version": "3.6.1-20206",
39+
"version": "3.6.1-20207",
4040
"apiVersion": "3.6.1",
4141
"homepage": "https://core.ai",
4242
"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: 33 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122727,9 +122727,11 @@ define("project/ProjectManager", function (require, exports, module) {
122727122727
return startupProjectPath;
122728122728
}
122729122729
startupProjectPath = updateWelcomeProjectPath(PreferencesManager.getViewState("projectPath"));
122730-
const dirExists = await _dirExists(startupProjectPath);
122731-
if(dirExists){
122732-
return startupProjectPath;
122730+
if(startupProjectPath && _isProjectSafeToStartup(startupProjectPath)){
122731+
const dirExists = await _dirExists(startupProjectPath);
122732+
if(dirExists){
122733+
return startupProjectPath;
122734+
}
122733122735
}
122734122736
return getWelcomeProjectPath();
122735122737
}
@@ -123731,12 +123733,39 @@ define("project/ProjectManager", function (require, exports, module) {
123731123733
.setEnabled(!Phoenix.VFS.isLocalDiscPath(projectRoot.fullPath));
123732123734
}
123733123735

123736+
const UNSAFE_PROJECT_EXIT_PREFIX = "_Unafe_project_exit_";
123737+
function _flagProjectNotExitedSafely(projectRootPath) {
123738+
// we store this in local storage as these checks happen in app exit/startup flows where
123739+
// phstore is not reliable. It's ok to lose this data.
123740+
localStorage.setItem(UNSAFE_PROJECT_EXIT_PREFIX+projectRootPath, "true");
123741+
}
123742+
function _flagProjectExitedSafely(projectRootPath) {
123743+
localStorage.removeItem(UNSAFE_PROJECT_EXIT_PREFIX+projectRootPath);
123744+
}
123745+
function _isProjectSafeToStartup(projectRootPath) {
123746+
// In some cases, For eg: user tries to open a whole drive with phcode (or any project that makes phcode crash),
123747+
// phoenix may get stuck and never open again with the bad project as we try to open the same bad project
123748+
// on restart. So we keep a safe exit flag with each project. We only start the project on boot if it has
123749+
// been marked safe at previous exit or project switch. So on unsafe exit, the default project will be opened.
123750+
const unsafeExit = (localStorage.getItem(UNSAFE_PROJECT_EXIT_PREFIX+projectRootPath) === "true");
123751+
return !unsafeExit;
123752+
}
123753+
123734123754
exports.on(EVENT_PROJECT_OPEN, (_evt, projectRoot)=>{
123735123755
_reloadProjectPreferencesScope();
123736123756
_saveProjectPath();
123737123757
_setProjectDownloadCommandEnabled(_evt, projectRoot);
123758+
_flagProjectNotExitedSafely(projectRoot.fullPath);
123759+
});
123760+
123761+
exports.on(EVENT_PROJECT_CLOSE, (_evt, projectRoot)=>{
123762+
_flagProjectExitedSafely(projectRoot.fullPath);
123763+
});
123764+
exports.on("beforeAppClose", ()=> {
123765+
_saveProjectPath();
123766+
_flagProjectExitedSafely(getProjectRoot().fullPath);
123767+
_unwatchProjectRoot();
123738123768
});
123739-
exports.on("beforeAppClose", _unwatchProjectRoot);
123740123769

123741123770
// Due to circular dependencies, not safe to call on() directly for other modules' events
123742123771
EventDispatcher.on_duringInit(FileViewController, "documentSelectionFocusChange", _documentSelectionFocusChange);

‎cacheManifest.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"appConfig.js": "0d0d9eec1bcf3308a46b95b3f437c27f85011f8e50e8ff01b8cc925133dd3753",
3-
"assets/default-project/en.zip": "629f0ac1cdfcb79407fdc7cbe77ebd525b648ef575178917444d578be0e6bad1",
2+
"appConfig.js": "fb763d3b1c1a39e32794bc75d5719b056471d4c40b3508883b4eb80eb52989af",
3+
"assets/default-project/en.zip": "740c375588a0d36ab7e33aaf13448a87c21d8493a7954209d2deaf422b0ce108",
44
"assets/default-project/en/images/cloud1.svg": "527399dadfa3357c3ee1a63d6c1c7dda81ecebb832f7383db26f1aaeaf722a8d",
55
"assets/default-project/en/images/cloud2.svg": "8127c63c0987bc674e2d25f7d24ead017853326c1e43d07706fec46091904418",
66
"assets/default-project/en/images/cloud3.svg": "15de53aa41dea3b0f685292814563f97213a9736c3cec2f8e17b5d9d45b3ae3d",
@@ -125,7 +125,7 @@
125125
"assets/pwa/32x32.png": "4f8f75bfcdb6efbbed1732f49edab4e292274cdeb1841e285ccc8194f4c9d8ac",
126126
"assets/pwa/phoenix.png": "d292bf76d6d61fdece2f97fb4cd71b8b0060d1058e9c1d02c94bfb20da8b7f0d",
127127
"assets/pwa/Square284x284Logo.png": "9887c2967039b4fae1214817925f1fb4f9227cba12d37612457c1c8ee1110c67",
128-
"assets/sample-projects/bootstrap-blog.zip": "2f183a4e2fbcdb0aa7fff79cafdb5eedd20172465dd14e39eecbf11f35c2c4f2",
128+
"assets/sample-projects/bootstrap-blog.zip": "0d2117f28789ff05e61d4aafa9fe0244f2f6d7c2404861ffbfdad591e8f754db",
129129
"assets/sample-projects/bootstrap-blog/assets/brand/bootstrap-logo-white.svg": "203d56e7e5e15d8203e596d4a711cec986f6380064591de21850f4563fb840bf",
130130
"assets/sample-projects/bootstrap-blog/assets/brand/bootstrap-logo.svg": "df11d37a123e36a768f2a6064973c4c6ab17d1e3c6501c8bf434ca5c0134c9a2",
131131
"assets/sample-projects/bootstrap-blog/assets/dist/css/bootstrap.min.css": "fb1763b59f9f5764294b5af9fa5250835ae608282fe6f2f2213a5952aacf1fbf",
@@ -135,7 +135,7 @@
135135
"assets/sample-projects/bootstrap-blog/blog.rtl.css": "33f49d02bbcb2e78f019b7582408fad2b5a76a2ecf79fe09d5b3c08c6ee3872b",
136136
"assets/sample-projects/bootstrap-blog/index-rtl.html": "c582278884060098ff51b9d350b0739e1a0396debdc76772c62b6ec375b6efcb",
137137
"assets/sample-projects/bootstrap-blog/index.html": "f4716c2affa299a27ab6f8c74c22fe67564f1b1d36ff2f0b322672bf0479d739",
138-
"assets/sample-projects/dashboard.zip": "b1305a5624dad81639d8ab38163640f8dbfa7fbc77f60162b6bb6cc1113afdab",
138+
"assets/sample-projects/dashboard.zip": "f0030cf119d08a11d69af00f5af56d8d4efa47751eeddb10a74d1aa57eb80079",
139139
"assets/sample-projects/dashboard/assets/brand/bootstrap-logo-white.svg": "203d56e7e5e15d8203e596d4a711cec986f6380064591de21850f4563fb840bf",
140140
"assets/sample-projects/dashboard/assets/brand/bootstrap-logo.svg": "df11d37a123e36a768f2a6064973c4c6ab17d1e3c6501c8bf434ca5c0134c9a2",
141141
"assets/sample-projects/dashboard/assets/dist/css/bootstrap.min.css": "fb1763b59f9f5764294b5af9fa5250835ae608282fe6f2f2213a5952aacf1fbf",
@@ -147,7 +147,7 @@
147147
"assets/sample-projects/dashboard/index.html": "1fb0c934f816d728cad85e180f78369679dc9edb1eca2d5c625b9360e6264235",
148148
"assets/sample-projects/dashboard/signin.css": "083bef710a6170a5112ce257c2ecf8580ca97ce19136d770f10460e5b85862de",
149149
"assets/sample-projects/dashboard/signin.html": "8c602e656631aeee624673397c0dc00c339498914ed930ab177478c4662a8d26",
150-
"assets/sample-projects/explore.zip": "1d474f6f88d4e7adcf3b23a1aabb76393ad68f793e2b60ebb921b8869075f17e",
150+
"assets/sample-projects/explore.zip": "81d3403659a4325d6c51279860c376463463126cd7cffdbf281f3c0fc86ff7c4",
151151
"assets/sample-projects/explore/A-tribute-page.html": "bd510c60f444058b7fcb71d83841f32b1cb5193c1a39421d7739bd6af9fef248",
152152
"assets/sample-projects/explore/adjustable-fireworks.html": "11e69bb2dd8708ed8fbf1acc62b0aaaf88c7ffec859ee958dc1ae51cd53ddac8",
153153
"assets/sample-projects/explore/ant_colony.html": "bc9435ed1b9868f2fbc7212d526f7532c533a5fdf45da988fa5e575bc5f363b7",
@@ -237,7 +237,7 @@
237237
"assets/sample-projects/explore/watermelon-pixel.html": "765a3fbffb5db97910512fbabaa7c55c0b52dc8eedfcc630811be39d0af98663",
238238
"assets/sample-projects/explore/webmine.html": "6b808f52812dc03db28483411500c04daf8ee0226f535c600a36999d6b7837c0",
239239
"assets/sample-projects/explore/whack-a-mole.html": "25be94a3640553b4801f80edd49998bae3a360988e8a26ff3bdfdc2a76b77191",
240-
"assets/sample-projects/home-pages.zip": "69b42575f5d4f3cf7f5c2be8ad099130332f224c1988c6cbb439410a7c3de527",
240+
"assets/sample-projects/home-pages.zip": "41b0b5f64530d40f8a3e247050110d30433c5933955a0a5a1413af0bd8d53d5f",
241241
"assets/sample-projects/home-pages/album/index.html": "e29a1e96644bc17bab1a7e3724e822d65a479e10df182725ee1afa916efbfdc1",
242242
"assets/sample-projects/home-pages/assets/brand/bootstrap-logo-white.svg": "203d56e7e5e15d8203e596d4a711cec986f6380064591de21850f4563fb840bf",
243243
"assets/sample-projects/home-pages/assets/brand/bootstrap-logo.svg": "df11d37a123e36a768f2a6064973c4c6ab17d1e3c6501c8bf434ca5c0134c9a2",
@@ -249,19 +249,19 @@
249249
"assets/sample-projects/home-pages/carousel/index.html": "235d650043a09f2954f24e4659f64d99ef3988858567fb2221fb1cf34df057e6",
250250
"assets/sample-projects/home-pages/cover/cover.css": "2fbb596077c570cad7ee9e98fb88f5665e0ecfc11e7085c3e04639ad03f7bc10",
251251
"assets/sample-projects/home-pages/cover/index.html": "759214701ff759432711b3421d80aca692c7a2b4c978c516a0bcd0c81a43f381",
252-
"assets/sample-projects/HTML5.zip": "65532a39162e50d2c173bc79a606f9bb1db7efeadbfc820315440a709d38970f",
252+
"assets/sample-projects/HTML5.zip": "9b90d8e83ee868a6dd1d58d2d17dbb96307a1e994a81eb9bf0911369cbd51910",
253253
"assets/sample-projects/HTML5/index.html": "2dc94c7d3e33aeeb44ec4f75bc7df86a5fd19f3121f2fd3638636fbf7c476c6a",
254254
"assets/sample-projects/HTML5/script.js": "c49e4b01cded4defbc21f5d5d0102719ce4cccbe1b9cb19f9232c5a05df658da",
255255
"assets/sample-projects/HTML5/styles.css": "744b85a9c31affbb00976694c4b9c9149b31e575ed9efdec386231d062ae93f2",
256256
"assets/sample-projects/new-project-list.json": "be1c907279163610779b000aa9ea6e4b035e07429203f16445a914c7045f2d64",
257257
"assets/sample-projects/zips/bootstrap.zip": "6f10407c00ce5d598e77f890528743dc645bc28014335483992b481e63fd7b97",
258258
"base-config/keyboard.json": "fc032682675e1f7d576374b080b97aaaa48a69ab47f15dab1c7f112853024f3d",
259259
"base-config/readme-keyboard.md": "27e98128176dbd060e93b1f321a4ddcd609571b7b8eb8c9112588f4767d08a03",
260-
"brackets-min.js": "baf7f749a9ef735b12ba4e712b5d1340d075f4145e8f3e4c60fbd13acdf0bdbb",
260+
"brackets-min.js": "865b696ef57734e8b3c9aef5ef6eb70203533c52d12f4a7af74ff9929eb00877",
261261
"brackets.config.dist.json": "8faa5c0a82bb4f49784e93d1225dbd5e1fd8ec6ab07b95f5f874c7c7bd7bb234",
262262
"brackets.config.staging.json": "c0e1f22c772c80f4f5756ab947e40538bcaf7fb7f8925834cfd4ef57c55e477a",
263263
"brackets.js": "eaa3a9d92eea6e0a23bb784eff8e72f7891b30276929c40148e222e5fc1f5fcd",
264-
"cacheManifest.json": "fbb97347960b90529863143d6dde8144138fd1bc06ccff374ace29f84ba78821",
264+
"cacheManifest.json": "c8d950bfd0104b3d1b3d801b6940f87dc80cf3ecb0dbe9278ccda030a4fe0aff",
265265
"command/ChangeShortcutTemplate.html": "345d682d8bde29380822824778cf09acc79affae6e82b9db00c6205b2b3dd2ee",
266266
"command/CommandManager.js": "0600518322584495bbbfae76ed2bb39e416de3735ee65b12c63a2b3e6b3423ca",
267267
"command/Commands.js": "008f1272f46500c042fc574ba7686f0fa35b4c2885f40b05e27e828aee291eea",
@@ -270,7 +270,7 @@
270270
"command/KeyboardOverlayMode.js": "46a9aee18e36a7861fd0f0ae46d765cb30b079a6a5f00b21fbf1e3acd91dacee",
271271
"command/Keys.js": "31cd87a01ce41de28e56ccbdd4fa14866cccc2b7bcde61c5134095adaa5cb674",
272272
"command/Menus.js": "c31266bdd68f4c83e2aed71a6a89551d51bc63b3ed66e67dec94e1d9ae77859f",
273-
"config.json": "c15e4f62a89498c2ed3600fd07a4c0dba273485dabd66aa7f3d7c871918cccad",
273+
"config.json": "a509ecbf485e957b7a06297a06774cdbcd63422699cbc7b1da2e97055c5e0d97",
274274
"desktop-metrics.html": "ca46d36aec85f715746d1b90af09664c98e17b8262e5b141eee69bdb9d2b1c89",
275275
"devEnable.html": "44aa1a496a8be413299f651e6b0c3e62ac50cd5d40126ad1bb6b70b9b2b818c4",
276276
"document/ChangedDocumentTracker.js": "03b0eaf0995fee6d27c782a8028a1314f61214e383f5f5e198320b2faac4cf40",
@@ -882,7 +882,7 @@
882882
"project/FileTreeView.js": "8cbb1f88067d28d5e28afac825df102861deec1e0db5ad584358b6d9144cf0d9",
883883
"project/FileTreeViewModel.js": "803fbc204c9c1fd8f85d37f0e792e21116a5de7308ccd81f26192f6c71f6b5da",
884884
"project/FileViewController.js": "9242ec246f25ebadd42813d3d46ea4a96f4f89a0a47adce136a8ca1fd65a888e",
885-
"project/ProjectManager.js": "832517a3fdfe86739fc63a067811d6c8b47912ad7ff9764cf8ebb4b21d7cd902",
885+
"project/ProjectManager.js": "621c62d5f0bdb2e317edb3c0d73b635f40580356cbf49a663194a3add5c72eb6",
886886
"project/ProjectModel.js": "f8bd6d1d21673a596daec77c91d7f99f607efe36b4e91f1b1f6f61449b4d758c",
887887
"project/SidebarView.js": "85ab5b5b67e502b0cac9c4b7671dfc46c6cdc81c34d6ce538992f5dca542e5bd",
888888
"project/WorkingSetSort.js": "b0b1bf90f087ed03d05bd7fa48858f427b0bd0c936097244f0f6e50203f759aa",

‎config.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"app_notification_url": "assets/notifications/dev/",
2424
"app_update_url": "https://updates.phcode.io/tauri/update-latest-experimental-build.json",
2525
"linting.enabled_by_default": true,
26-
"build_timestamp": "2024-04-25T10:31:36.958Z",
26+
"build_timestamp": "2024-04-25T14:00:32.269Z",
2727
"googleAnalyticsID": "G-P4HJFPDB76",
2828
"googleAnalyticsIDDesktop": "G-VE5BXWJ0HF",
2929
"mixPanelID": "49c4d164b592be2350fc7af06a259bf3",
@@ -35,7 +35,7 @@
3535
"bugsnagEnv": "development"
3636
},
3737
"name": "Phoenix Code",
38-
"version": "3.6.1-20206",
38+
"version": "3.6.1-20207",
3939
"apiVersion": "3.6.1",
4040
"homepage": "https://core.ai",
4141
"issues": {

0 commit comments

Comments
 (0)