Merge branch 'main' into push-xywwslvpqtmy

Author: mstange

package.json

@@ -134,7 +134,7 @@
     "copy-webpack-plugin": "^13.0.0",
     "cross-env": "^7.0.3",
     "css-loader": "^7.1.2",
-    "cssnano": "^7.0.7",
+    "cssnano": "^7.1.0",
     "devtools-license-check": "^0.9.0",
     "eslint": "^8.57.1",
     "eslint-config-prettier": "^10.1.5",
@@ -145,7 +145,7 @@
     "eslint-plugin-jest-dom": "^5.5.0",
     "eslint-plugin-jest-formatting": "^3.1.0",
     "eslint-plugin-react": "^7.37.5",
-    "eslint-plugin-testing-library": "^7.5.3",
+    "eslint-plugin-testing-library": "^7.6.0",
     "espree": "^10.4.0",
     "fake-indexeddb": "^6.0.1",
     "file-loader": "^6.2.0",
@@ -161,7 +161,7 @@
     "lockfile-lint": "^4.14.1",
     "mkdirp": "^3.0.1",
     "npm-run-all2": "^8.0.4",
-    "open": "^10.1.2",
+    "open": "^10.2.0",
     "patch-package": "^8.0.0",
     "postcss": "^8.5.6",
     "postcss-loader": "^8.1.1",
@@ -170,10 +170,10 @@
     "raw-loader": "^4.0.2",
     "rimraf": "^5.0.10",
     "style-loader": "^4.0.0",
-    "stylelint": "^16.21.0",
+    "stylelint": "^16.21.1",
     "stylelint-config-idiomatic-order": "^10.0.0",
     "stylelint-config-standard": "^38.0.0",
-    "webpack": "^5.99.9",
+    "webpack": "^5.100.2",
     "webpack-cli": "^6.0.1",
     "webpack-dev-server": "^5.2.2",
     "workbox-webpack-plugin": "^7.3.0",

src/profile-logic/process-profile.js

@@ -1482,9 +1482,12 @@ function _convertGeckoMarkerSchema(
     const discardedFields = staticFields.filter(
       (_f, i) => i !== staticDescriptionFieldIndex
     );
-    if (discardedFields.length !== 0) {
+    const potentiallyUsefulDiscardedFields = discardedFields.filter(
+      (f) => f.label !== 'Marker' && f.value !== 'UserTiming'
+    );
+    if (potentiallyUsefulDiscardedFields.length !== 0) {
       console.warn(
-        `Discarding the following static fields from marker schema "${name}": ${discardedFields.join(', ')}`
+        `Discarding the following static fields from marker schema "${markerSchema.name}": ${potentiallyUsefulDiscardedFields.map((f) => f.label + ': ' + f.value).join(', ')}`
       );
     }
     description = staticFields[staticDescriptionFieldIndex].value;