Merge inbound to mozilla-central. a=merge

.eslintignore

@@ -106,7 +106,7 @@ devtools/client/webreplay/mochitest/examples/*.html
 devtools/client/debugger/**
 
 # Ignore devtools imported repositories
-devtools/client/debugger/new/**
+devtools/client/debugger/**
 devtools/client/shared/components/reps/**
 
 # Ignore devtools preferences files

.gitignore

@@ -89,8 +89,8 @@ devtools/client/chrome.manifest
 devtools/shared/chrome.manifest
 
 # Ignore debugger build directories
-devtools/client/debugger/new/assets/build
-devtools/client/debugger/new/assets/module-manifest.json
+devtools/client/debugger/assets/build
+devtools/client/debugger/assets/module-manifest.json
 
 # Ignore node_modules directories in devtools
 devtools/**/node_modules

browser/base/content/test/static/browser_parsable_css.js

@@ -14,9 +14,9 @@ let whitelist = [
   {sourceName: /codemirror\.css$/i,
    isFromDevTools: true},
   // The debugger uses cross-browser CSS.
-  {sourceName: /devtools\/client\/debugger\/new\/dist\/vendors.css/i,
+  {sourceName: /devtools\/client\/debugger\/dist\/vendors.css/i,
    isFromDevTools: true},
-  {sourceName: /devtools\/client\/debugger\/new\/src\/components\/([A-z\/]+).css/i,
+  {sourceName: /devtools\/client\/debugger\/src\/components\/([A-z\/]+).css/i,
   isFromDevTools: true},
    // Reps uses cross-browser CSS.
    {sourceName: /devtools-client-shared\/components\/reps\/reps.css/i,

devtools/client/application/test/browser.ini

@@ -12,8 +12,8 @@ support-files =
   service-workers/scope-page.html
   service-workers/simple.html
   service-workers/simple-unicode.html
-  !/devtools/client/debugger/new/test/mochitest/helpers.js
-  !/devtools/client/debugger/new/test/mochitest/helpers/context.js
+  !/devtools/client/debugger/test/mochitest/helpers.js
+  !/devtools/client/debugger/test/mochitest/helpers/context.js
   !/devtools/client/shared/test/frame-script-utils.js
   !/devtools/client/shared/test/shared-head.js
   !/devtools/client/shared/test/telemetry-test-helpers.js

devtools/client/application/test/browser_application_panel_debug-service-worker.js

@@ -3,14 +3,14 @@
 
 "use strict";
 
-/* import-globals-from ../../debugger/new/test/mochitest/helpers.js */
+/* import-globals-from ../../debugger/test/mochitest/helpers.js */
 Services.scriptloader.loadSubScript(
-  "chrome://mochitests/content/browser/devtools/client/debugger/new/test/mochitest/helpers.js",
+  "chrome://mochitests/content/browser/devtools/client/debugger/test/mochitest/helpers.js",
   this);
 
-/* import-globals-from ../../debugger/new/test/mochitest/helpers/context.js */
+/* import-globals-from ../../debugger/test/mochitest/helpers/context.js */
 Services.scriptloader.loadSubScript(
-  "chrome://mochitests/content/browser/devtools/client/debugger/new/test/mochitest/helpers/context.js",
+  "chrome://mochitests/content/browser/devtools/client/debugger/test/mochitest/helpers/context.js",
   this);
 
 const TAB_URL = URL_ROOT + "service-workers/debug.html";

devtools/client/debugger/bin/bundle.js

@@ -14,7 +14,7 @@ const rimraf = require("rimraf");
 const projectPath = path.resolve(__dirname, "..");
 const bundlePath = path.join(projectPath, "./dist");
 
-const clientPath = path.join(projectPath, "../../");
+const clientPath = path.join(projectPath, "../");
 const watch = false;
 const updateAssets = true;
 

devtools/client/debugger/bin/module-manifest.json

@@ -15,7 +15,7 @@
         "byName": {},
         "byBlocks": {},
         "usedIds": {
-          "1": 1
+          "0": 0
         }
       }
     }
@@ -36,7 +36,7 @@
         "byName": {},
         "byBlocks": {},
         "usedIds": {
-          "1": 1
+          "0": 0
         }
       }
     }
@@ -57,7 +57,7 @@
         "byName": {},
         "byBlocks": {},
         "usedIds": {
-          "1": 1
+          "0": 0
         }
       }
     }
@@ -78,7 +78,7 @@
         "byName": {},
         "byBlocks": {},
         "usedIds": {
-          "1": 1
+          "0": 0
         }
       }
     }
@@ -99,7 +99,7 @@
         "byName": {},
         "byBlocks": {},
         "usedIds": {
-          "1": 1
+          "0": 0
         }
       }
     }
@@ -120,7 +120,7 @@
         "byName": {},
         "byBlocks": {},
         "usedIds": {
-          "1": 1
+          "0": 0
         }
       }
     }
@@ -141,7 +141,7 @@
         "byName": {},
         "byBlocks": {},
         "usedIds": {
-          "1": 1
+          "0": 0
         }
       }
     }

devtools/client/debugger/configs/firefox-panel.json

@@ -0,0 +1,15 @@
+{
+  "environment": "firefox-panel",
+  "logging": false,
+  "clientLogging": false,
+  "firefox": {
+    "mcPath": "./firefox"
+  },
+  "workers": {
+    "parserURL": "resource://devtools/client/debugger/parser-worker.js",
+    "prettyPrintURL":
+      "resource://devtools/client/debugger/pretty-print-worker.js",
+    "searchURL": "resource://devtools/client/debugger/search-worker.js"
+  },
+  "features": {}
+}

devtools/client/debugger/dist/vendors.css

@@ -34,14 +34,15 @@
 .tree-indent {
   display: inline-block;
   width: 12px;
-  margin-inline-start: 5px;
+  margin-inline-start: 3px;
   border-inline-start: 1px solid #a2d1ff;
   flex-shrink: 0;
 }
 
-/* Align with expandables siblings (where we have the arrow) */
-.tree-node[data-expandable="false"] .tree-indent:last-of-type {
-  margin-inline-end: 15px;
+.debugger .tree-indent {
+  width: 16px;
+  margin-inline-start: 0px;
+  border-inline-start: 0;
 }
 
 /* For non expandable root nodes, we don't have .tree-indent elements, so we declare
@@ -55,14 +56,13 @@
 }
 
 .tree-node button.arrow {
-  mask: url("resource://devtools/client/debugger/new/images/arrow.svg") no-repeat center;
+  mask: url("resource://devtools/client/debugger/images/arrow.svg") no-repeat center;
   mask-size: 10px;
   vertical-align: -1px;
   width: 10px;
   height: 10px;
   border: 0;
   padding: 0;
-  margin-inline-start: 1px;
   margin-inline-end: 4px;
   transform-origin: center center;
   transition: transform 125ms var(--animation-curve);