Skip to content

Commit b86e3b5

Browse files
phoenixidephoenixide
committed
deploy: 0b2f639 
1 parent 7d0517b commit b86e3b5

27 files changed

+160
-70
lines changed

‎appConfig.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ window.AppConfig = {
2121
"extension_url": "https://brackets-archive.github.io/brackets-extensions/extensions/",
2222
"extension_store_url": "https://store.core.ai/src/",
2323
"linting.enabled_by_default": true,
24-
"build_timestamp": "2023-01-11T07:44:10.282Z",
24+
"build_timestamp": "2023-01-11T10:10:26.445Z",
2525
"googleAnalyticsID": "G-P4HJFPDB76",
2626
"mixPanelID": "49c4d164b592be2350fc7af06a259bf3",
2727
"coreAnalyticsID": "phoenix",
@@ -31,7 +31,7 @@ window.AppConfig = {
3131
"bugsnagEnv": "development"
3232
},
3333
"name": "Phoenix",
34-
"version": "3.0.13-19075",
34+
"version": "3.0.13-19076",
3535
"apiVersion": "3.0.13",
3636
"homepage": "https://core.ai",
3737
"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.

‎cacheManifest.json‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"appConfig.js": "f997167d619cb4166a8da38e68433424",
3-
"assets/default-project/en.zip": "775fbb690cffbfbc5374969145da5a78",
2+
"appConfig.js": "d862c5795fe27e10e4e54803b618fdd6",
3+
"assets/default-project/en.zip": "8ce78642502e34539c0903a69756cf44",
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",
@@ -115,7 +115,7 @@
115115
"assets/phoenix-splash/no-preview.html": "2c51d14109552b59976145fe9ac33236",
116116
"assets/phoenix-splash/safari.html": "0e96b2a56337e7d096a95da9d91f9257",
117117
"assets/phoenix-splash/styles.css": "6809a039001526eeec64eeef1f0ad807",
118-
"assets/sample-projects/bootstrap-blog.zip": "0b915cd6102052e35c38714977a9449b",
118+
"assets/sample-projects/bootstrap-blog.zip": "3b2e5f937553a1f343a2c95ad158605c",
119119
"assets/sample-projects/bootstrap-blog/assets/brand/bootstrap-logo-white.svg": "2e642df55357162ad28519305c8fd4fe",
120120
"assets/sample-projects/bootstrap-blog/assets/brand/bootstrap-logo.svg": "88eef7f3c2bcf988457a0e6d123c3f1d",
121121
"assets/sample-projects/bootstrap-blog/assets/dist/css/bootstrap.min.css": "6d9c6fda1e7087224431cc8068bb998f",
@@ -125,7 +125,7 @@
125125
"assets/sample-projects/bootstrap-blog/blog.rtl.css": "c6c275bf0b804d3dec264ec7fb3d7677",
126126
"assets/sample-projects/bootstrap-blog/index-rtl.html": "506e2d3fd1c4bb3651377144a62d5e82",
127127
"assets/sample-projects/bootstrap-blog/index.html": "dd8824ad3c9520dc0a825176d20eb694",
128-
"assets/sample-projects/dashboard.zip": "8aa714eef5c72fe9ab46bc409508920f",
128+
"assets/sample-projects/dashboard.zip": "b69984a027d5723f88b528ef2463a098",
129129
"assets/sample-projects/dashboard/assets/brand/bootstrap-logo-white.svg": "2e642df55357162ad28519305c8fd4fe",
130130
"assets/sample-projects/dashboard/assets/brand/bootstrap-logo.svg": "88eef7f3c2bcf988457a0e6d123c3f1d",
131131
"assets/sample-projects/dashboard/assets/dist/css/bootstrap.min.css": "6d9c6fda1e7087224431cc8068bb998f",
@@ -137,7 +137,7 @@
137137
"assets/sample-projects/dashboard/index.html": "ddfda6ea9dfc8e12a8dcbbf065c804de",
138138
"assets/sample-projects/dashboard/signin.css": "a71ff2b493f230e0d6585793c2115809",
139139
"assets/sample-projects/dashboard/signin.html": "b108c183dfa7e2da3d88ec79bee79509",
140-
"assets/sample-projects/explore.zip": "c1caae65ddf3cc4b10806b9267c75137",
140+
"assets/sample-projects/explore.zip": "08b97540d06455599e307193720172be",
141141
"assets/sample-projects/explore/A-tribute-page.html": "007699e85177db3d1cd87d0d47440b36",
142142
"assets/sample-projects/explore/adjustable-fireworks.html": "706a0995d00d8ae009b5426cf7ee69be",
143143
"assets/sample-projects/explore/ant_colony.html": "d0885229e57caecc83049b50ee98560c",
@@ -227,7 +227,7 @@
227227
"assets/sample-projects/explore/watermelon-pixel.html": "6f6754e8073436bb823807a10a0446ea",
228228
"assets/sample-projects/explore/webmine.html": "9879458a48c757dc6671d408e940da4d",
229229
"assets/sample-projects/explore/whack-a-mole.html": "827f15c53657350b9c898fa27ecf15ac",
230-
"assets/sample-projects/home-pages.zip": "5da2916a10bde4ec93117f85e739bb0f",
230+
"assets/sample-projects/home-pages.zip": "67afac62f49e9b0e60f0c96ec189fffe",
231231
"assets/sample-projects/home-pages/album/index.html": "df20e4a479659463ab9d3f6b4ca4dbd1",
232232
"assets/sample-projects/home-pages/assets/brand/bootstrap-logo-white.svg": "2e642df55357162ad28519305c8fd4fe",
233233
"assets/sample-projects/home-pages/assets/brand/bootstrap-logo.svg": "88eef7f3c2bcf988457a0e6d123c3f1d",
@@ -239,7 +239,7 @@
239239
"assets/sample-projects/home-pages/carousel/index.html": "fc5bf7b2d8640a2c393f465294210e7c",
240240
"assets/sample-projects/home-pages/cover/cover.css": "3738586a82dd90263617020e7f1db82e",
241241
"assets/sample-projects/home-pages/cover/index.html": "a0ae1a11224672532b3466df93ce0821",
242-
"assets/sample-projects/HTML5.zip": "99730bf2a5342db667bd68f6cc4567f3",
242+
"assets/sample-projects/HTML5.zip": "516a46273b7258cb0d83bdfce92fb0ed",
243243
"assets/sample-projects/HTML5/index.html": "ca318e370d63b3e083d3bd63052b8252",
244244
"assets/sample-projects/HTML5/script.js": "47de56d88cd6d866c4f77027128c0dd7",
245245
"assets/sample-projects/HTML5/styles.css": "8c798c8b3bba7e4d49dfe99b4deccd47",
@@ -249,13 +249,13 @@
249249
"brackets.config.dist.json": "4f77dd581944e20353b2b23cc824cc4a",
250250
"brackets.config.staging.json": "a1d92e1354fbb3ac701a7c2e7c8007e4",
251251
"brackets.js": "175a28457050c0dc608f9200c73996df",
252-
"cacheManifest.json": "dcaa9068b2fabc41573e0087a600c041",
252+
"cacheManifest.json": "96b61e01cad388574c72de524ab9b244",
253253
"command/CommandManager.js": "ebbc15626600575d2dfe2a97da2993a0",
254254
"command/Commands.js": "d1b78cbe3e6272c06e442d8c3441838c",
255255
"command/DefaultMenus.js": "32a77445174fab4343a6da7b4e3bcd86",
256256
"command/KeyBindingManager.js": "f7edd8777e1615a59dfe7b82058e6e76",
257257
"command/Menus.js": "20d990cac9b0d3ecbcf2eb0dd34a8621",
258-
"config.json": "e705bdd6cf80d09aeb5045dd713f0a1e",
258+
"config.json": "528f796e30f9a65c645e09e23f80e6e9",
259259
"devEnable.html": "afb2596268ea108f48121765e8244518",
260260
"document/ChangedDocumentTracker.js": "8763dbbd784b9e8a3614a8ee723d5273",
261261
"document/Document.js": "e54a90c638153d50fe7d23ffeeb0076c",
@@ -742,7 +742,7 @@
742742
"LiveDevelopment/Servers/BaseServer.js": "5afd87e6bcf72121d37828d813703553",
743743
"LiveDevelopment/Servers/FileServer.js": "e92c4a3be90ca87af1fc1c0aa478bb23",
744744
"LiveDevelopment/Servers/UserServer.js": "2906f178bfc889ba3ba9df93ff7cf365",
745-
"loggerSetup.js": "f30ee253f35f43570b756e6c8f5b94e8",
745+
"loggerSetup.js": "7183f2b4e45eff55ed7c9805ef5e7e80",
746746
"main.js": "e21b2e3ece1f573f1bb334534affdb52",
747747
"manifest.json": "39d9f9d7ed3a00371ea51814f0d9e922",
748748
"nls/ar/expertTranslations.json": "8a80554c91d9fca8acb82f023de02f11",
@@ -920,8 +920,8 @@
920920
"nls/zh-tw/urls.js": "1b86fb17ec41f28002b8dc172d3e43b4",
921921
"phoenix/browserDetails.js": "12c6acb9d459383776b9035ecb98a0c1",
922922
"phoenix/errno.js": "d5cdd5d175f3f4e94433dc339ff00989",
923-
"phoenix/init_vfs.js": "c02b00a15349b494b2d5e67d550d2aa5",
924-
"phoenix/shell.js": "4aac9f74ef309b3c6c3b9ef65cc74fd2",
923+
"phoenix/init_vfs.js": "559178923d28ab041b5e7f641163c111",
924+
"phoenix/shell.js": "24d82154190f79f70ea31cd8118f0223",
925925
"phoenix/tauriShell.js": "f937860b5e2dc46a4b5ed4f7ded2d36b",
926926
"phoenix/virtual-server-loader.js": "7f7dd33c7dc108fa9853f733c61a590d",
927927
"phoenix/virtualfs.js": "612dad83c82659da67ae0f2796f723ed",
@@ -1897,7 +1897,7 @@
18971897
"utils/EventDispatcher.js": "43d5e63558b015e2968f3710f5aae0f6",
18981898
"utils/EventManager.js": "5c076852d0506f4265480316f3d5d061",
18991899
"utils/ExtensionInterface.js": "30e7f9e7453e36dcf2edd3e288a88348",
1900-
"utils/ExtensionLoader.js": "81188d2d0771330da5f0734bcfb45577",
1900+
"utils/ExtensionLoader.js": "cb27a2cc866dfa2810cf2630d5a46694",
19011901
"utils/ExtensionUtils.js": "67c343093d8f91573fa658543c1d64ad",
19021902
"utils/FeatureGate.js": "1f5041fd106de85430c2e183fc12ef78",
19031903
"utils/Global.js": "117dd6c8d27627806edefb3f3633d879",

‎config.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"extension_url": "https://brackets-archive.github.io/brackets-extensions/extensions/",
2121
"extension_store_url": "https://store.core.ai/src/",
2222
"linting.enabled_by_default": true,
23-
"build_timestamp": "2023-01-11T07:44:10.282Z",
23+
"build_timestamp": "2023-01-11T10:10:26.445Z",
2424
"googleAnalyticsID": "G-P4HJFPDB76",
2525
"mixPanelID": "49c4d164b592be2350fc7af06a259bf3",
2626
"coreAnalyticsID": "phoenix",
@@ -30,7 +30,7 @@
3030
"bugsnagEnv": "development"
3131
},
3232
"name": "Phoenix",
33-
"version": "3.0.13-19075",
33+
"version": "3.0.13-19076",
3434
"apiVersion": "3.0.13",
3535
"homepage": "https://core.ai",
3636
"issues": {

‎loggerSetup.js‎

Lines changed: 55 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -131,18 +131,64 @@
131131
logger.loggingOptions.logLivePreview = window.isLoggingEnabled(
132132
logger.loggingOptions.LOCAL_STORAGE_KEYS.LOG_LIVE_PREVIEW);
133133

134+
function _shouldDiscardError(errors = []) {
135+
if(!window.fsServerUrl || !window.Phoenix || !window.Phoenix.VFS){
136+
return false;
137+
}
138+
let fileURL, extensionName, userFsURLFound = false,
139+
userExtensionsURL = window.fsServerUrl.slice(0, -1) + window.Phoenix.VFS.getUserExtensionDir() + "/";
140+
141+
// errors with stacks originating from any folder or files from the user file system are not logged for privacy
142+
for(let error of errors){
143+
if(error.stacktrace && error.stacktrace[0]) {
144+
for(let stack of error.stacktrace){
145+
fileURL = stack.file || "";
146+
if(fileURL.startsWith(userExtensionsURL)) {
147+
// an extension installed from extension store has error. we dont log, but raise metric
148+
extensionName = fileURL.replace(userExtensionsURL, "");
149+
extensionName = extensionName.split("/")[0];
150+
window.Metrics.countEvent(window.Metrics.EVENT_TYPE.ERROR, `extn-${extensionName}`,
151+
error.type);
152+
window.Metrics.countEvent(window.Metrics.EVENT_TYPE.ERROR, `extn-${extensionName}`,
153+
error.errorClass);
154+
logger.leaveTrail(`Extension Error for ${extensionName} of type ${error.type} class ${error.errorClass}`);
155+
return true;
156+
}
157+
if(fileURL.startsWith(window.fsServerUrl)) {
158+
userFsURLFound = true;
159+
}
160+
}
161+
}
162+
}
163+
if(userFsURLFound) {
164+
return true;
165+
}
166+
return false;
167+
}
168+
134169
function onError(event) {
135170
// for more info https://docs.bugsnag.com/platforms/javascript/customizing-error-reports
136-
// change health logger popup string before changing the below line to anything other than "Caught Critical error"
137-
let reportedStatus = logger.loggingOptions.healthDataDisabled? "Not Reported as health data disabled." : "Reported";
171+
try{
172+
let reportedStatus = "Reported";
173+
let shouldReport = true;
174+
if(logger.loggingOptions.healthDataDisabled){
175+
reportedStatus = "Not Reported as health data disabled.";
176+
shouldReport = false;
177+
} else if(_shouldDiscardError(event.errors)){
178+
reportedStatus = "Not Reported error from user extension or fs.";
179+
shouldReport = false;
180+
}
138181

139-
console.error(`Caught Critical error, ${reportedStatus}: `, event);
140-
if(window.Metrics) {
141-
window.Metrics.countEvent(window.Metrics.EVENT_TYPE.ERROR, "uncaught", "logger");
142-
}
143-
if(logger.loggingOptions.healthDataDisabled){
144-
// don't log anything as user disabled health tracking
145-
return false;
182+
// change health logger popup string before changing the below to anything other than "Caught Critical error"
183+
console.error(`Caught Critical error, ${reportedStatus}: `, event);
184+
if(window.Metrics) {
185+
window.Metrics.countEvent(window.Metrics.EVENT_TYPE.ERROR, "uncaught", "logger");
186+
}
187+
188+
return shouldReport;
189+
} catch (e) {
190+
console.error("exception occurred while reposting error: ", e);
191+
event.addMetadata('onError', 'exception', e.message);
146192
}
147193
}
148194

0 commit comments

Comments
 (0)