diff --git a/.eslintignore b/.eslintignore
index d79f80b4c6c4..2f50f02e0724 100644
--- a/.eslintignore
+++ b/.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
diff --git a/.gitignore b/.gitignore
index 21f0860f57c0..84c024b281fc 100644
--- a/.gitignore
+++ b/.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
diff --git a/browser/base/content/test/static/browser_parsable_css.js b/browser/base/content/test/static/browser_parsable_css.js
index 8f8657bfc052..0f122909d1b6 100644
--- a/browser/base/content/test/static/browser_parsable_css.js
+++ b/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,
diff --git a/devtools/client/application/test/browser.ini b/devtools/client/application/test/browser.ini
index 59d3398a2d8f..ed0f47fa1eb3 100644
--- a/devtools/client/application/test/browser.ini
+++ b/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
diff --git a/devtools/client/application/test/browser_application_panel_debug-service-worker.js b/devtools/client/application/test/browser_application_panel_debug-service-worker.js
index a44e6ef61ac5..9073c07986e9 100644
--- a/devtools/client/application/test/browser_application_panel_debug-service-worker.js
+++ b/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";
diff --git a/devtools/client/debugger/new/.babelrc b/devtools/client/debugger/.babelrc
similarity index 100%
rename from devtools/client/debugger/new/.babelrc
rename to devtools/client/debugger/.babelrc
diff --git a/devtools/client/debugger/new/.eslintignore b/devtools/client/debugger/.eslintignore
similarity index 100%
rename from devtools/client/debugger/new/.eslintignore
rename to devtools/client/debugger/.eslintignore
diff --git a/devtools/client/debugger/new/.eslintrc b/devtools/client/debugger/.eslintrc
similarity index 100%
rename from devtools/client/debugger/new/.eslintrc
rename to devtools/client/debugger/.eslintrc
diff --git a/devtools/client/debugger/new/.eslintrc.jsx-a11y b/devtools/client/debugger/.eslintrc.jsx-a11y
similarity index 100%
rename from devtools/client/debugger/new/.eslintrc.jsx-a11y
rename to devtools/client/debugger/.eslintrc.jsx-a11y
diff --git a/devtools/client/debugger/new/.flowconfig b/devtools/client/debugger/.flowconfig
similarity index 100%
rename from devtools/client/debugger/new/.flowconfig
rename to devtools/client/debugger/.flowconfig
diff --git a/devtools/client/debugger/new/.prettierignore b/devtools/client/debugger/.prettierignore
similarity index 100%
rename from devtools/client/debugger/new/.prettierignore
rename to devtools/client/debugger/.prettierignore
diff --git a/devtools/client/debugger/new/.remarkignore b/devtools/client/debugger/.remarkignore
similarity index 100%
rename from devtools/client/debugger/new/.remarkignore
rename to devtools/client/debugger/.remarkignore
diff --git a/devtools/client/debugger/new/.remarkrc b/devtools/client/debugger/.remarkrc
similarity index 100%
rename from devtools/client/debugger/new/.remarkrc
rename to devtools/client/debugger/.remarkrc
diff --git a/devtools/client/debugger/new/.stylelintignore b/devtools/client/debugger/.stylelintignore
similarity index 100%
rename from devtools/client/debugger/new/.stylelintignore
rename to devtools/client/debugger/.stylelintignore
diff --git a/devtools/client/debugger/new/.stylelintrc b/devtools/client/debugger/.stylelintrc
similarity index 100%
rename from devtools/client/debugger/new/.stylelintrc
rename to devtools/client/debugger/.stylelintrc
diff --git a/devtools/client/debugger/new/README.mozilla b/devtools/client/debugger/README.mozilla
similarity index 100%
rename from devtools/client/debugger/new/README.mozilla
rename to devtools/client/debugger/README.mozilla
diff --git a/devtools/client/debugger/new/assets/dictionary.txt b/devtools/client/debugger/assets/dictionary.txt
similarity index 100%
rename from devtools/client/debugger/new/assets/dictionary.txt
rename to devtools/client/debugger/assets/dictionary.txt
diff --git a/devtools/client/debugger/new/bin/bundle.js b/devtools/client/debugger/bin/bundle.js
similarity index 97%
rename from devtools/client/debugger/new/bin/bundle.js
rename to devtools/client/debugger/bin/bundle.js
index ec1ae667fe3e..3a05704545be 100644
--- a/devtools/client/debugger/new/bin/bundle.js
+++ b/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;
diff --git a/devtools/client/debugger/new/bin/dev-server.js b/devtools/client/debugger/bin/dev-server.js
similarity index 100%
rename from devtools/client/debugger/new/bin/dev-server.js
rename to devtools/client/debugger/bin/dev-server.js
diff --git a/devtools/client/debugger/new/bin/getConfig.js b/devtools/client/debugger/bin/getConfig.js
similarity index 100%
rename from devtools/client/debugger/new/bin/getConfig.js
rename to devtools/client/debugger/bin/getConfig.js
diff --git a/devtools/client/debugger/new/bin/module-manifest.json b/devtools/client/debugger/bin/module-manifest.json
similarity index 99%
rename from devtools/client/debugger/new/bin/module-manifest.json
rename to devtools/client/debugger/bin/module-manifest.json
index ca68be21115e..be3b8dc32b26 100644
--- a/devtools/client/debugger/new/bin/module-manifest.json
+++ b/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
}
}
}
diff --git a/devtools/client/debugger/new/configs/development.json b/devtools/client/debugger/configs/development.json
similarity index 100%
rename from devtools/client/debugger/new/configs/development.json
rename to devtools/client/debugger/configs/development.json
diff --git a/devtools/client/debugger/configs/firefox-panel.json b/devtools/client/debugger/configs/firefox-panel.json
new file mode 100644
index 000000000000..ac01417ef8e5
--- /dev/null
+++ b/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": {}
+}
diff --git a/devtools/client/debugger/new/configs/mozilla-central-mappings.js b/devtools/client/debugger/configs/mozilla-central-mappings.js
similarity index 100%
rename from devtools/client/debugger/new/configs/mozilla-central-mappings.js
rename to devtools/client/debugger/configs/mozilla-central-mappings.js
diff --git a/devtools/client/debugger/new/dist/moz.build b/devtools/client/debugger/dist/moz.build
similarity index 100%
rename from devtools/client/debugger/new/dist/moz.build
rename to devtools/client/debugger/dist/moz.build
diff --git a/devtools/client/debugger/new/dist/parser-worker.js b/devtools/client/debugger/dist/parser-worker.js
similarity index 100%
rename from devtools/client/debugger/new/dist/parser-worker.js
rename to devtools/client/debugger/dist/parser-worker.js
diff --git a/devtools/client/debugger/new/dist/pretty-print-worker.js b/devtools/client/debugger/dist/pretty-print-worker.js
similarity index 100%
rename from devtools/client/debugger/new/dist/pretty-print-worker.js
rename to devtools/client/debugger/dist/pretty-print-worker.js
diff --git a/devtools/client/debugger/new/dist/search-worker.js b/devtools/client/debugger/dist/search-worker.js
similarity index 100%
rename from devtools/client/debugger/new/dist/search-worker.js
rename to devtools/client/debugger/dist/search-worker.js
diff --git a/devtools/client/debugger/new/dist/vendors.css b/devtools/client/debugger/dist/vendors.css
similarity index 94%
rename from devtools/client/debugger/new/dist/vendors.css
rename to devtools/client/debugger/dist/vendors.css
index 7f168b90b99b..9c9a51ded3f6 100644
--- a/devtools/client/debugger/new/dist/vendors.css
+++ b/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);
diff --git a/devtools/client/debugger/new/dist/vendors.js b/devtools/client/debugger/dist/vendors.js
similarity index 100%
rename from devtools/client/debugger/new/dist/vendors.js
rename to devtools/client/debugger/dist/vendors.js
diff --git a/devtools/client/debugger/new/flow-typed/debugger-html.js b/devtools/client/debugger/flow-typed/debugger-html.js
similarity index 100%
rename from devtools/client/debugger/new/flow-typed/debugger-html.js
rename to devtools/client/debugger/flow-typed/debugger-html.js
diff --git a/devtools/client/debugger/new/flow-typed/npm-custom/devtools-contextmenu_vx.x.x.js b/devtools/client/debugger/flow-typed/npm-custom/devtools-contextmenu_vx.x.x.js
similarity index 100%
rename from devtools/client/debugger/new/flow-typed/npm-custom/devtools-contextmenu_vx.x.x.js
rename to devtools/client/debugger/flow-typed/npm-custom/devtools-contextmenu_vx.x.x.js
diff --git a/devtools/client/debugger/new/flow-typed/npm-custom/devtools-module-vx.x.x.js b/devtools/client/debugger/flow-typed/npm-custom/devtools-module-vx.x.x.js
similarity index 100%
rename from devtools/client/debugger/new/flow-typed/npm-custom/devtools-module-vx.x.x.js
rename to devtools/client/debugger/flow-typed/npm-custom/devtools-module-vx.x.x.js
diff --git a/devtools/client/debugger/new/flow-typed/npm-custom/enzyme.js b/devtools/client/debugger/flow-typed/npm-custom/enzyme.js
similarity index 100%
rename from devtools/client/debugger/new/flow-typed/npm-custom/enzyme.js
rename to devtools/client/debugger/flow-typed/npm-custom/enzyme.js
diff --git a/devtools/client/debugger/new/flow-typed/npm-custom/prettier.js b/devtools/client/debugger/flow-typed/npm-custom/prettier.js
similarity index 100%
rename from devtools/client/debugger/new/flow-typed/npm-custom/prettier.js
rename to devtools/client/debugger/flow-typed/npm-custom/prettier.js
diff --git a/devtools/client/debugger/new/flow-typed/npm-custom/react-aria-components-vx.x.x.js b/devtools/client/debugger/flow-typed/npm-custom/react-aria-components-vx.x.x.js
similarity index 100%
rename from devtools/client/debugger/new/flow-typed/npm-custom/react-aria-components-vx.x.x.js
rename to devtools/client/debugger/flow-typed/npm-custom/react-aria-components-vx.x.x.js
diff --git a/devtools/client/debugger/new/flow-typed/npm/@babel/generator-vx.x.x.js b/devtools/client/debugger/flow-typed/npm/@babel/generator-vx.x.x.js
similarity index 100%
rename from devtools/client/debugger/new/flow-typed/npm/@babel/generator-vx.x.x.js
rename to devtools/client/debugger/flow-typed/npm/@babel/generator-vx.x.x.js
diff --git a/devtools/client/debugger/new/flow-typed/npm/@babel/parser.vx.x.x.js b/devtools/client/debugger/flow-typed/npm/@babel/parser.vx.x.x.js
similarity index 100%
rename from devtools/client/debugger/new/flow-typed/npm/@babel/parser.vx.x.x.js
rename to devtools/client/debugger/flow-typed/npm/@babel/parser.vx.x.x.js
diff --git a/devtools/client/debugger/new/flow-typed/npm/@babel/plugin-proposal-object-rest-spread_vx.x.x.js b/devtools/client/debugger/flow-typed/npm/@babel/plugin-proposal-object-rest-spread_vx.x.x.js
similarity index 100%
rename from devtools/client/debugger/new/flow-typed/npm/@babel/plugin-proposal-object-rest-spread_vx.x.x.js
rename to devtools/client/debugger/flow-typed/npm/@babel/plugin-proposal-object-rest-spread_vx.x.x.js
diff --git a/devtools/client/debugger/new/flow-typed/npm/@babel/template_vx.x.x.js b/devtools/client/debugger/flow-typed/npm/@babel/template_vx.x.x.js
similarity index 100%
rename from devtools/client/debugger/new/flow-typed/npm/@babel/template_vx.x.x.js
rename to devtools/client/debugger/flow-typed/npm/@babel/template_vx.x.x.js
diff --git a/devtools/client/debugger/new/flow-typed/npm/@babel/types.vx.x.x.js b/devtools/client/debugger/flow-typed/npm/@babel/types.vx.x.x.js
similarity index 100%
rename from devtools/client/debugger/new/flow-typed/npm/@babel/types.vx.x.x.js
rename to devtools/client/debugger/flow-typed/npm/@babel/types.vx.x.x.js
diff --git a/devtools/client/debugger/new/flow-typed/npm/babel-eslint_vx.x.x.js b/devtools/client/debugger/flow-typed/npm/babel-eslint_vx.x.x.js
similarity index 100%
rename from devtools/client/debugger/new/flow-typed/npm/babel-eslint_vx.x.x.js
rename to devtools/client/debugger/flow-typed/npm/babel-eslint_vx.x.x.js
diff --git a/devtools/client/debugger/new/flow-typed/npm/babel-jest_vx.x.x.js b/devtools/client/debugger/flow-typed/npm/babel-jest_vx.x.x.js
similarity index 100%
rename from devtools/client/debugger/new/flow-typed/npm/babel-jest_vx.x.x.js
rename to devtools/client/debugger/flow-typed/npm/babel-jest_vx.x.x.js
diff --git a/devtools/client/debugger/new/flow-typed/npm/babel-plugin-syntax-trailing-function-commas_vx.x.x.js b/devtools/client/debugger/flow-typed/npm/babel-plugin-syntax-trailing-function-commas_vx.x.x.js
similarity index 100%
rename from devtools/client/debugger/new/flow-typed/npm/babel-plugin-syntax-trailing-function-commas_vx.x.x.js
rename to devtools/client/debugger/flow-typed/npm/babel-plugin-syntax-trailing-function-commas_vx.x.x.js
diff --git a/devtools/client/debugger/new/flow-typed/npm/babel-plugin-transform-class-properties_vx.x.x.js b/devtools/client/debugger/flow-typed/npm/babel-plugin-transform-class-properties_vx.x.x.js
similarity index 100%
rename from devtools/client/debugger/new/flow-typed/npm/babel-plugin-transform-class-properties_vx.x.x.js
rename to devtools/client/debugger/flow-typed/npm/babel-plugin-transform-class-properties_vx.x.x.js
diff --git a/devtools/client/debugger/new/flow-typed/npm/babel-plugin-transform-es2015-modules-commonjs_vx.x.x.js b/devtools/client/debugger/flow-typed/npm/babel-plugin-transform-es2015-modules-commonjs_vx.x.x.js
similarity index 100%
rename from devtools/client/debugger/new/flow-typed/npm/babel-plugin-transform-es2015-modules-commonjs_vx.x.x.js
rename to devtools/client/debugger/flow-typed/npm/babel-plugin-transform-es2015-modules-commonjs_vx.x.x.js
diff --git a/devtools/client/debugger/new/flow-typed/npm/babel-plugin-transform-imports_vx.x.x.js b/devtools/client/debugger/flow-typed/npm/babel-plugin-transform-imports_vx.x.x.js
similarity index 100%
rename from devtools/client/debugger/new/flow-typed/npm/babel-plugin-transform-imports_vx.x.x.js
rename to devtools/client/debugger/flow-typed/npm/babel-plugin-transform-imports_vx.x.x.js
diff --git a/devtools/client/debugger/new/flow-typed/npm/babel-preset-env_vx.x.x.js b/devtools/client/debugger/flow-typed/npm/babel-preset-env_vx.x.x.js
similarity index 100%
rename from devtools/client/debugger/new/flow-typed/npm/babel-preset-env_vx.x.x.js
rename to devtools/client/debugger/flow-typed/npm/babel-preset-env_vx.x.x.js
diff --git a/devtools/client/debugger/new/flow-typed/npm/babel-preset-react_vx.x.x.js b/devtools/client/debugger/flow-typed/npm/babel-preset-react_vx.x.x.js
similarity index 100%
rename from devtools/client/debugger/new/flow-typed/npm/babel-preset-react_vx.x.x.js
rename to devtools/client/debugger/flow-typed/npm/babel-preset-react_vx.x.x.js
diff --git a/devtools/client/debugger/new/flow-typed/npm/babylon_vx.x.x.js b/devtools/client/debugger/flow-typed/npm/babylon_vx.x.x.js
similarity index 100%
rename from devtools/client/debugger/new/flow-typed/npm/babylon_vx.x.x.js
rename to devtools/client/debugger/flow-typed/npm/babylon_vx.x.x.js
diff --git a/devtools/client/debugger/new/flow-typed/npm/classnames_v2.x.x.js b/devtools/client/debugger/flow-typed/npm/classnames_v2.x.x.js
similarity index 100%
rename from devtools/client/debugger/new/flow-typed/npm/classnames_v2.x.x.js
rename to devtools/client/debugger/flow-typed/npm/classnames_v2.x.x.js
diff --git a/devtools/client/debugger/new/flow-typed/npm/codemirror_vx.x.x.js b/devtools/client/debugger/flow-typed/npm/codemirror_vx.x.x.js
similarity index 100%
rename from devtools/client/debugger/new/flow-typed/npm/codemirror_vx.x.x.js
rename to devtools/client/debugger/flow-typed/npm/codemirror_vx.x.x.js
diff --git a/devtools/client/debugger/new/flow-typed/npm/devtools-environment_vx.x.x.js b/devtools/client/debugger/flow-typed/npm/devtools-environment_vx.x.x.js
similarity index 100%
rename from devtools/client/debugger/new/flow-typed/npm/devtools-environment_vx.x.x.js
rename to devtools/client/debugger/flow-typed/npm/devtools-environment_vx.x.x.js
diff --git a/devtools/client/debugger/new/flow-typed/npm/devtools-launchpad_vx.x.x.js b/devtools/client/debugger/flow-typed/npm/devtools-launchpad_vx.x.x.js
similarity index 100%
rename from devtools/client/debugger/new/flow-typed/npm/devtools-launchpad_vx.x.x.js
rename to devtools/client/debugger/flow-typed/npm/devtools-launchpad_vx.x.x.js
diff --git a/devtools/client/debugger/new/flow-typed/npm/devtools-reps_vx.x.x.js b/devtools/client/debugger/flow-typed/npm/devtools-reps_vx.x.x.js
similarity index 100%
rename from devtools/client/debugger/new/flow-typed/npm/devtools-reps_vx.x.x.js
rename to devtools/client/debugger/flow-typed/npm/devtools-reps_vx.x.x.js
diff --git a/devtools/client/debugger/new/flow-typed/npm/devtools-services.vx.x.x.js b/devtools/client/debugger/flow-typed/npm/devtools-services.vx.x.x.js
similarity index 100%
rename from devtools/client/debugger/new/flow-typed/npm/devtools-services.vx.x.x.js
rename to devtools/client/debugger/flow-typed/npm/devtools-services.vx.x.x.js
diff --git a/devtools/client/debugger/new/flow-typed/npm/devtools-source-map_vx.x.x.js b/devtools/client/debugger/flow-typed/npm/devtools-source-map_vx.x.x.js
similarity index 100%
rename from devtools/client/debugger/new/flow-typed/npm/devtools-source-map_vx.x.x.js
rename to devtools/client/debugger/flow-typed/npm/devtools-source-map_vx.x.x.js
diff --git a/devtools/client/debugger/new/flow-typed/npm/devtools-splitter_vx.x.x.js b/devtools/client/debugger/flow-typed/npm/devtools-splitter_vx.x.x.js
similarity index 100%
rename from devtools/client/debugger/new/flow-typed/npm/devtools-splitter_vx.x.x.js
rename to devtools/client/debugger/flow-typed/npm/devtools-splitter_vx.x.x.js
diff --git a/devtools/client/debugger/new/flow-typed/npm/devtools-utils_vx.x.x.js b/devtools/client/debugger/flow-typed/npm/devtools-utils_vx.x.x.js
similarity index 100%
rename from devtools/client/debugger/new/flow-typed/npm/devtools-utils_vx.x.x.js
rename to devtools/client/debugger/flow-typed/npm/devtools-utils_vx.x.x.js
diff --git a/devtools/client/debugger/new/flow-typed/npm/enzyme-to-json_vx.x.x.js b/devtools/client/debugger/flow-typed/npm/enzyme-to-json_vx.x.x.js
similarity index 100%
rename from devtools/client/debugger/new/flow-typed/npm/enzyme-to-json_vx.x.x.js
rename to devtools/client/debugger/flow-typed/npm/enzyme-to-json_vx.x.x.js
diff --git a/devtools/client/debugger/new/flow-typed/npm/expect.js_vx.x.x.js b/devtools/client/debugger/flow-typed/npm/expect.js_vx.x.x.js
similarity index 100%
rename from devtools/client/debugger/new/flow-typed/npm/expect.js_vx.x.x.js
rename to devtools/client/debugger/flow-typed/npm/expect.js_vx.x.x.js
diff --git a/devtools/client/debugger/new/flow-typed/npm/flow-bin_v0.x.x.js b/devtools/client/debugger/flow-typed/npm/flow-bin_v0.x.x.js
similarity index 100%
rename from devtools/client/debugger/new/flow-typed/npm/flow-bin_v0.x.x.js
rename to devtools/client/debugger/flow-typed/npm/flow-bin_v0.x.x.js
diff --git a/devtools/client/debugger/new/flow-typed/npm/fuzzaldrin-plus_vx.x.x.js b/devtools/client/debugger/flow-typed/npm/fuzzaldrin-plus_vx.x.x.js
similarity index 100%
rename from devtools/client/debugger/new/flow-typed/npm/fuzzaldrin-plus_vx.x.x.js
rename to devtools/client/debugger/flow-typed/npm/fuzzaldrin-plus_vx.x.x.js
diff --git a/devtools/client/debugger/new/flow-typed/npm/immutable_vx.x.x.js b/devtools/client/debugger/flow-typed/npm/immutable_vx.x.x.js
similarity index 100%
rename from devtools/client/debugger/new/flow-typed/npm/immutable_vx.x.x.js
rename to devtools/client/debugger/flow-typed/npm/immutable_vx.x.x.js
diff --git a/devtools/client/debugger/new/flow-typed/npm/jest-environment-jsdom_vx.x.x.js b/devtools/client/debugger/flow-typed/npm/jest-environment-jsdom_vx.x.x.js
similarity index 100%
rename from devtools/client/debugger/new/flow-typed/npm/jest-environment-jsdom_vx.x.x.js
rename to devtools/client/debugger/flow-typed/npm/jest-environment-jsdom_vx.x.x.js
diff --git a/devtools/client/debugger/new/flow-typed/npm/jest-in-case_vx.x.x.js b/devtools/client/debugger/flow-typed/npm/jest-in-case_vx.x.x.js
similarity index 100%
rename from devtools/client/debugger/new/flow-typed/npm/jest-in-case_vx.x.x.js
rename to devtools/client/debugger/flow-typed/npm/jest-in-case_vx.x.x.js
diff --git a/devtools/client/debugger/new/flow-typed/npm/jest_v22.x.x.js b/devtools/client/debugger/flow-typed/npm/jest_v22.x.x.js
similarity index 100%
rename from devtools/client/debugger/new/flow-typed/npm/jest_v22.x.x.js
rename to devtools/client/debugger/flow-typed/npm/jest_v22.x.x.js
diff --git a/devtools/client/debugger/new/flow-typed/npm/jest_v23.x.x.js b/devtools/client/debugger/flow-typed/npm/jest_v23.x.x.js
similarity index 100%
rename from devtools/client/debugger/new/flow-typed/npm/jest_v23.x.x.js
rename to devtools/client/debugger/flow-typed/npm/jest_v23.x.x.js
diff --git a/devtools/client/debugger/new/flow-typed/npm/lodash-move-vx.x.x.js b/devtools/client/debugger/flow-typed/npm/lodash-move-vx.x.x.js
similarity index 100%
rename from devtools/client/debugger/new/flow-typed/npm/lodash-move-vx.x.x.js
rename to devtools/client/debugger/flow-typed/npm/lodash-move-vx.x.x.js
diff --git a/devtools/client/debugger/new/flow-typed/npm/lodash.kebabcase_vx.x.x.js b/devtools/client/debugger/flow-typed/npm/lodash.kebabcase_vx.x.x.js
similarity index 100%
rename from devtools/client/debugger/new/flow-typed/npm/lodash.kebabcase_vx.x.x.js
rename to devtools/client/debugger/flow-typed/npm/lodash.kebabcase_vx.x.x.js
diff --git a/devtools/client/debugger/new/flow-typed/npm/lodash_v4.x.x.js b/devtools/client/debugger/flow-typed/npm/lodash_v4.x.x.js
similarity index 100%
rename from devtools/client/debugger/new/flow-typed/npm/lodash_v4.x.x.js
rename to devtools/client/debugger/flow-typed/npm/lodash_v4.x.x.js
diff --git a/devtools/client/debugger/new/flow-typed/npm/md5_vx.x.x.js b/devtools/client/debugger/flow-typed/npm/md5_vx.x.x.js
similarity index 100%
rename from devtools/client/debugger/new/flow-typed/npm/md5_vx.x.x.js
rename to devtools/client/debugger/flow-typed/npm/md5_vx.x.x.js
diff --git a/devtools/client/debugger/new/flow-typed/npm/parse-script-tags-vx.x.x.js b/devtools/client/debugger/flow-typed/npm/parse-script-tags-vx.x.x.js
similarity index 100%
rename from devtools/client/debugger/new/flow-typed/npm/parse-script-tags-vx.x.x.js
rename to devtools/client/debugger/flow-typed/npm/parse-script-tags-vx.x.x.js
diff --git a/devtools/client/debugger/new/flow-typed/npm/pretty-fast_vx.x.x.js b/devtools/client/debugger/flow-typed/npm/pretty-fast_vx.x.x.js
similarity index 100%
rename from devtools/client/debugger/new/flow-typed/npm/pretty-fast_vx.x.x.js
rename to devtools/client/debugger/flow-typed/npm/pretty-fast_vx.x.x.js
diff --git a/devtools/client/debugger/new/flow-typed/npm/pretty-quick_vx.x.x.js b/devtools/client/debugger/flow-typed/npm/pretty-quick_vx.x.x.js
similarity index 100%
rename from devtools/client/debugger/new/flow-typed/npm/pretty-quick_vx.x.x.js
rename to devtools/client/debugger/flow-typed/npm/pretty-quick_vx.x.x.js
diff --git a/devtools/client/debugger/new/flow-typed/npm/prop-types_v15.x.x.js b/devtools/client/debugger/flow-typed/npm/prop-types_v15.x.x.js
similarity index 100%
rename from devtools/client/debugger/new/flow-typed/npm/prop-types_v15.x.x.js
rename to devtools/client/debugger/flow-typed/npm/prop-types_v15.x.x.js
diff --git a/devtools/client/debugger/new/flow-typed/npm/react-immutable-proptypes_vx.x.x.js b/devtools/client/debugger/flow-typed/npm/react-immutable-proptypes_vx.x.x.js
similarity index 100%
rename from devtools/client/debugger/new/flow-typed/npm/react-immutable-proptypes_vx.x.x.js
rename to devtools/client/debugger/flow-typed/npm/react-immutable-proptypes_vx.x.x.js
diff --git a/devtools/client/debugger/new/flow-typed/npm/react-inlinesvg_vx.x.x.js b/devtools/client/debugger/flow-typed/npm/react-inlinesvg_vx.x.x.js
similarity index 100%
rename from devtools/client/debugger/new/flow-typed/npm/react-inlinesvg_vx.x.x.js
rename to devtools/client/debugger/flow-typed/npm/react-inlinesvg_vx.x.x.js
diff --git a/devtools/client/debugger/new/flow-typed/npm/react-redux_v5.x.x.js b/devtools/client/debugger/flow-typed/npm/react-redux_v5.x.x.js
similarity index 100%
rename from devtools/client/debugger/new/flow-typed/npm/react-redux_v5.x.x.js
rename to devtools/client/debugger/flow-typed/npm/react-redux_v5.x.x.js
diff --git a/devtools/client/debugger/new/flow-typed/npm/react-transition-group_v2.x.x.js b/devtools/client/debugger/flow-typed/npm/react-transition-group_v2.x.x.js
similarity index 100%
rename from devtools/client/debugger/new/flow-typed/npm/react-transition-group_v2.x.x.js
rename to devtools/client/debugger/flow-typed/npm/react-transition-group_v2.x.x.js
diff --git a/devtools/client/debugger/new/flow-typed/npm/redux-saga_v0.16.x.js b/devtools/client/debugger/flow-typed/npm/redux-saga_v0.16.x.js
similarity index 100%
rename from devtools/client/debugger/new/flow-typed/npm/redux-saga_v0.16.x.js
rename to devtools/client/debugger/flow-typed/npm/redux-saga_v0.16.x.js
diff --git a/devtools/client/debugger/new/flow-typed/npm/redux-vx.x.x.js b/devtools/client/debugger/flow-typed/npm/redux-vx.x.x.js
similarity index 100%
rename from devtools/client/debugger/new/flow-typed/npm/redux-vx.x.x.js
rename to devtools/client/debugger/flow-typed/npm/redux-vx.x.x.js
diff --git a/devtools/client/debugger/new/flow-typed/npm/reselect_v3.x.x.js b/devtools/client/debugger/flow-typed/npm/reselect_v3.x.x.js
similarity index 100%
rename from devtools/client/debugger/new/flow-typed/npm/reselect_v3.x.x.js
rename to devtools/client/debugger/flow-typed/npm/reselect_v3.x.x.js
diff --git a/devtools/client/debugger/new/flow-typed/npm/source-map_vx.x.x.js b/devtools/client/debugger/flow-typed/npm/source-map_vx.x.x.js
similarity index 100%
rename from devtools/client/debugger/new/flow-typed/npm/source-map_vx.x.x.js
rename to devtools/client/debugger/flow-typed/npm/source-map_vx.x.x.js
diff --git a/devtools/client/debugger/new/flow-typed/npm/svg-inline-react_vx.x.x.js b/devtools/client/debugger/flow-typed/npm/svg-inline-react_vx.x.x.js
similarity index 100%
rename from devtools/client/debugger/new/flow-typed/npm/svg-inline-react_vx.x.x.js
rename to devtools/client/debugger/flow-typed/npm/svg-inline-react_vx.x.x.js
diff --git a/devtools/client/debugger/new/flow-typed/npm/wasmparser_vx.x.x.js b/devtools/client/debugger/flow-typed/npm/wasmparser_vx.x.x.js
similarity index 100%
rename from devtools/client/debugger/new/flow-typed/npm/wasmparser_vx.x.x.js
rename to devtools/client/debugger/flow-typed/npm/wasmparser_vx.x.x.js
diff --git a/devtools/client/debugger/new/images/Svg.js b/devtools/client/debugger/images/Svg.js
similarity index 100%
rename from devtools/client/debugger/new/images/Svg.js
rename to devtools/client/debugger/images/Svg.js
diff --git a/devtools/client/debugger/new/images/arrow-down.svg b/devtools/client/debugger/images/arrow-down.svg
similarity index 100%
rename from devtools/client/debugger/new/images/arrow-down.svg
rename to devtools/client/debugger/images/arrow-down.svg
diff --git a/devtools/client/debugger/new/images/arrow-up.svg b/devtools/client/debugger/images/arrow-up.svg
similarity index 100%
rename from devtools/client/debugger/new/images/arrow-up.svg
rename to devtools/client/debugger/images/arrow-up.svg
diff --git a/devtools/client/debugger/new/images/arrow.svg b/devtools/client/debugger/images/arrow.svg
similarity index 100%
rename from devtools/client/debugger/new/images/arrow.svg
rename to devtools/client/debugger/images/arrow.svg
diff --git a/devtools/client/debugger/new/images/blackBox.svg b/devtools/client/debugger/images/blackBox.svg
similarity index 100%
rename from devtools/client/debugger/new/images/blackBox.svg
rename to devtools/client/debugger/images/blackBox.svg
diff --git a/devtools/client/debugger/new/images/breadcrumbs-divider.svg b/devtools/client/debugger/images/breadcrumbs-divider.svg
similarity index 100%
rename from devtools/client/debugger/new/images/breadcrumbs-divider.svg
rename to devtools/client/debugger/images/breadcrumbs-divider.svg
diff --git a/devtools/client/debugger/new/images/breakpoint.svg b/devtools/client/debugger/images/breakpoint.svg
similarity index 100%
rename from devtools/client/debugger/new/images/breakpoint.svg
rename to devtools/client/debugger/images/breakpoint.svg
diff --git a/devtools/client/debugger/new/images/case-match.svg b/devtools/client/debugger/images/case-match.svg
similarity index 100%
rename from devtools/client/debugger/new/images/case-match.svg
rename to devtools/client/debugger/images/case-match.svg
diff --git a/devtools/client/debugger/new/images/close.svg b/devtools/client/debugger/images/close.svg
similarity index 100%
rename from devtools/client/debugger/new/images/close.svg
rename to devtools/client/debugger/images/close.svg
diff --git a/devtools/client/debugger/new/images/column-marker.svg b/devtools/client/debugger/images/column-marker.svg
similarity index 100%
rename from devtools/client/debugger/new/images/column-marker.svg
rename to devtools/client/debugger/images/column-marker.svg
diff --git a/devtools/client/debugger/new/images/command-chevron.svg b/devtools/client/debugger/images/command-chevron.svg
similarity index 100%
rename from devtools/client/debugger/new/images/command-chevron.svg
rename to devtools/client/debugger/images/command-chevron.svg
diff --git a/devtools/client/debugger/new/images/disable-pausing.svg b/devtools/client/debugger/images/disable-pausing.svg
similarity index 100%
rename from devtools/client/debugger/new/images/disable-pausing.svg
rename to devtools/client/debugger/images/disable-pausing.svg
diff --git a/devtools/client/debugger/new/images/file-small.svg b/devtools/client/debugger/images/file-small.svg
similarity index 100%
rename from devtools/client/debugger/new/images/file-small.svg
rename to devtools/client/debugger/images/file-small.svg
diff --git a/devtools/client/debugger/new/images/folder.svg b/devtools/client/debugger/images/folder.svg
similarity index 100%
rename from devtools/client/debugger/new/images/folder.svg
rename to devtools/client/debugger/images/folder.svg
diff --git a/devtools/client/debugger/new/images/globe-small.svg b/devtools/client/debugger/images/globe-small.svg
similarity index 100%
rename from devtools/client/debugger/new/images/globe-small.svg
rename to devtools/client/debugger/images/globe-small.svg
diff --git a/devtools/client/debugger/new/images/globe.svg b/devtools/client/debugger/images/globe.svg
similarity index 100%
rename from devtools/client/debugger/new/images/globe.svg
rename to devtools/client/debugger/images/globe.svg
diff --git a/devtools/client/debugger/new/images/help.svg b/devtools/client/debugger/images/help.svg
similarity index 100%
rename from devtools/client/debugger/new/images/help.svg
rename to devtools/client/debugger/images/help.svg
diff --git a/devtools/client/debugger/new/images/home.svg b/devtools/client/debugger/images/home.svg
similarity index 100%
rename from devtools/client/debugger/new/images/home.svg
rename to devtools/client/debugger/images/home.svg
diff --git a/devtools/client/debugger/new/images/loader.svg b/devtools/client/debugger/images/loader.svg
similarity index 100%
rename from devtools/client/debugger/new/images/loader.svg
rename to devtools/client/debugger/images/loader.svg
diff --git a/devtools/client/debugger/new/images/moz.build b/devtools/client/debugger/images/moz.build
similarity index 100%
rename from devtools/client/debugger/new/images/moz.build
rename to devtools/client/debugger/images/moz.build
diff --git a/devtools/client/debugger/new/images/next-circle.svg b/devtools/client/debugger/images/next-circle.svg
similarity index 100%
rename from devtools/client/debugger/new/images/next-circle.svg
rename to devtools/client/debugger/images/next-circle.svg
diff --git a/devtools/client/debugger/new/images/next.svg b/devtools/client/debugger/images/next.svg
similarity index 100%
rename from devtools/client/debugger/new/images/next.svg
rename to devtools/client/debugger/images/next.svg
diff --git a/devtools/client/debugger/new/images/pane-collapse.svg b/devtools/client/debugger/images/pane-collapse.svg
similarity index 100%
rename from devtools/client/debugger/new/images/pane-collapse.svg
rename to devtools/client/debugger/images/pane-collapse.svg
diff --git a/devtools/client/debugger/new/images/pane-expand.svg b/devtools/client/debugger/images/pane-expand.svg
similarity index 100%
rename from devtools/client/debugger/new/images/pane-expand.svg
rename to devtools/client/debugger/images/pane-expand.svg
diff --git a/devtools/client/debugger/new/images/pause.svg b/devtools/client/debugger/images/pause.svg
similarity index 100%
rename from devtools/client/debugger/new/images/pause.svg
rename to devtools/client/debugger/images/pause.svg
diff --git a/devtools/client/debugger/new/images/plus.svg b/devtools/client/debugger/images/plus.svg
similarity index 100%
rename from devtools/client/debugger/new/images/plus.svg
rename to devtools/client/debugger/images/plus.svg
diff --git a/devtools/client/debugger/new/images/prettyPrint.svg b/devtools/client/debugger/images/prettyPrint.svg
similarity index 100%
rename from devtools/client/debugger/new/images/prettyPrint.svg
rename to devtools/client/debugger/images/prettyPrint.svg
diff --git a/devtools/client/debugger/new/images/regex-match.svg b/devtools/client/debugger/images/regex-match.svg
similarity index 100%
rename from devtools/client/debugger/new/images/regex-match.svg
rename to devtools/client/debugger/images/regex-match.svg
diff --git a/devtools/client/debugger/new/images/reload.svg b/devtools/client/debugger/images/reload.svg
similarity index 100%
rename from devtools/client/debugger/new/images/reload.svg
rename to devtools/client/debugger/images/reload.svg
diff --git a/devtools/client/debugger/new/images/resume.svg b/devtools/client/debugger/images/resume.svg
similarity index 100%
rename from devtools/client/debugger/new/images/resume.svg
rename to devtools/client/debugger/images/resume.svg
diff --git a/devtools/client/debugger/new/images/rewind.svg b/devtools/client/debugger/images/rewind.svg
similarity index 100%
rename from devtools/client/debugger/new/images/rewind.svg
rename to devtools/client/debugger/images/rewind.svg
diff --git a/devtools/client/debugger/new/images/search.svg b/devtools/client/debugger/images/search.svg
similarity index 100%
rename from devtools/client/debugger/new/images/search.svg
rename to devtools/client/debugger/images/search.svg
diff --git a/devtools/client/debugger/new/images/sources/aframe.svg b/devtools/client/debugger/images/sources/aframe.svg
similarity index 100%
rename from devtools/client/debugger/new/images/sources/aframe.svg
rename to devtools/client/debugger/images/sources/aframe.svg
diff --git a/devtools/client/debugger/new/images/sources/angular.svg b/devtools/client/debugger/images/sources/angular.svg
similarity index 100%
rename from devtools/client/debugger/new/images/sources/angular.svg
rename to devtools/client/debugger/images/sources/angular.svg
diff --git a/devtools/client/debugger/new/images/sources/babel.svg b/devtools/client/debugger/images/sources/babel.svg
similarity index 100%
rename from devtools/client/debugger/new/images/sources/babel.svg
rename to devtools/client/debugger/images/sources/babel.svg
diff --git a/devtools/client/debugger/new/images/sources/backbone.svg b/devtools/client/debugger/images/sources/backbone.svg
similarity index 100%
rename from devtools/client/debugger/new/images/sources/backbone.svg
rename to devtools/client/debugger/images/sources/backbone.svg
diff --git a/devtools/client/debugger/new/images/sources/choo.svg b/devtools/client/debugger/images/sources/choo.svg
similarity index 100%
rename from devtools/client/debugger/new/images/sources/choo.svg
rename to devtools/client/debugger/images/sources/choo.svg
diff --git a/devtools/client/debugger/new/images/sources/coffeescript.svg b/devtools/client/debugger/images/sources/coffeescript.svg
similarity index 100%
rename from devtools/client/debugger/new/images/sources/coffeescript.svg
rename to devtools/client/debugger/images/sources/coffeescript.svg
diff --git a/devtools/client/debugger/new/images/sources/dojo.svg b/devtools/client/debugger/images/sources/dojo.svg
similarity index 100%
rename from devtools/client/debugger/new/images/sources/dojo.svg
rename to devtools/client/debugger/images/sources/dojo.svg
diff --git a/devtools/client/debugger/new/images/sources/ember.svg b/devtools/client/debugger/images/sources/ember.svg
similarity index 100%
rename from devtools/client/debugger/new/images/sources/ember.svg
rename to devtools/client/debugger/images/sources/ember.svg
diff --git a/devtools/client/debugger/new/images/sources/express.svg b/devtools/client/debugger/images/sources/express.svg
similarity index 100%
rename from devtools/client/debugger/new/images/sources/express.svg
rename to devtools/client/debugger/images/sources/express.svg
diff --git a/devtools/client/debugger/new/images/sources/extension.svg b/devtools/client/debugger/images/sources/extension.svg
similarity index 100%
rename from devtools/client/debugger/new/images/sources/extension.svg
rename to devtools/client/debugger/images/sources/extension.svg
diff --git a/devtools/client/debugger/new/images/sources/immutable.svg b/devtools/client/debugger/images/sources/immutable.svg
similarity index 100%
rename from devtools/client/debugger/new/images/sources/immutable.svg
rename to devtools/client/debugger/images/sources/immutable.svg
diff --git a/devtools/client/debugger/new/images/sources/javascript.svg b/devtools/client/debugger/images/sources/javascript.svg
similarity index 100%
rename from devtools/client/debugger/new/images/sources/javascript.svg
rename to devtools/client/debugger/images/sources/javascript.svg
diff --git a/devtools/client/debugger/new/images/sources/jquery.svg b/devtools/client/debugger/images/sources/jquery.svg
similarity index 100%
rename from devtools/client/debugger/new/images/sources/jquery.svg
rename to devtools/client/debugger/images/sources/jquery.svg
diff --git a/devtools/client/debugger/new/images/sources/lodash.svg b/devtools/client/debugger/images/sources/lodash.svg
similarity index 100%
rename from devtools/client/debugger/new/images/sources/lodash.svg
rename to devtools/client/debugger/images/sources/lodash.svg
diff --git a/devtools/client/debugger/new/images/sources/marko.svg b/devtools/client/debugger/images/sources/marko.svg
similarity index 100%
rename from devtools/client/debugger/new/images/sources/marko.svg
rename to devtools/client/debugger/images/sources/marko.svg
diff --git a/devtools/client/debugger/new/images/sources/mobx.svg b/devtools/client/debugger/images/sources/mobx.svg
similarity index 100%
rename from devtools/client/debugger/new/images/sources/mobx.svg
rename to devtools/client/debugger/images/sources/mobx.svg
diff --git a/devtools/client/debugger/new/images/sources/moz.build b/devtools/client/debugger/images/sources/moz.build
similarity index 100%
rename from devtools/client/debugger/new/images/sources/moz.build
rename to devtools/client/debugger/images/sources/moz.build
diff --git a/devtools/client/debugger/new/images/sources/nextjs.svg b/devtools/client/debugger/images/sources/nextjs.svg
similarity index 100%
rename from devtools/client/debugger/new/images/sources/nextjs.svg
rename to devtools/client/debugger/images/sources/nextjs.svg
diff --git a/devtools/client/debugger/new/images/sources/node.svg b/devtools/client/debugger/images/sources/node.svg
similarity index 100%
rename from devtools/client/debugger/new/images/sources/node.svg
rename to devtools/client/debugger/images/sources/node.svg
diff --git a/devtools/client/debugger/new/images/sources/nuxtjs.svg b/devtools/client/debugger/images/sources/nuxtjs.svg
similarity index 100%
rename from devtools/client/debugger/new/images/sources/nuxtjs.svg
rename to devtools/client/debugger/images/sources/nuxtjs.svg
diff --git a/devtools/client/debugger/new/images/sources/preact.svg b/devtools/client/debugger/images/sources/preact.svg
similarity index 100%
rename from devtools/client/debugger/new/images/sources/preact.svg
rename to devtools/client/debugger/images/sources/preact.svg
diff --git a/devtools/client/debugger/new/images/sources/pug.svg b/devtools/client/debugger/images/sources/pug.svg
similarity index 100%
rename from devtools/client/debugger/new/images/sources/pug.svg
rename to devtools/client/debugger/images/sources/pug.svg
diff --git a/devtools/client/debugger/new/images/sources/react.svg b/devtools/client/debugger/images/sources/react.svg
similarity index 100%
rename from devtools/client/debugger/new/images/sources/react.svg
rename to devtools/client/debugger/images/sources/react.svg
diff --git a/devtools/client/debugger/new/images/sources/redux.svg b/devtools/client/debugger/images/sources/redux.svg
similarity index 100%
rename from devtools/client/debugger/new/images/sources/redux.svg
rename to devtools/client/debugger/images/sources/redux.svg
diff --git a/devtools/client/debugger/new/images/sources/rxjs.svg b/devtools/client/debugger/images/sources/rxjs.svg
similarity index 100%
rename from devtools/client/debugger/new/images/sources/rxjs.svg
rename to devtools/client/debugger/images/sources/rxjs.svg
diff --git a/devtools/client/debugger/new/images/sources/sencha-extjs.svg b/devtools/client/debugger/images/sources/sencha-extjs.svg
similarity index 100%
rename from devtools/client/debugger/new/images/sources/sencha-extjs.svg
rename to devtools/client/debugger/images/sources/sencha-extjs.svg
diff --git a/devtools/client/debugger/new/images/sources/typescript.svg b/devtools/client/debugger/images/sources/typescript.svg
similarity index 100%
rename from devtools/client/debugger/new/images/sources/typescript.svg
rename to devtools/client/debugger/images/sources/typescript.svg
diff --git a/devtools/client/debugger/new/images/sources/underscore.svg b/devtools/client/debugger/images/sources/underscore.svg
similarity index 100%
rename from devtools/client/debugger/new/images/sources/underscore.svg
rename to devtools/client/debugger/images/sources/underscore.svg
diff --git a/devtools/client/debugger/new/images/sources/vuejs.svg b/devtools/client/debugger/images/sources/vuejs.svg
similarity index 100%
rename from devtools/client/debugger/new/images/sources/vuejs.svg
rename to devtools/client/debugger/images/sources/vuejs.svg
diff --git a/devtools/client/debugger/new/images/sources/webpack.svg b/devtools/client/debugger/images/sources/webpack.svg
similarity index 100%
rename from devtools/client/debugger/new/images/sources/webpack.svg
rename to devtools/client/debugger/images/sources/webpack.svg
diff --git a/devtools/client/debugger/new/images/stepIn.svg b/devtools/client/debugger/images/stepIn.svg
similarity index 100%
rename from devtools/client/debugger/new/images/stepIn.svg
rename to devtools/client/debugger/images/stepIn.svg
diff --git a/devtools/client/debugger/new/images/stepOut.svg b/devtools/client/debugger/images/stepOut.svg
similarity index 100%
rename from devtools/client/debugger/new/images/stepOut.svg
rename to devtools/client/debugger/images/stepOut.svg
diff --git a/devtools/client/debugger/new/images/stepOver.svg b/devtools/client/debugger/images/stepOver.svg
similarity index 100%
rename from devtools/client/debugger/new/images/stepOver.svg
rename to devtools/client/debugger/images/stepOver.svg
diff --git a/devtools/client/debugger/new/images/tab.svg b/devtools/client/debugger/images/tab.svg
similarity index 100%
rename from devtools/client/debugger/new/images/tab.svg
rename to devtools/client/debugger/images/tab.svg
diff --git a/devtools/client/debugger/new/images/whole-word-match.svg b/devtools/client/debugger/images/whole-word-match.svg
similarity index 100%
rename from devtools/client/debugger/new/images/whole-word-match.svg
rename to devtools/client/debugger/images/whole-word-match.svg
diff --git a/devtools/client/debugger/new/images/worker.svg b/devtools/client/debugger/images/worker.svg
similarity index 100%
rename from devtools/client/debugger/new/images/worker.svg
rename to devtools/client/debugger/images/worker.svg
diff --git a/devtools/client/debugger/new/index.html b/devtools/client/debugger/index.html
similarity index 85%
rename from devtools/client/debugger/new/index.html
rename to devtools/client/debugger/index.html
index 12022a24c521..ad3ed2205535 100644
--- a/devtools/client/debugger/new/index.html
+++ b/devtools/client/debugger/index.html
@@ -27,12 +27,12 @@
@@ -48,10 +48,10 @@
"resource://devtools/client/shared/browser-loader.js"
);
const { require } = BrowserLoader({
- baseURI: "resource://devtools/client/debugger/new",
+ baseURI: "resource://devtools/client/debugger",
window
});
- Debugger = require("devtools/client/debugger/new/src/main");
+ Debugger = require("devtools/client/debugger/src/main");
} catch (e) {
dump("Exception happened while loading the debugger:\n");
dump(e + "\n");
diff --git a/devtools/client/debugger/new/jest-test.config.js b/devtools/client/debugger/jest-test.config.js
similarity index 100%
rename from devtools/client/debugger/new/jest-test.config.js
rename to devtools/client/debugger/jest-test.config.js
diff --git a/devtools/client/debugger/new/jest.config.js b/devtools/client/debugger/jest.config.js
similarity index 100%
rename from devtools/client/debugger/new/jest.config.js
rename to devtools/client/debugger/jest.config.js
diff --git a/devtools/client/debugger/moz.build b/devtools/client/debugger/moz.build
index 87c48db0b915..479f5ee0e632 100644
--- a/devtools/client/debugger/moz.build
+++ b/devtools/client/debugger/moz.build
@@ -4,12 +4,17 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
DIRS += [
- 'new'
+ 'dist',
+ 'images',
+ 'src',
]
+include('../shared/build/node-templates.mozbuild')
+
BROWSER_CHROME_MANIFESTS += [
- 'new/test/mochitest/browser.ini',
+ 'test/mochitest/browser.ini',
]
-with Files('**'):
- BUG_COMPONENT = ('DevTools', 'Debugger')
+DevToolsModules(
+ 'panel.js',
+)
diff --git a/devtools/client/debugger/new/configs/firefox-panel.json b/devtools/client/debugger/new/configs/firefox-panel.json
deleted file mode 100644
index e8eec1ac8de1..000000000000
--- a/devtools/client/debugger/new/configs/firefox-panel.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "environment": "firefox-panel",
- "logging": false,
- "clientLogging": false,
- "firefox": {
- "mcPath": "./firefox"
- },
- "workers": {
- "parserURL": "resource://devtools/client/debugger/new/parser-worker.js",
- "prettyPrintURL":
- "resource://devtools/client/debugger/new/pretty-print-worker.js",
- "searchURL": "resource://devtools/client/debugger/new/search-worker.js"
- },
- "features": {}
-}
diff --git a/devtools/client/debugger/new/moz.build b/devtools/client/debugger/new/moz.build
deleted file mode 100644
index 12b43a7c2176..000000000000
--- a/devtools/client/debugger/new/moz.build
+++ /dev/null
@@ -1,16 +0,0 @@
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-DIRS += [
- 'dist',
- 'images',
- 'src',
-]
-
-include('../../shared/build/node-templates.mozbuild')
-
-DevToolsModules(
- 'panel.js',
-)
diff --git a/devtools/client/debugger/new/src/components/shared/AccessibleImage.css b/devtools/client/debugger/new/src/components/shared/AccessibleImage.css
deleted file mode 100644
index bfd9827758a7..000000000000
--- a/devtools/client/debugger/new/src/components/shared/AccessibleImage.css
+++ /dev/null
@@ -1,197 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at . */
-
-.img {
- display: inline-block;
- width: 16px;
- height: 16px;
- vertical-align: middle;
- /* use background-color for the icon color, and mask-image for its shape */
- background-color: var(--theme-icon-color);
- mask-size: contain;
- mask-repeat: no-repeat;
- mask-position: center;
- /* multicolor icons use background-image */
- background-position: center;
- background-repeat: no-repeat;
- background-size: contain;
- /* do not let images shrink when used as flex children */
- flex-shrink: 0;
-}
-
-/* Expand arrow icon */
-.img.arrow {
- width: 10px;
- height: 10px;
- mask-image: url(resource://devtools/client/debugger/new/images/arrow.svg);
- /* we may override the width/height in specific contexts to make the
- clickable area bigger, but we should always keep the mask size 10x10 */
- mask-size: 10px 10px;
- background-color: var(--theme-icon-dimmed-color);
- transform: rotate(-90deg);
- transition: transform 180ms var(--animation-curve);
-}
-
-html[dir="rtl"] .img.arrow {
- transform: rotate(90deg);
-}
-
-.img.arrow.expanded {
- /* icon should always point to the bottom (default) when expanded,
- regardless of the text direction */
- transform: none !important;
-}
-
-.img.arrow-down {
- mask-image: url(resource://devtools/client/debugger/new/images/arrow-down.svg);
-}
-
-.img.arrow-up {
- mask-image: url(resource://devtools/client/debugger/new/images/arrow-up.svg);
-}
-
-.img.blackBox {
- mask-image: url(resource://devtools/client/debugger/new/images/blackBox.svg);
-}
-
-.img.breadcrumb {
- mask-image: url(resource://devtools/client/debugger/new/images/breadcrumbs-divider.svg);
-}
-
-.img.case-match {
- mask-image: url(resource://devtools/client/debugger/new/images/case-match.svg);
-}
-
-.img.close {
- mask-image: url(resource://devtools/client/debugger/new/images/close.svg);
-}
-
-.img.disable-pausing {
- mask-image: url(resource://devtools/client/debugger/new/images/disable-pausing.svg);
-}
-
-.img.globe {
- mask-image: url(resource://devtools/client/debugger/new/images/globe.svg);
-}
-
-.img.globe-small {
- mask-image: url(resource://devtools/client/debugger/new/images/globe-small.svg);
- mask-size: 12px 12px;
-}
-
-.img.file {
- mask-image: url(resource://devtools/client/debugger/new/images/file-small.svg);
- mask-size: 12px 12px;
-}
-
-.img.folder {
- mask-image: url(resource://devtools/client/debugger/new/images/folder.svg);
-}
-
-.img.home {
- mask-image: url(resource://devtools/client/debugger/new/images/home.svg);
-}
-
-.img.loader {
- mask-image: url(resource://devtools/client/debugger/new/images/loader.svg);
-}
-
-.img.more-tabs {
- mask-image: url(resource://devtools/client/debugger/new/images/command-chevron.svg);
-}
-
-html[dir="rtl"] .img.more-tabs {
- transform: scaleX(-1);
-}
-
-.img.next {
- mask-image: url(resource://devtools/client/debugger/new/images/next.svg);
-}
-
-.img.next-circle {
- mask-image: url(resource://devtools/client/debugger/new/images/next-circle.svg);
-}
-
-.img.pane-collapse {
- mask-image: url(resource://devtools/client/debugger/new/images/pane-collapse.svg);
-}
-
-.img.pane-expand {
- mask-image: url(resource://devtools/client/debugger/new/images/pane-expand.svg);
-}
-
-.img.pause {
- mask-image: url(resource://devtools/client/debugger/new/images/pause.svg);
-}
-
-.img.plus {
- mask-image: url(resource://devtools/client/debugger/new/images/plus.svg);
-}
-
-.img.prettyPrint {
- mask-image: url(resource://devtools/client/debugger/new/images/prettyPrint.svg);
-}
-
-.img.refresh {
- mask-image: url(resource://devtools/client/debugger/new/images/reload.svg);
-}
-
-.img.regex-match {
- mask-image: url(resource://devtools/client/debugger/new/images/regex-match.svg);
-}
-
-.img.resume {
- mask-image: url(resource://devtools/client/debugger/new/images/resume.svg);
-}
-
-.img.reverseStepIn {
- mask-image: url(resource://devtools/client/debugger/new/images/stepIn.svg);
- transform: scaleX(-1);
-}
-
-.img.reverseStepOut {
- mask-image: url(resource://devtools/client/debugger/new/images/stepOut.svg);
- transform: scaleX(-1);
-}
-
-.img.reverseStepOver {
- mask-image: url(resource://devtools/client/debugger/new/images/stepOver.svg);
- transform: scaleX(-1);
-}
-
-.img.rewind {
- mask-image: url(resource://devtools/client/debugger/new/images/rewind.svg);
-}
-
-.img.search {
- mask-image: url(resource://devtools/client/debugger/new/images/search.svg);
-}
-
-.img.shortcuts {
- mask-image: url(resource://devtools/client/debugger/new/images/help.svg);
-}
-
-.img.stepIn {
- mask-image: url(resource://devtools/client/debugger/new/images/stepIn.svg);
-}
-
-.img.stepOut {
- mask-image: url(resource://devtools/client/debugger/new/images/stepOut.svg);
-}
-
-.img.stepOver {
- mask-image: url(resource://devtools/client/debugger/new/images/stepOver.svg);
-}
-
-.img.tab {
- mask-image: url(resource://devtools/client/debugger/new/images/tab.svg);
-}
-
-.img.whole-word-match {
- mask-image: url(resource://devtools/client/debugger/new/images/whole-word-match.svg);
-}
-
-.img.worker {
- mask-image: url(resource://devtools/client/debugger/new/images/worker.svg);
-}
diff --git a/devtools/client/debugger/new/src/components/shared/SourceIcon.css b/devtools/client/debugger/new/src/components/shared/SourceIcon.css
deleted file mode 100644
index ad823368ae7b..000000000000
--- a/devtools/client/debugger/new/src/components/shared/SourceIcon.css
+++ /dev/null
@@ -1,150 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at . */
-
-/**
- * Variant of AccessibleImage used in sources list and tabs.
- * Define the different source type / framework / library icons here.
- */
-
-.source-icon {
- margin-inline-end: 4px;
-}
-
-/* Icons for frameworks and libs */
-
-.img.aframe {
- background-image: url(resource://devtools/client/debugger/new/images/sources/aframe.svg);
- background-color: transparent !important;
-}
-
-.img.angular {
- background-image: url(resource://devtools/client/debugger/new/images/sources/angular.svg);
- background-color: transparent !important;
-}
-
-.img.babel {
- mask-image: url(resource://devtools/client/debugger/new/images/sources/babel.svg);
-}
-
-.img.backbone {
- mask-image: url(resource://devtools/client/debugger/new/images/sources/backbone.svg);
-}
-
-.img.choo {
- background-image: url(resource://devtools/client/debugger/new/images/sources/choo.svg);
- background-color: transparent !important;
-}
-
-.img.coffeescript {
- mask-image: url(resource://devtools/client/debugger/new/images/sources/coffeescript.svg);
-}
-
-.img.dojo {
- background-image: url(resource://devtools/client/debugger/new/images/sources/dojo.svg);
- background-color: transparent !important;
-}
-
-.img.ember {
- background-image: url(resource://devtools/client/debugger/new/images/sources/ember.svg);
- background-color: transparent !important;
-}
-
-.img.express {
- mask-image: url(resource://devtools/client/debugger/new/images/sources/express.svg);
-}
-
-.img.extension {
- mask-image: url(resource://devtools/client/debugger/new/images/sources/extension.svg);
-}
-
-.img.immutable {
- mask-image: url(resource://devtools/client/debugger/new/images/sources/immutable.svg);
-}
-
-.img.javascript {
- mask-image: url(resource://devtools/client/debugger/new/images/sources/javascript.svg);
- mask-size: 14px 14px;
-}
-
-.img.jquery {
- mask-image: url(resource://devtools/client/debugger/new/images/sources/jquery.svg);
-}
-
-.img.lodash {
- mask-image: url(resource://devtools/client/debugger/new/images/sources/lodash.svg);
-}
-
-.img.marko {
- background-image: url(resource://devtools/client/debugger/new/images/sources/marko.svg);
- background-color: transparent !important;
-}
-
-.img.mobx {
- background-image: url(resource://devtools/client/debugger/new/images/sources/mobx.svg);
- background-color: transparent !important;
-}
-
-.img.nextjs {
- background-image: url(resource://devtools/client/debugger/new/images/sources/nextjs.svg);
- background-color: transparent !important;
-}
-
-.img.node {
- background-image: url(resource://devtools/client/debugger/new/images/sources/node.svg);
- background-color: transparent !important;
-}
-
-.img.nuxtjs {
- background-image: url(resource://devtools/client/debugger/new/images/sources/nuxtjs.svg);
- background-color: transparent !important;
-}
-
-.img.preact {
- background-image: url(resource://devtools/client/debugger/new/images/sources/preact.svg);
- background-color: transparent !important;
-}
-
-.img.pug {
- background-image: url(resource://devtools/client/debugger/new/images/sources/pug.svg);
- background-color: transparent !important;
-}
-
-.img.react {
- mask-image: url(resource://devtools/client/debugger/new/images/sources/react.svg);
- background-color: var(--theme-highlight-bluegrey);
-}
-
-.img.redux {
- mask-image: url(resource://devtools/client/debugger/new/images/sources/redux.svg);
-}
-
-.img.rxjs {
- background-image: url(resource://devtools/client/debugger/new/images/sources/rxjs.svg);
- background-color: transparent !important;
-}
-
-.img.sencha-extjs {
- background-image: url(resource://devtools/client/debugger/new/images/sources/sencha-extjs.svg);
- background-color: transparent !important;
-}
-
-.img.typescript {
- mask-image: url(resource://devtools/client/debugger/new/images/sources/typescript.svg);
-}
-
-.img.underscore {
- mask-image: url(resource://devtools/client/debugger/new/images/sources/underscore.svg);
-}
-
-/* We use both 'Vue' and 'VueJS' when identifying frameworks */
-.img.vue,
-.img.vuejs {
- background-image: url(resource://devtools/client/debugger/new/images/sources/vuejs.svg);
- background-color: transparent !important;
-}
-
-.img.webpack {
- background-image: url(resource://devtools/client/debugger/new/images/sources/webpack.svg);
- background-color: transparent !important;
-}
diff --git a/devtools/client/debugger/new/package.json b/devtools/client/debugger/package.json
similarity index 98%
rename from devtools/client/debugger/new/package.json
rename to devtools/client/debugger/package.json
index 5133d3341d35..305c936fbfc7 100644
--- a/devtools/client/debugger/new/package.json
+++ b/devtools/client/debugger/package.json
@@ -24,11 +24,11 @@
"lint:js": "eslint *.js \"src/**/*.js\" \"packages/*/src/**/*.js\" --fix",
"lint:jsx-a11y": "eslint *.js \"src/**/*.js\" \"packages/*/src/**/*.js\" --plugin=jsx-a11y --config=.eslintrc.jsx-a11y",
"lint:md": "remark -u devtools-linters/markdown/preset -qf *.md src",
- "mochi": "mochii --mc ./firefox --interactive --default-test-path devtools/client/debugger/new",
+ "mochi": "mochii --mc ./firefox --interactive --default-test-path devtools/client/debugger",
"mochid": "yarn mochi -- --jsdebugger --",
"mochir": "yarn mochi -- --repeat 10 --",
"mochih": "yarn mochi -- --headless --",
- "mochici": "mochii --mc ./firefox --ci --default-test-path devtools/client/debugger/new --headless --",
+ "mochici": "mochii --mc ./firefox --ci --default-test-path devtools/client/debugger --headless --",
"test": "TZ=Africa/Nairobi jest",
"test:watch": "jest --watch",
"test:coverage": "yarn test --coverage",
diff --git a/devtools/client/debugger/new/packages/devtools-components/.babelrc b/devtools/client/debugger/packages/devtools-components/.babelrc
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-components/.babelrc
rename to devtools/client/debugger/packages/devtools-components/.babelrc
diff --git a/devtools/client/debugger/new/packages/devtools-components/.storybook/config.js b/devtools/client/debugger/packages/devtools-components/.storybook/config.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-components/.storybook/config.js
rename to devtools/client/debugger/packages/devtools-components/.storybook/config.js
diff --git a/devtools/client/debugger/new/packages/devtools-components/.storybook/webpack.config.js b/devtools/client/debugger/packages/devtools-components/.storybook/webpack.config.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-components/.storybook/webpack.config.js
rename to devtools/client/debugger/packages/devtools-components/.storybook/webpack.config.js
diff --git a/devtools/client/debugger/new/packages/devtools-components/LICENSE b/devtools/client/debugger/packages/devtools-components/LICENSE
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-components/LICENSE
rename to devtools/client/debugger/packages/devtools-components/LICENSE
diff --git a/devtools/client/debugger/new/packages/devtools-components/README.md b/devtools/client/debugger/packages/devtools-components/README.md
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-components/README.md
rename to devtools/client/debugger/packages/devtools-components/README.md
diff --git a/devtools/client/debugger/new/packages/devtools-components/index.js b/devtools/client/debugger/packages/devtools-components/index.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-components/index.js
rename to devtools/client/debugger/packages/devtools-components/index.js
diff --git a/devtools/client/debugger/new/packages/devtools-components/jest.config.js b/devtools/client/debugger/packages/devtools-components/jest.config.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-components/jest.config.js
rename to devtools/client/debugger/packages/devtools-components/jest.config.js
diff --git a/devtools/client/debugger/new/packages/devtools-components/package.json b/devtools/client/debugger/packages/devtools-components/package.json
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-components/package.json
rename to devtools/client/debugger/packages/devtools-components/package.json
diff --git a/devtools/client/debugger/new/packages/devtools-components/postcss.config.js b/devtools/client/debugger/packages/devtools-components/postcss.config.js
similarity index 94%
rename from devtools/client/debugger/new/packages/devtools-components/postcss.config.js
rename to devtools/client/debugger/packages/devtools-components/postcss.config.js
index 9c8930bf20a0..29c3c34c8044 100644
--- a/devtools/client/debugger/new/packages/devtools-components/postcss.config.js
+++ b/devtools/client/debugger/packages/devtools-components/postcss.config.js
@@ -3,7 +3,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
const mapUrl = require("postcss-url-mapper");
-const MC_PATH = "resource://devtools/client/debugger/new/images/";
+const MC_PATH = "resource://devtools/client/debugger/images/";
const EXPRESS_PATH = "/devtools-components/images/";
function mapUrlProduction(url, type) {
diff --git a/devtools/client/debugger/new/packages/devtools-components/src/images/arrow.svg b/devtools/client/debugger/packages/devtools-components/src/images/arrow.svg
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-components/src/images/arrow.svg
rename to devtools/client/debugger/packages/devtools-components/src/images/arrow.svg
diff --git a/devtools/client/debugger/new/packages/devtools-components/src/tests/__snapshots__/tree.js.snap b/devtools/client/debugger/packages/devtools-components/src/tests/__snapshots__/tree.js.snap
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-components/src/tests/__snapshots__/tree.js.snap
rename to devtools/client/debugger/packages/devtools-components/src/tests/__snapshots__/tree.js.snap
diff --git a/devtools/client/debugger/new/packages/devtools-components/src/tests/setup.js b/devtools/client/debugger/packages/devtools-components/src/tests/setup.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-components/src/tests/setup.js
rename to devtools/client/debugger/packages/devtools-components/src/tests/setup.js
diff --git a/devtools/client/debugger/new/packages/devtools-components/src/tests/tree.js b/devtools/client/debugger/packages/devtools-components/src/tests/tree.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-components/src/tests/tree.js
rename to devtools/client/debugger/packages/devtools-components/src/tests/tree.js
diff --git a/devtools/client/debugger/new/packages/devtools-components/src/tree.css b/devtools/client/debugger/packages/devtools-components/src/tree.css
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-components/src/tree.css
rename to devtools/client/debugger/packages/devtools-components/src/tree.css
diff --git a/devtools/client/debugger/new/packages/devtools-components/src/tree.js b/devtools/client/debugger/packages/devtools-components/src/tree.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-components/src/tree.js
rename to devtools/client/debugger/packages/devtools-components/src/tree.js
diff --git a/devtools/client/debugger/new/packages/devtools-components/stories/index.js b/devtools/client/debugger/packages/devtools-components/stories/index.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-components/stories/index.js
rename to devtools/client/debugger/packages/devtools-components/stories/index.js
diff --git a/devtools/client/debugger/new/packages/devtools-components/stories/tree.js b/devtools/client/debugger/packages/devtools-components/stories/tree.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-components/stories/tree.js
rename to devtools/client/debugger/packages/devtools-components/stories/tree.js
diff --git a/devtools/client/debugger/new/packages/devtools-components/webpack.config.js b/devtools/client/debugger/packages/devtools-components/webpack.config.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-components/webpack.config.js
rename to devtools/client/debugger/packages/devtools-components/webpack.config.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/LICENSE b/devtools/client/debugger/packages/devtools-reps/LICENSE
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/LICENSE
rename to devtools/client/debugger/packages/devtools-reps/LICENSE
diff --git a/devtools/client/debugger/new/packages/devtools-reps/README.md b/devtools/client/debugger/packages/devtools-reps/README.md
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/README.md
rename to devtools/client/debugger/packages/devtools-reps/README.md
diff --git a/devtools/client/debugger/new/packages/devtools-reps/assets/README.md b/devtools/client/debugger/packages/devtools-reps/assets/README.md
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/assets/README.md
rename to devtools/client/debugger/packages/devtools-reps/assets/README.md
diff --git a/devtools/client/debugger/new/packages/devtools-reps/assets/images/demo-app.png b/devtools/client/debugger/packages/devtools-reps/assets/images/demo-app.png
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/assets/images/demo-app.png
rename to devtools/client/debugger/packages/devtools-reps/assets/images/demo-app.png
diff --git a/devtools/client/debugger/new/packages/devtools-reps/assets/images/empty-launchpad.png b/devtools/client/debugger/packages/devtools-reps/assets/images/empty-launchpad.png
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/assets/images/empty-launchpad.png
rename to devtools/client/debugger/packages/devtools-reps/assets/images/empty-launchpad.png
diff --git a/devtools/client/debugger/new/packages/devtools-reps/assets/images/launchpad-app.png b/devtools/client/debugger/packages/devtools-reps/assets/images/launchpad-app.png
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/assets/images/launchpad-app.png
rename to devtools/client/debugger/packages/devtools-reps/assets/images/launchpad-app.png
diff --git a/devtools/client/debugger/new/packages/devtools-reps/bin/dev-server.js b/devtools/client/debugger/packages/devtools-reps/bin/dev-server.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/bin/dev-server.js
rename to devtools/client/debugger/packages/devtools-reps/bin/dev-server.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/config.js b/devtools/client/debugger/packages/devtools-reps/config.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/config.js
rename to devtools/client/debugger/packages/devtools-reps/config.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/jest.config.js b/devtools/client/debugger/packages/devtools-reps/jest.config.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/jest.config.js
rename to devtools/client/debugger/packages/devtools-reps/jest.config.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/package.json b/devtools/client/debugger/packages/devtools-reps/package.json
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/package.json
rename to devtools/client/debugger/packages/devtools-reps/package.json
diff --git a/devtools/client/debugger/new/packages/devtools-reps/postcss.config.js b/devtools/client/debugger/packages/devtools-reps/postcss.config.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/postcss.config.js
rename to devtools/client/debugger/packages/devtools-reps/postcss.config.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/index.js b/devtools/client/debugger/packages/devtools-reps/src/index.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/index.js
rename to devtools/client/debugger/packages/devtools-reps/src/index.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/launchpad/actions/expressions.js b/devtools/client/debugger/packages/devtools-reps/src/launchpad/actions/expressions.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/launchpad/actions/expressions.js
rename to devtools/client/debugger/packages/devtools-reps/src/launchpad/actions/expressions.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/launchpad/actions/index.js b/devtools/client/debugger/packages/devtools-reps/src/launchpad/actions/index.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/launchpad/actions/index.js
rename to devtools/client/debugger/packages/devtools-reps/src/launchpad/actions/index.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/launchpad/actions/input.js b/devtools/client/debugger/packages/devtools-reps/src/launchpad/actions/input.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/launchpad/actions/input.js
rename to devtools/client/debugger/packages/devtools-reps/src/launchpad/actions/input.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/launchpad/components/Console.css b/devtools/client/debugger/packages/devtools-reps/src/launchpad/components/Console.css
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/launchpad/components/Console.css
rename to devtools/client/debugger/packages/devtools-reps/src/launchpad/components/Console.css
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/launchpad/components/Console.js b/devtools/client/debugger/packages/devtools-reps/src/launchpad/components/Console.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/launchpad/components/Console.js
rename to devtools/client/debugger/packages/devtools-reps/src/launchpad/components/Console.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/launchpad/components/Header.css b/devtools/client/debugger/packages/devtools-reps/src/launchpad/components/Header.css
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/launchpad/components/Header.css
rename to devtools/client/debugger/packages/devtools-reps/src/launchpad/components/Header.css
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/launchpad/components/Header.js b/devtools/client/debugger/packages/devtools-reps/src/launchpad/components/Header.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/launchpad/components/Header.js
rename to devtools/client/debugger/packages/devtools-reps/src/launchpad/components/Header.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/launchpad/components/QuickLinks.css b/devtools/client/debugger/packages/devtools-reps/src/launchpad/components/QuickLinks.css
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/launchpad/components/QuickLinks.css
rename to devtools/client/debugger/packages/devtools-reps/src/launchpad/components/QuickLinks.css
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/launchpad/components/QuickLinks.js b/devtools/client/debugger/packages/devtools-reps/src/launchpad/components/QuickLinks.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/launchpad/components/QuickLinks.js
rename to devtools/client/debugger/packages/devtools-reps/src/launchpad/components/QuickLinks.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/launchpad/components/Result.js b/devtools/client/debugger/packages/devtools-reps/src/launchpad/components/Result.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/launchpad/components/Result.js
rename to devtools/client/debugger/packages/devtools-reps/src/launchpad/components/Result.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/launchpad/components/ResultsList.js b/devtools/client/debugger/packages/devtools-reps/src/launchpad/components/ResultsList.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/launchpad/components/ResultsList.js
rename to devtools/client/debugger/packages/devtools-reps/src/launchpad/components/ResultsList.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/launchpad/constants.js b/devtools/client/debugger/packages/devtools-reps/src/launchpad/constants.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/launchpad/constants.js
rename to devtools/client/debugger/packages/devtools-reps/src/launchpad/constants.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/launchpad/index.js b/devtools/client/debugger/packages/devtools-reps/src/launchpad/index.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/launchpad/index.js
rename to devtools/client/debugger/packages/devtools-reps/src/launchpad/index.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/launchpad/launchpad.css b/devtools/client/debugger/packages/devtools-reps/src/launchpad/launchpad.css
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/launchpad/launchpad.css
rename to devtools/client/debugger/packages/devtools-reps/src/launchpad/launchpad.css
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/launchpad/reducers/expressions.js b/devtools/client/debugger/packages/devtools-reps/src/launchpad/reducers/expressions.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/launchpad/reducers/expressions.js
rename to devtools/client/debugger/packages/devtools-reps/src/launchpad/reducers/expressions.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/launchpad/reducers/index.js b/devtools/client/debugger/packages/devtools-reps/src/launchpad/reducers/index.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/launchpad/reducers/index.js
rename to devtools/client/debugger/packages/devtools-reps/src/launchpad/reducers/index.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/launchpad/reducers/input.js b/devtools/client/debugger/packages/devtools-reps/src/launchpad/reducers/input.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/launchpad/reducers/input.js
rename to devtools/client/debugger/packages/devtools-reps/src/launchpad/reducers/input.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/launchpad/samples.js b/devtools/client/debugger/packages/devtools-reps/src/launchpad/samples.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/launchpad/samples.js
rename to devtools/client/debugger/packages/devtools-reps/src/launchpad/samples.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/launchpad/selectors/index.js b/devtools/client/debugger/packages/devtools-reps/src/launchpad/selectors/index.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/launchpad/selectors/index.js
rename to devtools/client/debugger/packages/devtools-reps/src/launchpad/selectors/index.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/launchpad/store.js b/devtools/client/debugger/packages/devtools-reps/src/launchpad/store.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/launchpad/store.js
rename to devtools/client/debugger/packages/devtools-reps/src/launchpad/store.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/launchpad/utils/redux/middleware/promise.js b/devtools/client/debugger/packages/devtools-reps/src/launchpad/utils/redux/middleware/promise.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/launchpad/utils/redux/middleware/promise.js
rename to devtools/client/debugger/packages/devtools-reps/src/launchpad/utils/redux/middleware/promise.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/launchpad/utils/redux/middleware/thunk.js b/devtools/client/debugger/packages/devtools-reps/src/launchpad/utils/redux/middleware/thunk.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/launchpad/utils/redux/middleware/thunk.js
rename to devtools/client/debugger/packages/devtools-reps/src/launchpad/utils/redux/middleware/thunk.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/launchpad/utils/utils.js b/devtools/client/debugger/packages/devtools-reps/src/launchpad/utils/utils.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/launchpad/utils/utils.js
rename to devtools/client/debugger/packages/devtools-reps/src/launchpad/utils/utils.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/actions.js b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/actions.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/actions.js
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/actions.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/components/ObjectInspector.css b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/components/ObjectInspector.css
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/components/ObjectInspector.css
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/components/ObjectInspector.css
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/components/ObjectInspector.js b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/components/ObjectInspector.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/components/ObjectInspector.js
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/components/ObjectInspector.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/components/ObjectInspectorItem.js b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/components/ObjectInspectorItem.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/components/ObjectInspectorItem.js
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/components/ObjectInspectorItem.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/index.js b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/index.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/index.js
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/index.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/reducer.js b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/reducer.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/reducer.js
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/reducer.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/stubs/grip.js b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/stubs/grip.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/stubs/grip.js
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/stubs/grip.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/stubs/map.js b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/stubs/map.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/stubs/map.js
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/stubs/map.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/stubs/performance.js b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/stubs/performance.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/stubs/performance.js
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/stubs/performance.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/__mocks__/long-string-client.js b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/__mocks__/long-string-client.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/__mocks__/long-string-client.js
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/__mocks__/long-string-client.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/__mocks__/object-client.js b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/__mocks__/object-client.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/__mocks__/object-client.js
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/__mocks__/object-client.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/component/__snapshots__/basic.js.snap b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/__snapshots__/basic.js.snap
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/component/__snapshots__/basic.js.snap
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/__snapshots__/basic.js.snap
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/component/__snapshots__/classnames.js.snap b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/__snapshots__/classnames.js.snap
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/component/__snapshots__/classnames.js.snap
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/__snapshots__/classnames.js.snap
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/component/__snapshots__/entries.js.snap b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/__snapshots__/entries.js.snap
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/component/__snapshots__/entries.js.snap
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/__snapshots__/entries.js.snap
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/component/__snapshots__/expand.js.snap b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/__snapshots__/expand.js.snap
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/component/__snapshots__/expand.js.snap
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/__snapshots__/expand.js.snap
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/component/__snapshots__/getter-setter.js.snap b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/__snapshots__/getter-setter.js.snap
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/component/__snapshots__/getter-setter.js.snap
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/__snapshots__/getter-setter.js.snap
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/component/__snapshots__/keyboard-navigation.js.snap b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/__snapshots__/keyboard-navigation.js.snap
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/component/__snapshots__/keyboard-navigation.js.snap
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/__snapshots__/keyboard-navigation.js.snap
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/component/__snapshots__/properties.js.snap b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/__snapshots__/properties.js.snap
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/component/__snapshots__/properties.js.snap
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/__snapshots__/properties.js.snap
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/component/__snapshots__/proxy.js.snap b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/__snapshots__/proxy.js.snap
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/component/__snapshots__/proxy.js.snap
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/__snapshots__/proxy.js.snap
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/component/__snapshots__/window.js.snap b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/__snapshots__/window.js.snap
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/component/__snapshots__/window.js.snap
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/__snapshots__/window.js.snap
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/component/basic.js b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/basic.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/component/basic.js
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/basic.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/component/classnames.js b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/classnames.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/component/classnames.js
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/classnames.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/component/create-long-string-client.js b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/create-long-string-client.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/component/create-long-string-client.js
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/create-long-string-client.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/component/create-object-client.js b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/create-object-client.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/component/create-object-client.js
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/create-object-client.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/component/entries.js b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/entries.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/component/entries.js
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/entries.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/component/events.js b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/events.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/component/events.js
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/events.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/component/expand.js b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/expand.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/component/expand.js
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/expand.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/component/function.js b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/function.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/component/function.js
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/function.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/component/getter-setter.js b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/getter-setter.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/component/getter-setter.js
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/getter-setter.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/component/keyboard-navigation.js b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/keyboard-navigation.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/component/keyboard-navigation.js
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/keyboard-navigation.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/component/properties.js b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/properties.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/component/properties.js
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/properties.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/component/proxy.js b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/proxy.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/component/proxy.js
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/proxy.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/component/release-actors.js b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/release-actors.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/component/release-actors.js
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/release-actors.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/component/should-item-update.js b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/should-item-update.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/component/should-item-update.js
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/should-item-update.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/component/window.js b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/window.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/component/window.js
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/window.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/test-utils.js b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/test-utils.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/test-utils.js
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/test-utils.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/utils/__snapshots__/promises.js.snap b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/utils/__snapshots__/promises.js.snap
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/utils/__snapshots__/promises.js.snap
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/utils/__snapshots__/promises.js.snap
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/utils/create-node.js b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/utils/create-node.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/utils/create-node.js
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/utils/create-node.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/utils/get-children.js b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/utils/get-children.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/utils/get-children.js
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/utils/get-children.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/utils/get-closest-grip-node.js b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/utils/get-closest-grip-node.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/utils/get-closest-grip-node.js
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/utils/get-closest-grip-node.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/utils/get-value.js b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/utils/get-value.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/utils/get-value.js
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/utils/get-value.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/utils/make-node-for-properties.js b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/utils/make-node-for-properties.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/utils/make-node-for-properties.js
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/utils/make-node-for-properties.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/utils/make-numerical-buckets.js b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/utils/make-numerical-buckets.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/utils/make-numerical-buckets.js
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/utils/make-numerical-buckets.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/utils/node-has-all-entries-in-preview.js b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/utils/node-has-all-entries-in-preview.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/utils/node-has-all-entries-in-preview.js
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/utils/node-has-all-entries-in-preview.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/utils/node-has-entries.js b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/utils/node-has-entries.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/utils/node-has-entries.js
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/utils/node-has-entries.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/utils/node-is-window.js b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/utils/node-is-window.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/utils/node-is-window.js
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/utils/node-is-window.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/utils/node-supports-numerical-bucketing.js b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/utils/node-supports-numerical-bucketing.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/utils/node-supports-numerical-bucketing.js
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/utils/node-supports-numerical-bucketing.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/utils/promises.js b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/utils/promises.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/utils/promises.js
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/utils/promises.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/utils/should-load-item-entries.js b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/utils/should-load-item-entries.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/utils/should-load-item-entries.js
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/utils/should-load-item-entries.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/utils/should-load-item-full-text.js b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/utils/should-load-item-full-text.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/utils/should-load-item-full-text.js
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/utils/should-load-item-full-text.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/utils/should-load-item-indexed-properties.js b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/utils/should-load-item-indexed-properties.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/utils/should-load-item-indexed-properties.js
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/utils/should-load-item-indexed-properties.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/utils/should-load-item-non-indexed-properties.js b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/utils/should-load-item-non-indexed-properties.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/utils/should-load-item-non-indexed-properties.js
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/utils/should-load-item-non-indexed-properties.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/utils/should-load-item-prototype.js b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/utils/should-load-item-prototype.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/utils/should-load-item-prototype.js
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/utils/should-load-item-prototype.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/utils/should-load-item-symbols.js b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/utils/should-load-item-symbols.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/utils/should-load-item-symbols.js
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/utils/should-load-item-symbols.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/utils/should-render-roots-in-reps.js b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/utils/should-render-roots-in-reps.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/tests/utils/should-render-roots-in-reps.js
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/utils/should-render-roots-in-reps.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/types.js b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/types.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/types.js
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/types.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/utils/client.js b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/utils/client.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/utils/client.js
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/utils/client.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/utils/index.js b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/utils/index.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/utils/index.js
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/utils/index.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/utils/load-properties.js b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/utils/load-properties.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/utils/load-properties.js
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/utils/load-properties.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/utils/node.js b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/utils/node.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/utils/node.js
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/utils/node.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/utils/selection.js b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/utils/selection.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/object-inspector/utils/selection.js
rename to devtools/client/debugger/packages/devtools-reps/src/object-inspector/utils/selection.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/accessible.js b/devtools/client/debugger/packages/devtools-reps/src/reps/accessible.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/accessible.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/accessible.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/accessor.js b/devtools/client/debugger/packages/devtools-reps/src/reps/accessor.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/accessor.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/accessor.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/array.js b/devtools/client/debugger/packages/devtools-reps/src/reps/array.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/array.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/array.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/attribute.js b/devtools/client/debugger/packages/devtools-reps/src/reps/attribute.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/attribute.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/attribute.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/big-int.js b/devtools/client/debugger/packages/devtools-reps/src/reps/big-int.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/big-int.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/big-int.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/caption.js b/devtools/client/debugger/packages/devtools-reps/src/reps/caption.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/caption.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/caption.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/comment-node.js b/devtools/client/debugger/packages/devtools-reps/src/reps/comment-node.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/comment-node.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/comment-node.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/constants.js b/devtools/client/debugger/packages/devtools-reps/src/reps/constants.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/constants.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/constants.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/date-time.js b/devtools/client/debugger/packages/devtools-reps/src/reps/date-time.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/date-time.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/date-time.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/document-type.js b/devtools/client/debugger/packages/devtools-reps/src/reps/document-type.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/document-type.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/document-type.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/document.js b/devtools/client/debugger/packages/devtools-reps/src/reps/document.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/document.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/document.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/element-node.js b/devtools/client/debugger/packages/devtools-reps/src/reps/element-node.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/element-node.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/element-node.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/error.js b/devtools/client/debugger/packages/devtools-reps/src/reps/error.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/error.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/error.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/event.js b/devtools/client/debugger/packages/devtools-reps/src/reps/event.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/event.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/event.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/function.js b/devtools/client/debugger/packages/devtools-reps/src/reps/function.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/function.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/function.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/grip-array.js b/devtools/client/debugger/packages/devtools-reps/src/reps/grip-array.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/grip-array.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/grip-array.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/grip-map-entry.js b/devtools/client/debugger/packages/devtools-reps/src/reps/grip-map-entry.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/grip-map-entry.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/grip-map-entry.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/grip-map.js b/devtools/client/debugger/packages/devtools-reps/src/reps/grip-map.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/grip-map.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/grip-map.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/grip.js b/devtools/client/debugger/packages/devtools-reps/src/reps/grip.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/grip.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/grip.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/infinity.js b/devtools/client/debugger/packages/devtools-reps/src/reps/infinity.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/infinity.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/infinity.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/nan.js b/devtools/client/debugger/packages/devtools-reps/src/reps/nan.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/nan.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/nan.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/null.js b/devtools/client/debugger/packages/devtools-reps/src/reps/null.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/null.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/null.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/number.js b/devtools/client/debugger/packages/devtools-reps/src/reps/number.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/number.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/number.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/object-with-text.js b/devtools/client/debugger/packages/devtools-reps/src/reps/object-with-text.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/object-with-text.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/object-with-text.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/object-with-url.js b/devtools/client/debugger/packages/devtools-reps/src/reps/object-with-url.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/object-with-url.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/object-with-url.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/object.js b/devtools/client/debugger/packages/devtools-reps/src/reps/object.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/object.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/object.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/promise.js b/devtools/client/debugger/packages/devtools-reps/src/reps/promise.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/promise.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/promise.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/prop-rep.js b/devtools/client/debugger/packages/devtools-reps/src/reps/prop-rep.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/prop-rep.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/prop-rep.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/regexp.js b/devtools/client/debugger/packages/devtools-reps/src/reps/regexp.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/regexp.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/regexp.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/rep-utils.js b/devtools/client/debugger/packages/devtools-reps/src/reps/rep-utils.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/rep-utils.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/rep-utils.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/rep.js b/devtools/client/debugger/packages/devtools-reps/src/reps/rep.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/rep.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/rep.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/reps.css b/devtools/client/debugger/packages/devtools-reps/src/reps/reps.css
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/reps.css
rename to devtools/client/debugger/packages/devtools-reps/src/reps/reps.css
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/string.js b/devtools/client/debugger/packages/devtools-reps/src/reps/string.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/string.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/string.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/accessible.js b/devtools/client/debugger/packages/devtools-reps/src/reps/stubs/accessible.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/accessible.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/stubs/accessible.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/accessor.js b/devtools/client/debugger/packages/devtools-reps/src/reps/stubs/accessor.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/accessor.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/stubs/accessor.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/attribute.js b/devtools/client/debugger/packages/devtools-reps/src/reps/stubs/attribute.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/attribute.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/stubs/attribute.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/big-int.js b/devtools/client/debugger/packages/devtools-reps/src/reps/stubs/big-int.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/big-int.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/stubs/big-int.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/comment-node.js b/devtools/client/debugger/packages/devtools-reps/src/reps/stubs/comment-node.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/comment-node.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/stubs/comment-node.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/date-time.js b/devtools/client/debugger/packages/devtools-reps/src/reps/stubs/date-time.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/date-time.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/stubs/date-time.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/document-type.js b/devtools/client/debugger/packages/devtools-reps/src/reps/stubs/document-type.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/document-type.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/stubs/document-type.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/document.js b/devtools/client/debugger/packages/devtools-reps/src/reps/stubs/document.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/document.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/stubs/document.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/element-node.js b/devtools/client/debugger/packages/devtools-reps/src/reps/stubs/element-node.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/element-node.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/stubs/element-node.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/error.js b/devtools/client/debugger/packages/devtools-reps/src/reps/stubs/error.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/error.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/stubs/error.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/event.js b/devtools/client/debugger/packages/devtools-reps/src/reps/stubs/event.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/event.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/stubs/event.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/failure.js b/devtools/client/debugger/packages/devtools-reps/src/reps/stubs/failure.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/failure.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/stubs/failure.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/function.js b/devtools/client/debugger/packages/devtools-reps/src/reps/stubs/function.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/function.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/stubs/function.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/grip-array.js b/devtools/client/debugger/packages/devtools-reps/src/reps/stubs/grip-array.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/grip-array.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/stubs/grip-array.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/grip-map-entry.js b/devtools/client/debugger/packages/devtools-reps/src/reps/stubs/grip-map-entry.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/grip-map-entry.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/stubs/grip-map-entry.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/grip-map.js b/devtools/client/debugger/packages/devtools-reps/src/reps/stubs/grip-map.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/grip-map.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/stubs/grip-map.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/grip.js b/devtools/client/debugger/packages/devtools-reps/src/reps/stubs/grip.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/grip.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/stubs/grip.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/infinity.js b/devtools/client/debugger/packages/devtools-reps/src/reps/stubs/infinity.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/infinity.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/stubs/infinity.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/long-string.js b/devtools/client/debugger/packages/devtools-reps/src/reps/stubs/long-string.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/long-string.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/stubs/long-string.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/nan.js b/devtools/client/debugger/packages/devtools-reps/src/reps/stubs/nan.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/nan.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/stubs/nan.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/null.js b/devtools/client/debugger/packages/devtools-reps/src/reps/stubs/null.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/null.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/stubs/null.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/number.js b/devtools/client/debugger/packages/devtools-reps/src/reps/stubs/number.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/number.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/stubs/number.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/object-with-text.js b/devtools/client/debugger/packages/devtools-reps/src/reps/stubs/object-with-text.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/object-with-text.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/stubs/object-with-text.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/object-with-url.js b/devtools/client/debugger/packages/devtools-reps/src/reps/stubs/object-with-url.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/object-with-url.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/stubs/object-with-url.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/promise.js b/devtools/client/debugger/packages/devtools-reps/src/reps/stubs/promise.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/promise.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/stubs/promise.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/regexp.js b/devtools/client/debugger/packages/devtools-reps/src/reps/stubs/regexp.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/regexp.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/stubs/regexp.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/stylesheet.js b/devtools/client/debugger/packages/devtools-reps/src/reps/stubs/stylesheet.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/stylesheet.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/stubs/stylesheet.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/symbol.js b/devtools/client/debugger/packages/devtools-reps/src/reps/stubs/symbol.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/symbol.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/stubs/symbol.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/text-node.js b/devtools/client/debugger/packages/devtools-reps/src/reps/stubs/text-node.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/text-node.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/stubs/text-node.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/undefined.js b/devtools/client/debugger/packages/devtools-reps/src/reps/stubs/undefined.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/undefined.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/stubs/undefined.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/window.js b/devtools/client/debugger/packages/devtools-reps/src/reps/stubs/window.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/stubs/window.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/stubs/window.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/stylesheet.js b/devtools/client/debugger/packages/devtools-reps/src/reps/stylesheet.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/stylesheet.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/stylesheet.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/symbol.js b/devtools/client/debugger/packages/devtools-reps/src/reps/symbol.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/symbol.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/symbol.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/__snapshots__/accessor.js.snap b/devtools/client/debugger/packages/devtools-reps/src/reps/tests/__snapshots__/accessor.js.snap
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/__snapshots__/accessor.js.snap
rename to devtools/client/debugger/packages/devtools-reps/src/reps/tests/__snapshots__/accessor.js.snap
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/__snapshots__/element-node.js.snap b/devtools/client/debugger/packages/devtools-reps/src/reps/tests/__snapshots__/element-node.js.snap
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/__snapshots__/element-node.js.snap
rename to devtools/client/debugger/packages/devtools-reps/src/reps/tests/__snapshots__/element-node.js.snap
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/__snapshots__/error.js.snap b/devtools/client/debugger/packages/devtools-reps/src/reps/tests/__snapshots__/error.js.snap
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/__snapshots__/error.js.snap
rename to devtools/client/debugger/packages/devtools-reps/src/reps/tests/__snapshots__/error.js.snap
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/__snapshots__/nan.js.snap b/devtools/client/debugger/packages/devtools-reps/src/reps/tests/__snapshots__/nan.js.snap
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/__snapshots__/nan.js.snap
rename to devtools/client/debugger/packages/devtools-reps/src/reps/tests/__snapshots__/nan.js.snap
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/accessible.js b/devtools/client/debugger/packages/devtools-reps/src/reps/tests/accessible.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/accessible.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/tests/accessible.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/accessor.js b/devtools/client/debugger/packages/devtools-reps/src/reps/tests/accessor.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/accessor.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/tests/accessor.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/array.js b/devtools/client/debugger/packages/devtools-reps/src/reps/tests/array.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/array.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/tests/array.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/attribute.js b/devtools/client/debugger/packages/devtools-reps/src/reps/tests/attribute.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/attribute.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/tests/attribute.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/big-int.js b/devtools/client/debugger/packages/devtools-reps/src/reps/tests/big-int.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/big-int.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/tests/big-int.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/comment-node.js b/devtools/client/debugger/packages/devtools-reps/src/reps/tests/comment-node.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/comment-node.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/tests/comment-node.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/date-time.js b/devtools/client/debugger/packages/devtools-reps/src/reps/tests/date-time.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/date-time.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/tests/date-time.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/document-type.js b/devtools/client/debugger/packages/devtools-reps/src/reps/tests/document-type.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/document-type.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/tests/document-type.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/document.js b/devtools/client/debugger/packages/devtools-reps/src/reps/tests/document.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/document.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/tests/document.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/element-node.js b/devtools/client/debugger/packages/devtools-reps/src/reps/tests/element-node.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/element-node.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/tests/element-node.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/error.js b/devtools/client/debugger/packages/devtools-reps/src/reps/tests/error.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/error.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/tests/error.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/event.js b/devtools/client/debugger/packages/devtools-reps/src/reps/tests/event.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/event.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/tests/event.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/failure.js b/devtools/client/debugger/packages/devtools-reps/src/reps/tests/failure.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/failure.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/tests/failure.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/function.js b/devtools/client/debugger/packages/devtools-reps/src/reps/tests/function.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/function.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/tests/function.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/grip-array.js b/devtools/client/debugger/packages/devtools-reps/src/reps/tests/grip-array.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/grip-array.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/tests/grip-array.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/grip-map-entry.js b/devtools/client/debugger/packages/devtools-reps/src/reps/tests/grip-map-entry.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/grip-map-entry.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/tests/grip-map-entry.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/grip-map.js b/devtools/client/debugger/packages/devtools-reps/src/reps/tests/grip-map.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/grip-map.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/tests/grip-map.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/grip.js b/devtools/client/debugger/packages/devtools-reps/src/reps/tests/grip.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/grip.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/tests/grip.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/helper-tests.js b/devtools/client/debugger/packages/devtools-reps/src/reps/tests/helper-tests.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/helper-tests.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/tests/helper-tests.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/infinity.js b/devtools/client/debugger/packages/devtools-reps/src/reps/tests/infinity.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/infinity.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/tests/infinity.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/long-string.js b/devtools/client/debugger/packages/devtools-reps/src/reps/tests/long-string.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/long-string.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/tests/long-string.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/nan.js b/devtools/client/debugger/packages/devtools-reps/src/reps/tests/nan.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/nan.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/tests/nan.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/null.js b/devtools/client/debugger/packages/devtools-reps/src/reps/tests/null.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/null.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/tests/null.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/number.js b/devtools/client/debugger/packages/devtools-reps/src/reps/tests/number.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/number.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/tests/number.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/object-with-text.js b/devtools/client/debugger/packages/devtools-reps/src/reps/tests/object-with-text.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/object-with-text.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/tests/object-with-text.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/object-with-url.js b/devtools/client/debugger/packages/devtools-reps/src/reps/tests/object-with-url.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/object-with-url.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/tests/object-with-url.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/object.js b/devtools/client/debugger/packages/devtools-reps/src/reps/tests/object.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/object.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/tests/object.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/promise.js b/devtools/client/debugger/packages/devtools-reps/src/reps/tests/promise.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/promise.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/tests/promise.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/regexp.js b/devtools/client/debugger/packages/devtools-reps/src/reps/tests/regexp.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/regexp.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/tests/regexp.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/string-with-url.js b/devtools/client/debugger/packages/devtools-reps/src/reps/tests/string-with-url.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/string-with-url.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/tests/string-with-url.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/string.js b/devtools/client/debugger/packages/devtools-reps/src/reps/tests/string.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/string.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/tests/string.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/stylesheet.js b/devtools/client/debugger/packages/devtools-reps/src/reps/tests/stylesheet.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/stylesheet.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/tests/stylesheet.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/symbol.js b/devtools/client/debugger/packages/devtools-reps/src/reps/tests/symbol.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/symbol.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/tests/symbol.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/test-helpers.js b/devtools/client/debugger/packages/devtools-reps/src/reps/tests/test-helpers.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/test-helpers.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/tests/test-helpers.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/text-node.js b/devtools/client/debugger/packages/devtools-reps/src/reps/tests/text-node.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/text-node.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/tests/text-node.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/undefined.js b/devtools/client/debugger/packages/devtools-reps/src/reps/tests/undefined.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/undefined.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/tests/undefined.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/window.js b/devtools/client/debugger/packages/devtools-reps/src/reps/tests/window.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/tests/window.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/tests/window.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/text-node.js b/devtools/client/debugger/packages/devtools-reps/src/reps/text-node.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/text-node.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/text-node.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/undefined.js b/devtools/client/debugger/packages/devtools-reps/src/reps/undefined.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/undefined.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/undefined.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/reps/window.js b/devtools/client/debugger/packages/devtools-reps/src/reps/window.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/reps/window.js
rename to devtools/client/debugger/packages/devtools-reps/src/reps/window.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/shared/dom-node-constants.js b/devtools/client/debugger/packages/devtools-reps/src/shared/dom-node-constants.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/shared/dom-node-constants.js
rename to devtools/client/debugger/packages/devtools-reps/src/shared/dom-node-constants.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/shared/grip-length-bubble.js b/devtools/client/debugger/packages/devtools-reps/src/shared/grip-length-bubble.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/shared/grip-length-bubble.js
rename to devtools/client/debugger/packages/devtools-reps/src/shared/grip-length-bubble.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/shared/images/input.svg b/devtools/client/debugger/packages/devtools-reps/src/shared/images/input.svg
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/shared/images/input.svg
rename to devtools/client/debugger/packages/devtools-reps/src/shared/images/input.svg
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/shared/images/jump-definition.svg b/devtools/client/debugger/packages/devtools-reps/src/shared/images/jump-definition.svg
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/shared/images/jump-definition.svg
rename to devtools/client/debugger/packages/devtools-reps/src/shared/images/jump-definition.svg
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/shared/images/open-inspector.svg b/devtools/client/debugger/packages/devtools-reps/src/shared/images/open-inspector.svg
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/shared/images/open-inspector.svg
rename to devtools/client/debugger/packages/devtools-reps/src/shared/images/open-inspector.svg
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/shared/redux/middleware/thunk.js b/devtools/client/debugger/packages/devtools-reps/src/shared/redux/middleware/thunk.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/shared/redux/middleware/thunk.js
rename to devtools/client/debugger/packages/devtools-reps/src/shared/redux/middleware/thunk.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/shared/redux/middleware/waitUntilService.js b/devtools/client/debugger/packages/devtools-reps/src/shared/redux/middleware/waitUntilService.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/shared/redux/middleware/waitUntilService.js
rename to devtools/client/debugger/packages/devtools-reps/src/shared/redux/middleware/waitUntilService.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/test/README.md b/devtools/client/debugger/packages/devtools-reps/src/test/README.md
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/test/README.md
rename to devtools/client/debugger/packages/devtools-reps/src/test/README.md
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/test/__mocks__/selection.js b/devtools/client/debugger/packages/devtools-reps/src/test/__mocks__/selection.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/test/__mocks__/selection.js
rename to devtools/client/debugger/packages/devtools-reps/src/test/__mocks__/selection.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/test/setup-file.js b/devtools/client/debugger/packages/devtools-reps/src/test/setup-file.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/test/setup-file.js
rename to devtools/client/debugger/packages/devtools-reps/src/test/setup-file.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/src/test/setup.js b/devtools/client/debugger/packages/devtools-reps/src/test/setup.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/src/test/setup.js
rename to devtools/client/debugger/packages/devtools-reps/src/test/setup.js
diff --git a/devtools/client/debugger/new/packages/devtools-reps/webpack.config.js b/devtools/client/debugger/packages/devtools-reps/webpack.config.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-reps/webpack.config.js
rename to devtools/client/debugger/packages/devtools-reps/webpack.config.js
diff --git a/devtools/client/debugger/new/packages/devtools-source-map/LICENSE b/devtools/client/debugger/packages/devtools-source-map/LICENSE
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-source-map/LICENSE
rename to devtools/client/debugger/packages/devtools-source-map/LICENSE
diff --git a/devtools/client/debugger/new/packages/devtools-source-map/README.md b/devtools/client/debugger/packages/devtools-source-map/README.md
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-source-map/README.md
rename to devtools/client/debugger/packages/devtools-source-map/README.md
diff --git a/devtools/client/debugger/new/packages/devtools-source-map/assets.js b/devtools/client/debugger/packages/devtools-source-map/assets.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-source-map/assets.js
rename to devtools/client/debugger/packages/devtools-source-map/assets.js
diff --git a/devtools/client/debugger/new/packages/devtools-source-map/jest.config.js b/devtools/client/debugger/packages/devtools-source-map/jest.config.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-source-map/jest.config.js
rename to devtools/client/debugger/packages/devtools-source-map/jest.config.js
diff --git a/devtools/client/debugger/new/packages/devtools-source-map/package.json b/devtools/client/debugger/packages/devtools-source-map/package.json
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-source-map/package.json
rename to devtools/client/debugger/packages/devtools-source-map/package.json
diff --git a/devtools/client/debugger/new/packages/devtools-source-map/src/index.js b/devtools/client/debugger/packages/devtools-source-map/src/index.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-source-map/src/index.js
rename to devtools/client/debugger/packages/devtools-source-map/src/index.js
diff --git a/devtools/client/debugger/new/packages/devtools-source-map/src/source-map.js b/devtools/client/debugger/packages/devtools-source-map/src/source-map.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-source-map/src/source-map.js
rename to devtools/client/debugger/packages/devtools-source-map/src/source-map.js
diff --git a/devtools/client/debugger/new/packages/devtools-source-map/src/tests/fixtures/absolute.js b/devtools/client/debugger/packages/devtools-source-map/src/tests/fixtures/absolute.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-source-map/src/tests/fixtures/absolute.js
rename to devtools/client/debugger/packages/devtools-source-map/src/tests/fixtures/absolute.js
diff --git a/devtools/client/debugger/new/packages/devtools-source-map/src/tests/fixtures/absolute.js.map b/devtools/client/debugger/packages/devtools-source-map/src/tests/fixtures/absolute.js.map
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-source-map/src/tests/fixtures/absolute.js.map
rename to devtools/client/debugger/packages/devtools-source-map/src/tests/fixtures/absolute.js.map
diff --git a/devtools/client/debugger/new/packages/devtools-source-map/src/tests/fixtures/bundle.js b/devtools/client/debugger/packages/devtools-source-map/src/tests/fixtures/bundle.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-source-map/src/tests/fixtures/bundle.js
rename to devtools/client/debugger/packages/devtools-source-map/src/tests/fixtures/bundle.js
diff --git a/devtools/client/debugger/new/packages/devtools-source-map/src/tests/fixtures/bundle.js.map b/devtools/client/debugger/packages/devtools-source-map/src/tests/fixtures/bundle.js.map
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-source-map/src/tests/fixtures/bundle.js.map
rename to devtools/client/debugger/packages/devtools-source-map/src/tests/fixtures/bundle.js.map
diff --git a/devtools/client/debugger/new/packages/devtools-source-map/src/tests/fixtures/empty.js b/devtools/client/debugger/packages/devtools-source-map/src/tests/fixtures/empty.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-source-map/src/tests/fixtures/empty.js
rename to devtools/client/debugger/packages/devtools-source-map/src/tests/fixtures/empty.js
diff --git a/devtools/client/debugger/new/packages/devtools-source-map/src/tests/fixtures/empty.js.map b/devtools/client/debugger/packages/devtools-source-map/src/tests/fixtures/empty.js.map
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-source-map/src/tests/fixtures/empty.js.map
rename to devtools/client/debugger/packages/devtools-source-map/src/tests/fixtures/empty.js.map
diff --git a/devtools/client/debugger/new/packages/devtools-source-map/src/tests/fixtures/if.js b/devtools/client/debugger/packages/devtools-source-map/src/tests/fixtures/if.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-source-map/src/tests/fixtures/if.js
rename to devtools/client/debugger/packages/devtools-source-map/src/tests/fixtures/if.js
diff --git a/devtools/client/debugger/new/packages/devtools-source-map/src/tests/fixtures/if.out.js b/devtools/client/debugger/packages/devtools-source-map/src/tests/fixtures/if.out.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-source-map/src/tests/fixtures/if.out.js
rename to devtools/client/debugger/packages/devtools-source-map/src/tests/fixtures/if.out.js
diff --git a/devtools/client/debugger/new/packages/devtools-source-map/src/tests/fixtures/if.out.js.map b/devtools/client/debugger/packages/devtools-source-map/src/tests/fixtures/if.out.js.map
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-source-map/src/tests/fixtures/if.out.js.map
rename to devtools/client/debugger/packages/devtools-source-map/src/tests/fixtures/if.out.js.map
diff --git a/devtools/client/debugger/new/packages/devtools-source-map/src/tests/fixtures/intermingled-sources.js b/devtools/client/debugger/packages/devtools-source-map/src/tests/fixtures/intermingled-sources.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-source-map/src/tests/fixtures/intermingled-sources.js
rename to devtools/client/debugger/packages/devtools-source-map/src/tests/fixtures/intermingled-sources.js
diff --git a/devtools/client/debugger/new/packages/devtools-source-map/src/tests/fixtures/intermingled-sources.js.map b/devtools/client/debugger/packages/devtools-source-map/src/tests/fixtures/intermingled-sources.js.map
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-source-map/src/tests/fixtures/intermingled-sources.js.map
rename to devtools/client/debugger/packages/devtools-source-map/src/tests/fixtures/intermingled-sources.js.map
diff --git a/devtools/client/debugger/new/packages/devtools-source-map/src/tests/fixtures/missingmap.js b/devtools/client/debugger/packages/devtools-source-map/src/tests/fixtures/missingmap.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-source-map/src/tests/fixtures/missingmap.js
rename to devtools/client/debugger/packages/devtools-source-map/src/tests/fixtures/missingmap.js
diff --git a/devtools/client/debugger/new/packages/devtools-source-map/src/tests/fixtures/noroot.js b/devtools/client/debugger/packages/devtools-source-map/src/tests/fixtures/noroot.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-source-map/src/tests/fixtures/noroot.js
rename to devtools/client/debugger/packages/devtools-source-map/src/tests/fixtures/noroot.js
diff --git a/devtools/client/debugger/new/packages/devtools-source-map/src/tests/fixtures/noroot.js.map b/devtools/client/debugger/packages/devtools-source-map/src/tests/fixtures/noroot.js.map
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-source-map/src/tests/fixtures/noroot.js.map
rename to devtools/client/debugger/packages/devtools-source-map/src/tests/fixtures/noroot.js.map
diff --git a/devtools/client/debugger/new/packages/devtools-source-map/src/tests/fixtures/noroot2.js b/devtools/client/debugger/packages/devtools-source-map/src/tests/fixtures/noroot2.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-source-map/src/tests/fixtures/noroot2.js
rename to devtools/client/debugger/packages/devtools-source-map/src/tests/fixtures/noroot2.js
diff --git a/devtools/client/debugger/new/packages/devtools-source-map/src/tests/fixtures/noroot2.js.map b/devtools/client/debugger/packages/devtools-source-map/src/tests/fixtures/noroot2.js.map
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-source-map/src/tests/fixtures/noroot2.js.map
rename to devtools/client/debugger/packages/devtools-source-map/src/tests/fixtures/noroot2.js.map
diff --git a/devtools/client/debugger/new/packages/devtools-source-map/src/tests/getContentType.js b/devtools/client/debugger/packages/devtools-source-map/src/tests/getContentType.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-source-map/src/tests/getContentType.js
rename to devtools/client/debugger/packages/devtools-source-map/src/tests/getContentType.js
diff --git a/devtools/client/debugger/new/packages/devtools-source-map/src/tests/helpers.js b/devtools/client/debugger/packages/devtools-source-map/src/tests/helpers.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-source-map/src/tests/helpers.js
rename to devtools/client/debugger/packages/devtools-source-map/src/tests/helpers.js
diff --git a/devtools/client/debugger/new/packages/devtools-source-map/src/tests/locations.js b/devtools/client/debugger/packages/devtools-source-map/src/tests/locations.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-source-map/src/tests/locations.js
rename to devtools/client/debugger/packages/devtools-source-map/src/tests/locations.js
diff --git a/devtools/client/debugger/new/packages/devtools-source-map/src/tests/source-map.js b/devtools/client/debugger/packages/devtools-source-map/src/tests/source-map.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-source-map/src/tests/source-map.js
rename to devtools/client/debugger/packages/devtools-source-map/src/tests/source-map.js
diff --git a/devtools/client/debugger/new/packages/devtools-source-map/src/tests/wasm-source-map.js b/devtools/client/debugger/packages/devtools-source-map/src/tests/wasm-source-map.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-source-map/src/tests/wasm-source-map.js
rename to devtools/client/debugger/packages/devtools-source-map/src/tests/wasm-source-map.js
diff --git a/devtools/client/debugger/new/packages/devtools-source-map/src/utils/assert.js b/devtools/client/debugger/packages/devtools-source-map/src/utils/assert.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-source-map/src/utils/assert.js
rename to devtools/client/debugger/packages/devtools-source-map/src/utils/assert.js
diff --git a/devtools/client/debugger/new/packages/devtools-source-map/src/utils/convertToJSON.js b/devtools/client/debugger/packages/devtools-source-map/src/utils/convertToJSON.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-source-map/src/utils/convertToJSON.js
rename to devtools/client/debugger/packages/devtools-source-map/src/utils/convertToJSON.js
diff --git a/devtools/client/debugger/new/packages/devtools-source-map/src/utils/createConsumer.js b/devtools/client/debugger/packages/devtools-source-map/src/utils/createConsumer.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-source-map/src/utils/createConsumer.js
rename to devtools/client/debugger/packages/devtools-source-map/src/utils/createConsumer.js
diff --git a/devtools/client/debugger/new/packages/devtools-source-map/src/utils/fetchSourceMap.js b/devtools/client/debugger/packages/devtools-source-map/src/utils/fetchSourceMap.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-source-map/src/utils/fetchSourceMap.js
rename to devtools/client/debugger/packages/devtools-source-map/src/utils/fetchSourceMap.js
diff --git a/devtools/client/debugger/new/packages/devtools-source-map/src/utils/getOriginalStackFrames.js b/devtools/client/debugger/packages/devtools-source-map/src/utils/getOriginalStackFrames.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-source-map/src/utils/getOriginalStackFrames.js
rename to devtools/client/debugger/packages/devtools-source-map/src/utils/getOriginalStackFrames.js
diff --git a/devtools/client/debugger/new/packages/devtools-source-map/src/utils/index.js b/devtools/client/debugger/packages/devtools-source-map/src/utils/index.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-source-map/src/utils/index.js
rename to devtools/client/debugger/packages/devtools-source-map/src/utils/index.js
diff --git a/devtools/client/debugger/new/packages/devtools-source-map/src/utils/sourceMapRequests.js b/devtools/client/debugger/packages/devtools-source-map/src/utils/sourceMapRequests.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-source-map/src/utils/sourceMapRequests.js
rename to devtools/client/debugger/packages/devtools-source-map/src/utils/sourceMapRequests.js
diff --git a/devtools/client/debugger/new/packages/devtools-source-map/src/utils/wasmAsset.js b/devtools/client/debugger/packages/devtools-source-map/src/utils/wasmAsset.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-source-map/src/utils/wasmAsset.js
rename to devtools/client/debugger/packages/devtools-source-map/src/utils/wasmAsset.js
diff --git a/devtools/client/debugger/new/packages/devtools-source-map/src/utils/wasmAssetBrowser.js b/devtools/client/debugger/packages/devtools-source-map/src/utils/wasmAssetBrowser.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-source-map/src/utils/wasmAssetBrowser.js
rename to devtools/client/debugger/packages/devtools-source-map/src/utils/wasmAssetBrowser.js
diff --git a/devtools/client/debugger/new/packages/devtools-source-map/src/utils/wasmRemap.js b/devtools/client/debugger/packages/devtools-source-map/src/utils/wasmRemap.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-source-map/src/utils/wasmRemap.js
rename to devtools/client/debugger/packages/devtools-source-map/src/utils/wasmRemap.js
diff --git a/devtools/client/debugger/new/packages/devtools-source-map/src/utils/wasmXScopes.js b/devtools/client/debugger/packages/devtools-source-map/src/utils/wasmXScopes.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-source-map/src/utils/wasmXScopes.js
rename to devtools/client/debugger/packages/devtools-source-map/src/utils/wasmXScopes.js
diff --git a/devtools/client/debugger/new/packages/devtools-source-map/src/worker.js b/devtools/client/debugger/packages/devtools-source-map/src/worker.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-source-map/src/worker.js
rename to devtools/client/debugger/packages/devtools-source-map/src/worker.js
diff --git a/devtools/client/debugger/new/packages/devtools-source-map/wasm/dwarf_to_json.wasm b/devtools/client/debugger/packages/devtools-source-map/wasm/dwarf_to_json.wasm
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-source-map/wasm/dwarf_to_json.wasm
rename to devtools/client/debugger/packages/devtools-source-map/wasm/dwarf_to_json.wasm
diff --git a/devtools/client/debugger/new/packages/devtools-splitter/.babelrc b/devtools/client/debugger/packages/devtools-splitter/.babelrc
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-splitter/.babelrc
rename to devtools/client/debugger/packages/devtools-splitter/.babelrc
diff --git a/devtools/client/debugger/new/packages/devtools-splitter/LICENSE b/devtools/client/debugger/packages/devtools-splitter/LICENSE
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-splitter/LICENSE
rename to devtools/client/debugger/packages/devtools-splitter/LICENSE
diff --git a/devtools/client/debugger/new/packages/devtools-splitter/README.md b/devtools/client/debugger/packages/devtools-splitter/README.md
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-splitter/README.md
rename to devtools/client/debugger/packages/devtools-splitter/README.md
diff --git a/devtools/client/debugger/new/packages/devtools-splitter/index.js b/devtools/client/debugger/packages/devtools-splitter/index.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-splitter/index.js
rename to devtools/client/debugger/packages/devtools-splitter/index.js
diff --git a/devtools/client/debugger/new/packages/devtools-splitter/package.json b/devtools/client/debugger/packages/devtools-splitter/package.json
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-splitter/package.json
rename to devtools/client/debugger/packages/devtools-splitter/package.json
diff --git a/devtools/client/debugger/new/packages/devtools-splitter/src/Draggable.js b/devtools/client/debugger/packages/devtools-splitter/src/Draggable.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-splitter/src/Draggable.js
rename to devtools/client/debugger/packages/devtools-splitter/src/Draggable.js
diff --git a/devtools/client/debugger/new/packages/devtools-splitter/src/SplitBox.css b/devtools/client/debugger/packages/devtools-splitter/src/SplitBox.css
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-splitter/src/SplitBox.css
rename to devtools/client/debugger/packages/devtools-splitter/src/SplitBox.css
diff --git a/devtools/client/debugger/new/packages/devtools-splitter/src/SplitBox.js b/devtools/client/debugger/packages/devtools-splitter/src/SplitBox.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-splitter/src/SplitBox.js
rename to devtools/client/debugger/packages/devtools-splitter/src/SplitBox.js
diff --git a/devtools/client/debugger/new/packages/devtools-utils/.babelrc b/devtools/client/debugger/packages/devtools-utils/.babelrc
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-utils/.babelrc
rename to devtools/client/debugger/packages/devtools-utils/.babelrc
diff --git a/devtools/client/debugger/new/packages/devtools-utils/LICENSE b/devtools/client/debugger/packages/devtools-utils/LICENSE
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-utils/LICENSE
rename to devtools/client/debugger/packages/devtools-utils/LICENSE
diff --git a/devtools/client/debugger/new/packages/devtools-utils/README.md b/devtools/client/debugger/packages/devtools-utils/README.md
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-utils/README.md
rename to devtools/client/debugger/packages/devtools-utils/README.md
diff --git a/devtools/client/debugger/new/packages/devtools-utils/index.js b/devtools/client/debugger/packages/devtools-utils/index.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-utils/index.js
rename to devtools/client/debugger/packages/devtools-utils/index.js
diff --git a/devtools/client/debugger/new/packages/devtools-utils/jest.config.js b/devtools/client/debugger/packages/devtools-utils/jest.config.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-utils/jest.config.js
rename to devtools/client/debugger/packages/devtools-utils/jest.config.js
diff --git a/devtools/client/debugger/new/packages/devtools-utils/package.json b/devtools/client/debugger/packages/devtools-utils/package.json
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-utils/package.json
rename to devtools/client/debugger/packages/devtools-utils/package.json
diff --git a/devtools/client/debugger/new/packages/devtools-utils/src/network-request.js b/devtools/client/debugger/packages/devtools-utils/src/network-request.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-utils/src/network-request.js
rename to devtools/client/debugger/packages/devtools-utils/src/network-request.js
diff --git a/devtools/client/debugger/new/packages/devtools-utils/src/privileged-network-request.js b/devtools/client/debugger/packages/devtools-utils/src/privileged-network-request.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-utils/src/privileged-network-request.js
rename to devtools/client/debugger/packages/devtools-utils/src/privileged-network-request.js
diff --git a/devtools/client/debugger/new/packages/devtools-utils/src/tests/.eslintrc b/devtools/client/debugger/packages/devtools-utils/src/tests/.eslintrc
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-utils/src/tests/.eslintrc
rename to devtools/client/debugger/packages/devtools-utils/src/tests/.eslintrc
diff --git a/devtools/client/debugger/new/packages/devtools-utils/src/tests/network-request.js b/devtools/client/debugger/packages/devtools-utils/src/tests/network-request.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-utils/src/tests/network-request.js
rename to devtools/client/debugger/packages/devtools-utils/src/tests/network-request.js
diff --git a/devtools/client/debugger/new/packages/devtools-utils/src/tests/worker-utils.js b/devtools/client/debugger/packages/devtools-utils/src/tests/worker-utils.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-utils/src/tests/worker-utils.js
rename to devtools/client/debugger/packages/devtools-utils/src/tests/worker-utils.js
diff --git a/devtools/client/debugger/new/packages/devtools-utils/src/worker-utils.js b/devtools/client/debugger/packages/devtools-utils/src/worker-utils.js
similarity index 100%
rename from devtools/client/debugger/new/packages/devtools-utils/src/worker-utils.js
rename to devtools/client/debugger/packages/devtools-utils/src/worker-utils.js
diff --git a/devtools/client/debugger/new/panel.js b/devtools/client/debugger/panel.js
similarity index 100%
rename from devtools/client/debugger/new/panel.js
rename to devtools/client/debugger/panel.js
diff --git a/devtools/client/debugger/new/postcss.config.js b/devtools/client/debugger/postcss.config.js
similarity index 90%
rename from devtools/client/debugger/new/postcss.config.js
rename to devtools/client/debugger/postcss.config.js
index 6e9455f4d102..0e2839c4d55e 100644
--- a/devtools/client/debugger/new/postcss.config.js
+++ b/devtools/client/debugger/postcss.config.js
@@ -7,10 +7,7 @@ const debug = require("debug")("launchpad");
function mapUrlDevelopment(url) {
const newUrl = url
- .replace(
- /resource:\/\/devtools\/client\/debugger\/new\/images\//,
- "/images/"
- )
+ .replace(/resource:\/\/devtools\/client\/debugger\/images\//, "/images/")
.replace(/(chrome:\/\/)/, "/images/")
.replace(/devtools\/skin/, "devtools/client/themes")
.replace(/devtools\/content/, "devtools/client");
diff --git a/devtools/client/debugger/new/src/actions/README.md b/devtools/client/debugger/src/actions/README.md
similarity index 100%
rename from devtools/client/debugger/new/src/actions/README.md
rename to devtools/client/debugger/src/actions/README.md
diff --git a/devtools/client/debugger/new/src/actions/ast.js b/devtools/client/debugger/src/actions/ast.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/ast.js
rename to devtools/client/debugger/src/actions/ast.js
diff --git a/devtools/client/debugger/new/src/actions/ast/moz.build b/devtools/client/debugger/src/actions/ast/moz.build
similarity index 100%
rename from devtools/client/debugger/new/src/actions/ast/moz.build
rename to devtools/client/debugger/src/actions/ast/moz.build
diff --git a/devtools/client/debugger/new/src/actions/ast/setInScopeLines.js b/devtools/client/debugger/src/actions/ast/setInScopeLines.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/ast/setInScopeLines.js
rename to devtools/client/debugger/src/actions/ast/setInScopeLines.js
diff --git a/devtools/client/debugger/new/src/actions/breakpoints/breakpointPositions.js b/devtools/client/debugger/src/actions/breakpoints/breakpointPositions.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/breakpoints/breakpointPositions.js
rename to devtools/client/debugger/src/actions/breakpoints/breakpointPositions.js
diff --git a/devtools/client/debugger/new/src/actions/breakpoints/index.js b/devtools/client/debugger/src/actions/breakpoints/index.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/breakpoints/index.js
rename to devtools/client/debugger/src/actions/breakpoints/index.js
diff --git a/devtools/client/debugger/new/src/actions/breakpoints/modify.js b/devtools/client/debugger/src/actions/breakpoints/modify.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/breakpoints/modify.js
rename to devtools/client/debugger/src/actions/breakpoints/modify.js
diff --git a/devtools/client/debugger/new/src/actions/breakpoints/moz.build b/devtools/client/debugger/src/actions/breakpoints/moz.build
similarity index 100%
rename from devtools/client/debugger/new/src/actions/breakpoints/moz.build
rename to devtools/client/debugger/src/actions/breakpoints/moz.build
diff --git a/devtools/client/debugger/new/src/actions/breakpoints/remapLocations.js b/devtools/client/debugger/src/actions/breakpoints/remapLocations.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/breakpoints/remapLocations.js
rename to devtools/client/debugger/src/actions/breakpoints/remapLocations.js
diff --git a/devtools/client/debugger/new/src/actions/breakpoints/syncBreakpoint.js b/devtools/client/debugger/src/actions/breakpoints/syncBreakpoint.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/breakpoints/syncBreakpoint.js
rename to devtools/client/debugger/src/actions/breakpoints/syncBreakpoint.js
diff --git a/devtools/client/debugger/new/src/actions/breakpoints/tests/__snapshots__/breakpoints.spec.js.snap b/devtools/client/debugger/src/actions/breakpoints/tests/__snapshots__/breakpoints.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/actions/breakpoints/tests/__snapshots__/breakpoints.spec.js.snap
rename to devtools/client/debugger/src/actions/breakpoints/tests/__snapshots__/breakpoints.spec.js.snap
diff --git a/devtools/client/debugger/new/src/actions/breakpoints/tests/breakpointPositions.spec.js b/devtools/client/debugger/src/actions/breakpoints/tests/breakpointPositions.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/breakpoints/tests/breakpointPositions.spec.js
rename to devtools/client/debugger/src/actions/breakpoints/tests/breakpointPositions.spec.js
diff --git a/devtools/client/debugger/new/src/actions/breakpoints/tests/breakpoints.spec.js b/devtools/client/debugger/src/actions/breakpoints/tests/breakpoints.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/breakpoints/tests/breakpoints.spec.js
rename to devtools/client/debugger/src/actions/breakpoints/tests/breakpoints.spec.js
diff --git a/devtools/client/debugger/new/src/actions/debuggee.js b/devtools/client/debugger/src/actions/debuggee.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/debuggee.js
rename to devtools/client/debugger/src/actions/debuggee.js
diff --git a/devtools/client/debugger/new/src/actions/event-listeners.js b/devtools/client/debugger/src/actions/event-listeners.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/event-listeners.js
rename to devtools/client/debugger/src/actions/event-listeners.js
diff --git a/devtools/client/debugger/new/src/actions/expressions.js b/devtools/client/debugger/src/actions/expressions.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/expressions.js
rename to devtools/client/debugger/src/actions/expressions.js
diff --git a/devtools/client/debugger/new/src/actions/file-search.js b/devtools/client/debugger/src/actions/file-search.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/file-search.js
rename to devtools/client/debugger/src/actions/file-search.js
diff --git a/devtools/client/debugger/new/src/actions/index.js b/devtools/client/debugger/src/actions/index.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/index.js
rename to devtools/client/debugger/src/actions/index.js
diff --git a/devtools/client/debugger/new/src/actions/moz.build b/devtools/client/debugger/src/actions/moz.build
similarity index 100%
rename from devtools/client/debugger/new/src/actions/moz.build
rename to devtools/client/debugger/src/actions/moz.build
diff --git a/devtools/client/debugger/new/src/actions/navigation.js b/devtools/client/debugger/src/actions/navigation.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/navigation.js
rename to devtools/client/debugger/src/actions/navigation.js
diff --git a/devtools/client/debugger/new/src/actions/pause/breakOnNext.js b/devtools/client/debugger/src/actions/pause/breakOnNext.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/pause/breakOnNext.js
rename to devtools/client/debugger/src/actions/pause/breakOnNext.js
diff --git a/devtools/client/debugger/new/src/actions/pause/commands.js b/devtools/client/debugger/src/actions/pause/commands.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/pause/commands.js
rename to devtools/client/debugger/src/actions/pause/commands.js
diff --git a/devtools/client/debugger/new/src/actions/pause/continueToHere.js b/devtools/client/debugger/src/actions/pause/continueToHere.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/pause/continueToHere.js
rename to devtools/client/debugger/src/actions/pause/continueToHere.js
diff --git a/devtools/client/debugger/new/src/actions/pause/fetchScopes.js b/devtools/client/debugger/src/actions/pause/fetchScopes.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/pause/fetchScopes.js
rename to devtools/client/debugger/src/actions/pause/fetchScopes.js
diff --git a/devtools/client/debugger/new/src/actions/pause/index.js b/devtools/client/debugger/src/actions/pause/index.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/pause/index.js
rename to devtools/client/debugger/src/actions/pause/index.js
diff --git a/devtools/client/debugger/new/src/actions/pause/mapFrames.js b/devtools/client/debugger/src/actions/pause/mapFrames.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/pause/mapFrames.js
rename to devtools/client/debugger/src/actions/pause/mapFrames.js
diff --git a/devtools/client/debugger/new/src/actions/pause/mapScopes.js b/devtools/client/debugger/src/actions/pause/mapScopes.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/pause/mapScopes.js
rename to devtools/client/debugger/src/actions/pause/mapScopes.js
diff --git a/devtools/client/debugger/new/src/actions/pause/moz.build b/devtools/client/debugger/src/actions/pause/moz.build
similarity index 100%
rename from devtools/client/debugger/new/src/actions/pause/moz.build
rename to devtools/client/debugger/src/actions/pause/moz.build
diff --git a/devtools/client/debugger/new/src/actions/pause/pauseOnExceptions.js b/devtools/client/debugger/src/actions/pause/pauseOnExceptions.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/pause/pauseOnExceptions.js
rename to devtools/client/debugger/src/actions/pause/pauseOnExceptions.js
diff --git a/devtools/client/debugger/new/src/actions/pause/paused.js b/devtools/client/debugger/src/actions/pause/paused.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/pause/paused.js
rename to devtools/client/debugger/src/actions/pause/paused.js
diff --git a/devtools/client/debugger/new/src/actions/pause/resumed.js b/devtools/client/debugger/src/actions/pause/resumed.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/pause/resumed.js
rename to devtools/client/debugger/src/actions/pause/resumed.js
diff --git a/devtools/client/debugger/new/src/actions/pause/selectFrame.js b/devtools/client/debugger/src/actions/pause/selectFrame.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/pause/selectFrame.js
rename to devtools/client/debugger/src/actions/pause/selectFrame.js
diff --git a/devtools/client/debugger/new/src/actions/pause/setPopupObjectProperties.js b/devtools/client/debugger/src/actions/pause/setPopupObjectProperties.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/pause/setPopupObjectProperties.js
rename to devtools/client/debugger/src/actions/pause/setPopupObjectProperties.js
diff --git a/devtools/client/debugger/new/src/actions/pause/skipPausing.js b/devtools/client/debugger/src/actions/pause/skipPausing.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/pause/skipPausing.js
rename to devtools/client/debugger/src/actions/pause/skipPausing.js
diff --git a/devtools/client/debugger/new/src/actions/pause/tests/__snapshots__/pauseOnExceptions.spec.js.snap b/devtools/client/debugger/src/actions/pause/tests/__snapshots__/pauseOnExceptions.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/actions/pause/tests/__snapshots__/pauseOnExceptions.spec.js.snap
rename to devtools/client/debugger/src/actions/pause/tests/__snapshots__/pauseOnExceptions.spec.js.snap
diff --git a/devtools/client/debugger/new/src/actions/pause/tests/pause.spec.js b/devtools/client/debugger/src/actions/pause/tests/pause.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/pause/tests/pause.spec.js
rename to devtools/client/debugger/src/actions/pause/tests/pause.spec.js
diff --git a/devtools/client/debugger/new/src/actions/pause/tests/pauseOnExceptions.spec.js b/devtools/client/debugger/src/actions/pause/tests/pauseOnExceptions.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/pause/tests/pauseOnExceptions.spec.js
rename to devtools/client/debugger/src/actions/pause/tests/pauseOnExceptions.spec.js
diff --git a/devtools/client/debugger/new/src/actions/pause/tests/skipPausing.spec.js b/devtools/client/debugger/src/actions/pause/tests/skipPausing.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/pause/tests/skipPausing.spec.js
rename to devtools/client/debugger/src/actions/pause/tests/skipPausing.spec.js
diff --git a/devtools/client/debugger/new/src/actions/preview.js b/devtools/client/debugger/src/actions/preview.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/preview.js
rename to devtools/client/debugger/src/actions/preview.js
diff --git a/devtools/client/debugger/new/src/actions/project-text-search.js b/devtools/client/debugger/src/actions/project-text-search.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/project-text-search.js
rename to devtools/client/debugger/src/actions/project-text-search.js
diff --git a/devtools/client/debugger/new/src/actions/quick-open.js b/devtools/client/debugger/src/actions/quick-open.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/quick-open.js
rename to devtools/client/debugger/src/actions/quick-open.js
diff --git a/devtools/client/debugger/new/src/actions/source-tree.js b/devtools/client/debugger/src/actions/source-tree.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/source-tree.js
rename to devtools/client/debugger/src/actions/source-tree.js
diff --git a/devtools/client/debugger/new/src/actions/sources/blackbox.js b/devtools/client/debugger/src/actions/sources/blackbox.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/sources/blackbox.js
rename to devtools/client/debugger/src/actions/sources/blackbox.js
diff --git a/devtools/client/debugger/new/src/actions/sources/index.js b/devtools/client/debugger/src/actions/sources/index.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/sources/index.js
rename to devtools/client/debugger/src/actions/sources/index.js
diff --git a/devtools/client/debugger/new/src/actions/sources/loadSourceText.js b/devtools/client/debugger/src/actions/sources/loadSourceText.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/sources/loadSourceText.js
rename to devtools/client/debugger/src/actions/sources/loadSourceText.js
diff --git a/devtools/client/debugger/new/src/actions/sources/moz.build b/devtools/client/debugger/src/actions/sources/moz.build
similarity index 100%
rename from devtools/client/debugger/new/src/actions/sources/moz.build
rename to devtools/client/debugger/src/actions/sources/moz.build
diff --git a/devtools/client/debugger/new/src/actions/sources/newSources.js b/devtools/client/debugger/src/actions/sources/newSources.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/sources/newSources.js
rename to devtools/client/debugger/src/actions/sources/newSources.js
diff --git a/devtools/client/debugger/new/src/actions/sources/prettyPrint.js b/devtools/client/debugger/src/actions/sources/prettyPrint.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/sources/prettyPrint.js
rename to devtools/client/debugger/src/actions/sources/prettyPrint.js
diff --git a/devtools/client/debugger/new/src/actions/sources/select.js b/devtools/client/debugger/src/actions/sources/select.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/sources/select.js
rename to devtools/client/debugger/src/actions/sources/select.js
diff --git a/devtools/client/debugger/new/src/actions/sources/symbols.js b/devtools/client/debugger/src/actions/sources/symbols.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/sources/symbols.js
rename to devtools/client/debugger/src/actions/sources/symbols.js
diff --git a/devtools/client/debugger/new/src/actions/sources/tests/__snapshots__/newSources.spec.js.snap b/devtools/client/debugger/src/actions/sources/tests/__snapshots__/newSources.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/actions/sources/tests/__snapshots__/newSources.spec.js.snap
rename to devtools/client/debugger/src/actions/sources/tests/__snapshots__/newSources.spec.js.snap
diff --git a/devtools/client/debugger/new/src/actions/sources/tests/__snapshots__/prettyPrint.spec.js.snap b/devtools/client/debugger/src/actions/sources/tests/__snapshots__/prettyPrint.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/actions/sources/tests/__snapshots__/prettyPrint.spec.js.snap
rename to devtools/client/debugger/src/actions/sources/tests/__snapshots__/prettyPrint.spec.js.snap
diff --git a/devtools/client/debugger/new/src/actions/sources/tests/blackbox.spec.js b/devtools/client/debugger/src/actions/sources/tests/blackbox.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/sources/tests/blackbox.spec.js
rename to devtools/client/debugger/src/actions/sources/tests/blackbox.spec.js
diff --git a/devtools/client/debugger/new/src/actions/sources/tests/loadSource.spec.js b/devtools/client/debugger/src/actions/sources/tests/loadSource.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/sources/tests/loadSource.spec.js
rename to devtools/client/debugger/src/actions/sources/tests/loadSource.spec.js
diff --git a/devtools/client/debugger/new/src/actions/sources/tests/newSources.spec.js b/devtools/client/debugger/src/actions/sources/tests/newSources.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/sources/tests/newSources.spec.js
rename to devtools/client/debugger/src/actions/sources/tests/newSources.spec.js
diff --git a/devtools/client/debugger/new/src/actions/sources/tests/prettyPrint.spec.js b/devtools/client/debugger/src/actions/sources/tests/prettyPrint.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/sources/tests/prettyPrint.spec.js
rename to devtools/client/debugger/src/actions/sources/tests/prettyPrint.spec.js
diff --git a/devtools/client/debugger/new/src/actions/sources/tests/querystrings.spec.js b/devtools/client/debugger/src/actions/sources/tests/querystrings.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/sources/tests/querystrings.spec.js
rename to devtools/client/debugger/src/actions/sources/tests/querystrings.spec.js
diff --git a/devtools/client/debugger/new/src/actions/sources/tests/select.spec.js b/devtools/client/debugger/src/actions/sources/tests/select.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/sources/tests/select.spec.js
rename to devtools/client/debugger/src/actions/sources/tests/select.spec.js
diff --git a/devtools/client/debugger/new/src/actions/tabs.js b/devtools/client/debugger/src/actions/tabs.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/tabs.js
rename to devtools/client/debugger/src/actions/tabs.js
diff --git a/devtools/client/debugger/new/src/actions/tests/__snapshots__/ast.spec.js.snap b/devtools/client/debugger/src/actions/tests/__snapshots__/ast.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/actions/tests/__snapshots__/ast.spec.js.snap
rename to devtools/client/debugger/src/actions/tests/__snapshots__/ast.spec.js.snap
diff --git a/devtools/client/debugger/new/src/actions/tests/__snapshots__/expressions.spec.js.snap b/devtools/client/debugger/src/actions/tests/__snapshots__/expressions.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/actions/tests/__snapshots__/expressions.spec.js.snap
rename to devtools/client/debugger/src/actions/tests/__snapshots__/expressions.spec.js.snap
diff --git a/devtools/client/debugger/new/src/actions/tests/__snapshots__/pending-breakpoints.spec.js.snap b/devtools/client/debugger/src/actions/tests/__snapshots__/pending-breakpoints.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/actions/tests/__snapshots__/pending-breakpoints.spec.js.snap
rename to devtools/client/debugger/src/actions/tests/__snapshots__/pending-breakpoints.spec.js.snap
diff --git a/devtools/client/debugger/new/src/actions/tests/__snapshots__/project-text-search.spec.js.snap b/devtools/client/debugger/src/actions/tests/__snapshots__/project-text-search.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/actions/tests/__snapshots__/project-text-search.spec.js.snap
rename to devtools/client/debugger/src/actions/tests/__snapshots__/project-text-search.spec.js.snap
diff --git a/devtools/client/debugger/new/src/actions/tests/ast.spec.js b/devtools/client/debugger/src/actions/tests/ast.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/tests/ast.spec.js
rename to devtools/client/debugger/src/actions/tests/ast.spec.js
diff --git a/devtools/client/debugger/new/src/actions/tests/expressions.spec.js b/devtools/client/debugger/src/actions/tests/expressions.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/tests/expressions.spec.js
rename to devtools/client/debugger/src/actions/tests/expressions.spec.js
diff --git a/devtools/client/debugger/new/src/actions/tests/file-search.spec.js b/devtools/client/debugger/src/actions/tests/file-search.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/tests/file-search.spec.js
rename to devtools/client/debugger/src/actions/tests/file-search.spec.js
diff --git a/devtools/client/debugger/new/src/actions/tests/fixtures/immutable.js b/devtools/client/debugger/src/actions/tests/fixtures/immutable.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/tests/fixtures/immutable.js
rename to devtools/client/debugger/src/actions/tests/fixtures/immutable.js
diff --git a/devtools/client/debugger/new/src/actions/tests/fixtures/reactComponent.js b/devtools/client/debugger/src/actions/tests/fixtures/reactComponent.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/tests/fixtures/reactComponent.js
rename to devtools/client/debugger/src/actions/tests/fixtures/reactComponent.js
diff --git a/devtools/client/debugger/new/src/actions/tests/fixtures/reactFuncComponent.js b/devtools/client/debugger/src/actions/tests/fixtures/reactFuncComponent.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/tests/fixtures/reactFuncComponent.js
rename to devtools/client/debugger/src/actions/tests/fixtures/reactFuncComponent.js
diff --git a/devtools/client/debugger/new/src/actions/tests/fixtures/scopes.js b/devtools/client/debugger/src/actions/tests/fixtures/scopes.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/tests/fixtures/scopes.js
rename to devtools/client/debugger/src/actions/tests/fixtures/scopes.js
diff --git a/devtools/client/debugger/new/src/actions/tests/helpers/breakpoints.js b/devtools/client/debugger/src/actions/tests/helpers/breakpoints.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/tests/helpers/breakpoints.js
rename to devtools/client/debugger/src/actions/tests/helpers/breakpoints.js
diff --git a/devtools/client/debugger/new/src/actions/tests/helpers/readFixture.js b/devtools/client/debugger/src/actions/tests/helpers/readFixture.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/tests/helpers/readFixture.js
rename to devtools/client/debugger/src/actions/tests/helpers/readFixture.js
diff --git a/devtools/client/debugger/new/src/actions/tests/helpers/threadClient.js b/devtools/client/debugger/src/actions/tests/helpers/threadClient.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/tests/helpers/threadClient.js
rename to devtools/client/debugger/src/actions/tests/helpers/threadClient.js
diff --git a/devtools/client/debugger/new/src/actions/tests/navigation.spec.js b/devtools/client/debugger/src/actions/tests/navigation.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/tests/navigation.spec.js
rename to devtools/client/debugger/src/actions/tests/navigation.spec.js
diff --git a/devtools/client/debugger/new/src/actions/tests/pending-breakpoints.spec.js b/devtools/client/debugger/src/actions/tests/pending-breakpoints.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/tests/pending-breakpoints.spec.js
rename to devtools/client/debugger/src/actions/tests/pending-breakpoints.spec.js
diff --git a/devtools/client/debugger/new/src/actions/tests/project-text-search.spec.js b/devtools/client/debugger/src/actions/tests/project-text-search.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/tests/project-text-search.spec.js
rename to devtools/client/debugger/src/actions/tests/project-text-search.spec.js
diff --git a/devtools/client/debugger/new/src/actions/tests/setProjectDirectoryRoot.spec.js b/devtools/client/debugger/src/actions/tests/setProjectDirectoryRoot.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/tests/setProjectDirectoryRoot.spec.js
rename to devtools/client/debugger/src/actions/tests/setProjectDirectoryRoot.spec.js
diff --git a/devtools/client/debugger/new/src/actions/tests/source-tree.spec.js b/devtools/client/debugger/src/actions/tests/source-tree.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/tests/source-tree.spec.js
rename to devtools/client/debugger/src/actions/tests/source-tree.spec.js
diff --git a/devtools/client/debugger/new/src/actions/tests/tabs.spec.js b/devtools/client/debugger/src/actions/tests/tabs.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/tests/tabs.spec.js
rename to devtools/client/debugger/src/actions/tests/tabs.spec.js
diff --git a/devtools/client/debugger/new/src/actions/tests/ui.spec.js b/devtools/client/debugger/src/actions/tests/ui.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/tests/ui.spec.js
rename to devtools/client/debugger/src/actions/tests/ui.spec.js
diff --git a/devtools/client/debugger/new/src/actions/toolbox.js b/devtools/client/debugger/src/actions/toolbox.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/toolbox.js
rename to devtools/client/debugger/src/actions/toolbox.js
diff --git a/devtools/client/debugger/new/src/actions/types/ASTAction.js b/devtools/client/debugger/src/actions/types/ASTAction.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/types/ASTAction.js
rename to devtools/client/debugger/src/actions/types/ASTAction.js
diff --git a/devtools/client/debugger/new/src/actions/types/BreakpointAction.js b/devtools/client/debugger/src/actions/types/BreakpointAction.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/types/BreakpointAction.js
rename to devtools/client/debugger/src/actions/types/BreakpointAction.js
diff --git a/devtools/client/debugger/new/src/actions/types/PauseAction.js b/devtools/client/debugger/src/actions/types/PauseAction.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/types/PauseAction.js
rename to devtools/client/debugger/src/actions/types/PauseAction.js
diff --git a/devtools/client/debugger/new/src/actions/types/SourceAction.js b/devtools/client/debugger/src/actions/types/SourceAction.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/types/SourceAction.js
rename to devtools/client/debugger/src/actions/types/SourceAction.js
diff --git a/devtools/client/debugger/new/src/actions/types/UIAction.js b/devtools/client/debugger/src/actions/types/UIAction.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/types/UIAction.js
rename to devtools/client/debugger/src/actions/types/UIAction.js
diff --git a/devtools/client/debugger/new/src/actions/types/index.js b/devtools/client/debugger/src/actions/types/index.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/types/index.js
rename to devtools/client/debugger/src/actions/types/index.js
diff --git a/devtools/client/debugger/new/src/actions/ui.js b/devtools/client/debugger/src/actions/ui.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/ui.js
rename to devtools/client/debugger/src/actions/ui.js
diff --git a/devtools/client/debugger/new/src/actions/utils/create-store.js b/devtools/client/debugger/src/actions/utils/create-store.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/utils/create-store.js
rename to devtools/client/debugger/src/actions/utils/create-store.js
diff --git a/devtools/client/debugger/new/src/actions/utils/middleware/context.js b/devtools/client/debugger/src/actions/utils/middleware/context.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/utils/middleware/context.js
rename to devtools/client/debugger/src/actions/utils/middleware/context.js
diff --git a/devtools/client/debugger/new/src/actions/utils/middleware/history.js b/devtools/client/debugger/src/actions/utils/middleware/history.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/utils/middleware/history.js
rename to devtools/client/debugger/src/actions/utils/middleware/history.js
diff --git a/devtools/client/debugger/new/src/actions/utils/middleware/log.js b/devtools/client/debugger/src/actions/utils/middleware/log.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/utils/middleware/log.js
rename to devtools/client/debugger/src/actions/utils/middleware/log.js
diff --git a/devtools/client/debugger/new/src/actions/utils/middleware/moz.build b/devtools/client/debugger/src/actions/utils/middleware/moz.build
similarity index 100%
rename from devtools/client/debugger/new/src/actions/utils/middleware/moz.build
rename to devtools/client/debugger/src/actions/utils/middleware/moz.build
diff --git a/devtools/client/debugger/new/src/actions/utils/middleware/promise.js b/devtools/client/debugger/src/actions/utils/middleware/promise.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/utils/middleware/promise.js
rename to devtools/client/debugger/src/actions/utils/middleware/promise.js
diff --git a/devtools/client/debugger/new/src/actions/utils/middleware/thunk.js b/devtools/client/debugger/src/actions/utils/middleware/thunk.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/utils/middleware/thunk.js
rename to devtools/client/debugger/src/actions/utils/middleware/thunk.js
diff --git a/devtools/client/debugger/new/src/actions/utils/middleware/timing.js b/devtools/client/debugger/src/actions/utils/middleware/timing.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/utils/middleware/timing.js
rename to devtools/client/debugger/src/actions/utils/middleware/timing.js
diff --git a/devtools/client/debugger/new/src/actions/utils/middleware/wait-service.js b/devtools/client/debugger/src/actions/utils/middleware/wait-service.js
similarity index 100%
rename from devtools/client/debugger/new/src/actions/utils/middleware/wait-service.js
rename to devtools/client/debugger/src/actions/utils/middleware/wait-service.js
diff --git a/devtools/client/debugger/new/src/actions/utils/moz.build b/devtools/client/debugger/src/actions/utils/moz.build
similarity index 100%
rename from devtools/client/debugger/new/src/actions/utils/moz.build
rename to devtools/client/debugger/src/actions/utils/moz.build
diff --git a/devtools/client/debugger/new/src/client/README.md b/devtools/client/debugger/src/client/README.md
similarity index 100%
rename from devtools/client/debugger/new/src/client/README.md
rename to devtools/client/debugger/src/client/README.md
diff --git a/devtools/client/debugger/new/src/client/chrome.js b/devtools/client/debugger/src/client/chrome.js
similarity index 100%
rename from devtools/client/debugger/new/src/client/chrome.js
rename to devtools/client/debugger/src/client/chrome.js
diff --git a/devtools/client/debugger/new/src/client/chrome/commands.js b/devtools/client/debugger/src/client/chrome/commands.js
similarity index 100%
rename from devtools/client/debugger/new/src/client/chrome/commands.js
rename to devtools/client/debugger/src/client/chrome/commands.js
diff --git a/devtools/client/debugger/new/src/client/chrome/create.js b/devtools/client/debugger/src/client/chrome/create.js
similarity index 100%
rename from devtools/client/debugger/new/src/client/chrome/create.js
rename to devtools/client/debugger/src/client/chrome/create.js
diff --git a/devtools/client/debugger/new/src/client/chrome/events.js b/devtools/client/debugger/src/client/chrome/events.js
similarity index 100%
rename from devtools/client/debugger/new/src/client/chrome/events.js
rename to devtools/client/debugger/src/client/chrome/events.js
diff --git a/devtools/client/debugger/new/src/client/chrome/moz.build b/devtools/client/debugger/src/client/chrome/moz.build
similarity index 100%
rename from devtools/client/debugger/new/src/client/chrome/moz.build
rename to devtools/client/debugger/src/client/chrome/moz.build
diff --git a/devtools/client/debugger/new/src/client/chrome/types.js b/devtools/client/debugger/src/client/chrome/types.js
similarity index 100%
rename from devtools/client/debugger/new/src/client/chrome/types.js
rename to devtools/client/debugger/src/client/chrome/types.js
diff --git a/devtools/client/debugger/new/src/client/firefox.js b/devtools/client/debugger/src/client/firefox.js
similarity index 100%
rename from devtools/client/debugger/new/src/client/firefox.js
rename to devtools/client/debugger/src/client/firefox.js
diff --git a/devtools/client/debugger/new/src/client/firefox/commands.js b/devtools/client/debugger/src/client/firefox/commands.js
similarity index 100%
rename from devtools/client/debugger/new/src/client/firefox/commands.js
rename to devtools/client/debugger/src/client/firefox/commands.js
diff --git a/devtools/client/debugger/new/src/client/firefox/create.js b/devtools/client/debugger/src/client/firefox/create.js
similarity index 100%
rename from devtools/client/debugger/new/src/client/firefox/create.js
rename to devtools/client/debugger/src/client/firefox/create.js
diff --git a/devtools/client/debugger/new/src/client/firefox/events.js b/devtools/client/debugger/src/client/firefox/events.js
similarity index 100%
rename from devtools/client/debugger/new/src/client/firefox/events.js
rename to devtools/client/debugger/src/client/firefox/events.js
diff --git a/devtools/client/debugger/new/src/client/firefox/moz.build b/devtools/client/debugger/src/client/firefox/moz.build
similarity index 100%
rename from devtools/client/debugger/new/src/client/firefox/moz.build
rename to devtools/client/debugger/src/client/firefox/moz.build
diff --git a/devtools/client/debugger/new/src/client/firefox/tests/__snapshots__/commands.spec.js.snap b/devtools/client/debugger/src/client/firefox/tests/__snapshots__/commands.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/client/firefox/tests/__snapshots__/commands.spec.js.snap
rename to devtools/client/debugger/src/client/firefox/tests/__snapshots__/commands.spec.js.snap
diff --git a/devtools/client/debugger/new/src/client/firefox/tests/commands.spec.js b/devtools/client/debugger/src/client/firefox/tests/commands.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/client/firefox/tests/commands.spec.js
rename to devtools/client/debugger/src/client/firefox/tests/commands.spec.js
diff --git a/devtools/client/debugger/new/src/client/firefox/tests/onconnect.spec.js b/devtools/client/debugger/src/client/firefox/tests/onconnect.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/client/firefox/tests/onconnect.spec.js
rename to devtools/client/debugger/src/client/firefox/tests/onconnect.spec.js
diff --git a/devtools/client/debugger/new/src/client/firefox/types.js b/devtools/client/debugger/src/client/firefox/types.js
similarity index 100%
rename from devtools/client/debugger/new/src/client/firefox/types.js
rename to devtools/client/debugger/src/client/firefox/types.js
diff --git a/devtools/client/debugger/new/src/client/firefox/workers.js b/devtools/client/debugger/src/client/firefox/workers.js
similarity index 100%
rename from devtools/client/debugger/new/src/client/firefox/workers.js
rename to devtools/client/debugger/src/client/firefox/workers.js
diff --git a/devtools/client/debugger/new/src/client/index.js b/devtools/client/debugger/src/client/index.js
similarity index 100%
rename from devtools/client/debugger/new/src/client/index.js
rename to devtools/client/debugger/src/client/index.js
diff --git a/devtools/client/debugger/new/src/client/moz.build b/devtools/client/debugger/src/client/moz.build
similarity index 100%
rename from devtools/client/debugger/new/src/client/moz.build
rename to devtools/client/debugger/src/client/moz.build
diff --git a/devtools/client/debugger/new/src/components/A11yIntention.css b/devtools/client/debugger/src/components/A11yIntention.css
similarity index 100%
rename from devtools/client/debugger/new/src/components/A11yIntention.css
rename to devtools/client/debugger/src/components/A11yIntention.css
diff --git a/devtools/client/debugger/new/src/components/A11yIntention.js b/devtools/client/debugger/src/components/A11yIntention.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/A11yIntention.js
rename to devtools/client/debugger/src/components/A11yIntention.js
diff --git a/devtools/client/debugger/new/src/components/App.css b/devtools/client/debugger/src/components/App.css
similarity index 100%
rename from devtools/client/debugger/new/src/components/App.css
rename to devtools/client/debugger/src/components/App.css
diff --git a/devtools/client/debugger/new/src/components/App.js b/devtools/client/debugger/src/components/App.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/App.js
rename to devtools/client/debugger/src/components/App.js
diff --git a/devtools/client/debugger/new/src/components/Editor/Breakpoint.js b/devtools/client/debugger/src/components/Editor/Breakpoint.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/Editor/Breakpoint.js
rename to devtools/client/debugger/src/components/Editor/Breakpoint.js
diff --git a/devtools/client/debugger/new/src/components/Editor/Breakpoints.css b/devtools/client/debugger/src/components/Editor/Breakpoints.css
similarity index 95%
rename from devtools/client/debugger/new/src/components/Editor/Breakpoints.css
rename to devtools/client/debugger/src/components/Editor/Breakpoints.css
index 85a742903852..5b4b37005a65 100644
--- a/devtools/client/debugger/new/src/components/Editor/Breakpoints.css
+++ b/devtools/client/debugger/src/components/Editor/Breakpoints.css
@@ -56,7 +56,7 @@
bottom: 0;
height: 15px;
background-color: var(--gutter-hover-background-color);
- mask: url(resource://devtools/client/debugger/new/images/breakpoint.svg)
+ mask: url(resource://devtools/client/debugger/images/breakpoint.svg)
no-repeat;
mask-size: auto 15px;
mask-position: right;
@@ -152,5 +152,5 @@
}
.img.column-marker {
- background-image: url(resource://devtools/client/debugger/new/images/column-marker.svg);
+ background-image: url(resource://devtools/client/debugger/images/column-marker.svg);
}
diff --git a/devtools/client/debugger/new/src/components/Editor/Breakpoints.js b/devtools/client/debugger/src/components/Editor/Breakpoints.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/Editor/Breakpoints.js
rename to devtools/client/debugger/src/components/Editor/Breakpoints.js
diff --git a/devtools/client/debugger/new/src/components/Editor/ColumnBreakpoint.js b/devtools/client/debugger/src/components/Editor/ColumnBreakpoint.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/Editor/ColumnBreakpoint.js
rename to devtools/client/debugger/src/components/Editor/ColumnBreakpoint.js
diff --git a/devtools/client/debugger/new/src/components/Editor/ColumnBreakpoints.js b/devtools/client/debugger/src/components/Editor/ColumnBreakpoints.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/Editor/ColumnBreakpoints.js
rename to devtools/client/debugger/src/components/Editor/ColumnBreakpoints.js
diff --git a/devtools/client/debugger/new/src/components/Editor/ConditionalPanel.css b/devtools/client/debugger/src/components/Editor/ConditionalPanel.css
similarity index 100%
rename from devtools/client/debugger/new/src/components/Editor/ConditionalPanel.css
rename to devtools/client/debugger/src/components/Editor/ConditionalPanel.css
diff --git a/devtools/client/debugger/new/src/components/Editor/ConditionalPanel.js b/devtools/client/debugger/src/components/Editor/ConditionalPanel.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/Editor/ConditionalPanel.js
rename to devtools/client/debugger/src/components/Editor/ConditionalPanel.js
diff --git a/devtools/client/debugger/new/src/components/Editor/DebugLine.js b/devtools/client/debugger/src/components/Editor/DebugLine.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/Editor/DebugLine.js
rename to devtools/client/debugger/src/components/Editor/DebugLine.js
diff --git a/devtools/client/debugger/new/src/components/Editor/Editor.css b/devtools/client/debugger/src/components/Editor/Editor.css
similarity index 100%
rename from devtools/client/debugger/new/src/components/Editor/Editor.css
rename to devtools/client/debugger/src/components/Editor/Editor.css
diff --git a/devtools/client/debugger/new/src/components/Editor/EditorMenu.js b/devtools/client/debugger/src/components/Editor/EditorMenu.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/Editor/EditorMenu.js
rename to devtools/client/debugger/src/components/Editor/EditorMenu.js
diff --git a/devtools/client/debugger/new/src/components/Editor/EmptyLines.js b/devtools/client/debugger/src/components/Editor/EmptyLines.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/Editor/EmptyLines.js
rename to devtools/client/debugger/src/components/Editor/EmptyLines.js
diff --git a/devtools/client/debugger/new/src/components/Editor/Footer.css b/devtools/client/debugger/src/components/Editor/Footer.css
similarity index 100%
rename from devtools/client/debugger/new/src/components/Editor/Footer.css
rename to devtools/client/debugger/src/components/Editor/Footer.css
diff --git a/devtools/client/debugger/new/src/components/Editor/Footer.js b/devtools/client/debugger/src/components/Editor/Footer.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/Editor/Footer.js
rename to devtools/client/debugger/src/components/Editor/Footer.js
diff --git a/devtools/client/debugger/new/src/components/Editor/Highlight.css b/devtools/client/debugger/src/components/Editor/Highlight.css
similarity index 100%
rename from devtools/client/debugger/new/src/components/Editor/Highlight.css
rename to devtools/client/debugger/src/components/Editor/Highlight.css
diff --git a/devtools/client/debugger/new/src/components/Editor/HighlightLine.js b/devtools/client/debugger/src/components/Editor/HighlightLine.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/Editor/HighlightLine.js
rename to devtools/client/debugger/src/components/Editor/HighlightLine.js
diff --git a/devtools/client/debugger/new/src/components/Editor/HighlightLines.js b/devtools/client/debugger/src/components/Editor/HighlightLines.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/Editor/HighlightLines.js
rename to devtools/client/debugger/src/components/Editor/HighlightLines.js
diff --git a/devtools/client/debugger/new/src/components/Editor/Preview.css b/devtools/client/debugger/src/components/Editor/Preview.css
similarity index 100%
rename from devtools/client/debugger/new/src/components/Editor/Preview.css
rename to devtools/client/debugger/src/components/Editor/Preview.css
diff --git a/devtools/client/debugger/new/src/components/Editor/Preview/Popup.css b/devtools/client/debugger/src/components/Editor/Preview/Popup.css
similarity index 100%
rename from devtools/client/debugger/new/src/components/Editor/Preview/Popup.css
rename to devtools/client/debugger/src/components/Editor/Preview/Popup.css
diff --git a/devtools/client/debugger/new/src/components/Editor/Preview/Popup.js b/devtools/client/debugger/src/components/Editor/Preview/Popup.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/Editor/Preview/Popup.js
rename to devtools/client/debugger/src/components/Editor/Preview/Popup.js
diff --git a/devtools/client/debugger/new/src/components/Editor/Preview/index.js b/devtools/client/debugger/src/components/Editor/Preview/index.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/Editor/Preview/index.js
rename to devtools/client/debugger/src/components/Editor/Preview/index.js
diff --git a/devtools/client/debugger/new/src/components/Editor/Preview/moz.build b/devtools/client/debugger/src/components/Editor/Preview/moz.build
similarity index 100%
rename from devtools/client/debugger/new/src/components/Editor/Preview/moz.build
rename to devtools/client/debugger/src/components/Editor/Preview/moz.build
diff --git a/devtools/client/debugger/new/src/components/Editor/SearchBar.css b/devtools/client/debugger/src/components/Editor/SearchBar.css
similarity index 100%
rename from devtools/client/debugger/new/src/components/Editor/SearchBar.css
rename to devtools/client/debugger/src/components/Editor/SearchBar.css
diff --git a/devtools/client/debugger/new/src/components/Editor/SearchBar.js b/devtools/client/debugger/src/components/Editor/SearchBar.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/Editor/SearchBar.js
rename to devtools/client/debugger/src/components/Editor/SearchBar.js
diff --git a/devtools/client/debugger/new/src/components/Editor/Tab.js b/devtools/client/debugger/src/components/Editor/Tab.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/Editor/Tab.js
rename to devtools/client/debugger/src/components/Editor/Tab.js
diff --git a/devtools/client/debugger/new/src/components/Editor/Tabs.css b/devtools/client/debugger/src/components/Editor/Tabs.css
similarity index 100%
rename from devtools/client/debugger/new/src/components/Editor/Tabs.css
rename to devtools/client/debugger/src/components/Editor/Tabs.css
diff --git a/devtools/client/debugger/new/src/components/Editor/Tabs.js b/devtools/client/debugger/src/components/Editor/Tabs.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/Editor/Tabs.js
rename to devtools/client/debugger/src/components/Editor/Tabs.js
diff --git a/devtools/client/debugger/new/src/components/Editor/index.js b/devtools/client/debugger/src/components/Editor/index.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/Editor/index.js
rename to devtools/client/debugger/src/components/Editor/index.js
diff --git a/devtools/client/debugger/new/src/components/Editor/menus/breakpoints.js b/devtools/client/debugger/src/components/Editor/menus/breakpoints.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/Editor/menus/breakpoints.js
rename to devtools/client/debugger/src/components/Editor/menus/breakpoints.js
diff --git a/devtools/client/debugger/new/src/components/Editor/menus/editor.js b/devtools/client/debugger/src/components/Editor/menus/editor.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/Editor/menus/editor.js
rename to devtools/client/debugger/src/components/Editor/menus/editor.js
diff --git a/devtools/client/debugger/new/src/components/Editor/menus/moz.build b/devtools/client/debugger/src/components/Editor/menus/moz.build
similarity index 100%
rename from devtools/client/debugger/new/src/components/Editor/menus/moz.build
rename to devtools/client/debugger/src/components/Editor/menus/moz.build
diff --git a/devtools/client/debugger/new/src/components/Editor/menus/source.js b/devtools/client/debugger/src/components/Editor/menus/source.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/Editor/menus/source.js
rename to devtools/client/debugger/src/components/Editor/menus/source.js
diff --git a/devtools/client/debugger/new/src/components/Editor/moz.build b/devtools/client/debugger/src/components/Editor/moz.build
similarity index 100%
rename from devtools/client/debugger/new/src/components/Editor/moz.build
rename to devtools/client/debugger/src/components/Editor/moz.build
diff --git a/devtools/client/debugger/new/src/components/Editor/tests/Breakpoints.spec.js b/devtools/client/debugger/src/components/Editor/tests/Breakpoints.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/Editor/tests/Breakpoints.spec.js
rename to devtools/client/debugger/src/components/Editor/tests/Breakpoints.spec.js
diff --git a/devtools/client/debugger/new/src/components/Editor/tests/DebugLine.spec.js b/devtools/client/debugger/src/components/Editor/tests/DebugLine.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/Editor/tests/DebugLine.spec.js
rename to devtools/client/debugger/src/components/Editor/tests/DebugLine.spec.js
diff --git a/devtools/client/debugger/new/src/components/Editor/tests/Editor.spec.js b/devtools/client/debugger/src/components/Editor/tests/Editor.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/Editor/tests/Editor.spec.js
rename to devtools/client/debugger/src/components/Editor/tests/Editor.spec.js
diff --git a/devtools/client/debugger/new/src/components/Editor/tests/Footer.spec.js b/devtools/client/debugger/src/components/Editor/tests/Footer.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/Editor/tests/Footer.spec.js
rename to devtools/client/debugger/src/components/Editor/tests/Footer.spec.js
diff --git a/devtools/client/debugger/new/src/components/Editor/tests/SearchBar.spec.js b/devtools/client/debugger/src/components/Editor/tests/SearchBar.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/Editor/tests/SearchBar.spec.js
rename to devtools/client/debugger/src/components/Editor/tests/SearchBar.spec.js
diff --git a/devtools/client/debugger/new/src/components/Editor/tests/__snapshots__/Breakpoints.spec.js.snap b/devtools/client/debugger/src/components/Editor/tests/__snapshots__/Breakpoints.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/components/Editor/tests/__snapshots__/Breakpoints.spec.js.snap
rename to devtools/client/debugger/src/components/Editor/tests/__snapshots__/Breakpoints.spec.js.snap
diff --git a/devtools/client/debugger/new/src/components/Editor/tests/__snapshots__/Editor.spec.js.snap b/devtools/client/debugger/src/components/Editor/tests/__snapshots__/Editor.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/components/Editor/tests/__snapshots__/Editor.spec.js.snap
rename to devtools/client/debugger/src/components/Editor/tests/__snapshots__/Editor.spec.js.snap
diff --git a/devtools/client/debugger/new/src/components/Editor/tests/__snapshots__/Footer.spec.js.snap b/devtools/client/debugger/src/components/Editor/tests/__snapshots__/Footer.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/components/Editor/tests/__snapshots__/Footer.spec.js.snap
rename to devtools/client/debugger/src/components/Editor/tests/__snapshots__/Footer.spec.js.snap
diff --git a/devtools/client/debugger/new/src/components/Editor/tests/__snapshots__/SearchBar.spec.js.snap b/devtools/client/debugger/src/components/Editor/tests/__snapshots__/SearchBar.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/components/Editor/tests/__snapshots__/SearchBar.spec.js.snap
rename to devtools/client/debugger/src/components/Editor/tests/__snapshots__/SearchBar.spec.js.snap
diff --git a/devtools/client/debugger/new/src/components/PrimaryPanes/Outline.css b/devtools/client/debugger/src/components/PrimaryPanes/Outline.css
similarity index 100%
rename from devtools/client/debugger/new/src/components/PrimaryPanes/Outline.css
rename to devtools/client/debugger/src/components/PrimaryPanes/Outline.css
diff --git a/devtools/client/debugger/new/src/components/PrimaryPanes/Outline.js b/devtools/client/debugger/src/components/PrimaryPanes/Outline.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/PrimaryPanes/Outline.js
rename to devtools/client/debugger/src/components/PrimaryPanes/Outline.js
diff --git a/devtools/client/debugger/new/src/components/PrimaryPanes/OutlineFilter.css b/devtools/client/debugger/src/components/PrimaryPanes/OutlineFilter.css
similarity index 100%
rename from devtools/client/debugger/new/src/components/PrimaryPanes/OutlineFilter.css
rename to devtools/client/debugger/src/components/PrimaryPanes/OutlineFilter.css
diff --git a/devtools/client/debugger/new/src/components/PrimaryPanes/OutlineFilter.js b/devtools/client/debugger/src/components/PrimaryPanes/OutlineFilter.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/PrimaryPanes/OutlineFilter.js
rename to devtools/client/debugger/src/components/PrimaryPanes/OutlineFilter.js
diff --git a/devtools/client/debugger/new/src/components/PrimaryPanes/Sources.css b/devtools/client/debugger/src/components/PrimaryPanes/Sources.css
similarity index 100%
rename from devtools/client/debugger/new/src/components/PrimaryPanes/Sources.css
rename to devtools/client/debugger/src/components/PrimaryPanes/Sources.css
diff --git a/devtools/client/debugger/new/src/components/PrimaryPanes/SourcesTree.js b/devtools/client/debugger/src/components/PrimaryPanes/SourcesTree.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/PrimaryPanes/SourcesTree.js
rename to devtools/client/debugger/src/components/PrimaryPanes/SourcesTree.js
diff --git a/devtools/client/debugger/new/src/components/PrimaryPanes/SourcesTreeItem.js b/devtools/client/debugger/src/components/PrimaryPanes/SourcesTreeItem.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/PrimaryPanes/SourcesTreeItem.js
rename to devtools/client/debugger/src/components/PrimaryPanes/SourcesTreeItem.js
diff --git a/devtools/client/debugger/new/src/components/PrimaryPanes/index.js b/devtools/client/debugger/src/components/PrimaryPanes/index.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/PrimaryPanes/index.js
rename to devtools/client/debugger/src/components/PrimaryPanes/index.js
diff --git a/devtools/client/debugger/new/src/components/PrimaryPanes/moz.build b/devtools/client/debugger/src/components/PrimaryPanes/moz.build
similarity index 100%
rename from devtools/client/debugger/new/src/components/PrimaryPanes/moz.build
rename to devtools/client/debugger/src/components/PrimaryPanes/moz.build
diff --git a/devtools/client/debugger/new/src/components/PrimaryPanes/tests/PrimaryPanes.spec.js b/devtools/client/debugger/src/components/PrimaryPanes/tests/PrimaryPanes.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/PrimaryPanes/tests/PrimaryPanes.spec.js
rename to devtools/client/debugger/src/components/PrimaryPanes/tests/PrimaryPanes.spec.js
diff --git a/devtools/client/debugger/new/src/components/PrimaryPanes/tests/SourcesTree.spec.js b/devtools/client/debugger/src/components/PrimaryPanes/tests/SourcesTree.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/PrimaryPanes/tests/SourcesTree.spec.js
rename to devtools/client/debugger/src/components/PrimaryPanes/tests/SourcesTree.spec.js
diff --git a/devtools/client/debugger/new/src/components/PrimaryPanes/tests/SourcesTreeItem.spec.js b/devtools/client/debugger/src/components/PrimaryPanes/tests/SourcesTreeItem.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/PrimaryPanes/tests/SourcesTreeItem.spec.js
rename to devtools/client/debugger/src/components/PrimaryPanes/tests/SourcesTreeItem.spec.js
diff --git a/devtools/client/debugger/new/src/components/PrimaryPanes/tests/__snapshots__/PrimaryPanes.spec.js.snap b/devtools/client/debugger/src/components/PrimaryPanes/tests/__snapshots__/PrimaryPanes.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/components/PrimaryPanes/tests/__snapshots__/PrimaryPanes.spec.js.snap
rename to devtools/client/debugger/src/components/PrimaryPanes/tests/__snapshots__/PrimaryPanes.spec.js.snap
diff --git a/devtools/client/debugger/new/src/components/PrimaryPanes/tests/__snapshots__/SourcesTree.spec.js.snap b/devtools/client/debugger/src/components/PrimaryPanes/tests/__snapshots__/SourcesTree.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/components/PrimaryPanes/tests/__snapshots__/SourcesTree.spec.js.snap
rename to devtools/client/debugger/src/components/PrimaryPanes/tests/__snapshots__/SourcesTree.spec.js.snap
diff --git a/devtools/client/debugger/new/src/components/PrimaryPanes/tests/__snapshots__/SourcesTreeItem.spec.js.snap b/devtools/client/debugger/src/components/PrimaryPanes/tests/__snapshots__/SourcesTreeItem.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/components/PrimaryPanes/tests/__snapshots__/SourcesTreeItem.spec.js.snap
rename to devtools/client/debugger/src/components/PrimaryPanes/tests/__snapshots__/SourcesTreeItem.spec.js.snap
diff --git a/devtools/client/debugger/new/src/components/ProjectSearch.css b/devtools/client/debugger/src/components/ProjectSearch.css
similarity index 100%
rename from devtools/client/debugger/new/src/components/ProjectSearch.css
rename to devtools/client/debugger/src/components/ProjectSearch.css
diff --git a/devtools/client/debugger/new/src/components/ProjectSearch.js b/devtools/client/debugger/src/components/ProjectSearch.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/ProjectSearch.js
rename to devtools/client/debugger/src/components/ProjectSearch.js
diff --git a/devtools/client/debugger/new/src/components/QuickOpenModal.css b/devtools/client/debugger/src/components/QuickOpenModal.css
similarity index 100%
rename from devtools/client/debugger/new/src/components/QuickOpenModal.css
rename to devtools/client/debugger/src/components/QuickOpenModal.css
diff --git a/devtools/client/debugger/new/src/components/QuickOpenModal.js b/devtools/client/debugger/src/components/QuickOpenModal.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/QuickOpenModal.js
rename to devtools/client/debugger/src/components/QuickOpenModal.js
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/Breakpoints/Breakpoint.js b/devtools/client/debugger/src/components/SecondaryPanes/Breakpoints/Breakpoint.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/SecondaryPanes/Breakpoints/Breakpoint.js
rename to devtools/client/debugger/src/components/SecondaryPanes/Breakpoints/Breakpoint.js
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/Breakpoints/BreakpointHeading.js b/devtools/client/debugger/src/components/SecondaryPanes/Breakpoints/BreakpointHeading.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/SecondaryPanes/Breakpoints/BreakpointHeading.js
rename to devtools/client/debugger/src/components/SecondaryPanes/Breakpoints/BreakpointHeading.js
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/Breakpoints/BreakpointHeadingsContextMenu.js b/devtools/client/debugger/src/components/SecondaryPanes/Breakpoints/BreakpointHeadingsContextMenu.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/SecondaryPanes/Breakpoints/BreakpointHeadingsContextMenu.js
rename to devtools/client/debugger/src/components/SecondaryPanes/Breakpoints/BreakpointHeadingsContextMenu.js
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/Breakpoints/Breakpoints.css b/devtools/client/debugger/src/components/SecondaryPanes/Breakpoints/Breakpoints.css
similarity index 100%
rename from devtools/client/debugger/new/src/components/SecondaryPanes/Breakpoints/Breakpoints.css
rename to devtools/client/debugger/src/components/SecondaryPanes/Breakpoints/Breakpoints.css
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/Breakpoints/BreakpointsContextMenu.js b/devtools/client/debugger/src/components/SecondaryPanes/Breakpoints/BreakpointsContextMenu.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/SecondaryPanes/Breakpoints/BreakpointsContextMenu.js
rename to devtools/client/debugger/src/components/SecondaryPanes/Breakpoints/BreakpointsContextMenu.js
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/Breakpoints/ExceptionOption.js b/devtools/client/debugger/src/components/SecondaryPanes/Breakpoints/ExceptionOption.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/SecondaryPanes/Breakpoints/ExceptionOption.js
rename to devtools/client/debugger/src/components/SecondaryPanes/Breakpoints/ExceptionOption.js
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/Breakpoints/index.js b/devtools/client/debugger/src/components/SecondaryPanes/Breakpoints/index.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/SecondaryPanes/Breakpoints/index.js
rename to devtools/client/debugger/src/components/SecondaryPanes/Breakpoints/index.js
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/Breakpoints/moz.build b/devtools/client/debugger/src/components/SecondaryPanes/Breakpoints/moz.build
similarity index 100%
rename from devtools/client/debugger/new/src/components/SecondaryPanes/Breakpoints/moz.build
rename to devtools/client/debugger/src/components/SecondaryPanes/Breakpoints/moz.build
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/Breakpoints/tests/Breakpoint.spec.js b/devtools/client/debugger/src/components/SecondaryPanes/Breakpoints/tests/Breakpoint.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/SecondaryPanes/Breakpoints/tests/Breakpoint.spec.js
rename to devtools/client/debugger/src/components/SecondaryPanes/Breakpoints/tests/Breakpoint.spec.js
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/Breakpoints/tests/BreakpointsContextMenu.spec.js b/devtools/client/debugger/src/components/SecondaryPanes/Breakpoints/tests/BreakpointsContextMenu.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/SecondaryPanes/Breakpoints/tests/BreakpointsContextMenu.spec.js
rename to devtools/client/debugger/src/components/SecondaryPanes/Breakpoints/tests/BreakpointsContextMenu.spec.js
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/Breakpoints/tests/ExceptionOption.spec.js b/devtools/client/debugger/src/components/SecondaryPanes/Breakpoints/tests/ExceptionOption.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/SecondaryPanes/Breakpoints/tests/ExceptionOption.spec.js
rename to devtools/client/debugger/src/components/SecondaryPanes/Breakpoints/tests/ExceptionOption.spec.js
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/Breakpoints/tests/__snapshots__/Breakpoint.spec.js.snap b/devtools/client/debugger/src/components/SecondaryPanes/Breakpoints/tests/__snapshots__/Breakpoint.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/components/SecondaryPanes/Breakpoints/tests/__snapshots__/Breakpoint.spec.js.snap
rename to devtools/client/debugger/src/components/SecondaryPanes/Breakpoints/tests/__snapshots__/Breakpoint.spec.js.snap
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/Breakpoints/tests/__snapshots__/ExceptionOption.spec.js.snap b/devtools/client/debugger/src/components/SecondaryPanes/Breakpoints/tests/__snapshots__/ExceptionOption.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/components/SecondaryPanes/Breakpoints/tests/__snapshots__/ExceptionOption.spec.js.snap
rename to devtools/client/debugger/src/components/SecondaryPanes/Breakpoints/tests/__snapshots__/ExceptionOption.spec.js.snap
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/CommandBar.css b/devtools/client/debugger/src/components/SecondaryPanes/CommandBar.css
similarity index 100%
rename from devtools/client/debugger/new/src/components/SecondaryPanes/CommandBar.css
rename to devtools/client/debugger/src/components/SecondaryPanes/CommandBar.css
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/CommandBar.js b/devtools/client/debugger/src/components/SecondaryPanes/CommandBar.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/SecondaryPanes/CommandBar.js
rename to devtools/client/debugger/src/components/SecondaryPanes/CommandBar.js
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/EventListeners.css b/devtools/client/debugger/src/components/SecondaryPanes/EventListeners.css
similarity index 100%
rename from devtools/client/debugger/new/src/components/SecondaryPanes/EventListeners.css
rename to devtools/client/debugger/src/components/SecondaryPanes/EventListeners.css
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/EventListeners.js b/devtools/client/debugger/src/components/SecondaryPanes/EventListeners.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/SecondaryPanes/EventListeners.js
rename to devtools/client/debugger/src/components/SecondaryPanes/EventListeners.js
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/Expressions.css b/devtools/client/debugger/src/components/SecondaryPanes/Expressions.css
similarity index 100%
rename from devtools/client/debugger/new/src/components/SecondaryPanes/Expressions.css
rename to devtools/client/debugger/src/components/SecondaryPanes/Expressions.css
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/Expressions.js b/devtools/client/debugger/src/components/SecondaryPanes/Expressions.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/SecondaryPanes/Expressions.js
rename to devtools/client/debugger/src/components/SecondaryPanes/Expressions.js
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/Frames/Frame.js b/devtools/client/debugger/src/components/SecondaryPanes/Frames/Frame.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/SecondaryPanes/Frames/Frame.js
rename to devtools/client/debugger/src/components/SecondaryPanes/Frames/Frame.js
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/Frames/FrameIndent.js b/devtools/client/debugger/src/components/SecondaryPanes/Frames/FrameIndent.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/SecondaryPanes/Frames/FrameIndent.js
rename to devtools/client/debugger/src/components/SecondaryPanes/Frames/FrameIndent.js
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/Frames/FrameMenu.js b/devtools/client/debugger/src/components/SecondaryPanes/Frames/FrameMenu.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/SecondaryPanes/Frames/FrameMenu.js
rename to devtools/client/debugger/src/components/SecondaryPanes/Frames/FrameMenu.js
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/Frames/Frames.css b/devtools/client/debugger/src/components/SecondaryPanes/Frames/Frames.css
similarity index 100%
rename from devtools/client/debugger/new/src/components/SecondaryPanes/Frames/Frames.css
rename to devtools/client/debugger/src/components/SecondaryPanes/Frames/Frames.css
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/Frames/Group.css b/devtools/client/debugger/src/components/SecondaryPanes/Frames/Group.css
similarity index 100%
rename from devtools/client/debugger/new/src/components/SecondaryPanes/Frames/Group.css
rename to devtools/client/debugger/src/components/SecondaryPanes/Frames/Group.css
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/Frames/Group.js b/devtools/client/debugger/src/components/SecondaryPanes/Frames/Group.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/SecondaryPanes/Frames/Group.js
rename to devtools/client/debugger/src/components/SecondaryPanes/Frames/Group.js
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/Frames/WhyPaused.css b/devtools/client/debugger/src/components/SecondaryPanes/Frames/WhyPaused.css
similarity index 100%
rename from devtools/client/debugger/new/src/components/SecondaryPanes/Frames/WhyPaused.css
rename to devtools/client/debugger/src/components/SecondaryPanes/Frames/WhyPaused.css
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/Frames/WhyPaused.js b/devtools/client/debugger/src/components/SecondaryPanes/Frames/WhyPaused.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/SecondaryPanes/Frames/WhyPaused.js
rename to devtools/client/debugger/src/components/SecondaryPanes/Frames/WhyPaused.js
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/Frames/index.js b/devtools/client/debugger/src/components/SecondaryPanes/Frames/index.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/SecondaryPanes/Frames/index.js
rename to devtools/client/debugger/src/components/SecondaryPanes/Frames/index.js
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/Frames/moz.build b/devtools/client/debugger/src/components/SecondaryPanes/Frames/moz.build
similarity index 100%
rename from devtools/client/debugger/new/src/components/SecondaryPanes/Frames/moz.build
rename to devtools/client/debugger/src/components/SecondaryPanes/Frames/moz.build
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/Frames/tests/Frame.spec.js b/devtools/client/debugger/src/components/SecondaryPanes/Frames/tests/Frame.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/SecondaryPanes/Frames/tests/Frame.spec.js
rename to devtools/client/debugger/src/components/SecondaryPanes/Frames/tests/Frame.spec.js
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/Frames/tests/FrameMenu.spec.js b/devtools/client/debugger/src/components/SecondaryPanes/Frames/tests/FrameMenu.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/SecondaryPanes/Frames/tests/FrameMenu.spec.js
rename to devtools/client/debugger/src/components/SecondaryPanes/Frames/tests/FrameMenu.spec.js
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/Frames/tests/Frames.spec.js b/devtools/client/debugger/src/components/SecondaryPanes/Frames/tests/Frames.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/SecondaryPanes/Frames/tests/Frames.spec.js
rename to devtools/client/debugger/src/components/SecondaryPanes/Frames/tests/Frames.spec.js
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/Frames/tests/Group.spec.js b/devtools/client/debugger/src/components/SecondaryPanes/Frames/tests/Group.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/SecondaryPanes/Frames/tests/Group.spec.js
rename to devtools/client/debugger/src/components/SecondaryPanes/Frames/tests/Group.spec.js
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/Frames/tests/__snapshots__/Frame.spec.js.snap b/devtools/client/debugger/src/components/SecondaryPanes/Frames/tests/__snapshots__/Frame.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/components/SecondaryPanes/Frames/tests/__snapshots__/Frame.spec.js.snap
rename to devtools/client/debugger/src/components/SecondaryPanes/Frames/tests/__snapshots__/Frame.spec.js.snap
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/Frames/tests/__snapshots__/Frames.spec.js.snap b/devtools/client/debugger/src/components/SecondaryPanes/Frames/tests/__snapshots__/Frames.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/components/SecondaryPanes/Frames/tests/__snapshots__/Frames.spec.js.snap
rename to devtools/client/debugger/src/components/SecondaryPanes/Frames/tests/__snapshots__/Frames.spec.js.snap
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/Frames/tests/__snapshots__/Group.spec.js.snap b/devtools/client/debugger/src/components/SecondaryPanes/Frames/tests/__snapshots__/Group.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/components/SecondaryPanes/Frames/tests/__snapshots__/Group.spec.js.snap
rename to devtools/client/debugger/src/components/SecondaryPanes/Frames/tests/__snapshots__/Group.spec.js.snap
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/Scopes.css b/devtools/client/debugger/src/components/SecondaryPanes/Scopes.css
similarity index 100%
rename from devtools/client/debugger/new/src/components/SecondaryPanes/Scopes.css
rename to devtools/client/debugger/src/components/SecondaryPanes/Scopes.css
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/Scopes.js b/devtools/client/debugger/src/components/SecondaryPanes/Scopes.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/SecondaryPanes/Scopes.js
rename to devtools/client/debugger/src/components/SecondaryPanes/Scopes.js
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/SecondaryPanes.css b/devtools/client/debugger/src/components/SecondaryPanes/SecondaryPanes.css
similarity index 100%
rename from devtools/client/debugger/new/src/components/SecondaryPanes/SecondaryPanes.css
rename to devtools/client/debugger/src/components/SecondaryPanes/SecondaryPanes.css
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/UtilsBar.js b/devtools/client/debugger/src/components/SecondaryPanes/UtilsBar.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/SecondaryPanes/UtilsBar.js
rename to devtools/client/debugger/src/components/SecondaryPanes/UtilsBar.js
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/Worker.js b/devtools/client/debugger/src/components/SecondaryPanes/Worker.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/SecondaryPanes/Worker.js
rename to devtools/client/debugger/src/components/SecondaryPanes/Worker.js
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/Workers.css b/devtools/client/debugger/src/components/SecondaryPanes/Workers.css
similarity index 100%
rename from devtools/client/debugger/new/src/components/SecondaryPanes/Workers.css
rename to devtools/client/debugger/src/components/SecondaryPanes/Workers.css
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/Workers.js b/devtools/client/debugger/src/components/SecondaryPanes/Workers.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/SecondaryPanes/Workers.js
rename to devtools/client/debugger/src/components/SecondaryPanes/Workers.js
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/XHRBreakpoints.css b/devtools/client/debugger/src/components/SecondaryPanes/XHRBreakpoints.css
similarity index 100%
rename from devtools/client/debugger/new/src/components/SecondaryPanes/XHRBreakpoints.css
rename to devtools/client/debugger/src/components/SecondaryPanes/XHRBreakpoints.css
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/XHRBreakpoints.js b/devtools/client/debugger/src/components/SecondaryPanes/XHRBreakpoints.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/SecondaryPanes/XHRBreakpoints.js
rename to devtools/client/debugger/src/components/SecondaryPanes/XHRBreakpoints.js
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/index.js b/devtools/client/debugger/src/components/SecondaryPanes/index.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/SecondaryPanes/index.js
rename to devtools/client/debugger/src/components/SecondaryPanes/index.js
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/moz.build b/devtools/client/debugger/src/components/SecondaryPanes/moz.build
similarity index 100%
rename from devtools/client/debugger/new/src/components/SecondaryPanes/moz.build
rename to devtools/client/debugger/src/components/SecondaryPanes/moz.build
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/tests/CommandBar.spec.js b/devtools/client/debugger/src/components/SecondaryPanes/tests/CommandBar.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/SecondaryPanes/tests/CommandBar.spec.js
rename to devtools/client/debugger/src/components/SecondaryPanes/tests/CommandBar.spec.js
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/tests/Expressions.spec.js b/devtools/client/debugger/src/components/SecondaryPanes/tests/Expressions.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/SecondaryPanes/tests/Expressions.spec.js
rename to devtools/client/debugger/src/components/SecondaryPanes/tests/Expressions.spec.js
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/tests/XHRBreakpoints.spec.js b/devtools/client/debugger/src/components/SecondaryPanes/tests/XHRBreakpoints.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/SecondaryPanes/tests/XHRBreakpoints.spec.js
rename to devtools/client/debugger/src/components/SecondaryPanes/tests/XHRBreakpoints.spec.js
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/tests/__snapshots__/Expressions.spec.js.snap b/devtools/client/debugger/src/components/SecondaryPanes/tests/__snapshots__/Expressions.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/components/SecondaryPanes/tests/__snapshots__/Expressions.spec.js.snap
rename to devtools/client/debugger/src/components/SecondaryPanes/tests/__snapshots__/Expressions.spec.js.snap
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/tests/__snapshots__/XHRBreakpoints.spec.js.snap b/devtools/client/debugger/src/components/SecondaryPanes/tests/__snapshots__/XHRBreakpoints.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/components/SecondaryPanes/tests/__snapshots__/XHRBreakpoints.spec.js.snap
rename to devtools/client/debugger/src/components/SecondaryPanes/tests/__snapshots__/XHRBreakpoints.spec.js.snap
diff --git a/devtools/client/debugger/new/src/components/ShortcutsModal.css b/devtools/client/debugger/src/components/ShortcutsModal.css
similarity index 100%
rename from devtools/client/debugger/new/src/components/ShortcutsModal.css
rename to devtools/client/debugger/src/components/ShortcutsModal.css
diff --git a/devtools/client/debugger/new/src/components/ShortcutsModal.js b/devtools/client/debugger/src/components/ShortcutsModal.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/ShortcutsModal.js
rename to devtools/client/debugger/src/components/ShortcutsModal.js
diff --git a/devtools/client/debugger/new/src/components/WelcomeBox.css b/devtools/client/debugger/src/components/WelcomeBox.css
similarity index 100%
rename from devtools/client/debugger/new/src/components/WelcomeBox.css
rename to devtools/client/debugger/src/components/WelcomeBox.css
diff --git a/devtools/client/debugger/new/src/components/WelcomeBox.js b/devtools/client/debugger/src/components/WelcomeBox.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/WelcomeBox.js
rename to devtools/client/debugger/src/components/WelcomeBox.js
diff --git a/devtools/client/debugger/new/src/components/moz.build b/devtools/client/debugger/src/components/moz.build
similarity index 100%
rename from devtools/client/debugger/new/src/components/moz.build
rename to devtools/client/debugger/src/components/moz.build
diff --git a/devtools/client/debugger/src/components/shared/AccessibleImage.css b/devtools/client/debugger/src/components/shared/AccessibleImage.css
new file mode 100644
index 000000000000..8342054d8d3a
--- /dev/null
+++ b/devtools/client/debugger/src/components/shared/AccessibleImage.css
@@ -0,0 +1,197 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at . */
+
+.img {
+ display: inline-block;
+ width: 16px;
+ height: 16px;
+ vertical-align: middle;
+ /* use background-color for the icon color, and mask-image for its shape */
+ background-color: var(--theme-icon-color);
+ mask-size: contain;
+ mask-repeat: no-repeat;
+ mask-position: center;
+ /* multicolor icons use background-image */
+ background-position: center;
+ background-repeat: no-repeat;
+ background-size: contain;
+ /* do not let images shrink when used as flex children */
+ flex-shrink: 0;
+}
+
+/* Expand arrow icon */
+.img.arrow {
+ width: 10px;
+ height: 10px;
+ mask-image: url(resource://devtools/client/debugger/images/arrow.svg);
+ /* we may override the width/height in specific contexts to make the
+ clickable area bigger, but we should always keep the mask size 10x10 */
+ mask-size: 10px 10px;
+ background-color: var(--theme-icon-dimmed-color);
+ transform: rotate(-90deg);
+ transition: transform 180ms var(--animation-curve);
+}
+
+html[dir="rtl"] .img.arrow {
+ transform: rotate(90deg);
+}
+
+.img.arrow.expanded {
+ /* icon should always point to the bottom (default) when expanded,
+ regardless of the text direction */
+ transform: none !important;
+}
+
+.img.arrow-down {
+ mask-image: url(resource://devtools/client/debugger/images/arrow-down.svg);
+}
+
+.img.arrow-up {
+ mask-image: url(resource://devtools/client/debugger/images/arrow-up.svg);
+}
+
+.img.blackBox {
+ mask-image: url(resource://devtools/client/debugger/images/blackBox.svg);
+}
+
+.img.breadcrumb {
+ mask-image: url(resource://devtools/client/debugger/images/breadcrumbs-divider.svg);
+}
+
+.img.case-match {
+ mask-image: url(resource://devtools/client/debugger/images/case-match.svg);
+}
+
+.img.close {
+ mask-image: url(resource://devtools/client/debugger/images/close.svg);
+}
+
+.img.disable-pausing {
+ mask-image: url(resource://devtools/client/debugger/images/disable-pausing.svg);
+}
+
+.img.globe {
+ mask-image: url(resource://devtools/client/debugger/images/globe.svg);
+}
+
+.img.globe-small {
+ mask-image: url(resource://devtools/client/debugger/images/globe-small.svg);
+ mask-size: 12px 12px;
+}
+
+.img.file {
+ mask-image: url(resource://devtools/client/debugger/images/file-small.svg);
+ mask-size: 12px 12px;
+}
+
+.img.folder {
+ mask-image: url(resource://devtools/client/debugger/images/folder.svg);
+}
+
+.img.home {
+ mask-image: url(resource://devtools/client/debugger/images/home.svg);
+}
+
+.img.loader {
+ mask-image: url(resource://devtools/client/debugger/images/loader.svg);
+}
+
+.img.more-tabs {
+ mask-image: url(resource://devtools/client/debugger/images/command-chevron.svg);
+}
+
+html[dir="rtl"] .img.more-tabs {
+ transform: scaleX(-1);
+}
+
+.img.next {
+ mask-image: url(resource://devtools/client/debugger/images/next.svg);
+}
+
+.img.next-circle {
+ mask-image: url(resource://devtools/client/debugger/images/next-circle.svg);
+}
+
+.img.pane-collapse {
+ mask-image: url(resource://devtools/client/debugger/images/pane-collapse.svg);
+}
+
+.img.pane-expand {
+ mask-image: url(resource://devtools/client/debugger/images/pane-expand.svg);
+}
+
+.img.pause {
+ mask-image: url(resource://devtools/client/debugger/images/pause.svg);
+}
+
+.img.plus {
+ mask-image: url(resource://devtools/client/debugger/images/plus.svg);
+}
+
+.img.prettyPrint {
+ mask-image: url(resource://devtools/client/debugger/images/prettyPrint.svg);
+}
+
+.img.refresh {
+ mask-image: url(resource://devtools/client/debugger/images/reload.svg);
+}
+
+.img.regex-match {
+ mask-image: url(resource://devtools/client/debugger/images/regex-match.svg);
+}
+
+.img.resume {
+ mask-image: url(resource://devtools/client/debugger/images/resume.svg);
+}
+
+.img.reverseStepIn {
+ mask-image: url(resource://devtools/client/debugger/images/stepIn.svg);
+ transform: scaleX(-1);
+}
+
+.img.reverseStepOut {
+ mask-image: url(resource://devtools/client/debugger/images/stepOut.svg);
+ transform: scaleX(-1);
+}
+
+.img.reverseStepOver {
+ mask-image: url(resource://devtools/client/debugger/images/stepOver.svg);
+ transform: scaleX(-1);
+}
+
+.img.rewind {
+ mask-image: url(resource://devtools/client/debugger/images/rewind.svg);
+}
+
+.img.search {
+ mask-image: url(resource://devtools/client/debugger/images/search.svg);
+}
+
+.img.shortcuts {
+ mask-image: url(resource://devtools/client/debugger/images/help.svg);
+}
+
+.img.stepIn {
+ mask-image: url(resource://devtools/client/debugger/images/stepIn.svg);
+}
+
+.img.stepOut {
+ mask-image: url(resource://devtools/client/debugger/images/stepOut.svg);
+}
+
+.img.stepOver {
+ mask-image: url(resource://devtools/client/debugger/images/stepOver.svg);
+}
+
+.img.tab {
+ mask-image: url(resource://devtools/client/debugger/images/tab.svg);
+}
+
+.img.whole-word-match {
+ mask-image: url(resource://devtools/client/debugger/images/whole-word-match.svg);
+}
+
+.img.worker {
+ mask-image: url(resource://devtools/client/debugger/images/worker.svg);
+}
diff --git a/devtools/client/debugger/new/src/components/shared/AccessibleImage.js b/devtools/client/debugger/src/components/shared/AccessibleImage.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/AccessibleImage.js
rename to devtools/client/debugger/src/components/shared/AccessibleImage.js
diff --git a/devtools/client/debugger/new/src/components/shared/Accordion.css b/devtools/client/debugger/src/components/shared/Accordion.css
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/Accordion.css
rename to devtools/client/debugger/src/components/shared/Accordion.css
diff --git a/devtools/client/debugger/new/src/components/shared/Accordion.js b/devtools/client/debugger/src/components/shared/Accordion.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/Accordion.js
rename to devtools/client/debugger/src/components/shared/Accordion.js
diff --git a/devtools/client/debugger/new/src/components/shared/Badge.css b/devtools/client/debugger/src/components/shared/Badge.css
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/Badge.css
rename to devtools/client/debugger/src/components/shared/Badge.css
diff --git a/devtools/client/debugger/new/src/components/shared/Badge.js b/devtools/client/debugger/src/components/shared/Badge.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/Badge.js
rename to devtools/client/debugger/src/components/shared/Badge.js
diff --git a/devtools/client/debugger/new/src/components/shared/BracketArrow.css b/devtools/client/debugger/src/components/shared/BracketArrow.css
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/BracketArrow.css
rename to devtools/client/debugger/src/components/shared/BracketArrow.css
diff --git a/devtools/client/debugger/new/src/components/shared/BracketArrow.js b/devtools/client/debugger/src/components/shared/BracketArrow.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/BracketArrow.js
rename to devtools/client/debugger/src/components/shared/BracketArrow.js
diff --git a/devtools/client/debugger/new/src/components/shared/Button/CloseButton.js b/devtools/client/debugger/src/components/shared/Button/CloseButton.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/Button/CloseButton.js
rename to devtools/client/debugger/src/components/shared/Button/CloseButton.js
diff --git a/devtools/client/debugger/new/src/components/shared/Button/CommandBarButton.js b/devtools/client/debugger/src/components/shared/Button/CommandBarButton.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/Button/CommandBarButton.js
rename to devtools/client/debugger/src/components/shared/Button/CommandBarButton.js
diff --git a/devtools/client/debugger/new/src/components/shared/Button/PaneToggleButton.js b/devtools/client/debugger/src/components/shared/Button/PaneToggleButton.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/Button/PaneToggleButton.js
rename to devtools/client/debugger/src/components/shared/Button/PaneToggleButton.js
diff --git a/devtools/client/debugger/new/src/components/shared/Button/index.js b/devtools/client/debugger/src/components/shared/Button/index.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/Button/index.js
rename to devtools/client/debugger/src/components/shared/Button/index.js
diff --git a/devtools/client/debugger/new/src/components/shared/Button/moz.build b/devtools/client/debugger/src/components/shared/Button/moz.build
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/Button/moz.build
rename to devtools/client/debugger/src/components/shared/Button/moz.build
diff --git a/devtools/client/debugger/new/src/components/shared/Button/styles/CloseButton.css b/devtools/client/debugger/src/components/shared/Button/styles/CloseButton.css
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/Button/styles/CloseButton.css
rename to devtools/client/debugger/src/components/shared/Button/styles/CloseButton.css
diff --git a/devtools/client/debugger/new/src/components/shared/Button/styles/CommandBarButton.css b/devtools/client/debugger/src/components/shared/Button/styles/CommandBarButton.css
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/Button/styles/CommandBarButton.css
rename to devtools/client/debugger/src/components/shared/Button/styles/CommandBarButton.css
diff --git a/devtools/client/debugger/new/src/components/shared/Button/styles/PaneToggleButton.css b/devtools/client/debugger/src/components/shared/Button/styles/PaneToggleButton.css
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/Button/styles/PaneToggleButton.css
rename to devtools/client/debugger/src/components/shared/Button/styles/PaneToggleButton.css
diff --git a/devtools/client/debugger/new/src/components/shared/Button/styles/moz.build b/devtools/client/debugger/src/components/shared/Button/styles/moz.build
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/Button/styles/moz.build
rename to devtools/client/debugger/src/components/shared/Button/styles/moz.build
diff --git a/devtools/client/debugger/new/src/components/shared/Button/tests/CloseButton.spec.js b/devtools/client/debugger/src/components/shared/Button/tests/CloseButton.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/Button/tests/CloseButton.spec.js
rename to devtools/client/debugger/src/components/shared/Button/tests/CloseButton.spec.js
diff --git a/devtools/client/debugger/new/src/components/shared/Button/tests/CommandBarButton.spec.js b/devtools/client/debugger/src/components/shared/Button/tests/CommandBarButton.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/Button/tests/CommandBarButton.spec.js
rename to devtools/client/debugger/src/components/shared/Button/tests/CommandBarButton.spec.js
diff --git a/devtools/client/debugger/new/src/components/shared/Button/tests/PaneToggleButton.spec.js b/devtools/client/debugger/src/components/shared/Button/tests/PaneToggleButton.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/Button/tests/PaneToggleButton.spec.js
rename to devtools/client/debugger/src/components/shared/Button/tests/PaneToggleButton.spec.js
diff --git a/devtools/client/debugger/new/src/components/shared/Button/tests/__snapshots__/CloseButton.spec.js.snap b/devtools/client/debugger/src/components/shared/Button/tests/__snapshots__/CloseButton.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/Button/tests/__snapshots__/CloseButton.spec.js.snap
rename to devtools/client/debugger/src/components/shared/Button/tests/__snapshots__/CloseButton.spec.js.snap
diff --git a/devtools/client/debugger/new/src/components/shared/Button/tests/__snapshots__/CommandBarButton.spec.js.snap b/devtools/client/debugger/src/components/shared/Button/tests/__snapshots__/CommandBarButton.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/Button/tests/__snapshots__/CommandBarButton.spec.js.snap
rename to devtools/client/debugger/src/components/shared/Button/tests/__snapshots__/CommandBarButton.spec.js.snap
diff --git a/devtools/client/debugger/new/src/components/shared/Button/tests/__snapshots__/PaneToggleButton.spec.js.snap b/devtools/client/debugger/src/components/shared/Button/tests/__snapshots__/PaneToggleButton.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/Button/tests/__snapshots__/PaneToggleButton.spec.js.snap
rename to devtools/client/debugger/src/components/shared/Button/tests/__snapshots__/PaneToggleButton.spec.js.snap
diff --git a/devtools/client/debugger/new/src/components/shared/Dropdown.css b/devtools/client/debugger/src/components/shared/Dropdown.css
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/Dropdown.css
rename to devtools/client/debugger/src/components/shared/Dropdown.css
diff --git a/devtools/client/debugger/new/src/components/shared/Dropdown.js b/devtools/client/debugger/src/components/shared/Dropdown.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/Dropdown.js
rename to devtools/client/debugger/src/components/shared/Dropdown.js
diff --git a/devtools/client/debugger/new/src/components/shared/ManagedTree.css b/devtools/client/debugger/src/components/shared/ManagedTree.css
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/ManagedTree.css
rename to devtools/client/debugger/src/components/shared/ManagedTree.css
diff --git a/devtools/client/debugger/new/src/components/shared/ManagedTree.js b/devtools/client/debugger/src/components/shared/ManagedTree.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/ManagedTree.js
rename to devtools/client/debugger/src/components/shared/ManagedTree.js
diff --git a/devtools/client/debugger/new/src/components/shared/Modal.css b/devtools/client/debugger/src/components/shared/Modal.css
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/Modal.css
rename to devtools/client/debugger/src/components/shared/Modal.css
diff --git a/devtools/client/debugger/new/src/components/shared/Modal.js b/devtools/client/debugger/src/components/shared/Modal.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/Modal.js
rename to devtools/client/debugger/src/components/shared/Modal.js
diff --git a/devtools/client/debugger/new/src/components/shared/Popover.css b/devtools/client/debugger/src/components/shared/Popover.css
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/Popover.css
rename to devtools/client/debugger/src/components/shared/Popover.css
diff --git a/devtools/client/debugger/new/src/components/shared/Popover.js b/devtools/client/debugger/src/components/shared/Popover.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/Popover.js
rename to devtools/client/debugger/src/components/shared/Popover.js
diff --git a/devtools/client/debugger/new/src/components/shared/PreviewFunction.css b/devtools/client/debugger/src/components/shared/PreviewFunction.css
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/PreviewFunction.css
rename to devtools/client/debugger/src/components/shared/PreviewFunction.css
diff --git a/devtools/client/debugger/new/src/components/shared/PreviewFunction.js b/devtools/client/debugger/src/components/shared/PreviewFunction.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/PreviewFunction.js
rename to devtools/client/debugger/src/components/shared/PreviewFunction.js
diff --git a/devtools/client/debugger/new/src/components/shared/ResultList.css b/devtools/client/debugger/src/components/shared/ResultList.css
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/ResultList.css
rename to devtools/client/debugger/src/components/shared/ResultList.css
diff --git a/devtools/client/debugger/new/src/components/shared/ResultList.js b/devtools/client/debugger/src/components/shared/ResultList.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/ResultList.js
rename to devtools/client/debugger/src/components/shared/ResultList.js
diff --git a/devtools/client/debugger/new/src/components/shared/SearchInput.css b/devtools/client/debugger/src/components/shared/SearchInput.css
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/SearchInput.css
rename to devtools/client/debugger/src/components/shared/SearchInput.css
diff --git a/devtools/client/debugger/new/src/components/shared/SearchInput.js b/devtools/client/debugger/src/components/shared/SearchInput.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/SearchInput.js
rename to devtools/client/debugger/src/components/shared/SearchInput.js
diff --git a/devtools/client/debugger/src/components/shared/SourceIcon.css b/devtools/client/debugger/src/components/shared/SourceIcon.css
new file mode 100644
index 000000000000..cc9a13fc1159
--- /dev/null
+++ b/devtools/client/debugger/src/components/shared/SourceIcon.css
@@ -0,0 +1,150 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at . */
+
+/**
+ * Variant of AccessibleImage used in sources list and tabs.
+ * Define the different source type / framework / library icons here.
+ */
+
+.source-icon {
+ margin-inline-end: 4px;
+}
+
+/* Icons for frameworks and libs */
+
+.img.aframe {
+ background-image: url(resource://devtools/client/debugger/images/sources/aframe.svg);
+ background-color: transparent !important;
+}
+
+.img.angular {
+ background-image: url(resource://devtools/client/debugger/images/sources/angular.svg);
+ background-color: transparent !important;
+}
+
+.img.babel {
+ mask-image: url(resource://devtools/client/debugger/images/sources/babel.svg);
+}
+
+.img.backbone {
+ mask-image: url(resource://devtools/client/debugger/images/sources/backbone.svg);
+}
+
+.img.choo {
+ background-image: url(resource://devtools/client/debugger/images/sources/choo.svg);
+ background-color: transparent !important;
+}
+
+.img.coffeescript {
+ mask-image: url(resource://devtools/client/debugger/images/sources/coffeescript.svg);
+}
+
+.img.dojo {
+ background-image: url(resource://devtools/client/debugger/images/sources/dojo.svg);
+ background-color: transparent !important;
+}
+
+.img.ember {
+ background-image: url(resource://devtools/client/debugger/images/sources/ember.svg);
+ background-color: transparent !important;
+}
+
+.img.express {
+ mask-image: url(resource://devtools/client/debugger/images/sources/express.svg);
+}
+
+.img.extension {
+ mask-image: url(resource://devtools/client/debugger/images/sources/extension.svg);
+}
+
+.img.immutable {
+ mask-image: url(resource://devtools/client/debugger/images/sources/immutable.svg);
+}
+
+.img.javascript {
+ mask-image: url(resource://devtools/client/debugger/images/sources/javascript.svg);
+ mask-size: 14px 14px;
+}
+
+.img.jquery {
+ mask-image: url(resource://devtools/client/debugger/images/sources/jquery.svg);
+}
+
+.img.lodash {
+ mask-image: url(resource://devtools/client/debugger/images/sources/lodash.svg);
+}
+
+.img.marko {
+ background-image: url(resource://devtools/client/debugger/images/sources/marko.svg);
+ background-color: transparent !important;
+}
+
+.img.mobx {
+ background-image: url(resource://devtools/client/debugger/images/sources/mobx.svg);
+ background-color: transparent !important;
+}
+
+.img.nextjs {
+ background-image: url(resource://devtools/client/debugger/images/sources/nextjs.svg);
+ background-color: transparent !important;
+}
+
+.img.node {
+ background-image: url(resource://devtools/client/debugger/images/sources/node.svg);
+ background-color: transparent !important;
+}
+
+.img.nuxtjs {
+ background-image: url(resource://devtools/client/debugger/images/sources/nuxtjs.svg);
+ background-color: transparent !important;
+}
+
+.img.preact {
+ background-image: url(resource://devtools/client/debugger/images/sources/preact.svg);
+ background-color: transparent !important;
+}
+
+.img.pug {
+ background-image: url(resource://devtools/client/debugger/images/sources/pug.svg);
+ background-color: transparent !important;
+}
+
+.img.react {
+ mask-image: url(resource://devtools/client/debugger/images/sources/react.svg);
+ background-color: var(--theme-highlight-bluegrey);
+}
+
+.img.redux {
+ mask-image: url(resource://devtools/client/debugger/images/sources/redux.svg);
+}
+
+.img.rxjs {
+ background-image: url(resource://devtools/client/debugger/images/sources/rxjs.svg);
+ background-color: transparent !important;
+}
+
+.img.sencha-extjs {
+ background-image: url(resource://devtools/client/debugger/images/sources/sencha-extjs.svg);
+ background-color: transparent !important;
+}
+
+.img.typescript {
+ mask-image: url(resource://devtools/client/debugger/images/sources/typescript.svg);
+}
+
+.img.underscore {
+ mask-image: url(resource://devtools/client/debugger/images/sources/underscore.svg);
+}
+
+/* We use both 'Vue' and 'VueJS' when identifying frameworks */
+.img.vue,
+.img.vuejs {
+ background-image: url(resource://devtools/client/debugger/images/sources/vuejs.svg);
+ background-color: transparent !important;
+}
+
+.img.webpack {
+ background-image: url(resource://devtools/client/debugger/images/sources/webpack.svg);
+ background-color: transparent !important;
+}
diff --git a/devtools/client/debugger/new/src/components/shared/SourceIcon.js b/devtools/client/debugger/src/components/shared/SourceIcon.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/SourceIcon.js
rename to devtools/client/debugger/src/components/shared/SourceIcon.js
diff --git a/devtools/client/debugger/new/src/components/shared/Svg.js b/devtools/client/debugger/src/components/shared/Svg.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/Svg.js
rename to devtools/client/debugger/src/components/shared/Svg.js
diff --git a/devtools/client/debugger/new/src/components/shared/menu.css b/devtools/client/debugger/src/components/shared/menu.css
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/menu.css
rename to devtools/client/debugger/src/components/shared/menu.css
diff --git a/devtools/client/debugger/new/src/components/shared/moz.build b/devtools/client/debugger/src/components/shared/moz.build
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/moz.build
rename to devtools/client/debugger/src/components/shared/moz.build
diff --git a/devtools/client/debugger/new/src/components/shared/reps.css b/devtools/client/debugger/src/components/shared/reps.css
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/reps.css
rename to devtools/client/debugger/src/components/shared/reps.css
diff --git a/devtools/client/debugger/new/src/components/shared/tests/Accordion.spec.js b/devtools/client/debugger/src/components/shared/tests/Accordion.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/tests/Accordion.spec.js
rename to devtools/client/debugger/src/components/shared/tests/Accordion.spec.js
diff --git a/devtools/client/debugger/new/src/components/shared/tests/Badge.spec.js b/devtools/client/debugger/src/components/shared/tests/Badge.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/tests/Badge.spec.js
rename to devtools/client/debugger/src/components/shared/tests/Badge.spec.js
diff --git a/devtools/client/debugger/new/src/components/shared/tests/BracketArrow.spec.js b/devtools/client/debugger/src/components/shared/tests/BracketArrow.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/tests/BracketArrow.spec.js
rename to devtools/client/debugger/src/components/shared/tests/BracketArrow.spec.js
diff --git a/devtools/client/debugger/new/src/components/shared/tests/Dropdown.spec.js b/devtools/client/debugger/src/components/shared/tests/Dropdown.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/tests/Dropdown.spec.js
rename to devtools/client/debugger/src/components/shared/tests/Dropdown.spec.js
diff --git a/devtools/client/debugger/new/src/components/shared/tests/ManagedTree.spec.js b/devtools/client/debugger/src/components/shared/tests/ManagedTree.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/tests/ManagedTree.spec.js
rename to devtools/client/debugger/src/components/shared/tests/ManagedTree.spec.js
diff --git a/devtools/client/debugger/new/src/components/shared/tests/Modal.spec.js b/devtools/client/debugger/src/components/shared/tests/Modal.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/tests/Modal.spec.js
rename to devtools/client/debugger/src/components/shared/tests/Modal.spec.js
diff --git a/devtools/client/debugger/new/src/components/shared/tests/Popover.spec.js b/devtools/client/debugger/src/components/shared/tests/Popover.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/tests/Popover.spec.js
rename to devtools/client/debugger/src/components/shared/tests/Popover.spec.js
diff --git a/devtools/client/debugger/new/src/components/shared/tests/PreviewFunction.spec.js b/devtools/client/debugger/src/components/shared/tests/PreviewFunction.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/tests/PreviewFunction.spec.js
rename to devtools/client/debugger/src/components/shared/tests/PreviewFunction.spec.js
diff --git a/devtools/client/debugger/new/src/components/shared/tests/ResultList.spec.js b/devtools/client/debugger/src/components/shared/tests/ResultList.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/tests/ResultList.spec.js
rename to devtools/client/debugger/src/components/shared/tests/ResultList.spec.js
diff --git a/devtools/client/debugger/new/src/components/shared/tests/SearchInput.spec.js b/devtools/client/debugger/src/components/shared/tests/SearchInput.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/tests/SearchInput.spec.js
rename to devtools/client/debugger/src/components/shared/tests/SearchInput.spec.js
diff --git a/devtools/client/debugger/new/src/components/shared/tests/__snapshots__/Accordion.spec.js.snap b/devtools/client/debugger/src/components/shared/tests/__snapshots__/Accordion.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/tests/__snapshots__/Accordion.spec.js.snap
rename to devtools/client/debugger/src/components/shared/tests/__snapshots__/Accordion.spec.js.snap
diff --git a/devtools/client/debugger/new/src/components/shared/tests/__snapshots__/Badge.spec.js.snap b/devtools/client/debugger/src/components/shared/tests/__snapshots__/Badge.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/tests/__snapshots__/Badge.spec.js.snap
rename to devtools/client/debugger/src/components/shared/tests/__snapshots__/Badge.spec.js.snap
diff --git a/devtools/client/debugger/new/src/components/shared/tests/__snapshots__/BracketArrow.spec.js.snap b/devtools/client/debugger/src/components/shared/tests/__snapshots__/BracketArrow.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/tests/__snapshots__/BracketArrow.spec.js.snap
rename to devtools/client/debugger/src/components/shared/tests/__snapshots__/BracketArrow.spec.js.snap
diff --git a/devtools/client/debugger/new/src/components/shared/tests/__snapshots__/Dropdown.spec.js.snap b/devtools/client/debugger/src/components/shared/tests/__snapshots__/Dropdown.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/tests/__snapshots__/Dropdown.spec.js.snap
rename to devtools/client/debugger/src/components/shared/tests/__snapshots__/Dropdown.spec.js.snap
diff --git a/devtools/client/debugger/new/src/components/shared/tests/__snapshots__/ManagedTree.spec.js.snap b/devtools/client/debugger/src/components/shared/tests/__snapshots__/ManagedTree.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/tests/__snapshots__/ManagedTree.spec.js.snap
rename to devtools/client/debugger/src/components/shared/tests/__snapshots__/ManagedTree.spec.js.snap
diff --git a/devtools/client/debugger/new/src/components/shared/tests/__snapshots__/Modal.spec.js.snap b/devtools/client/debugger/src/components/shared/tests/__snapshots__/Modal.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/tests/__snapshots__/Modal.spec.js.snap
rename to devtools/client/debugger/src/components/shared/tests/__snapshots__/Modal.spec.js.snap
diff --git a/devtools/client/debugger/new/src/components/shared/tests/__snapshots__/Popover.spec.js.snap b/devtools/client/debugger/src/components/shared/tests/__snapshots__/Popover.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/tests/__snapshots__/Popover.spec.js.snap
rename to devtools/client/debugger/src/components/shared/tests/__snapshots__/Popover.spec.js.snap
diff --git a/devtools/client/debugger/new/src/components/shared/tests/__snapshots__/PreviewFunction.spec.js.snap b/devtools/client/debugger/src/components/shared/tests/__snapshots__/PreviewFunction.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/tests/__snapshots__/PreviewFunction.spec.js.snap
rename to devtools/client/debugger/src/components/shared/tests/__snapshots__/PreviewFunction.spec.js.snap
diff --git a/devtools/client/debugger/new/src/components/shared/tests/__snapshots__/ResultList.spec.js.snap b/devtools/client/debugger/src/components/shared/tests/__snapshots__/ResultList.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/tests/__snapshots__/ResultList.spec.js.snap
rename to devtools/client/debugger/src/components/shared/tests/__snapshots__/ResultList.spec.js.snap
diff --git a/devtools/client/debugger/new/src/components/shared/tests/__snapshots__/SearchInput.spec.js.snap b/devtools/client/debugger/src/components/shared/tests/__snapshots__/SearchInput.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/components/shared/tests/__snapshots__/SearchInput.spec.js.snap
rename to devtools/client/debugger/src/components/shared/tests/__snapshots__/SearchInput.spec.js.snap
diff --git a/devtools/client/debugger/new/src/components/test/A11yIntention.spec.js b/devtools/client/debugger/src/components/test/A11yIntention.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/test/A11yIntention.spec.js
rename to devtools/client/debugger/src/components/test/A11yIntention.spec.js
diff --git a/devtools/client/debugger/new/src/components/test/Outline.spec.js b/devtools/client/debugger/src/components/test/Outline.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/test/Outline.spec.js
rename to devtools/client/debugger/src/components/test/Outline.spec.js
diff --git a/devtools/client/debugger/new/src/components/test/OutlineFilter.spec.js b/devtools/client/debugger/src/components/test/OutlineFilter.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/test/OutlineFilter.spec.js
rename to devtools/client/debugger/src/components/test/OutlineFilter.spec.js
diff --git a/devtools/client/debugger/new/src/components/test/ProjectSearch.spec.js b/devtools/client/debugger/src/components/test/ProjectSearch.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/test/ProjectSearch.spec.js
rename to devtools/client/debugger/src/components/test/ProjectSearch.spec.js
diff --git a/devtools/client/debugger/new/src/components/test/QuickOpenModal.spec.js b/devtools/client/debugger/src/components/test/QuickOpenModal.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/test/QuickOpenModal.spec.js
rename to devtools/client/debugger/src/components/test/QuickOpenModal.spec.js
diff --git a/devtools/client/debugger/new/src/components/test/ShortcutsModal.spec.js b/devtools/client/debugger/src/components/test/ShortcutsModal.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/test/ShortcutsModal.spec.js
rename to devtools/client/debugger/src/components/test/ShortcutsModal.spec.js
diff --git a/devtools/client/debugger/new/src/components/test/WelcomeBox.spec.js b/devtools/client/debugger/src/components/test/WelcomeBox.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/test/WelcomeBox.spec.js
rename to devtools/client/debugger/src/components/test/WelcomeBox.spec.js
diff --git a/devtools/client/debugger/new/src/components/test/WhyPaused.spec.js b/devtools/client/debugger/src/components/test/WhyPaused.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/components/test/WhyPaused.spec.js
rename to devtools/client/debugger/src/components/test/WhyPaused.spec.js
diff --git a/devtools/client/debugger/new/src/components/test/__snapshots__/A11yIntention.spec.js.snap b/devtools/client/debugger/src/components/test/__snapshots__/A11yIntention.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/components/test/__snapshots__/A11yIntention.spec.js.snap
rename to devtools/client/debugger/src/components/test/__snapshots__/A11yIntention.spec.js.snap
diff --git a/devtools/client/debugger/new/src/components/test/__snapshots__/Outline.spec.js.snap b/devtools/client/debugger/src/components/test/__snapshots__/Outline.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/components/test/__snapshots__/Outline.spec.js.snap
rename to devtools/client/debugger/src/components/test/__snapshots__/Outline.spec.js.snap
diff --git a/devtools/client/debugger/new/src/components/test/__snapshots__/OutlineFilter.spec.js.snap b/devtools/client/debugger/src/components/test/__snapshots__/OutlineFilter.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/components/test/__snapshots__/OutlineFilter.spec.js.snap
rename to devtools/client/debugger/src/components/test/__snapshots__/OutlineFilter.spec.js.snap
diff --git a/devtools/client/debugger/new/src/components/test/__snapshots__/ProjectSearch.spec.js.snap b/devtools/client/debugger/src/components/test/__snapshots__/ProjectSearch.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/components/test/__snapshots__/ProjectSearch.spec.js.snap
rename to devtools/client/debugger/src/components/test/__snapshots__/ProjectSearch.spec.js.snap
diff --git a/devtools/client/debugger/new/src/components/test/__snapshots__/QuickOpenModal.spec.js.snap b/devtools/client/debugger/src/components/test/__snapshots__/QuickOpenModal.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/components/test/__snapshots__/QuickOpenModal.spec.js.snap
rename to devtools/client/debugger/src/components/test/__snapshots__/QuickOpenModal.spec.js.snap
diff --git a/devtools/client/debugger/new/src/components/test/__snapshots__/ShortcutsModal.spec.js.snap b/devtools/client/debugger/src/components/test/__snapshots__/ShortcutsModal.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/components/test/__snapshots__/ShortcutsModal.spec.js.snap
rename to devtools/client/debugger/src/components/test/__snapshots__/ShortcutsModal.spec.js.snap
diff --git a/devtools/client/debugger/new/src/components/test/__snapshots__/WelcomeBox.spec.js.snap b/devtools/client/debugger/src/components/test/__snapshots__/WelcomeBox.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/components/test/__snapshots__/WelcomeBox.spec.js.snap
rename to devtools/client/debugger/src/components/test/__snapshots__/WelcomeBox.spec.js.snap
diff --git a/devtools/client/debugger/new/src/components/test/__snapshots__/WhyPaused.spec.js.snap b/devtools/client/debugger/src/components/test/__snapshots__/WhyPaused.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/components/test/__snapshots__/WhyPaused.spec.js.snap
rename to devtools/client/debugger/src/components/test/__snapshots__/WhyPaused.spec.js.snap
diff --git a/devtools/client/debugger/new/src/components/variables.css b/devtools/client/debugger/src/components/variables.css
similarity index 100%
rename from devtools/client/debugger/new/src/components/variables.css
rename to devtools/client/debugger/src/components/variables.css
diff --git a/devtools/client/debugger/new/src/debugger.css b/devtools/client/debugger/src/debugger.css
similarity index 100%
rename from devtools/client/debugger/new/src/debugger.css
rename to devtools/client/debugger/src/debugger.css
diff --git a/devtools/client/debugger/new/src/global-types.js b/devtools/client/debugger/src/global-types.js
similarity index 100%
rename from devtools/client/debugger/new/src/global-types.js
rename to devtools/client/debugger/src/global-types.js
diff --git a/devtools/client/debugger/new/src/main.development.js b/devtools/client/debugger/src/main.development.js
similarity index 93%
rename from devtools/client/debugger/new/src/main.development.js
rename to devtools/client/debugger/src/main.development.js
index 80af576b36a1..14a61b8276c9 100644
--- a/devtools/client/debugger/new/src/main.development.js
+++ b/devtools/client/debugger/src/main.development.js
@@ -13,7 +13,7 @@ const { bootstrap, L10N } = require("devtools-launchpad");
window.L10N = L10N;
// $FlowIgnore:
-window.L10N.setBundle(require("../../../locales/en-US/debugger.properties"));
+window.L10N.setBundle(require("../../locales/en-US/debugger.properties"));
bootstrap(React, ReactDOM).then(connection => {
onConnect(connection, require("devtools-source-map"), {
diff --git a/devtools/client/debugger/new/src/main.js b/devtools/client/debugger/src/main.js
similarity index 100%
rename from devtools/client/debugger/new/src/main.js
rename to devtools/client/debugger/src/main.js
diff --git a/devtools/client/debugger/new/src/moz.build b/devtools/client/debugger/src/moz.build
similarity index 100%
rename from devtools/client/debugger/new/src/moz.build
rename to devtools/client/debugger/src/moz.build
diff --git a/devtools/client/debugger/new/src/reducers/ast.js b/devtools/client/debugger/src/reducers/ast.js
similarity index 100%
rename from devtools/client/debugger/new/src/reducers/ast.js
rename to devtools/client/debugger/src/reducers/ast.js
diff --git a/devtools/client/debugger/new/src/reducers/async-requests.js b/devtools/client/debugger/src/reducers/async-requests.js
similarity index 100%
rename from devtools/client/debugger/new/src/reducers/async-requests.js
rename to devtools/client/debugger/src/reducers/async-requests.js
diff --git a/devtools/client/debugger/new/src/reducers/breakpoints.js b/devtools/client/debugger/src/reducers/breakpoints.js
similarity index 100%
rename from devtools/client/debugger/new/src/reducers/breakpoints.js
rename to devtools/client/debugger/src/reducers/breakpoints.js
diff --git a/devtools/client/debugger/new/src/reducers/debuggee.js b/devtools/client/debugger/src/reducers/debuggee.js
similarity index 100%
rename from devtools/client/debugger/new/src/reducers/debuggee.js
rename to devtools/client/debugger/src/reducers/debuggee.js
diff --git a/devtools/client/debugger/new/src/reducers/event-listeners.js b/devtools/client/debugger/src/reducers/event-listeners.js
similarity index 100%
rename from devtools/client/debugger/new/src/reducers/event-listeners.js
rename to devtools/client/debugger/src/reducers/event-listeners.js
diff --git a/devtools/client/debugger/new/src/reducers/expressions.js b/devtools/client/debugger/src/reducers/expressions.js
similarity index 100%
rename from devtools/client/debugger/new/src/reducers/expressions.js
rename to devtools/client/debugger/src/reducers/expressions.js
diff --git a/devtools/client/debugger/new/src/reducers/file-search.js b/devtools/client/debugger/src/reducers/file-search.js
similarity index 100%
rename from devtools/client/debugger/new/src/reducers/file-search.js
rename to devtools/client/debugger/src/reducers/file-search.js
diff --git a/devtools/client/debugger/new/src/reducers/index.js b/devtools/client/debugger/src/reducers/index.js
similarity index 100%
rename from devtools/client/debugger/new/src/reducers/index.js
rename to devtools/client/debugger/src/reducers/index.js
diff --git a/devtools/client/debugger/new/src/reducers/moz.build b/devtools/client/debugger/src/reducers/moz.build
similarity index 100%
rename from devtools/client/debugger/new/src/reducers/moz.build
rename to devtools/client/debugger/src/reducers/moz.build
diff --git a/devtools/client/debugger/new/src/reducers/pause.js b/devtools/client/debugger/src/reducers/pause.js
similarity index 100%
rename from devtools/client/debugger/new/src/reducers/pause.js
rename to devtools/client/debugger/src/reducers/pause.js
diff --git a/devtools/client/debugger/new/src/reducers/pending-breakpoints.js b/devtools/client/debugger/src/reducers/pending-breakpoints.js
similarity index 100%
rename from devtools/client/debugger/new/src/reducers/pending-breakpoints.js
rename to devtools/client/debugger/src/reducers/pending-breakpoints.js
diff --git a/devtools/client/debugger/new/src/reducers/project-text-search.js b/devtools/client/debugger/src/reducers/project-text-search.js
similarity index 100%
rename from devtools/client/debugger/new/src/reducers/project-text-search.js
rename to devtools/client/debugger/src/reducers/project-text-search.js
diff --git a/devtools/client/debugger/new/src/reducers/quick-open.js b/devtools/client/debugger/src/reducers/quick-open.js
similarity index 100%
rename from devtools/client/debugger/new/src/reducers/quick-open.js
rename to devtools/client/debugger/src/reducers/quick-open.js
diff --git a/devtools/client/debugger/new/src/reducers/source-tree.js b/devtools/client/debugger/src/reducers/source-tree.js
similarity index 100%
rename from devtools/client/debugger/new/src/reducers/source-tree.js
rename to devtools/client/debugger/src/reducers/source-tree.js
diff --git a/devtools/client/debugger/new/src/reducers/sources.js b/devtools/client/debugger/src/reducers/sources.js
similarity index 100%
rename from devtools/client/debugger/new/src/reducers/sources.js
rename to devtools/client/debugger/src/reducers/sources.js
diff --git a/devtools/client/debugger/new/src/reducers/tabs.js b/devtools/client/debugger/src/reducers/tabs.js
similarity index 100%
rename from devtools/client/debugger/new/src/reducers/tabs.js
rename to devtools/client/debugger/src/reducers/tabs.js
diff --git a/devtools/client/debugger/new/src/reducers/tests/breakpoints.spec.js b/devtools/client/debugger/src/reducers/tests/breakpoints.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/reducers/tests/breakpoints.spec.js
rename to devtools/client/debugger/src/reducers/tests/breakpoints.spec.js
diff --git a/devtools/client/debugger/new/src/reducers/tests/quick-open.spec.js b/devtools/client/debugger/src/reducers/tests/quick-open.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/reducers/tests/quick-open.spec.js
rename to devtools/client/debugger/src/reducers/tests/quick-open.spec.js
diff --git a/devtools/client/debugger/new/src/reducers/tests/sources.spec.js b/devtools/client/debugger/src/reducers/tests/sources.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/reducers/tests/sources.spec.js
rename to devtools/client/debugger/src/reducers/tests/sources.spec.js
diff --git a/devtools/client/debugger/new/src/reducers/tests/ui.spec.js b/devtools/client/debugger/src/reducers/tests/ui.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/reducers/tests/ui.spec.js
rename to devtools/client/debugger/src/reducers/tests/ui.spec.js
diff --git a/devtools/client/debugger/new/src/reducers/types.js b/devtools/client/debugger/src/reducers/types.js
similarity index 100%
rename from devtools/client/debugger/new/src/reducers/types.js
rename to devtools/client/debugger/src/reducers/types.js
diff --git a/devtools/client/debugger/new/src/reducers/ui.js b/devtools/client/debugger/src/reducers/ui.js
similarity index 100%
rename from devtools/client/debugger/new/src/reducers/ui.js
rename to devtools/client/debugger/src/reducers/ui.js
diff --git a/devtools/client/debugger/new/src/selectors/breakpointAtLocation.js b/devtools/client/debugger/src/selectors/breakpointAtLocation.js
similarity index 100%
rename from devtools/client/debugger/new/src/selectors/breakpointAtLocation.js
rename to devtools/client/debugger/src/selectors/breakpointAtLocation.js
diff --git a/devtools/client/debugger/new/src/selectors/breakpointSources.js b/devtools/client/debugger/src/selectors/breakpointSources.js
similarity index 100%
rename from devtools/client/debugger/new/src/selectors/breakpointSources.js
rename to devtools/client/debugger/src/selectors/breakpointSources.js
diff --git a/devtools/client/debugger/new/src/selectors/breakpoints.js b/devtools/client/debugger/src/selectors/breakpoints.js
similarity index 100%
rename from devtools/client/debugger/new/src/selectors/breakpoints.js
rename to devtools/client/debugger/src/selectors/breakpoints.js
diff --git a/devtools/client/debugger/new/src/selectors/getCallStackFrames.js b/devtools/client/debugger/src/selectors/getCallStackFrames.js
similarity index 100%
rename from devtools/client/debugger/new/src/selectors/getCallStackFrames.js
rename to devtools/client/debugger/src/selectors/getCallStackFrames.js
diff --git a/devtools/client/debugger/new/src/selectors/inComponent.js b/devtools/client/debugger/src/selectors/inComponent.js
similarity index 100%
rename from devtools/client/debugger/new/src/selectors/inComponent.js
rename to devtools/client/debugger/src/selectors/inComponent.js
diff --git a/devtools/client/debugger/new/src/selectors/index.js b/devtools/client/debugger/src/selectors/index.js
similarity index 100%
rename from devtools/client/debugger/new/src/selectors/index.js
rename to devtools/client/debugger/src/selectors/index.js
diff --git a/devtools/client/debugger/new/src/selectors/isSelectedFrameVisible.js b/devtools/client/debugger/src/selectors/isSelectedFrameVisible.js
similarity index 100%
rename from devtools/client/debugger/new/src/selectors/isSelectedFrameVisible.js
rename to devtools/client/debugger/src/selectors/isSelectedFrameVisible.js
diff --git a/devtools/client/debugger/new/src/selectors/moz.build b/devtools/client/debugger/src/selectors/moz.build
similarity index 100%
rename from devtools/client/debugger/new/src/selectors/moz.build
rename to devtools/client/debugger/src/selectors/moz.build
diff --git a/devtools/client/debugger/new/src/selectors/pause.js b/devtools/client/debugger/src/selectors/pause.js
similarity index 100%
rename from devtools/client/debugger/new/src/selectors/pause.js
rename to devtools/client/debugger/src/selectors/pause.js
diff --git a/devtools/client/debugger/new/src/selectors/test/__snapshots__/visibleColumnBreakpoints.spec.js.snap b/devtools/client/debugger/src/selectors/test/__snapshots__/visibleColumnBreakpoints.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/selectors/test/__snapshots__/visibleColumnBreakpoints.spec.js.snap
rename to devtools/client/debugger/src/selectors/test/__snapshots__/visibleColumnBreakpoints.spec.js.snap
diff --git a/devtools/client/debugger/new/src/selectors/test/getCallStackFrames.spec.js b/devtools/client/debugger/src/selectors/test/getCallStackFrames.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/selectors/test/getCallStackFrames.spec.js
rename to devtools/client/debugger/src/selectors/test/getCallStackFrames.spec.js
diff --git a/devtools/client/debugger/new/src/selectors/test/visibleColumnBreakpoints.spec.js b/devtools/client/debugger/src/selectors/test/visibleColumnBreakpoints.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/selectors/test/visibleColumnBreakpoints.spec.js
rename to devtools/client/debugger/src/selectors/test/visibleColumnBreakpoints.spec.js
diff --git a/devtools/client/debugger/new/src/selectors/visibleBreakpoints.js b/devtools/client/debugger/src/selectors/visibleBreakpoints.js
similarity index 100%
rename from devtools/client/debugger/new/src/selectors/visibleBreakpoints.js
rename to devtools/client/debugger/src/selectors/visibleBreakpoints.js
diff --git a/devtools/client/debugger/new/src/selectors/visibleColumnBreakpoints.js b/devtools/client/debugger/src/selectors/visibleColumnBreakpoints.js
similarity index 100%
rename from devtools/client/debugger/new/src/selectors/visibleColumnBreakpoints.js
rename to devtools/client/debugger/src/selectors/visibleColumnBreakpoints.js
diff --git a/devtools/client/debugger/new/src/test/__mocks__/request-animation-frame.js b/devtools/client/debugger/src/test/__mocks__/request-animation-frame.js
similarity index 100%
rename from devtools/client/debugger/new/src/test/__mocks__/request-animation-frame.js
rename to devtools/client/debugger/src/test/__mocks__/request-animation-frame.js
diff --git a/devtools/client/debugger/new/src/test/__mocks__/styleMock.js b/devtools/client/debugger/src/test/__mocks__/styleMock.js
similarity index 100%
rename from devtools/client/debugger/new/src/test/__mocks__/styleMock.js
rename to devtools/client/debugger/src/test/__mocks__/styleMock.js
diff --git a/devtools/client/debugger/new/src/test/__mocks__/svgMock.js b/devtools/client/debugger/src/test/__mocks__/svgMock.js
similarity index 100%
rename from devtools/client/debugger/new/src/test/__mocks__/svgMock.js
rename to devtools/client/debugger/src/test/__mocks__/svgMock.js
diff --git a/devtools/client/debugger/new/src/test/fixtures/README.md b/devtools/client/debugger/src/test/fixtures/README.md
similarity index 100%
rename from devtools/client/debugger/new/src/test/fixtures/README.md
rename to devtools/client/debugger/src/test/fixtures/README.md
diff --git a/devtools/client/debugger/new/src/test/fixtures/foobar.json b/devtools/client/debugger/src/test/fixtures/foobar.json
similarity index 100%
rename from devtools/client/debugger/new/src/test/fixtures/foobar.json
rename to devtools/client/debugger/src/test/fixtures/foobar.json
diff --git a/devtools/client/debugger/new/src/test/fixtures/index.js b/devtools/client/debugger/src/test/fixtures/index.js
similarity index 100%
rename from devtools/client/debugger/new/src/test/fixtures/index.js
rename to devtools/client/debugger/src/test/fixtures/index.js
diff --git a/devtools/client/debugger/new/src/test/shim.js b/devtools/client/debugger/src/test/shim.js
similarity index 100%
rename from devtools/client/debugger/new/src/test/shim.js
rename to devtools/client/debugger/src/test/shim.js
diff --git a/devtools/client/debugger/new/src/test/tests-setup.js b/devtools/client/debugger/src/test/tests-setup.js
similarity index 98%
rename from devtools/client/debugger/new/src/test/tests-setup.js
rename to devtools/client/debugger/src/test/tests-setup.js
index c771ea6cfeda..2b3e1f57ee39 100644
--- a/devtools/client/debugger/new/src/test/tests-setup.js
+++ b/devtools/client/debugger/src/test/tests-setup.js
@@ -47,7 +47,7 @@ function getL10nBundle() {
try {
return read("./assets/panel/debugger.properties");
} catch (e) {
- return read("../../locales/en-US/debugger.properties");
+ return read("../locales/en-US/debugger.properties");
}
}
diff --git a/devtools/client/debugger/new/src/test/utils/history.js b/devtools/client/debugger/src/test/utils/history.js
similarity index 100%
rename from devtools/client/debugger/new/src/test/utils/history.js
rename to devtools/client/debugger/src/test/utils/history.js
diff --git a/devtools/client/debugger/new/src/types.js b/devtools/client/debugger/src/types.js
similarity index 100%
rename from devtools/client/debugger/new/src/types.js
rename to devtools/client/debugger/src/types.js
diff --git a/devtools/client/debugger/new/src/utils/DevToolsUtils.js b/devtools/client/debugger/src/utils/DevToolsUtils.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/DevToolsUtils.js
rename to devtools/client/debugger/src/utils/DevToolsUtils.js
diff --git a/devtools/client/debugger/new/src/utils/assert.js b/devtools/client/debugger/src/utils/assert.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/assert.js
rename to devtools/client/debugger/src/utils/assert.js
diff --git a/devtools/client/debugger/new/src/utils/ast.js b/devtools/client/debugger/src/utils/ast.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/ast.js
rename to devtools/client/debugger/src/utils/ast.js
diff --git a/devtools/client/debugger/new/src/utils/asyncStoreHelper.js b/devtools/client/debugger/src/utils/asyncStoreHelper.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/asyncStoreHelper.js
rename to devtools/client/debugger/src/utils/asyncStoreHelper.js
diff --git a/devtools/client/debugger/new/src/utils/bootstrap.js b/devtools/client/debugger/src/utils/bootstrap.js
similarity index 98%
rename from devtools/client/debugger/new/src/utils/bootstrap.js
rename to devtools/client/debugger/src/utils/bootstrap.js
index 97c014f12f84..ef94debbc68c 100644
--- a/devtools/client/debugger/new/src/utils/bootstrap.js
+++ b/devtools/client/debugger/src/utils/bootstrap.js
@@ -68,7 +68,7 @@ export function bootstrapStore(
export function bootstrapWorkers() {
const workerPath = isDevelopment()
? "assets/build"
- : "resource://devtools/client/debugger/new/dist";
+ : "resource://devtools/client/debugger/dist";
if (isDevelopment()) {
// When used in Firefox, the toolbox manages the source map worker.
diff --git a/devtools/client/debugger/new/src/utils/breakpoint/astBreakpointLocation.js b/devtools/client/debugger/src/utils/breakpoint/astBreakpointLocation.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/breakpoint/astBreakpointLocation.js
rename to devtools/client/debugger/src/utils/breakpoint/astBreakpointLocation.js
diff --git a/devtools/client/debugger/new/src/utils/breakpoint/breakpointPositions.js b/devtools/client/debugger/src/utils/breakpoint/breakpointPositions.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/breakpoint/breakpointPositions.js
rename to devtools/client/debugger/src/utils/breakpoint/breakpointPositions.js
diff --git a/devtools/client/debugger/new/src/utils/breakpoint/index.js b/devtools/client/debugger/src/utils/breakpoint/index.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/breakpoint/index.js
rename to devtools/client/debugger/src/utils/breakpoint/index.js
diff --git a/devtools/client/debugger/new/src/utils/breakpoint/moz.build b/devtools/client/debugger/src/utils/breakpoint/moz.build
similarity index 100%
rename from devtools/client/debugger/new/src/utils/breakpoint/moz.build
rename to devtools/client/debugger/src/utils/breakpoint/moz.build
diff --git a/devtools/client/debugger/new/src/utils/breakpoint/tests/__snapshots__/astBreakpointLocation.spec.js.snap b/devtools/client/debugger/src/utils/breakpoint/tests/__snapshots__/astBreakpointLocation.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/utils/breakpoint/tests/__snapshots__/astBreakpointLocation.spec.js.snap
rename to devtools/client/debugger/src/utils/breakpoint/tests/__snapshots__/astBreakpointLocation.spec.js.snap
diff --git a/devtools/client/debugger/new/src/utils/breakpoint/tests/astBreakpointLocation.spec.js b/devtools/client/debugger/src/utils/breakpoint/tests/astBreakpointLocation.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/breakpoint/tests/astBreakpointLocation.spec.js
rename to devtools/client/debugger/src/utils/breakpoint/tests/astBreakpointLocation.spec.js
diff --git a/devtools/client/debugger/new/src/utils/breakpoint/tests/index.spec.js b/devtools/client/debugger/src/utils/breakpoint/tests/index.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/breakpoint/tests/index.spec.js
rename to devtools/client/debugger/src/utils/breakpoint/tests/index.spec.js
diff --git a/devtools/client/debugger/new/src/utils/build-query.js b/devtools/client/debugger/src/utils/build-query.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/build-query.js
rename to devtools/client/debugger/src/utils/build-query.js
diff --git a/devtools/client/debugger/new/src/utils/clipboard.js b/devtools/client/debugger/src/utils/clipboard.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/clipboard.js
rename to devtools/client/debugger/src/utils/clipboard.js
diff --git a/devtools/client/debugger/new/src/utils/connect.js b/devtools/client/debugger/src/utils/connect.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/connect.js
rename to devtools/client/debugger/src/utils/connect.js
diff --git a/devtools/client/debugger/new/src/utils/context.js b/devtools/client/debugger/src/utils/context.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/context.js
rename to devtools/client/debugger/src/utils/context.js
diff --git a/devtools/client/debugger/new/src/utils/dbg.js b/devtools/client/debugger/src/utils/dbg.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/dbg.js
rename to devtools/client/debugger/src/utils/dbg.js
diff --git a/devtools/client/debugger/new/src/utils/defer.js b/devtools/client/debugger/src/utils/defer.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/defer.js
rename to devtools/client/debugger/src/utils/defer.js
diff --git a/devtools/client/debugger/new/src/utils/editor/create-editor.js b/devtools/client/debugger/src/utils/editor/create-editor.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/editor/create-editor.js
rename to devtools/client/debugger/src/utils/editor/create-editor.js
diff --git a/devtools/client/debugger/new/src/utils/editor/get-expression.js b/devtools/client/debugger/src/utils/editor/get-expression.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/editor/get-expression.js
rename to devtools/client/debugger/src/utils/editor/get-expression.js
diff --git a/devtools/client/debugger/new/src/utils/editor/get-token-location.js b/devtools/client/debugger/src/utils/editor/get-token-location.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/editor/get-token-location.js
rename to devtools/client/debugger/src/utils/editor/get-token-location.js
diff --git a/devtools/client/debugger/new/src/utils/editor/index.js b/devtools/client/debugger/src/utils/editor/index.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/editor/index.js
rename to devtools/client/debugger/src/utils/editor/index.js
diff --git a/devtools/client/debugger/new/src/utils/editor/moz.build b/devtools/client/debugger/src/utils/editor/moz.build
similarity index 100%
rename from devtools/client/debugger/new/src/utils/editor/moz.build
rename to devtools/client/debugger/src/utils/editor/moz.build
diff --git a/devtools/client/debugger/new/src/utils/editor/source-documents.js b/devtools/client/debugger/src/utils/editor/source-documents.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/editor/source-documents.js
rename to devtools/client/debugger/src/utils/editor/source-documents.js
diff --git a/devtools/client/debugger/new/src/utils/editor/source-editor.css b/devtools/client/debugger/src/utils/editor/source-editor.css
similarity index 100%
rename from devtools/client/debugger/new/src/utils/editor/source-editor.css
rename to devtools/client/debugger/src/utils/editor/source-editor.css
diff --git a/devtools/client/debugger/new/src/utils/editor/source-editor.js b/devtools/client/debugger/src/utils/editor/source-editor.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/editor/source-editor.js
rename to devtools/client/debugger/src/utils/editor/source-editor.js
diff --git a/devtools/client/debugger/new/src/utils/editor/source-search.js b/devtools/client/debugger/src/utils/editor/source-search.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/editor/source-search.js
rename to devtools/client/debugger/src/utils/editor/source-search.js
diff --git a/devtools/client/debugger/new/src/utils/editor/tests/__snapshots__/create-editor.spec.js.snap b/devtools/client/debugger/src/utils/editor/tests/__snapshots__/create-editor.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/utils/editor/tests/__snapshots__/create-editor.spec.js.snap
rename to devtools/client/debugger/src/utils/editor/tests/__snapshots__/create-editor.spec.js.snap
diff --git a/devtools/client/debugger/new/src/utils/editor/tests/create-editor.spec.js b/devtools/client/debugger/src/utils/editor/tests/create-editor.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/editor/tests/create-editor.spec.js
rename to devtools/client/debugger/src/utils/editor/tests/create-editor.spec.js
diff --git a/devtools/client/debugger/new/src/utils/editor/tests/editor.spec.js b/devtools/client/debugger/src/utils/editor/tests/editor.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/editor/tests/editor.spec.js
rename to devtools/client/debugger/src/utils/editor/tests/editor.spec.js
diff --git a/devtools/client/debugger/new/src/utils/editor/tests/get-expression.spec.js b/devtools/client/debugger/src/utils/editor/tests/get-expression.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/editor/tests/get-expression.spec.js
rename to devtools/client/debugger/src/utils/editor/tests/get-expression.spec.js
diff --git a/devtools/client/debugger/new/src/utils/editor/tests/get-token-location.spec.js b/devtools/client/debugger/src/utils/editor/tests/get-token-location.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/editor/tests/get-token-location.spec.js
rename to devtools/client/debugger/src/utils/editor/tests/get-token-location.spec.js
diff --git a/devtools/client/debugger/new/src/utils/editor/tests/source-search.spec.js b/devtools/client/debugger/src/utils/editor/tests/source-search.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/editor/tests/source-search.spec.js
rename to devtools/client/debugger/src/utils/editor/tests/source-search.spec.js
diff --git a/devtools/client/debugger/new/src/utils/editor/token-events.js b/devtools/client/debugger/src/utils/editor/token-events.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/editor/token-events.js
rename to devtools/client/debugger/src/utils/editor/token-events.js
diff --git a/devtools/client/debugger/new/src/utils/editor/types.js b/devtools/client/debugger/src/utils/editor/types.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/editor/types.js
rename to devtools/client/debugger/src/utils/editor/types.js
diff --git a/devtools/client/debugger/new/src/utils/empty-lines.js b/devtools/client/debugger/src/utils/empty-lines.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/empty-lines.js
rename to devtools/client/debugger/src/utils/empty-lines.js
diff --git a/devtools/client/debugger/new/src/utils/expressions.js b/devtools/client/debugger/src/utils/expressions.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/expressions.js
rename to devtools/client/debugger/src/utils/expressions.js
diff --git a/devtools/client/debugger/new/src/utils/fromJS.js b/devtools/client/debugger/src/utils/fromJS.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/fromJS.js
rename to devtools/client/debugger/src/utils/fromJS.js
diff --git a/devtools/client/debugger/new/src/utils/function.js b/devtools/client/debugger/src/utils/function.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/function.js
rename to devtools/client/debugger/src/utils/function.js
diff --git a/devtools/client/debugger/new/src/utils/indentation.js b/devtools/client/debugger/src/utils/indentation.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/indentation.js
rename to devtools/client/debugger/src/utils/indentation.js
diff --git a/devtools/client/debugger/new/src/utils/isMinified.js b/devtools/client/debugger/src/utils/isMinified.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/isMinified.js
rename to devtools/client/debugger/src/utils/isMinified.js
diff --git a/devtools/client/debugger/new/src/utils/location.js b/devtools/client/debugger/src/utils/location.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/location.js
rename to devtools/client/debugger/src/utils/location.js
diff --git a/devtools/client/debugger/new/src/utils/log.js b/devtools/client/debugger/src/utils/log.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/log.js
rename to devtools/client/debugger/src/utils/log.js
diff --git a/devtools/client/debugger/new/src/utils/makeRecord.js b/devtools/client/debugger/src/utils/makeRecord.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/makeRecord.js
rename to devtools/client/debugger/src/utils/makeRecord.js
diff --git a/devtools/client/debugger/new/src/utils/memoizableAction.js b/devtools/client/debugger/src/utils/memoizableAction.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/memoizableAction.js
rename to devtools/client/debugger/src/utils/memoizableAction.js
diff --git a/devtools/client/debugger/new/src/utils/memoize.js b/devtools/client/debugger/src/utils/memoize.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/memoize.js
rename to devtools/client/debugger/src/utils/memoize.js
diff --git a/devtools/client/debugger/new/src/utils/moz.build b/devtools/client/debugger/src/utils/moz.build
similarity index 100%
rename from devtools/client/debugger/new/src/utils/moz.build
rename to devtools/client/debugger/src/utils/moz.build
diff --git a/devtools/client/debugger/new/src/utils/path.js b/devtools/client/debugger/src/utils/path.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/path.js
rename to devtools/client/debugger/src/utils/path.js
diff --git a/devtools/client/debugger/new/src/utils/pause/frames/annotateFrames.js b/devtools/client/debugger/src/utils/pause/frames/annotateFrames.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/pause/frames/annotateFrames.js
rename to devtools/client/debugger/src/utils/pause/frames/annotateFrames.js
diff --git a/devtools/client/debugger/new/src/utils/pause/frames/collapseFrames.js b/devtools/client/debugger/src/utils/pause/frames/collapseFrames.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/pause/frames/collapseFrames.js
rename to devtools/client/debugger/src/utils/pause/frames/collapseFrames.js
diff --git a/devtools/client/debugger/new/src/utils/pause/frames/displayName.js b/devtools/client/debugger/src/utils/pause/frames/displayName.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/pause/frames/displayName.js
rename to devtools/client/debugger/src/utils/pause/frames/displayName.js
diff --git a/devtools/client/debugger/new/src/utils/pause/frames/getFrameUrl.js b/devtools/client/debugger/src/utils/pause/frames/getFrameUrl.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/pause/frames/getFrameUrl.js
rename to devtools/client/debugger/src/utils/pause/frames/getFrameUrl.js
diff --git a/devtools/client/debugger/new/src/utils/pause/frames/getLibraryFromUrl.js b/devtools/client/debugger/src/utils/pause/frames/getLibraryFromUrl.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/pause/frames/getLibraryFromUrl.js
rename to devtools/client/debugger/src/utils/pause/frames/getLibraryFromUrl.js
diff --git a/devtools/client/debugger/new/src/utils/pause/frames/index.js b/devtools/client/debugger/src/utils/pause/frames/index.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/pause/frames/index.js
rename to devtools/client/debugger/src/utils/pause/frames/index.js
diff --git a/devtools/client/debugger/new/src/utils/pause/frames/moz.build b/devtools/client/debugger/src/utils/pause/frames/moz.build
similarity index 100%
rename from devtools/client/debugger/new/src/utils/pause/frames/moz.build
rename to devtools/client/debugger/src/utils/pause/frames/moz.build
diff --git a/devtools/client/debugger/new/src/utils/pause/frames/tests/annotateFrames.spec.js b/devtools/client/debugger/src/utils/pause/frames/tests/annotateFrames.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/pause/frames/tests/annotateFrames.spec.js
rename to devtools/client/debugger/src/utils/pause/frames/tests/annotateFrames.spec.js
diff --git a/devtools/client/debugger/new/src/utils/pause/frames/tests/displayName.spec.js b/devtools/client/debugger/src/utils/pause/frames/tests/displayName.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/pause/frames/tests/displayName.spec.js
rename to devtools/client/debugger/src/utils/pause/frames/tests/displayName.spec.js
diff --git a/devtools/client/debugger/new/src/utils/pause/frames/tests/getLibraryFromUrl.spec.js b/devtools/client/debugger/src/utils/pause/frames/tests/getLibraryFromUrl.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/pause/frames/tests/getLibraryFromUrl.spec.js
rename to devtools/client/debugger/src/utils/pause/frames/tests/getLibraryFromUrl.spec.js
diff --git a/devtools/client/debugger/new/src/utils/pause/index.js b/devtools/client/debugger/src/utils/pause/index.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/pause/index.js
rename to devtools/client/debugger/src/utils/pause/index.js
diff --git a/devtools/client/debugger/new/src/utils/pause/mapScopes/README.md b/devtools/client/debugger/src/utils/pause/mapScopes/README.md
similarity index 100%
rename from devtools/client/debugger/new/src/utils/pause/mapScopes/README.md
rename to devtools/client/debugger/src/utils/pause/mapScopes/README.md
diff --git a/devtools/client/debugger/new/src/utils/pause/mapScopes/buildGeneratedBindingList.js b/devtools/client/debugger/src/utils/pause/mapScopes/buildGeneratedBindingList.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/pause/mapScopes/buildGeneratedBindingList.js
rename to devtools/client/debugger/src/utils/pause/mapScopes/buildGeneratedBindingList.js
diff --git a/devtools/client/debugger/new/src/utils/pause/mapScopes/filtering.js b/devtools/client/debugger/src/utils/pause/mapScopes/filtering.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/pause/mapScopes/filtering.js
rename to devtools/client/debugger/src/utils/pause/mapScopes/filtering.js
diff --git a/devtools/client/debugger/new/src/utils/pause/mapScopes/findGeneratedBindingFromPosition.js b/devtools/client/debugger/src/utils/pause/mapScopes/findGeneratedBindingFromPosition.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/pause/mapScopes/findGeneratedBindingFromPosition.js
rename to devtools/client/debugger/src/utils/pause/mapScopes/findGeneratedBindingFromPosition.js
diff --git a/devtools/client/debugger/new/src/utils/pause/mapScopes/getApplicableBindingsForOriginalPosition.js b/devtools/client/debugger/src/utils/pause/mapScopes/getApplicableBindingsForOriginalPosition.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/pause/mapScopes/getApplicableBindingsForOriginalPosition.js
rename to devtools/client/debugger/src/utils/pause/mapScopes/getApplicableBindingsForOriginalPosition.js
diff --git a/devtools/client/debugger/new/src/utils/pause/mapScopes/index.js b/devtools/client/debugger/src/utils/pause/mapScopes/index.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/pause/mapScopes/index.js
rename to devtools/client/debugger/src/utils/pause/mapScopes/index.js
diff --git a/devtools/client/debugger/new/src/utils/pause/mapScopes/locColumn.js b/devtools/client/debugger/src/utils/pause/mapScopes/locColumn.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/pause/mapScopes/locColumn.js
rename to devtools/client/debugger/src/utils/pause/mapScopes/locColumn.js
diff --git a/devtools/client/debugger/new/src/utils/pause/mapScopes/mappingContains.js b/devtools/client/debugger/src/utils/pause/mapScopes/mappingContains.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/pause/mapScopes/mappingContains.js
rename to devtools/client/debugger/src/utils/pause/mapScopes/mappingContains.js
diff --git a/devtools/client/debugger/new/src/utils/pause/mapScopes/moz.build b/devtools/client/debugger/src/utils/pause/mapScopes/moz.build
similarity index 100%
rename from devtools/client/debugger/new/src/utils/pause/mapScopes/moz.build
rename to devtools/client/debugger/src/utils/pause/mapScopes/moz.build
diff --git a/devtools/client/debugger/new/src/utils/pause/mapScopes/positionCmp.js b/devtools/client/debugger/src/utils/pause/mapScopes/positionCmp.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/pause/mapScopes/positionCmp.js
rename to devtools/client/debugger/src/utils/pause/mapScopes/positionCmp.js
diff --git a/devtools/client/debugger/new/src/utils/pause/mapScopes/rangeMetadata.js b/devtools/client/debugger/src/utils/pause/mapScopes/rangeMetadata.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/pause/mapScopes/rangeMetadata.js
rename to devtools/client/debugger/src/utils/pause/mapScopes/rangeMetadata.js
diff --git a/devtools/client/debugger/new/src/utils/pause/moz.build b/devtools/client/debugger/src/utils/pause/moz.build
similarity index 100%
rename from devtools/client/debugger/new/src/utils/pause/moz.build
rename to devtools/client/debugger/src/utils/pause/moz.build
diff --git a/devtools/client/debugger/new/src/utils/pause/scopes/getScope.js b/devtools/client/debugger/src/utils/pause/scopes/getScope.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/pause/scopes/getScope.js
rename to devtools/client/debugger/src/utils/pause/scopes/getScope.js
diff --git a/devtools/client/debugger/new/src/utils/pause/scopes/getVariables.js b/devtools/client/debugger/src/utils/pause/scopes/getVariables.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/pause/scopes/getVariables.js
rename to devtools/client/debugger/src/utils/pause/scopes/getVariables.js
diff --git a/devtools/client/debugger/new/src/utils/pause/scopes/index.js b/devtools/client/debugger/src/utils/pause/scopes/index.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/pause/scopes/index.js
rename to devtools/client/debugger/src/utils/pause/scopes/index.js
diff --git a/devtools/client/debugger/new/src/utils/pause/scopes/moz.build b/devtools/client/debugger/src/utils/pause/scopes/moz.build
similarity index 100%
rename from devtools/client/debugger/new/src/utils/pause/scopes/moz.build
rename to devtools/client/debugger/src/utils/pause/scopes/moz.build
diff --git a/devtools/client/debugger/new/src/utils/pause/scopes/tests/getFramePopVariables.spec.js b/devtools/client/debugger/src/utils/pause/scopes/tests/getFramePopVariables.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/pause/scopes/tests/getFramePopVariables.spec.js
rename to devtools/client/debugger/src/utils/pause/scopes/tests/getFramePopVariables.spec.js
diff --git a/devtools/client/debugger/new/src/utils/pause/scopes/tests/scopes.spec.js b/devtools/client/debugger/src/utils/pause/scopes/tests/scopes.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/pause/scopes/tests/scopes.spec.js
rename to devtools/client/debugger/src/utils/pause/scopes/tests/scopes.spec.js
diff --git a/devtools/client/debugger/new/src/utils/pause/scopes/types.js b/devtools/client/debugger/src/utils/pause/scopes/types.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/pause/scopes/types.js
rename to devtools/client/debugger/src/utils/pause/scopes/types.js
diff --git a/devtools/client/debugger/new/src/utils/pause/scopes/utils.js b/devtools/client/debugger/src/utils/pause/scopes/utils.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/pause/scopes/utils.js
rename to devtools/client/debugger/src/utils/pause/scopes/utils.js
diff --git a/devtools/client/debugger/new/src/utils/pause/why.js b/devtools/client/debugger/src/utils/pause/why.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/pause/why.js
rename to devtools/client/debugger/src/utils/pause/why.js
diff --git a/devtools/client/debugger/new/src/utils/prefs.js b/devtools/client/debugger/src/utils/prefs.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/prefs.js
rename to devtools/client/debugger/src/utils/prefs.js
diff --git a/devtools/client/debugger/new/src/utils/preview.js b/devtools/client/debugger/src/utils/preview.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/preview.js
rename to devtools/client/debugger/src/utils/preview.js
diff --git a/devtools/client/debugger/new/src/utils/project-search.js b/devtools/client/debugger/src/utils/project-search.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/project-search.js
rename to devtools/client/debugger/src/utils/project-search.js
diff --git a/devtools/client/debugger/new/src/utils/quick-open.js b/devtools/client/debugger/src/utils/quick-open.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/quick-open.js
rename to devtools/client/debugger/src/utils/quick-open.js
diff --git a/devtools/client/debugger/new/src/utils/result-list.js b/devtools/client/debugger/src/utils/result-list.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/result-list.js
rename to devtools/client/debugger/src/utils/result-list.js
diff --git a/devtools/client/debugger/new/src/utils/source-maps.js b/devtools/client/debugger/src/utils/source-maps.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/source-maps.js
rename to devtools/client/debugger/src/utils/source-maps.js
diff --git a/devtools/client/debugger/new/src/utils/source-queue.js b/devtools/client/debugger/src/utils/source-queue.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/source-queue.js
rename to devtools/client/debugger/src/utils/source-queue.js
diff --git a/devtools/client/debugger/new/src/utils/source.js b/devtools/client/debugger/src/utils/source.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/source.js
rename to devtools/client/debugger/src/utils/source.js
diff --git a/devtools/client/debugger/new/src/utils/sources-tree/addToTree.js b/devtools/client/debugger/src/utils/sources-tree/addToTree.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/sources-tree/addToTree.js
rename to devtools/client/debugger/src/utils/sources-tree/addToTree.js
diff --git a/devtools/client/debugger/new/src/utils/sources-tree/collapseTree.js b/devtools/client/debugger/src/utils/sources-tree/collapseTree.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/sources-tree/collapseTree.js
rename to devtools/client/debugger/src/utils/sources-tree/collapseTree.js
diff --git a/devtools/client/debugger/new/src/utils/sources-tree/createTree.js b/devtools/client/debugger/src/utils/sources-tree/createTree.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/sources-tree/createTree.js
rename to devtools/client/debugger/src/utils/sources-tree/createTree.js
diff --git a/devtools/client/debugger/new/src/utils/sources-tree/formatTree.js b/devtools/client/debugger/src/utils/sources-tree/formatTree.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/sources-tree/formatTree.js
rename to devtools/client/debugger/src/utils/sources-tree/formatTree.js
diff --git a/devtools/client/debugger/new/src/utils/sources-tree/getDirectories.js b/devtools/client/debugger/src/utils/sources-tree/getDirectories.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/sources-tree/getDirectories.js
rename to devtools/client/debugger/src/utils/sources-tree/getDirectories.js
diff --git a/devtools/client/debugger/new/src/utils/sources-tree/getURL.js b/devtools/client/debugger/src/utils/sources-tree/getURL.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/sources-tree/getURL.js
rename to devtools/client/debugger/src/utils/sources-tree/getURL.js
diff --git a/devtools/client/debugger/new/src/utils/sources-tree/index.js b/devtools/client/debugger/src/utils/sources-tree/index.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/sources-tree/index.js
rename to devtools/client/debugger/src/utils/sources-tree/index.js
diff --git a/devtools/client/debugger/new/src/utils/sources-tree/moz.build b/devtools/client/debugger/src/utils/sources-tree/moz.build
similarity index 100%
rename from devtools/client/debugger/new/src/utils/sources-tree/moz.build
rename to devtools/client/debugger/src/utils/sources-tree/moz.build
diff --git a/devtools/client/debugger/new/src/utils/sources-tree/sortTree.js b/devtools/client/debugger/src/utils/sources-tree/sortTree.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/sources-tree/sortTree.js
rename to devtools/client/debugger/src/utils/sources-tree/sortTree.js
diff --git a/devtools/client/debugger/new/src/utils/sources-tree/tests/__snapshots__/addToTree.spec.js.snap b/devtools/client/debugger/src/utils/sources-tree/tests/__snapshots__/addToTree.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/utils/sources-tree/tests/__snapshots__/addToTree.spec.js.snap
rename to devtools/client/debugger/src/utils/sources-tree/tests/__snapshots__/addToTree.spec.js.snap
diff --git a/devtools/client/debugger/new/src/utils/sources-tree/tests/__snapshots__/collapseTree.spec.js.snap b/devtools/client/debugger/src/utils/sources-tree/tests/__snapshots__/collapseTree.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/utils/sources-tree/tests/__snapshots__/collapseTree.spec.js.snap
rename to devtools/client/debugger/src/utils/sources-tree/tests/__snapshots__/collapseTree.spec.js.snap
diff --git a/devtools/client/debugger/new/src/utils/sources-tree/tests/__snapshots__/sortTree.spec.js.snap b/devtools/client/debugger/src/utils/sources-tree/tests/__snapshots__/sortTree.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/utils/sources-tree/tests/__snapshots__/sortTree.spec.js.snap
rename to devtools/client/debugger/src/utils/sources-tree/tests/__snapshots__/sortTree.spec.js.snap
diff --git a/devtools/client/debugger/new/src/utils/sources-tree/tests/__snapshots__/updateTree.spec.js.snap b/devtools/client/debugger/src/utils/sources-tree/tests/__snapshots__/updateTree.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/utils/sources-tree/tests/__snapshots__/updateTree.spec.js.snap
rename to devtools/client/debugger/src/utils/sources-tree/tests/__snapshots__/updateTree.spec.js.snap
diff --git a/devtools/client/debugger/new/src/utils/sources-tree/tests/addToTree.spec.js b/devtools/client/debugger/src/utils/sources-tree/tests/addToTree.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/sources-tree/tests/addToTree.spec.js
rename to devtools/client/debugger/src/utils/sources-tree/tests/addToTree.spec.js
diff --git a/devtools/client/debugger/new/src/utils/sources-tree/tests/collapseTree.spec.js b/devtools/client/debugger/src/utils/sources-tree/tests/collapseTree.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/sources-tree/tests/collapseTree.spec.js
rename to devtools/client/debugger/src/utils/sources-tree/tests/collapseTree.spec.js
diff --git a/devtools/client/debugger/new/src/utils/sources-tree/tests/getDirectories.spec.js b/devtools/client/debugger/src/utils/sources-tree/tests/getDirectories.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/sources-tree/tests/getDirectories.spec.js
rename to devtools/client/debugger/src/utils/sources-tree/tests/getDirectories.spec.js
diff --git a/devtools/client/debugger/new/src/utils/sources-tree/tests/getUrl.spec.js b/devtools/client/debugger/src/utils/sources-tree/tests/getUrl.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/sources-tree/tests/getUrl.spec.js
rename to devtools/client/debugger/src/utils/sources-tree/tests/getUrl.spec.js
diff --git a/devtools/client/debugger/new/src/utils/sources-tree/tests/sortTree.spec.js b/devtools/client/debugger/src/utils/sources-tree/tests/sortTree.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/sources-tree/tests/sortTree.spec.js
rename to devtools/client/debugger/src/utils/sources-tree/tests/sortTree.spec.js
diff --git a/devtools/client/debugger/new/src/utils/sources-tree/tests/treeOrder.spec.js b/devtools/client/debugger/src/utils/sources-tree/tests/treeOrder.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/sources-tree/tests/treeOrder.spec.js
rename to devtools/client/debugger/src/utils/sources-tree/tests/treeOrder.spec.js
diff --git a/devtools/client/debugger/new/src/utils/sources-tree/tests/updateTree.spec.js b/devtools/client/debugger/src/utils/sources-tree/tests/updateTree.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/sources-tree/tests/updateTree.spec.js
rename to devtools/client/debugger/src/utils/sources-tree/tests/updateTree.spec.js
diff --git a/devtools/client/debugger/new/src/utils/sources-tree/tests/utils.spec.js b/devtools/client/debugger/src/utils/sources-tree/tests/utils.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/sources-tree/tests/utils.spec.js
rename to devtools/client/debugger/src/utils/sources-tree/tests/utils.spec.js
diff --git a/devtools/client/debugger/new/src/utils/sources-tree/treeOrder.js b/devtools/client/debugger/src/utils/sources-tree/treeOrder.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/sources-tree/treeOrder.js
rename to devtools/client/debugger/src/utils/sources-tree/treeOrder.js
diff --git a/devtools/client/debugger/new/src/utils/sources-tree/types.js b/devtools/client/debugger/src/utils/sources-tree/types.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/sources-tree/types.js
rename to devtools/client/debugger/src/utils/sources-tree/types.js
diff --git a/devtools/client/debugger/new/src/utils/sources-tree/updateTree.js b/devtools/client/debugger/src/utils/sources-tree/updateTree.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/sources-tree/updateTree.js
rename to devtools/client/debugger/src/utils/sources-tree/updateTree.js
diff --git a/devtools/client/debugger/new/src/utils/sources-tree/utils.js b/devtools/client/debugger/src/utils/sources-tree/utils.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/sources-tree/utils.js
rename to devtools/client/debugger/src/utils/sources-tree/utils.js
diff --git a/devtools/client/debugger/new/src/utils/tabs.js b/devtools/client/debugger/src/utils/tabs.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/tabs.js
rename to devtools/client/debugger/src/utils/tabs.js
diff --git a/devtools/client/debugger/new/src/utils/task.js b/devtools/client/debugger/src/utils/task.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/task.js
rename to devtools/client/debugger/src/utils/task.js
diff --git a/devtools/client/debugger/new/src/utils/telemetry.js b/devtools/client/debugger/src/utils/telemetry.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/telemetry.js
rename to devtools/client/debugger/src/utils/telemetry.js
diff --git a/devtools/client/debugger/new/src/utils/test-head.js b/devtools/client/debugger/src/utils/test-head.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/test-head.js
rename to devtools/client/debugger/src/utils/test-head.js
diff --git a/devtools/client/debugger/new/src/utils/test-mockup.js b/devtools/client/debugger/src/utils/test-mockup.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/test-mockup.js
rename to devtools/client/debugger/src/utils/test-mockup.js
diff --git a/devtools/client/debugger/new/src/utils/tests/DevToolsUtils.spec.js b/devtools/client/debugger/src/utils/tests/DevToolsUtils.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/tests/DevToolsUtils.spec.js
rename to devtools/client/debugger/src/utils/tests/DevToolsUtils.spec.js
diff --git a/devtools/client/debugger/new/src/utils/tests/__snapshots__/ast.spec.js.snap b/devtools/client/debugger/src/utils/tests/__snapshots__/ast.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/utils/tests/__snapshots__/ast.spec.js.snap
rename to devtools/client/debugger/src/utils/tests/__snapshots__/ast.spec.js.snap
diff --git a/devtools/client/debugger/new/src/utils/tests/__snapshots__/expressions.spec.js.snap b/devtools/client/debugger/src/utils/tests/__snapshots__/expressions.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/utils/tests/__snapshots__/expressions.spec.js.snap
rename to devtools/client/debugger/src/utils/tests/__snapshots__/expressions.spec.js.snap
diff --git a/devtools/client/debugger/new/src/utils/tests/__snapshots__/function.spec.js.snap b/devtools/client/debugger/src/utils/tests/__snapshots__/function.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/utils/tests/__snapshots__/function.spec.js.snap
rename to devtools/client/debugger/src/utils/tests/__snapshots__/function.spec.js.snap
diff --git a/devtools/client/debugger/new/src/utils/tests/__snapshots__/indentation.spec.js.snap b/devtools/client/debugger/src/utils/tests/__snapshots__/indentation.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/utils/tests/__snapshots__/indentation.spec.js.snap
rename to devtools/client/debugger/src/utils/tests/__snapshots__/indentation.spec.js.snap
diff --git a/devtools/client/debugger/new/src/utils/tests/__snapshots__/project-search.spec.js.snap b/devtools/client/debugger/src/utils/tests/__snapshots__/project-search.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/utils/tests/__snapshots__/project-search.spec.js.snap
rename to devtools/client/debugger/src/utils/tests/__snapshots__/project-search.spec.js.snap
diff --git a/devtools/client/debugger/new/src/utils/tests/assert.spec.js b/devtools/client/debugger/src/utils/tests/assert.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/tests/assert.spec.js
rename to devtools/client/debugger/src/utils/tests/assert.spec.js
diff --git a/devtools/client/debugger/new/src/utils/tests/ast.spec.js b/devtools/client/debugger/src/utils/tests/ast.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/tests/ast.spec.js
rename to devtools/client/debugger/src/utils/tests/ast.spec.js
diff --git a/devtools/client/debugger/new/src/utils/tests/asyncStoreHelper.spec.js b/devtools/client/debugger/src/utils/tests/asyncStoreHelper.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/tests/asyncStoreHelper.spec.js
rename to devtools/client/debugger/src/utils/tests/asyncStoreHelper.spec.js
diff --git a/devtools/client/debugger/new/src/utils/tests/build-query.spec.js b/devtools/client/debugger/src/utils/tests/build-query.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/tests/build-query.spec.js
rename to devtools/client/debugger/src/utils/tests/build-query.spec.js
diff --git a/devtools/client/debugger/new/src/utils/tests/clipboard.spec.js b/devtools/client/debugger/src/utils/tests/clipboard.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/tests/clipboard.spec.js
rename to devtools/client/debugger/src/utils/tests/clipboard.spec.js
diff --git a/devtools/client/debugger/new/src/utils/tests/empty-lines.spec.js b/devtools/client/debugger/src/utils/tests/empty-lines.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/tests/empty-lines.spec.js
rename to devtools/client/debugger/src/utils/tests/empty-lines.spec.js
diff --git a/devtools/client/debugger/new/src/utils/tests/expressions.spec.js b/devtools/client/debugger/src/utils/tests/expressions.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/tests/expressions.spec.js
rename to devtools/client/debugger/src/utils/tests/expressions.spec.js
diff --git a/devtools/client/debugger/new/src/utils/tests/fromJS.spec.js b/devtools/client/debugger/src/utils/tests/fromJS.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/tests/fromJS.spec.js
rename to devtools/client/debugger/src/utils/tests/fromJS.spec.js
diff --git a/devtools/client/debugger/new/src/utils/tests/function.spec.js b/devtools/client/debugger/src/utils/tests/function.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/tests/function.spec.js
rename to devtools/client/debugger/src/utils/tests/function.spec.js
diff --git a/devtools/client/debugger/new/src/utils/tests/indentation.spec.js b/devtools/client/debugger/src/utils/tests/indentation.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/tests/indentation.spec.js
rename to devtools/client/debugger/src/utils/tests/indentation.spec.js
diff --git a/devtools/client/debugger/new/src/utils/tests/isMinified.spec.js b/devtools/client/debugger/src/utils/tests/isMinified.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/tests/isMinified.spec.js
rename to devtools/client/debugger/src/utils/tests/isMinified.spec.js
diff --git a/devtools/client/debugger/new/src/utils/tests/location.spec.js b/devtools/client/debugger/src/utils/tests/location.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/tests/location.spec.js
rename to devtools/client/debugger/src/utils/tests/location.spec.js
diff --git a/devtools/client/debugger/new/src/utils/tests/log.spec.js b/devtools/client/debugger/src/utils/tests/log.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/tests/log.spec.js
rename to devtools/client/debugger/src/utils/tests/log.spec.js
diff --git a/devtools/client/debugger/new/src/utils/tests/memoize.spec.js b/devtools/client/debugger/src/utils/tests/memoize.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/tests/memoize.spec.js
rename to devtools/client/debugger/src/utils/tests/memoize.spec.js
diff --git a/devtools/client/debugger/new/src/utils/tests/path.spec.js b/devtools/client/debugger/src/utils/tests/path.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/tests/path.spec.js
rename to devtools/client/debugger/src/utils/tests/path.spec.js
diff --git a/devtools/client/debugger/new/src/utils/tests/project-search.spec.js b/devtools/client/debugger/src/utils/tests/project-search.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/tests/project-search.spec.js
rename to devtools/client/debugger/src/utils/tests/project-search.spec.js
diff --git a/devtools/client/debugger/new/src/utils/tests/quick-open.spec.js b/devtools/client/debugger/src/utils/tests/quick-open.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/tests/quick-open.spec.js
rename to devtools/client/debugger/src/utils/tests/quick-open.spec.js
diff --git a/devtools/client/debugger/new/src/utils/tests/result-list.spec.js b/devtools/client/debugger/src/utils/tests/result-list.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/tests/result-list.spec.js
rename to devtools/client/debugger/src/utils/tests/result-list.spec.js
diff --git a/devtools/client/debugger/new/src/utils/tests/source.spec.js b/devtools/client/debugger/src/utils/tests/source.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/tests/source.spec.js
rename to devtools/client/debugger/src/utils/tests/source.spec.js
diff --git a/devtools/client/debugger/new/src/utils/tests/telemetry.spec.js b/devtools/client/debugger/src/utils/tests/telemetry.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/tests/telemetry.spec.js
rename to devtools/client/debugger/src/utils/tests/telemetry.spec.js
diff --git a/devtools/client/debugger/new/src/utils/tests/text.spec.js b/devtools/client/debugger/src/utils/tests/text.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/tests/text.spec.js
rename to devtools/client/debugger/src/utils/tests/text.spec.js
diff --git a/devtools/client/debugger/new/src/utils/tests/ui.spec.js b/devtools/client/debugger/src/utils/tests/ui.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/tests/ui.spec.js
rename to devtools/client/debugger/src/utils/tests/ui.spec.js
diff --git a/devtools/client/debugger/new/src/utils/tests/utils.spec.js b/devtools/client/debugger/src/utils/tests/utils.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/tests/utils.spec.js
rename to devtools/client/debugger/src/utils/tests/utils.spec.js
diff --git a/devtools/client/debugger/new/src/utils/tests/wasm.spec.js b/devtools/client/debugger/src/utils/tests/wasm.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/tests/wasm.spec.js
rename to devtools/client/debugger/src/utils/tests/wasm.spec.js
diff --git a/devtools/client/debugger/new/src/utils/text.js b/devtools/client/debugger/src/utils/text.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/text.js
rename to devtools/client/debugger/src/utils/text.js
diff --git a/devtools/client/debugger/new/src/utils/timings.js b/devtools/client/debugger/src/utils/timings.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/timings.js
rename to devtools/client/debugger/src/utils/timings.js
diff --git a/devtools/client/debugger/new/src/utils/ui.js b/devtools/client/debugger/src/utils/ui.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/ui.js
rename to devtools/client/debugger/src/utils/ui.js
diff --git a/devtools/client/debugger/new/src/utils/url.js b/devtools/client/debugger/src/utils/url.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/url.js
rename to devtools/client/debugger/src/utils/url.js
diff --git a/devtools/client/debugger/new/src/utils/utils.js b/devtools/client/debugger/src/utils/utils.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/utils.js
rename to devtools/client/debugger/src/utils/utils.js
diff --git a/devtools/client/debugger/new/src/utils/wasm.js b/devtools/client/debugger/src/utils/wasm.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/wasm.js
rename to devtools/client/debugger/src/utils/wasm.js
diff --git a/devtools/client/debugger/new/src/utils/worker.js b/devtools/client/debugger/src/utils/worker.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/worker.js
rename to devtools/client/debugger/src/utils/worker.js
diff --git a/devtools/client/debugger/new/src/utils/workers.js b/devtools/client/debugger/src/utils/workers.js
similarity index 100%
rename from devtools/client/debugger/new/src/utils/workers.js
rename to devtools/client/debugger/src/utils/workers.js
diff --git a/devtools/client/debugger/new/src/vendors.js b/devtools/client/debugger/src/vendors.js
similarity index 100%
rename from devtools/client/debugger/new/src/vendors.js
rename to devtools/client/debugger/src/vendors.js
diff --git a/devtools/client/debugger/new/src/workers/moz.build b/devtools/client/debugger/src/workers/moz.build
similarity index 100%
rename from devtools/client/debugger/new/src/workers/moz.build
rename to devtools/client/debugger/src/workers/moz.build
diff --git a/devtools/client/debugger/new/src/workers/parser/findOutOfScopeLocations.js b/devtools/client/debugger/src/workers/parser/findOutOfScopeLocations.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/findOutOfScopeLocations.js
rename to devtools/client/debugger/src/workers/parser/findOutOfScopeLocations.js
diff --git a/devtools/client/debugger/new/src/workers/parser/frameworks.js b/devtools/client/debugger/src/workers/parser/frameworks.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/frameworks.js
rename to devtools/client/debugger/src/workers/parser/frameworks.js
diff --git a/devtools/client/debugger/new/src/workers/parser/getScopes/index.js b/devtools/client/debugger/src/workers/parser/getScopes/index.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/getScopes/index.js
rename to devtools/client/debugger/src/workers/parser/getScopes/index.js
diff --git a/devtools/client/debugger/new/src/workers/parser/getScopes/visitor.js b/devtools/client/debugger/src/workers/parser/getScopes/visitor.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/getScopes/visitor.js
rename to devtools/client/debugger/src/workers/parser/getScopes/visitor.js
diff --git a/devtools/client/debugger/new/src/workers/parser/getSymbols.js b/devtools/client/debugger/src/workers/parser/getSymbols.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/getSymbols.js
rename to devtools/client/debugger/src/workers/parser/getSymbols.js
diff --git a/devtools/client/debugger/new/src/workers/parser/index.js b/devtools/client/debugger/src/workers/parser/index.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/index.js
rename to devtools/client/debugger/src/workers/parser/index.js
diff --git a/devtools/client/debugger/new/src/workers/parser/mapAwaitExpression.js b/devtools/client/debugger/src/workers/parser/mapAwaitExpression.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/mapAwaitExpression.js
rename to devtools/client/debugger/src/workers/parser/mapAwaitExpression.js
diff --git a/devtools/client/debugger/new/src/workers/parser/mapBindings.js b/devtools/client/debugger/src/workers/parser/mapBindings.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/mapBindings.js
rename to devtools/client/debugger/src/workers/parser/mapBindings.js
diff --git a/devtools/client/debugger/new/src/workers/parser/mapExpression.js b/devtools/client/debugger/src/workers/parser/mapExpression.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/mapExpression.js
rename to devtools/client/debugger/src/workers/parser/mapExpression.js
diff --git a/devtools/client/debugger/new/src/workers/parser/mapOriginalExpression.js b/devtools/client/debugger/src/workers/parser/mapOriginalExpression.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/mapOriginalExpression.js
rename to devtools/client/debugger/src/workers/parser/mapOriginalExpression.js
diff --git a/devtools/client/debugger/new/src/workers/parser/moz.build b/devtools/client/debugger/src/workers/parser/moz.build
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/moz.build
rename to devtools/client/debugger/src/workers/parser/moz.build
diff --git a/devtools/client/debugger/new/src/workers/parser/sources.js b/devtools/client/debugger/src/workers/parser/sources.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/sources.js
rename to devtools/client/debugger/src/workers/parser/sources.js
diff --git a/devtools/client/debugger/new/src/workers/parser/steps.js b/devtools/client/debugger/src/workers/parser/steps.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/steps.js
rename to devtools/client/debugger/src/workers/parser/steps.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/__snapshots__/findOutOfScopeLocations.spec.js.snap b/devtools/client/debugger/src/workers/parser/tests/__snapshots__/findOutOfScopeLocations.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/__snapshots__/findOutOfScopeLocations.spec.js.snap
rename to devtools/client/debugger/src/workers/parser/tests/__snapshots__/findOutOfScopeLocations.spec.js.snap
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/__snapshots__/getScopes.spec.js.snap b/devtools/client/debugger/src/workers/parser/tests/__snapshots__/getScopes.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/__snapshots__/getScopes.spec.js.snap
rename to devtools/client/debugger/src/workers/parser/tests/__snapshots__/getScopes.spec.js.snap
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/__snapshots__/getSymbols.spec.js.snap b/devtools/client/debugger/src/workers/parser/tests/__snapshots__/getSymbols.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/__snapshots__/getSymbols.spec.js.snap
rename to devtools/client/debugger/src/workers/parser/tests/__snapshots__/getSymbols.spec.js.snap
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/__snapshots__/validate.spec.js.snap b/devtools/client/debugger/src/workers/parser/tests/__snapshots__/validate.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/__snapshots__/validate.spec.js.snap
rename to devtools/client/debugger/src/workers/parser/tests/__snapshots__/validate.spec.js.snap
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/contains.spec.js b/devtools/client/debugger/src/workers/parser/tests/contains.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/contains.spec.js
rename to devtools/client/debugger/src/workers/parser/tests/contains.spec.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/findOutOfScopeLocations.spec.js b/devtools/client/debugger/src/workers/parser/tests/findOutOfScopeLocations.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/findOutOfScopeLocations.spec.js
rename to devtools/client/debugger/src/workers/parser/tests/findOutOfScopeLocations.spec.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/allSymbols.js b/devtools/client/debugger/src/workers/parser/tests/fixtures/allSymbols.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/allSymbols.js
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/allSymbols.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/async.js b/devtools/client/debugger/src/workers/parser/tests/fixtures/async.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/async.js
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/async.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/call-sites.js b/devtools/client/debugger/src/workers/parser/tests/fixtures/call-sites.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/call-sites.js
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/call-sites.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/callExpressions.js b/devtools/client/debugger/src/workers/parser/tests/fixtures/callExpressions.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/callExpressions.js
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/callExpressions.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/calls.js b/devtools/client/debugger/src/workers/parser/tests/fixtures/calls.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/calls.js
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/calls.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/class.js b/devtools/client/debugger/src/workers/parser/tests/fixtures/class.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/class.js
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/class.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/component.js b/devtools/client/debugger/src/workers/parser/tests/fixtures/component.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/component.js
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/component.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/computed-props.js b/devtools/client/debugger/src/workers/parser/tests/fixtures/computed-props.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/computed-props.js
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/computed-props.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/control-flow.js b/devtools/client/debugger/src/workers/parser/tests/fixtures/control-flow.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/control-flow.js
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/control-flow.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/decorators.js b/devtools/client/debugger/src/workers/parser/tests/fixtures/decorators.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/decorators.js
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/decorators.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/destructuring.js b/devtools/client/debugger/src/workers/parser/tests/fixtures/destructuring.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/destructuring.js
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/destructuring.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/es6.js b/devtools/client/debugger/src/workers/parser/tests/fixtures/es6.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/es6.js
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/es6.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/expression.js b/devtools/client/debugger/src/workers/parser/tests/fixtures/expression.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/expression.js
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/expression.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/flow.js b/devtools/client/debugger/src/workers/parser/tests/fixtures/flow.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/flow.js
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/flow.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/frameworks/angular1FalsePositive.js b/devtools/client/debugger/src/workers/parser/tests/fixtures/frameworks/angular1FalsePositive.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/frameworks/angular1FalsePositive.js
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/frameworks/angular1FalsePositive.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/frameworks/angular1Module.js b/devtools/client/debugger/src/workers/parser/tests/fixtures/frameworks/angular1Module.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/frameworks/angular1Module.js
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/frameworks/angular1Module.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/frameworks/plainJavascript.js b/devtools/client/debugger/src/workers/parser/tests/fixtures/frameworks/plainJavascript.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/frameworks/plainJavascript.js
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/frameworks/plainJavascript.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/frameworks/reactComponent.js b/devtools/client/debugger/src/workers/parser/tests/fixtures/frameworks/reactComponent.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/frameworks/reactComponent.js
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/frameworks/reactComponent.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/frameworks/reactComponentEs5.js b/devtools/client/debugger/src/workers/parser/tests/fixtures/frameworks/reactComponentEs5.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/frameworks/reactComponentEs5.js
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/frameworks/reactComponentEs5.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/frameworks/vueFileComponent.js b/devtools/client/debugger/src/workers/parser/tests/fixtures/frameworks/vueFileComponent.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/frameworks/vueFileComponent.js
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/frameworks/vueFileComponent.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/frameworks/vueFileDeclarative.js b/devtools/client/debugger/src/workers/parser/tests/fixtures/frameworks/vueFileDeclarative.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/frameworks/vueFileDeclarative.js
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/frameworks/vueFileDeclarative.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/func.js b/devtools/client/debugger/src/workers/parser/tests/fixtures/func.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/func.js
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/func.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/functionNames.js b/devtools/client/debugger/src/workers/parser/tests/fixtures/functionNames.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/functionNames.js
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/functionNames.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/generators.js b/devtools/client/debugger/src/workers/parser/tests/fixtures/generators.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/generators.js
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/generators.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/jsx.js b/devtools/client/debugger/src/workers/parser/tests/fixtures/jsx.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/jsx.js
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/jsx.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/math.js b/devtools/client/debugger/src/workers/parser/tests/fixtures/math.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/math.js
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/math.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/modules.js b/devtools/client/debugger/src/workers/parser/tests/fixtures/modules.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/modules.js
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/modules.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/object-expressions.js b/devtools/client/debugger/src/workers/parser/tests/fixtures/object-expressions.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/object-expressions.js
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/object-expressions.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/outOfScope.js b/devtools/client/debugger/src/workers/parser/tests/fixtures/outOfScope.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/outOfScope.js
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/outOfScope.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/outOfScopeComment.js b/devtools/client/debugger/src/workers/parser/tests/fixtures/outOfScopeComment.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/outOfScopeComment.js
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/outOfScopeComment.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/parseScriptTags.html b/devtools/client/debugger/src/workers/parser/tests/fixtures/parseScriptTags.html
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/parseScriptTags.html
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/parseScriptTags.html
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/proto.js b/devtools/client/debugger/src/workers/parser/tests/fixtures/proto.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/proto.js
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/proto.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/resolveToken.js b/devtools/client/debugger/src/workers/parser/tests/fixtures/resolveToken.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/resolveToken.js
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/resolveToken.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/scopes/arrow-function.js b/devtools/client/debugger/src/workers/parser/tests/fixtures/scopes/arrow-function.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/scopes/arrow-function.js
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/scopes/arrow-function.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/scopes/binding-types.js b/devtools/client/debugger/src/workers/parser/tests/fixtures/scopes/binding-types.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/scopes/binding-types.js
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/scopes/binding-types.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/scopes/block-statement.js b/devtools/client/debugger/src/workers/parser/tests/fixtures/scopes/block-statement.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/scopes/block-statement.js
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/scopes/block-statement.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/scopes/class-declaration.js b/devtools/client/debugger/src/workers/parser/tests/fixtures/scopes/class-declaration.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/scopes/class-declaration.js
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/scopes/class-declaration.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/scopes/class-expression.js b/devtools/client/debugger/src/workers/parser/tests/fixtures/scopes/class-expression.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/scopes/class-expression.js
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/scopes/class-expression.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/scopes/class-property.js b/devtools/client/debugger/src/workers/parser/tests/fixtures/scopes/class-property.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/scopes/class-property.js
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/scopes/class-property.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/scopes/complex-nesting.js b/devtools/client/debugger/src/workers/parser/tests/fixtures/scopes/complex-nesting.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/scopes/complex-nesting.js
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/scopes/complex-nesting.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/scopes/expressions.js b/devtools/client/debugger/src/workers/parser/tests/fixtures/scopes/expressions.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/scopes/expressions.js
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/scopes/expressions.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/scopes/flowtype-bindings.js b/devtools/client/debugger/src/workers/parser/tests/fixtures/scopes/flowtype-bindings.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/scopes/flowtype-bindings.js
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/scopes/flowtype-bindings.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/scopes/fn-body-lex-and-nonlex.js b/devtools/client/debugger/src/workers/parser/tests/fixtures/scopes/fn-body-lex-and-nonlex.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/scopes/fn-body-lex-and-nonlex.js
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/scopes/fn-body-lex-and-nonlex.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/scopes/for-loops.js b/devtools/client/debugger/src/workers/parser/tests/fixtures/scopes/for-loops.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/scopes/for-loops.js
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/scopes/for-loops.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/scopes/function-declaration.js b/devtools/client/debugger/src/workers/parser/tests/fixtures/scopes/function-declaration.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/scopes/function-declaration.js
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/scopes/function-declaration.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/scopes/function-expression.js b/devtools/client/debugger/src/workers/parser/tests/fixtures/scopes/function-expression.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/scopes/function-expression.js
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/scopes/function-expression.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/scopes/jsx-component.js b/devtools/client/debugger/src/workers/parser/tests/fixtures/scopes/jsx-component.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/scopes/jsx-component.js
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/scopes/jsx-component.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/scopes/out-of-order-declarations.js b/devtools/client/debugger/src/workers/parser/tests/fixtures/scopes/out-of-order-declarations.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/scopes/out-of-order-declarations.js
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/scopes/out-of-order-declarations.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/scopes/pattern-declarations.js b/devtools/client/debugger/src/workers/parser/tests/fixtures/scopes/pattern-declarations.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/scopes/pattern-declarations.js
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/scopes/pattern-declarations.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/scopes/simple-module.js b/devtools/client/debugger/src/workers/parser/tests/fixtures/scopes/simple-module.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/scopes/simple-module.js
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/scopes/simple-module.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/scopes/switch-statement.js b/devtools/client/debugger/src/workers/parser/tests/fixtures/scopes/switch-statement.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/scopes/switch-statement.js
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/scopes/switch-statement.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/scopes/try-catch.js b/devtools/client/debugger/src/workers/parser/tests/fixtures/scopes/try-catch.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/scopes/try-catch.js
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/scopes/try-catch.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/scopes/ts-sample.ts b/devtools/client/debugger/src/workers/parser/tests/fixtures/scopes/ts-sample.ts
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/scopes/ts-sample.ts
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/scopes/ts-sample.ts
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/scopes/tsx-sample.tsx b/devtools/client/debugger/src/workers/parser/tests/fixtures/scopes/tsx-sample.tsx
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/scopes/tsx-sample.tsx
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/scopes/tsx-sample.tsx
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/scopes/vue-sample.vue b/devtools/client/debugger/src/workers/parser/tests/fixtures/scopes/vue-sample.vue
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/scopes/vue-sample.vue
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/scopes/vue-sample.vue
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/statements.js b/devtools/client/debugger/src/workers/parser/tests/fixtures/statements.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/statements.js
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/statements.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/thisExpression.js b/devtools/client/debugger/src/workers/parser/tests/fixtures/thisExpression.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/thisExpression.js
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/thisExpression.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/fixtures/var.js b/devtools/client/debugger/src/workers/parser/tests/fixtures/var.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/fixtures/var.js
rename to devtools/client/debugger/src/workers/parser/tests/fixtures/var.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/framework.spec.js b/devtools/client/debugger/src/workers/parser/tests/framework.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/framework.spec.js
rename to devtools/client/debugger/src/workers/parser/tests/framework.spec.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/getScopes.spec.js b/devtools/client/debugger/src/workers/parser/tests/getScopes.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/getScopes.spec.js
rename to devtools/client/debugger/src/workers/parser/tests/getScopes.spec.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/getSymbols.spec.js b/devtools/client/debugger/src/workers/parser/tests/getSymbols.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/getSymbols.spec.js
rename to devtools/client/debugger/src/workers/parser/tests/getSymbols.spec.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/helpers/index.js b/devtools/client/debugger/src/workers/parser/tests/helpers/index.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/helpers/index.js
rename to devtools/client/debugger/src/workers/parser/tests/helpers/index.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/mapBindings.spec.js b/devtools/client/debugger/src/workers/parser/tests/mapBindings.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/mapBindings.spec.js
rename to devtools/client/debugger/src/workers/parser/tests/mapBindings.spec.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/mapExpression.spec.js b/devtools/client/debugger/src/workers/parser/tests/mapExpression.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/mapExpression.spec.js
rename to devtools/client/debugger/src/workers/parser/tests/mapExpression.spec.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/mapOriginalExpression.spec.js b/devtools/client/debugger/src/workers/parser/tests/mapOriginalExpression.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/mapOriginalExpression.spec.js
rename to devtools/client/debugger/src/workers/parser/tests/mapOriginalExpression.spec.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/sources.spec.js b/devtools/client/debugger/src/workers/parser/tests/sources.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/sources.spec.js
rename to devtools/client/debugger/src/workers/parser/tests/sources.spec.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/steps.spec.js b/devtools/client/debugger/src/workers/parser/tests/steps.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/steps.spec.js
rename to devtools/client/debugger/src/workers/parser/tests/steps.spec.js
diff --git a/devtools/client/debugger/new/src/workers/parser/tests/validate.spec.js b/devtools/client/debugger/src/workers/parser/tests/validate.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/tests/validate.spec.js
rename to devtools/client/debugger/src/workers/parser/tests/validate.spec.js
diff --git a/devtools/client/debugger/new/src/workers/parser/types.js b/devtools/client/debugger/src/workers/parser/types.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/types.js
rename to devtools/client/debugger/src/workers/parser/types.js
diff --git a/devtools/client/debugger/new/src/workers/parser/utils/ast.js b/devtools/client/debugger/src/workers/parser/utils/ast.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/utils/ast.js
rename to devtools/client/debugger/src/workers/parser/utils/ast.js
diff --git a/devtools/client/debugger/new/src/workers/parser/utils/closest.js b/devtools/client/debugger/src/workers/parser/utils/closest.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/utils/closest.js
rename to devtools/client/debugger/src/workers/parser/utils/closest.js
diff --git a/devtools/client/debugger/new/src/workers/parser/utils/contains.js b/devtools/client/debugger/src/workers/parser/utils/contains.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/utils/contains.js
rename to devtools/client/debugger/src/workers/parser/utils/contains.js
diff --git a/devtools/client/debugger/new/src/workers/parser/utils/formatSymbols.js b/devtools/client/debugger/src/workers/parser/utils/formatSymbols.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/utils/formatSymbols.js
rename to devtools/client/debugger/src/workers/parser/utils/formatSymbols.js
diff --git a/devtools/client/debugger/new/src/workers/parser/utils/getFunctionName.js b/devtools/client/debugger/src/workers/parser/utils/getFunctionName.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/utils/getFunctionName.js
rename to devtools/client/debugger/src/workers/parser/utils/getFunctionName.js
diff --git a/devtools/client/debugger/new/src/workers/parser/utils/helpers.js b/devtools/client/debugger/src/workers/parser/utils/helpers.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/utils/helpers.js
rename to devtools/client/debugger/src/workers/parser/utils/helpers.js
diff --git a/devtools/client/debugger/new/src/workers/parser/utils/inferClassName.js b/devtools/client/debugger/src/workers/parser/utils/inferClassName.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/utils/inferClassName.js
rename to devtools/client/debugger/src/workers/parser/utils/inferClassName.js
diff --git a/devtools/client/debugger/new/src/workers/parser/utils/simple-path.js b/devtools/client/debugger/src/workers/parser/utils/simple-path.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/utils/simple-path.js
rename to devtools/client/debugger/src/workers/parser/utils/simple-path.js
diff --git a/devtools/client/debugger/new/src/workers/parser/utils/tests/ast.spec.js b/devtools/client/debugger/src/workers/parser/utils/tests/ast.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/utils/tests/ast.spec.js
rename to devtools/client/debugger/src/workers/parser/utils/tests/ast.spec.js
diff --git a/devtools/client/debugger/new/src/workers/parser/validate.js b/devtools/client/debugger/src/workers/parser/validate.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/validate.js
rename to devtools/client/debugger/src/workers/parser/validate.js
diff --git a/devtools/client/debugger/new/src/workers/parser/worker.js b/devtools/client/debugger/src/workers/parser/worker.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/parser/worker.js
rename to devtools/client/debugger/src/workers/parser/worker.js
diff --git a/devtools/client/debugger/new/src/workers/pretty-print/index.js b/devtools/client/debugger/src/workers/pretty-print/index.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/pretty-print/index.js
rename to devtools/client/debugger/src/workers/pretty-print/index.js
diff --git a/devtools/client/debugger/new/src/workers/pretty-print/moz.build b/devtools/client/debugger/src/workers/pretty-print/moz.build
similarity index 100%
rename from devtools/client/debugger/new/src/workers/pretty-print/moz.build
rename to devtools/client/debugger/src/workers/pretty-print/moz.build
diff --git a/devtools/client/debugger/new/src/workers/pretty-print/worker.js b/devtools/client/debugger/src/workers/pretty-print/worker.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/pretty-print/worker.js
rename to devtools/client/debugger/src/workers/pretty-print/worker.js
diff --git a/devtools/client/debugger/new/src/workers/search/get-matches.js b/devtools/client/debugger/src/workers/search/get-matches.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/search/get-matches.js
rename to devtools/client/debugger/src/workers/search/get-matches.js
diff --git a/devtools/client/debugger/new/src/workers/search/index.js b/devtools/client/debugger/src/workers/search/index.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/search/index.js
rename to devtools/client/debugger/src/workers/search/index.js
diff --git a/devtools/client/debugger/new/src/workers/search/moz.build b/devtools/client/debugger/src/workers/search/moz.build
similarity index 100%
rename from devtools/client/debugger/new/src/workers/search/moz.build
rename to devtools/client/debugger/src/workers/search/moz.build
diff --git a/devtools/client/debugger/new/src/workers/search/project-search.js b/devtools/client/debugger/src/workers/search/project-search.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/search/project-search.js
rename to devtools/client/debugger/src/workers/search/project-search.js
diff --git a/devtools/client/debugger/new/src/workers/search/tests/__snapshots__/project-search.spec.js.snap b/devtools/client/debugger/src/workers/search/tests/__snapshots__/project-search.spec.js.snap
similarity index 100%
rename from devtools/client/debugger/new/src/workers/search/tests/__snapshots__/project-search.spec.js.snap
rename to devtools/client/debugger/src/workers/search/tests/__snapshots__/project-search.spec.js.snap
diff --git a/devtools/client/debugger/new/src/workers/search/tests/get-matches.spec.js b/devtools/client/debugger/src/workers/search/tests/get-matches.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/search/tests/get-matches.spec.js
rename to devtools/client/debugger/src/workers/search/tests/get-matches.spec.js
diff --git a/devtools/client/debugger/new/src/workers/search/tests/project-search.spec.js b/devtools/client/debugger/src/workers/search/tests/project-search.spec.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/search/tests/project-search.spec.js
rename to devtools/client/debugger/src/workers/search/tests/project-search.spec.js
diff --git a/devtools/client/debugger/new/src/workers/search/worker.js b/devtools/client/debugger/src/workers/search/worker.js
similarity index 100%
rename from devtools/client/debugger/new/src/workers/search/worker.js
rename to devtools/client/debugger/src/workers/search/worker.js
diff --git a/devtools/client/debugger/new/test/mochitest/.eslintrc b/devtools/client/debugger/test/mochitest/.eslintrc
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/.eslintrc
rename to devtools/client/debugger/test/mochitest/.eslintrc
diff --git a/devtools/client/debugger/new/test/mochitest/browser.ini b/devtools/client/debugger/test/mochitest/browser.ini
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser.ini
rename to devtools/client/debugger/test/mochitest/browser.ini
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-asm.js b/devtools/client/debugger/test/mochitest/browser_dbg-asm.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-asm.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-asm.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-async-stepping.js b/devtools/client/debugger/test/mochitest/browser_dbg-async-stepping.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-async-stepping.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-async-stepping.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-audiocontext.js b/devtools/client/debugger/test/mochitest/browser_dbg-audiocontext.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-audiocontext.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-audiocontext.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-blackbox-original.js b/devtools/client/debugger/test/mochitest/browser_dbg-blackbox-original.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-blackbox-original.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-blackbox-original.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-breaking-from-console.js b/devtools/client/debugger/test/mochitest/browser_dbg-breaking-from-console.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-breaking-from-console.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-breaking-from-console.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-breaking.js b/devtools/client/debugger/test/mochitest/browser_dbg-breaking.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-breaking.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-breaking.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-breakpoint-skipping.js b/devtools/client/debugger/test/mochitest/browser_dbg-breakpoint-skipping.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-breakpoint-skipping.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-breakpoint-skipping.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-breakpoints-actions.js b/devtools/client/debugger/test/mochitest/browser_dbg-breakpoints-actions.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-breakpoints-actions.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-breakpoints-actions.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-breakpoints-columns.js b/devtools/client/debugger/test/mochitest/browser_dbg-breakpoints-columns.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-breakpoints-columns.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-breakpoints-columns.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-breakpoints-cond.js b/devtools/client/debugger/test/mochitest/browser_dbg-breakpoints-cond.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-breakpoints-cond.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-breakpoints-cond.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-breakpoints-duplicate-functions.js b/devtools/client/debugger/test/mochitest/browser_dbg-breakpoints-duplicate-functions.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-breakpoints-duplicate-functions.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-breakpoints-duplicate-functions.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-breakpoints-reloading.js b/devtools/client/debugger/test/mochitest/browser_dbg-breakpoints-reloading.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-breakpoints-reloading.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-breakpoints-reloading.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-breakpoints.js b/devtools/client/debugger/test/mochitest/browser_dbg-breakpoints.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-breakpoints.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-breakpoints.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-browser-content-toolbox.js b/devtools/client/debugger/test/mochitest/browser_dbg-browser-content-toolbox.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-browser-content-toolbox.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-browser-content-toolbox.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-call-stack.js b/devtools/client/debugger/test/mochitest/browser_dbg-call-stack.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-call-stack.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-call-stack.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-chrome-create.js b/devtools/client/debugger/test/mochitest/browser_dbg-chrome-create.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-chrome-create.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-chrome-create.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-chrome-debugging.js b/devtools/client/debugger/test/mochitest/browser_dbg-chrome-debugging.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-chrome-debugging.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-chrome-debugging.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-console-async.js b/devtools/client/debugger/test/mochitest/browser_dbg-console-async.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-console-async.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-console-async.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-console-eval.js b/devtools/client/debugger/test/mochitest/browser_dbg-console-eval.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-console-eval.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-console-eval.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-console-link.js b/devtools/client/debugger/test/mochitest/browser_dbg-console-link.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-console-link.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-console-link.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-console-map-bindings.js b/devtools/client/debugger/test/mochitest/browser_dbg-console-map-bindings.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-console-map-bindings.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-console-map-bindings.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-console.js b/devtools/client/debugger/test/mochitest/browser_dbg-console.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-console.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-console.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-content-script-sources.js b/devtools/client/debugger/test/mochitest/browser_dbg-content-script-sources.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-content-script-sources.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-content-script-sources.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-debug-line.js b/devtools/client/debugger/test/mochitest/browser_dbg-debug-line.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-debug-line.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-debug-line.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-debugger-buttons.js b/devtools/client/debugger/test/mochitest/browser_dbg-debugger-buttons.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-debugger-buttons.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-debugger-buttons.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-editor-gutter.js b/devtools/client/debugger/test/mochitest/browser_dbg-editor-gutter.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-editor-gutter.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-editor-gutter.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-editor-highlight.js b/devtools/client/debugger/test/mochitest/browser_dbg-editor-highlight.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-editor-highlight.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-editor-highlight.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-editor-mode.js b/devtools/client/debugger/test/mochitest/browser_dbg-editor-mode.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-editor-mode.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-editor-mode.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-editor-select.js b/devtools/client/debugger/test/mochitest/browser_dbg-editor-select.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-editor-select.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-editor-select.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-ember-quickstart.js b/devtools/client/debugger/test/mochitest/browser_dbg-ember-quickstart.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-ember-quickstart.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-ember-quickstart.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-eval-throw.js b/devtools/client/debugger/test/mochitest/browser_dbg-eval-throw.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-eval-throw.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-eval-throw.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-event-handler.js b/devtools/client/debugger/test/mochitest/browser_dbg-event-handler.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-event-handler.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-event-handler.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-expressions-error.js b/devtools/client/debugger/test/mochitest/browser_dbg-expressions-error.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-expressions-error.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-expressions-error.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-expressions-focus.js b/devtools/client/debugger/test/mochitest/browser_dbg-expressions-focus.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-expressions-focus.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-expressions-focus.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-expressions.js b/devtools/client/debugger/test/mochitest/browser_dbg-expressions.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-expressions.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-expressions.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-html-breakpoints.js b/devtools/client/debugger/test/mochitest/browser_dbg-html-breakpoints.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-html-breakpoints.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-html-breakpoints.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-iframes.js b/devtools/client/debugger/test/mochitest/browser_dbg-iframes.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-iframes.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-iframes.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-inline-cache.js b/devtools/client/debugger/test/mochitest/browser_dbg-inline-cache.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-inline-cache.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-inline-cache.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-inspector-integration.js b/devtools/client/debugger/test/mochitest/browser_dbg-inspector-integration.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-inspector-integration.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-inspector-integration.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-keyboard-navigation.js b/devtools/client/debugger/test/mochitest/browser_dbg-keyboard-navigation.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-keyboard-navigation.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-keyboard-navigation.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-keyboard-shortcuts.js b/devtools/client/debugger/test/mochitest/browser_dbg-keyboard-shortcuts.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-keyboard-shortcuts.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-keyboard-shortcuts.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-layout-changes.js b/devtools/client/debugger/test/mochitest/browser_dbg-layout-changes.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-layout-changes.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-layout-changes.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-log-points.js b/devtools/client/debugger/test/mochitest/browser_dbg-log-points.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-log-points.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-log-points.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-minified.js b/devtools/client/debugger/test/mochitest/browser_dbg-minified.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-minified.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-minified.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-navigation.js b/devtools/client/debugger/test/mochitest/browser_dbg-navigation.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-navigation.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-navigation.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-outline-filter.js b/devtools/client/debugger/test/mochitest/browser_dbg-outline-filter.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-outline-filter.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-outline-filter.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-outline-pretty.js b/devtools/client/debugger/test/mochitest/browser_dbg-outline-pretty.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-outline-pretty.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-outline-pretty.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-outline.js b/devtools/client/debugger/test/mochitest/browser_dbg-outline.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-outline.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-outline.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-pause-exceptions.js b/devtools/client/debugger/test/mochitest/browser_dbg-pause-exceptions.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-pause-exceptions.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-pause-exceptions.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-pause-on-next.js b/devtools/client/debugger/test/mochitest/browser_dbg-pause-on-next.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-pause-on-next.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-pause-on-next.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-pause-points.js b/devtools/client/debugger/test/mochitest/browser_dbg-pause-points.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-pause-points.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-pause-points.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-pause-ux.js b/devtools/client/debugger/test/mochitest/browser_dbg-pause-ux.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-pause-ux.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-pause-ux.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-pretty-print-breakpoints.js b/devtools/client/debugger/test/mochitest/browser_dbg-pretty-print-breakpoints.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-pretty-print-breakpoints.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-pretty-print-breakpoints.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-pretty-print-console.js b/devtools/client/debugger/test/mochitest/browser_dbg-pretty-print-console.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-pretty-print-console.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-pretty-print-console.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-pretty-print-paused.js b/devtools/client/debugger/test/mochitest/browser_dbg-pretty-print-paused.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-pretty-print-paused.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-pretty-print-paused.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-pretty-print.js b/devtools/client/debugger/test/mochitest/browser_dbg-pretty-print.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-pretty-print.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-pretty-print.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-preview-module.js b/devtools/client/debugger/test/mochitest/browser_dbg-preview-module.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-preview-module.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-preview-module.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-preview-source-maps.js b/devtools/client/debugger/test/mochitest/browser_dbg-preview-source-maps.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-preview-source-maps.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-preview-source-maps.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-preview.js b/devtools/client/debugger/test/mochitest/browser_dbg-preview.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-preview.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-preview.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-quick-open.js b/devtools/client/debugger/test/mochitest/browser_dbg-quick-open.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-quick-open.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-quick-open.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-react-app.js b/devtools/client/debugger/test/mochitest/browser_dbg-react-app.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-react-app.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-react-app.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-react-jsx.js b/devtools/client/debugger/test/mochitest/browser_dbg-react-jsx.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-react-jsx.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-react-jsx.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-reload.js b/devtools/client/debugger/test/mochitest/browser_dbg-reload.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-reload.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-reload.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-reloading.js b/devtools/client/debugger/test/mochitest/browser_dbg-reloading.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-reloading.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-reloading.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-returnvalues.js b/devtools/client/debugger/test/mochitest/browser_dbg-returnvalues.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-returnvalues.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-returnvalues.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-scopes-mutations.js b/devtools/client/debugger/test/mochitest/browser_dbg-scopes-mutations.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-scopes-mutations.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-scopes-mutations.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-scopes.js b/devtools/client/debugger/test/mochitest/browser_dbg-scopes.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-scopes.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-scopes.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-scroll-run-to-completion.js b/devtools/client/debugger/test/mochitest/browser_dbg-scroll-run-to-completion.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-scroll-run-to-completion.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-scroll-run-to-completion.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-search-file.js b/devtools/client/debugger/test/mochitest/browser_dbg-search-file.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-search-file.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-search-file.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-search-project.js b/devtools/client/debugger/test/mochitest/browser_dbg-search-project.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-search-project.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-search-project.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-sourceURL-breakpoint.js b/devtools/client/debugger/test/mochitest/browser_dbg-sourceURL-breakpoint.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-sourceURL-breakpoint.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-sourceURL-breakpoint.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-sourcemapped-breakpoint-console.js b/devtools/client/debugger/test/mochitest/browser_dbg-sourcemapped-breakpoint-console.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-sourcemapped-breakpoint-console.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-sourcemapped-breakpoint-console.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-sourcemapped-preview.js b/devtools/client/debugger/test/mochitest/browser_dbg-sourcemapped-preview.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-sourcemapped-preview.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-sourcemapped-preview.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-sourcemapped-scopes.js b/devtools/client/debugger/test/mochitest/browser_dbg-sourcemapped-scopes.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-sourcemapped-scopes.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-sourcemapped-scopes.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-sourcemapped-stepping.js b/devtools/client/debugger/test/mochitest/browser_dbg-sourcemapped-stepping.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-sourcemapped-stepping.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-sourcemapped-stepping.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-sourcemaps-bogus.js b/devtools/client/debugger/test/mochitest/browser_dbg-sourcemaps-bogus.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-sourcemaps-bogus.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-sourcemaps-bogus.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-sourcemaps-breakpoints.js b/devtools/client/debugger/test/mochitest/browser_dbg-sourcemaps-breakpoints.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-sourcemaps-breakpoints.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-sourcemaps-breakpoints.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-sourcemaps-disabled.js b/devtools/client/debugger/test/mochitest/browser_dbg-sourcemaps-disabled.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-sourcemaps-disabled.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-sourcemaps-disabled.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-sourcemaps-reload.js b/devtools/client/debugger/test/mochitest/browser_dbg-sourcemaps-reload.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-sourcemaps-reload.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-sourcemaps-reload.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-sourcemaps-reloading.js b/devtools/client/debugger/test/mochitest/browser_dbg-sourcemaps-reloading.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-sourcemaps-reloading.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-sourcemaps-reloading.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-sourcemaps.js b/devtools/client/debugger/test/mochitest/browser_dbg-sourcemaps.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-sourcemaps.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-sourcemaps.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-sourcemaps2.js b/devtools/client/debugger/test/mochitest/browser_dbg-sourcemaps2.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-sourcemaps2.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-sourcemaps2.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-sourcemaps3.js b/devtools/client/debugger/test/mochitest/browser_dbg-sourcemaps3.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-sourcemaps3.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-sourcemaps3.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-sources-arrow-keys.js b/devtools/client/debugger/test/mochitest/browser_dbg-sources-arrow-keys.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-sources-arrow-keys.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-sources-arrow-keys.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-sources-named-eval.js b/devtools/client/debugger/test/mochitest/browser_dbg-sources-named-eval.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-sources-named-eval.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-sources-named-eval.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-sources-querystring.js b/devtools/client/debugger/test/mochitest/browser_dbg-sources-querystring.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-sources-querystring.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-sources-querystring.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-sources.js b/devtools/client/debugger/test/mochitest/browser_dbg-sources.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-sources.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-sources.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-stepping.js b/devtools/client/debugger/test/mochitest/browser_dbg-stepping.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-stepping.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-stepping.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-tabs-keyboard.js b/devtools/client/debugger/test/mochitest/browser_dbg-tabs-keyboard.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-tabs-keyboard.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-tabs-keyboard.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-tabs-pretty-print.js b/devtools/client/debugger/test/mochitest/browser_dbg-tabs-pretty-print.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-tabs-pretty-print.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-tabs-pretty-print.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-tabs-without-urls.js b/devtools/client/debugger/test/mochitest/browser_dbg-tabs-without-urls.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-tabs-without-urls.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-tabs-without-urls.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-tabs.js b/devtools/client/debugger/test/mochitest/browser_dbg-tabs.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-tabs.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-tabs.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-toggling-tools.js b/devtools/client/debugger/test/mochitest/browser_dbg-toggling-tools.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-toggling-tools.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-toggling-tools.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-wasm-sourcemaps.js b/devtools/client/debugger/test/mochitest/browser_dbg-wasm-sourcemaps.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-wasm-sourcemaps.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-wasm-sourcemaps.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-windowless-workers-early-breakpoint.js b/devtools/client/debugger/test/mochitest/browser_dbg-windowless-workers-early-breakpoint.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-windowless-workers-early-breakpoint.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-windowless-workers-early-breakpoint.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-windowless-workers.js b/devtools/client/debugger/test/mochitest/browser_dbg-windowless-workers.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-windowless-workers.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-windowless-workers.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-xhr-breakpoints.js b/devtools/client/debugger/test/mochitest/browser_dbg-xhr-breakpoints.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-xhr-breakpoints.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-xhr-breakpoints.js
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-xhr-run-to-completion.js b/devtools/client/debugger/test/mochitest/browser_dbg-xhr-run-to-completion.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/browser_dbg-xhr-run-to-completion.js
rename to devtools/client/debugger/test/mochitest/browser_dbg-xhr-run-to-completion.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/README.md b/devtools/client/debugger/test/mochitest/examples/README.md
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/README.md
rename to devtools/client/debugger/test/mochitest/examples/README.md
diff --git a/devtools/client/debugger/new/test/mochitest/examples/asm.js b/devtools/client/debugger/test/mochitest/examples/asm.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/asm.js
rename to devtools/client/debugger/test/mochitest/examples/asm.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/async.js b/devtools/client/debugger/test/mochitest/examples/async.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/async.js
rename to devtools/client/debugger/test/mochitest/examples/async.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/big-sourcemap.html b/devtools/client/debugger/test/mochitest/examples/big-sourcemap.html
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/big-sourcemap.html
rename to devtools/client/debugger/test/mochitest/examples/big-sourcemap.html
diff --git a/devtools/client/debugger/new/test/mochitest/examples/big-sourcemap_files/bundle.js b/devtools/client/debugger/test/mochitest/examples/big-sourcemap_files/bundle.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/big-sourcemap_files/bundle.js
rename to devtools/client/debugger/test/mochitest/examples/big-sourcemap_files/bundle.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/big-sourcemap_files/bundle.js.map b/devtools/client/debugger/test/mochitest/examples/big-sourcemap_files/bundle.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/big-sourcemap_files/bundle.js.map
rename to devtools/client/debugger/test/mochitest/examples/big-sourcemap_files/bundle.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/bogus-map.js b/devtools/client/debugger/test/mochitest/examples/bogus-map.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/bogus-map.js
rename to devtools/client/debugger/test/mochitest/examples/bogus-map.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/doc-asm.html b/devtools/client/debugger/test/mochitest/examples/doc-asm.html
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/doc-asm.html
rename to devtools/client/debugger/test/mochitest/examples/doc-asm.html
diff --git a/devtools/client/debugger/new/test/mochitest/examples/doc-async.html b/devtools/client/debugger/test/mochitest/examples/doc-async.html
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/doc-async.html
rename to devtools/client/debugger/test/mochitest/examples/doc-async.html
diff --git a/devtools/client/debugger/new/test/mochitest/examples/doc-audiocontext.html b/devtools/client/debugger/test/mochitest/examples/doc-audiocontext.html
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/doc-audiocontext.html
rename to devtools/client/debugger/test/mochitest/examples/doc-audiocontext.html
diff --git a/devtools/client/debugger/new/test/mochitest/examples/doc-content-script-sources.html b/devtools/client/debugger/test/mochitest/examples/doc-content-script-sources.html
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/doc-content-script-sources.html
rename to devtools/client/debugger/test/mochitest/examples/doc-content-script-sources.html
diff --git a/devtools/client/debugger/new/test/mochitest/examples/doc-debugger-statements.html b/devtools/client/debugger/test/mochitest/examples/doc-debugger-statements.html
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/doc-debugger-statements.html
rename to devtools/client/debugger/test/mochitest/examples/doc-debugger-statements.html
diff --git a/devtools/client/debugger/new/test/mochitest/examples/doc-duplicate-functions.html b/devtools/client/debugger/test/mochitest/examples/doc-duplicate-functions.html
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/doc-duplicate-functions.html
rename to devtools/client/debugger/test/mochitest/examples/doc-duplicate-functions.html
diff --git a/devtools/client/debugger/new/test/mochitest/examples/doc-eval-throw.html b/devtools/client/debugger/test/mochitest/examples/doc-eval-throw.html
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/doc-eval-throw.html
rename to devtools/client/debugger/test/mochitest/examples/doc-eval-throw.html
diff --git a/devtools/client/debugger/new/test/mochitest/examples/doc-event-handler.html b/devtools/client/debugger/test/mochitest/examples/doc-event-handler.html
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/doc-event-handler.html
rename to devtools/client/debugger/test/mochitest/examples/doc-event-handler.html
diff --git a/devtools/client/debugger/new/test/mochitest/examples/doc-exceptions.html b/devtools/client/debugger/test/mochitest/examples/doc-exceptions.html
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/doc-exceptions.html
rename to devtools/client/debugger/test/mochitest/examples/doc-exceptions.html
diff --git a/devtools/client/debugger/new/test/mochitest/examples/doc-frames.html b/devtools/client/debugger/test/mochitest/examples/doc-frames.html
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/doc-frames.html
rename to devtools/client/debugger/test/mochitest/examples/doc-frames.html
diff --git a/devtools/client/debugger/new/test/mochitest/examples/doc-html-breakpoints.html b/devtools/client/debugger/test/mochitest/examples/doc-html-breakpoints.html
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/doc-html-breakpoints.html
rename to devtools/client/debugger/test/mochitest/examples/doc-html-breakpoints.html
diff --git a/devtools/client/debugger/new/test/mochitest/examples/doc-iframes.html b/devtools/client/debugger/test/mochitest/examples/doc-iframes.html
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/doc-iframes.html
rename to devtools/client/debugger/test/mochitest/examples/doc-iframes.html
diff --git a/devtools/client/debugger/new/test/mochitest/examples/doc-minified.html b/devtools/client/debugger/test/mochitest/examples/doc-minified.html
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/doc-minified.html
rename to devtools/client/debugger/test/mochitest/examples/doc-minified.html
diff --git a/devtools/client/debugger/new/test/mochitest/examples/doc-minified2.html b/devtools/client/debugger/test/mochitest/examples/doc-minified2.html
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/doc-minified2.html
rename to devtools/client/debugger/test/mochitest/examples/doc-minified2.html
diff --git a/devtools/client/debugger/new/test/mochitest/examples/doc-on-load.html b/devtools/client/debugger/test/mochitest/examples/doc-on-load.html
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/doc-on-load.html
rename to devtools/client/debugger/test/mochitest/examples/doc-on-load.html
diff --git a/devtools/client/debugger/new/test/mochitest/examples/doc-pause-points.html b/devtools/client/debugger/test/mochitest/examples/doc-pause-points.html
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/doc-pause-points.html
rename to devtools/client/debugger/test/mochitest/examples/doc-pause-points.html
diff --git a/devtools/client/debugger/new/test/mochitest/examples/doc-pretty.html b/devtools/client/debugger/test/mochitest/examples/doc-pretty.html
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/doc-pretty.html
rename to devtools/client/debugger/test/mochitest/examples/doc-pretty.html
diff --git a/devtools/client/debugger/new/test/mochitest/examples/doc-preview.html b/devtools/client/debugger/test/mochitest/examples/doc-preview.html
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/doc-preview.html
rename to devtools/client/debugger/test/mochitest/examples/doc-preview.html
diff --git a/devtools/client/debugger/new/test/mochitest/examples/doc-react-jsx.html b/devtools/client/debugger/test/mochitest/examples/doc-react-jsx.html
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/doc-react-jsx.html
rename to devtools/client/debugger/test/mochitest/examples/doc-react-jsx.html
diff --git a/devtools/client/debugger/new/test/mochitest/examples/doc-react.html b/devtools/client/debugger/test/mochitest/examples/doc-react.html
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/doc-react.html
rename to devtools/client/debugger/test/mochitest/examples/doc-react.html
diff --git a/devtools/client/debugger/new/test/mochitest/examples/doc-return-values.html b/devtools/client/debugger/test/mochitest/examples/doc-return-values.html
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/doc-return-values.html
rename to devtools/client/debugger/test/mochitest/examples/doc-return-values.html
diff --git a/devtools/client/debugger/new/test/mochitest/examples/doc-script-mutate.html b/devtools/client/debugger/test/mochitest/examples/doc-script-mutate.html
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/doc-script-mutate.html
rename to devtools/client/debugger/test/mochitest/examples/doc-script-mutate.html
diff --git a/devtools/client/debugger/new/test/mochitest/examples/doc-script-switching.html b/devtools/client/debugger/test/mochitest/examples/doc-script-switching.html
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/doc-script-switching.html
rename to devtools/client/debugger/test/mochitest/examples/doc-script-switching.html
diff --git a/devtools/client/debugger/new/test/mochitest/examples/doc-scripts-debugger.html b/devtools/client/debugger/test/mochitest/examples/doc-scripts-debugger.html
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/doc-scripts-debugger.html
rename to devtools/client/debugger/test/mochitest/examples/doc-scripts-debugger.html
diff --git a/devtools/client/debugger/new/test/mochitest/examples/doc-scripts.html b/devtools/client/debugger/test/mochitest/examples/doc-scripts.html
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/doc-scripts.html
rename to devtools/client/debugger/test/mochitest/examples/doc-scripts.html
diff --git a/devtools/client/debugger/new/test/mochitest/examples/doc-scroll-run-to-completion.html b/devtools/client/debugger/test/mochitest/examples/doc-scroll-run-to-completion.html
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/doc-scroll-run-to-completion.html
rename to devtools/client/debugger/test/mochitest/examples/doc-scroll-run-to-completion.html
diff --git a/devtools/client/debugger/new/test/mochitest/examples/doc-sourceURL-breakpoint.html b/devtools/client/debugger/test/mochitest/examples/doc-sourceURL-breakpoint.html
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/doc-sourceURL-breakpoint.html
rename to devtools/client/debugger/test/mochitest/examples/doc-sourceURL-breakpoint.html
diff --git a/devtools/client/debugger/new/test/mochitest/examples/doc-sourcemap-bogus.html b/devtools/client/debugger/test/mochitest/examples/doc-sourcemap-bogus.html
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/doc-sourcemap-bogus.html
rename to devtools/client/debugger/test/mochitest/examples/doc-sourcemap-bogus.html
diff --git a/devtools/client/debugger/new/test/mochitest/examples/doc-sourcemapped.html b/devtools/client/debugger/test/mochitest/examples/doc-sourcemapped.html
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/doc-sourcemapped.html
rename to devtools/client/debugger/test/mochitest/examples/doc-sourcemapped.html
diff --git a/devtools/client/debugger/new/test/mochitest/examples/doc-sourcemaps.html b/devtools/client/debugger/test/mochitest/examples/doc-sourcemaps.html
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/doc-sourcemaps.html
rename to devtools/client/debugger/test/mochitest/examples/doc-sourcemaps.html
diff --git a/devtools/client/debugger/new/test/mochitest/examples/doc-sourcemaps2.html b/devtools/client/debugger/test/mochitest/examples/doc-sourcemaps2.html
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/doc-sourcemaps2.html
rename to devtools/client/debugger/test/mochitest/examples/doc-sourcemaps2.html
diff --git a/devtools/client/debugger/new/test/mochitest/examples/doc-sourcemaps3.html b/devtools/client/debugger/test/mochitest/examples/doc-sourcemaps3.html
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/doc-sourcemaps3.html
rename to devtools/client/debugger/test/mochitest/examples/doc-sourcemaps3.html
diff --git a/devtools/client/debugger/new/test/mochitest/examples/doc-sources-querystring.html b/devtools/client/debugger/test/mochitest/examples/doc-sources-querystring.html
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/doc-sources-querystring.html
rename to devtools/client/debugger/test/mochitest/examples/doc-sources-querystring.html
diff --git a/devtools/client/debugger/new/test/mochitest/examples/doc-sources.html b/devtools/client/debugger/test/mochitest/examples/doc-sources.html
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/doc-sources.html
rename to devtools/client/debugger/test/mochitest/examples/doc-sources.html
diff --git a/devtools/client/debugger/new/test/mochitest/examples/doc-strict.html b/devtools/client/debugger/test/mochitest/examples/doc-strict.html
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/doc-strict.html
rename to devtools/client/debugger/test/mochitest/examples/doc-strict.html
diff --git a/devtools/client/debugger/new/test/mochitest/examples/doc-wasm-sourcemaps.html b/devtools/client/debugger/test/mochitest/examples/doc-wasm-sourcemaps.html
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/doc-wasm-sourcemaps.html
rename to devtools/client/debugger/test/mochitest/examples/doc-wasm-sourcemaps.html
diff --git a/devtools/client/debugger/new/test/mochitest/examples/doc-windowless-workers-early-breakpoint.html b/devtools/client/debugger/test/mochitest/examples/doc-windowless-workers-early-breakpoint.html
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/doc-windowless-workers-early-breakpoint.html
rename to devtools/client/debugger/test/mochitest/examples/doc-windowless-workers-early-breakpoint.html
diff --git a/devtools/client/debugger/new/test/mochitest/examples/doc-windowless-workers.html b/devtools/client/debugger/test/mochitest/examples/doc-windowless-workers.html
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/doc-windowless-workers.html
rename to devtools/client/debugger/test/mochitest/examples/doc-windowless-workers.html
diff --git a/devtools/client/debugger/new/test/mochitest/examples/doc-xhr-run-to-completion.html b/devtools/client/debugger/test/mochitest/examples/doc-xhr-run-to-completion.html
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/doc-xhr-run-to-completion.html
rename to devtools/client/debugger/test/mochitest/examples/doc-xhr-run-to-completion.html
diff --git a/devtools/client/debugger/new/test/mochitest/examples/doc-xhr.html b/devtools/client/debugger/test/mochitest/examples/doc-xhr.html
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/doc-xhr.html
rename to devtools/client/debugger/test/mochitest/examples/doc-xhr.html
diff --git a/devtools/client/debugger/new/test/mochitest/examples/ember/quickstart/.editorconfig b/devtools/client/debugger/test/mochitest/examples/ember/quickstart/.editorconfig
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/ember/quickstart/.editorconfig
rename to devtools/client/debugger/test/mochitest/examples/ember/quickstart/.editorconfig
diff --git a/devtools/client/debugger/new/test/mochitest/examples/ember/quickstart/.ember-cli b/devtools/client/debugger/test/mochitest/examples/ember/quickstart/.ember-cli
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/ember/quickstart/.ember-cli
rename to devtools/client/debugger/test/mochitest/examples/ember/quickstart/.ember-cli
diff --git a/devtools/client/debugger/new/test/mochitest/examples/ember/quickstart/.eslintrc.js b/devtools/client/debugger/test/mochitest/examples/ember/quickstart/.eslintrc.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/ember/quickstart/.eslintrc.js
rename to devtools/client/debugger/test/mochitest/examples/ember/quickstart/.eslintrc.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/ember/quickstart/.gitignore b/devtools/client/debugger/test/mochitest/examples/ember/quickstart/.gitignore
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/ember/quickstart/.gitignore
rename to devtools/client/debugger/test/mochitest/examples/ember/quickstart/.gitignore
diff --git a/devtools/client/debugger/new/test/mochitest/examples/ember/quickstart/.travis.yml b/devtools/client/debugger/test/mochitest/examples/ember/quickstart/.travis.yml
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/ember/quickstart/.travis.yml
rename to devtools/client/debugger/test/mochitest/examples/ember/quickstart/.travis.yml
diff --git a/devtools/client/debugger/new/test/mochitest/examples/ember/quickstart/.watchmanconfig b/devtools/client/debugger/test/mochitest/examples/ember/quickstart/.watchmanconfig
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/ember/quickstart/.watchmanconfig
rename to devtools/client/debugger/test/mochitest/examples/ember/quickstart/.watchmanconfig
diff --git a/devtools/client/debugger/new/test/mochitest/examples/ember/quickstart/dist/assets/quickstart.css b/devtools/client/debugger/test/mochitest/examples/ember/quickstart/dist/assets/quickstart.css
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/ember/quickstart/dist/assets/quickstart.css
rename to devtools/client/debugger/test/mochitest/examples/ember/quickstart/dist/assets/quickstart.css
diff --git a/devtools/client/debugger/new/test/mochitest/examples/ember/quickstart/dist/assets/quickstart.js b/devtools/client/debugger/test/mochitest/examples/ember/quickstart/dist/assets/quickstart.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/ember/quickstart/dist/assets/quickstart.js
rename to devtools/client/debugger/test/mochitest/examples/ember/quickstart/dist/assets/quickstart.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/ember/quickstart/dist/assets/quickstart.map b/devtools/client/debugger/test/mochitest/examples/ember/quickstart/dist/assets/quickstart.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/ember/quickstart/dist/assets/quickstart.map
rename to devtools/client/debugger/test/mochitest/examples/ember/quickstart/dist/assets/quickstart.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/ember/quickstart/dist/assets/test-support.css b/devtools/client/debugger/test/mochitest/examples/ember/quickstart/dist/assets/test-support.css
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/ember/quickstart/dist/assets/test-support.css
rename to devtools/client/debugger/test/mochitest/examples/ember/quickstart/dist/assets/test-support.css
diff --git a/devtools/client/debugger/new/test/mochitest/examples/ember/quickstart/dist/assets/test-support.js b/devtools/client/debugger/test/mochitest/examples/ember/quickstart/dist/assets/test-support.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/ember/quickstart/dist/assets/test-support.js
rename to devtools/client/debugger/test/mochitest/examples/ember/quickstart/dist/assets/test-support.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/ember/quickstart/dist/assets/test-support.map b/devtools/client/debugger/test/mochitest/examples/ember/quickstart/dist/assets/test-support.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/ember/quickstart/dist/assets/test-support.map
rename to devtools/client/debugger/test/mochitest/examples/ember/quickstart/dist/assets/test-support.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/ember/quickstart/dist/assets/tests.js b/devtools/client/debugger/test/mochitest/examples/ember/quickstart/dist/assets/tests.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/ember/quickstart/dist/assets/tests.js
rename to devtools/client/debugger/test/mochitest/examples/ember/quickstart/dist/assets/tests.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/ember/quickstart/dist/assets/tests.map b/devtools/client/debugger/test/mochitest/examples/ember/quickstart/dist/assets/tests.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/ember/quickstart/dist/assets/tests.map
rename to devtools/client/debugger/test/mochitest/examples/ember/quickstart/dist/assets/tests.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/ember/quickstart/dist/assets/vendor.css b/devtools/client/debugger/test/mochitest/examples/ember/quickstart/dist/assets/vendor.css
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/ember/quickstart/dist/assets/vendor.css
rename to devtools/client/debugger/test/mochitest/examples/ember/quickstart/dist/assets/vendor.css
diff --git a/devtools/client/debugger/new/test/mochitest/examples/ember/quickstart/dist/assets/vendor.js b/devtools/client/debugger/test/mochitest/examples/ember/quickstart/dist/assets/vendor.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/ember/quickstart/dist/assets/vendor.js
rename to devtools/client/debugger/test/mochitest/examples/ember/quickstart/dist/assets/vendor.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/ember/quickstart/dist/assets/vendor.map b/devtools/client/debugger/test/mochitest/examples/ember/quickstart/dist/assets/vendor.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/ember/quickstart/dist/assets/vendor.map
rename to devtools/client/debugger/test/mochitest/examples/ember/quickstart/dist/assets/vendor.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/ember/quickstart/dist/index.html b/devtools/client/debugger/test/mochitest/examples/ember/quickstart/dist/index.html
similarity index 59%
rename from devtools/client/debugger/new/test/mochitest/examples/ember/quickstart/dist/index.html
rename to devtools/client/debugger/test/mochitest/examples/ember/quickstart/dist/index.html
index 78c24914aeee..d06170221d74 100644
--- a/devtools/client/debugger/new/test/mochitest/examples/ember/quickstart/dist/index.html
+++ b/devtools/client/debugger/test/mochitest/examples/ember/quickstart/dist/index.html
@@ -8,18 +8,18 @@
-
+
-
-
+
+
-
-
+
+
diff --git a/devtools/client/debugger/new/test/mochitest/examples/ember/quickstart/dist/robots.txt b/devtools/client/debugger/test/mochitest/examples/ember/quickstart/dist/robots.txt
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/ember/quickstart/dist/robots.txt
rename to devtools/client/debugger/test/mochitest/examples/ember/quickstart/dist/robots.txt
diff --git a/devtools/client/debugger/new/test/mochitest/examples/ember/quickstart/dist/testem.js b/devtools/client/debugger/test/mochitest/examples/ember/quickstart/dist/testem.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/ember/quickstart/dist/testem.js
rename to devtools/client/debugger/test/mochitest/examples/ember/quickstart/dist/testem.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/entry.js b/devtools/client/debugger/test/mochitest/examples/entry.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/entry.js
rename to devtools/client/debugger/test/mochitest/examples/entry.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/exceptions.js b/devtools/client/debugger/test/mochitest/examples/exceptions.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/exceptions.js
rename to devtools/client/debugger/test/mochitest/examples/exceptions.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/fetch.js b/devtools/client/debugger/test/mochitest/examples/fetch.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/fetch.js
rename to devtools/client/debugger/test/mochitest/examples/fetch.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/frames.js b/devtools/client/debugger/test/mochitest/examples/frames.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/frames.js
rename to devtools/client/debugger/test/mochitest/examples/frames.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/html-breakpoints-slow.js b/devtools/client/debugger/test/mochitest/examples/html-breakpoints-slow.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/html-breakpoints-slow.js
rename to devtools/client/debugger/test/mochitest/examples/html-breakpoints-slow.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/long.js b/devtools/client/debugger/test/mochitest/examples/long.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/long.js
rename to devtools/client/debugger/test/mochitest/examples/long.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/math.min.js b/devtools/client/debugger/test/mochitest/examples/math.min.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/math.min.js
rename to devtools/client/debugger/test/mochitest/examples/math.min.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/nested/nested-source.js b/devtools/client/debugger/test/mochitest/examples/nested/nested-source.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/nested/nested-source.js
rename to devtools/client/debugger/test/mochitest/examples/nested/nested-source.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/opts.js b/devtools/client/debugger/test/mochitest/examples/opts.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/opts.js
rename to devtools/client/debugger/test/mochitest/examples/opts.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/output.js b/devtools/client/debugger/test/mochitest/examples/output.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/output.js
rename to devtools/client/debugger/test/mochitest/examples/output.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/pause-points.js b/devtools/client/debugger/test/mochitest/examples/pause-points.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/pause-points.js
rename to devtools/client/debugger/test/mochitest/examples/pause-points.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/pretty.js b/devtools/client/debugger/test/mochitest/examples/pretty.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/pretty.js
rename to devtools/client/debugger/test/mochitest/examples/pretty.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/preview.js b/devtools/client/debugger/test/mochitest/examples/preview.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/preview.js
rename to devtools/client/debugger/test/mochitest/examples/preview.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/react/.gitignore b/devtools/client/debugger/test/mochitest/examples/react/.gitignore
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/react/.gitignore
rename to devtools/client/debugger/test/mochitest/examples/react/.gitignore
diff --git a/devtools/client/debugger/new/test/mochitest/examples/react/README.md b/devtools/client/debugger/test/mochitest/examples/react/README.md
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/react/README.md
rename to devtools/client/debugger/test/mochitest/examples/react/README.md
diff --git a/devtools/client/debugger/new/test/mochitest/examples/react/build/asset-manifest.json b/devtools/client/debugger/test/mochitest/examples/react/build/asset-manifest.json
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/react/build/asset-manifest.json
rename to devtools/client/debugger/test/mochitest/examples/react/build/asset-manifest.json
diff --git a/devtools/client/debugger/new/test/mochitest/examples/react/build/index.html b/devtools/client/debugger/test/mochitest/examples/react/build/index.html
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/react/build/index.html
rename to devtools/client/debugger/test/mochitest/examples/react/build/index.html
diff --git a/devtools/client/debugger/new/test/mochitest/examples/react/build/main.js b/devtools/client/debugger/test/mochitest/examples/react/build/main.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/react/build/main.js
rename to devtools/client/debugger/test/mochitest/examples/react/build/main.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/react/build/main.js.map b/devtools/client/debugger/test/mochitest/examples/react/build/main.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/react/build/main.js.map
rename to devtools/client/debugger/test/mochitest/examples/react/build/main.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/react/build/service-worker.js b/devtools/client/debugger/test/mochitest/examples/react/build/service-worker.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/react/build/service-worker.js
rename to devtools/client/debugger/test/mochitest/examples/react/build/service-worker.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/react/config-overrides.js b/devtools/client/debugger/test/mochitest/examples/react/config-overrides.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/react/config-overrides.js
rename to devtools/client/debugger/test/mochitest/examples/react/config-overrides.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/react/package.json b/devtools/client/debugger/test/mochitest/examples/react/package.json
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/react/package.json
rename to devtools/client/debugger/test/mochitest/examples/react/package.json
diff --git a/devtools/client/debugger/new/test/mochitest/examples/react/public/index.html b/devtools/client/debugger/test/mochitest/examples/react/public/index.html
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/react/public/index.html
rename to devtools/client/debugger/test/mochitest/examples/react/public/index.html
diff --git a/devtools/client/debugger/new/test/mochitest/examples/react/src/App.js b/devtools/client/debugger/test/mochitest/examples/react/src/App.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/react/src/App.js
rename to devtools/client/debugger/test/mochitest/examples/react/src/App.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/react/src/index.js b/devtools/client/debugger/test/mochitest/examples/react/src/index.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/react/src/index.js
rename to devtools/client/debugger/test/mochitest/examples/react/src/index.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/react/yarn.lock b/devtools/client/debugger/test/mochitest/examples/react/yarn.lock
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/react/yarn.lock
rename to devtools/client/debugger/test/mochitest/examples/react/yarn.lock
diff --git a/devtools/client/debugger/new/test/mochitest/examples/reload/code_reload_1.js b/devtools/client/debugger/test/mochitest/examples/reload/code_reload_1.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/reload/code_reload_1.js
rename to devtools/client/debugger/test/mochitest/examples/reload/code_reload_1.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/reload/code_reload_2.js b/devtools/client/debugger/test/mochitest/examples/reload/code_reload_2.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/reload/code_reload_2.js
rename to devtools/client/debugger/test/mochitest/examples/reload/code_reload_2.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/reload/doc-reload.html b/devtools/client/debugger/test/mochitest/examples/reload/doc-reload.html
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/reload/doc-reload.html
rename to devtools/client/debugger/test/mochitest/examples/reload/doc-reload.html
diff --git a/devtools/client/debugger/new/test/mochitest/examples/reload/sjs_code_reload.sjs b/devtools/client/debugger/test/mochitest/examples/reload/sjs_code_reload.sjs
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/reload/sjs_code_reload.sjs
rename to devtools/client/debugger/test/mochitest/examples/reload/sjs_code_reload.sjs
diff --git a/devtools/client/debugger/new/test/mochitest/examples/script-mutate.js b/devtools/client/debugger/test/mochitest/examples/script-mutate.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/script-mutate.js
rename to devtools/client/debugger/test/mochitest/examples/script-mutate.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/script-switching-01.js b/devtools/client/debugger/test/mochitest/examples/script-switching-01.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/script-switching-01.js
rename to devtools/client/debugger/test/mochitest/examples/script-switching-01.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/script-switching-02.js b/devtools/client/debugger/test/mochitest/examples/script-switching-02.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/script-switching-02.js
rename to devtools/client/debugger/test/mochitest/examples/script-switching-02.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/simple-worker.js b/devtools/client/debugger/test/mochitest/examples/simple-worker.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/simple-worker.js
rename to devtools/client/debugger/test/mochitest/examples/simple-worker.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/simple1.js b/devtools/client/debugger/test/mochitest/examples/simple1.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/simple1.js
rename to devtools/client/debugger/test/mochitest/examples/simple1.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/simple2.js b/devtools/client/debugger/test/mochitest/examples/simple2.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/simple2.js
rename to devtools/client/debugger/test/mochitest/examples/simple2.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/simple3.js b/devtools/client/debugger/test/mochitest/examples/simple3.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/simple3.js
rename to devtools/client/debugger/test/mochitest/examples/simple3.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sjs_slow-load.sjs b/devtools/client/debugger/test/mochitest/examples/sjs_slow-load.sjs
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sjs_slow-load.sjs
rename to devtools/client/debugger/test/mochitest/examples/sjs_slow-load.sjs
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/.rpt2_cache/120bf459f95b8b447674b99c6fe5d040b99b6a97/types/cache/f67752e2d3a8fd18a75558156ccfd8c764b544a1 b/devtools/client/debugger/test/mochitest/examples/sourcemapped/.rpt2_cache/120bf459f95b8b447674b99c6fe5d040b99b6a97/types/cache/f67752e2d3a8fd18a75558156ccfd8c764b544a1
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/.rpt2_cache/120bf459f95b8b447674b99c6fe5d040b99b6a97/types/cache/f67752e2d3a8fd18a75558156ccfd8c764b544a1
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/.rpt2_cache/120bf459f95b8b447674b99c6fe5d040b99b6a97/types/cache/f67752e2d3a8fd18a75558156ccfd8c764b544a1
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/README.md b/devtools/client/debugger/test/mochitest/examples/sourcemapped/README.md
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/README.md
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/README.md
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/build.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/build.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/build.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/build.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/parcel/index.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/parcel/index.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/parcel/index.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/parcel/index.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/parcel/package.json b/devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/parcel/package.json
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/parcel/package.json
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/parcel/package.json
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/parcel/yarn.lock b/devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/parcel/yarn.lock
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/parcel/yarn.lock
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/parcel/yarn.lock
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/rollup-babel6/index.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/rollup-babel6/index.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/rollup-babel6/index.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/rollup-babel6/index.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/rollup-babel6/package.json b/devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/rollup-babel6/package.json
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/rollup-babel6/package.json
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/rollup-babel6/package.json
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/rollup-babel6/yarn.lock b/devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/rollup-babel6/yarn.lock
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/rollup-babel6/yarn.lock
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/rollup-babel6/yarn.lock
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/rollup-babel7/index.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/rollup-babel7/index.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/rollup-babel7/index.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/rollup-babel7/index.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/rollup-babel7/package.json b/devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/rollup-babel7/package.json
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/rollup-babel7/package.json
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/rollup-babel7/package.json
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/rollup-babel7/yarn.lock b/devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/rollup-babel7/yarn.lock
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/rollup-babel7/yarn.lock
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/rollup-babel7/yarn.lock
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/rollup/index.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/rollup/index.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/rollup/index.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/rollup/index.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/rollup/package.json b/devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/rollup/package.json
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/rollup/package.json
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/rollup/package.json
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/rollup/yarn.lock b/devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/rollup/yarn.lock
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/rollup/yarn.lock
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/rollup/yarn.lock
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/webpack3-babel6/index.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/webpack3-babel6/index.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/webpack3-babel6/index.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/webpack3-babel6/index.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/webpack3-babel6/package.json b/devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/webpack3-babel6/package.json
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/webpack3-babel6/package.json
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/webpack3-babel6/package.json
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/webpack3-babel6/yarn.lock b/devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/webpack3-babel6/yarn.lock
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/webpack3-babel6/yarn.lock
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/webpack3-babel6/yarn.lock
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/webpack3-babel7/index.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/webpack3-babel7/index.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/webpack3-babel7/index.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/webpack3-babel7/index.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/webpack3-babel7/package.json b/devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/webpack3-babel7/package.json
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/webpack3-babel7/package.json
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/webpack3-babel7/package.json
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/webpack3-babel7/yarn.lock b/devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/webpack3-babel7/yarn.lock
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/webpack3-babel7/yarn.lock
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/webpack3-babel7/yarn.lock
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/webpack3/index.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/webpack3/index.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/webpack3/index.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/webpack3/index.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/webpack3/package.json b/devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/webpack3/package.json
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/webpack3/package.json
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/webpack3/package.json
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/webpack3/yarn.lock b/devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/webpack3/yarn.lock
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/webpack3/yarn.lock
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/webpack3/yarn.lock
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/webpack4-babel6/index.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/webpack4-babel6/index.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/webpack4-babel6/index.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/webpack4-babel6/index.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/webpack4-babel6/package.json b/devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/webpack4-babel6/package.json
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/webpack4-babel6/package.json
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/webpack4-babel6/package.json
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/webpack4-babel6/yarn.lock b/devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/webpack4-babel6/yarn.lock
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/webpack4-babel6/yarn.lock
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/webpack4-babel6/yarn.lock
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/webpack4-babel7/index.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/webpack4-babel7/index.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/webpack4-babel7/index.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/webpack4-babel7/index.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/webpack4-babel7/package.json b/devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/webpack4-babel7/package.json
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/webpack4-babel7/package.json
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/webpack4-babel7/package.json
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/webpack4-babel7/yarn.lock b/devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/webpack4-babel7/yarn.lock
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/webpack4-babel7/yarn.lock
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/webpack4-babel7/yarn.lock
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/webpack4/index.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/webpack4/index.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/webpack4/index.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/webpack4/index.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/webpack4/package.json b/devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/webpack4/package.json
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/webpack4/package.json
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/webpack4/package.json
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/webpack4/yarn.lock b/devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/webpack4/yarn.lock
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/builds/webpack4/yarn.lock
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/builds/webpack4/yarn.lock
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/babel-bindings-with-flow/input.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/babel-bindings-with-flow/input.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/babel-bindings-with-flow/input.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/babel-bindings-with-flow/input.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/babel-bindings-with-flow/src/mod.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/babel-bindings-with-flow/src/mod.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/babel-bindings-with-flow/src/mod.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/babel-bindings-with-flow/src/mod.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/babel-classes/input.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/babel-classes/input.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/babel-classes/input.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/babel-classes/input.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/babel-flowtype-bindings/input.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/babel-flowtype-bindings/input.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/babel-flowtype-bindings/input.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/babel-flowtype-bindings/input.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/babel-flowtype-bindings/src/mod.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/babel-flowtype-bindings/src/mod.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/babel-flowtype-bindings/src/mod.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/babel-flowtype-bindings/src/mod.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/classes/input.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/classes/input.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/classes/input.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/classes/input.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules-cjs/input.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules-cjs/input.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules-cjs/input.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules-cjs/input.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules-cjs/src/mod1.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules-cjs/src/mod1.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules-cjs/src/mod1.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules-cjs/src/mod1.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules-cjs/src/mod10.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules-cjs/src/mod10.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules-cjs/src/mod10.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules-cjs/src/mod10.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules-cjs/src/mod11.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules-cjs/src/mod11.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules-cjs/src/mod11.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules-cjs/src/mod11.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules-cjs/src/mod12.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules-cjs/src/mod12.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules-cjs/src/mod12.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules-cjs/src/mod12.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules-cjs/src/mod2.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules-cjs/src/mod2.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules-cjs/src/mod2.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules-cjs/src/mod2.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules-cjs/src/mod3.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules-cjs/src/mod3.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules-cjs/src/mod3.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules-cjs/src/mod3.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules-cjs/src/mod4.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules-cjs/src/mod4.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules-cjs/src/mod4.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules-cjs/src/mod4.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules-cjs/src/mod5.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules-cjs/src/mod5.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules-cjs/src/mod5.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules-cjs/src/mod5.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules-cjs/src/mod6.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules-cjs/src/mod6.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules-cjs/src/mod6.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules-cjs/src/mod6.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules-cjs/src/mod7.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules-cjs/src/mod7.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules-cjs/src/mod7.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules-cjs/src/mod7.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules-cjs/src/mod8.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules-cjs/src/mod8.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules-cjs/src/mod8.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules-cjs/src/mod8.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules-cjs/src/mod9.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules-cjs/src/mod9.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules-cjs/src/mod9.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules-cjs/src/mod9.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules-cjs/src/optimized-out.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules-cjs/src/optimized-out.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules-cjs/src/optimized-out.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules-cjs/src/optimized-out.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules-es6/input.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules-es6/input.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules-es6/input.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules-es6/input.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules-es6/src/mod1.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules-es6/src/mod1.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules-es6/src/mod1.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules-es6/src/mod1.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules-es6/src/mod10.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules-es6/src/mod10.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules-es6/src/mod10.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules-es6/src/mod10.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules-es6/src/mod11.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules-es6/src/mod11.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules-es6/src/mod11.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules-es6/src/mod11.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules-es6/src/mod12.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules-es6/src/mod12.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules-es6/src/mod12.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules-es6/src/mod12.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules-es6/src/mod2.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules-es6/src/mod2.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules-es6/src/mod2.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules-es6/src/mod2.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules-es6/src/mod3.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules-es6/src/mod3.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules-es6/src/mod3.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules-es6/src/mod3.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules-es6/src/mod4.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules-es6/src/mod4.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules-es6/src/mod4.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules-es6/src/mod4.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules-es6/src/mod5.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules-es6/src/mod5.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules-es6/src/mod5.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules-es6/src/mod5.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules-es6/src/mod6.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules-es6/src/mod6.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules-es6/src/mod6.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules-es6/src/mod6.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules-es6/src/mod7.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules-es6/src/mod7.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules-es6/src/mod7.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules-es6/src/mod7.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules-es6/src/mod8.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules-es6/src/mod8.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules-es6/src/mod8.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules-es6/src/mod8.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules-es6/src/mod9.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules-es6/src/mod9.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules-es6/src/mod9.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules-es6/src/mod9.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules-es6/src/optimized-out.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules-es6/src/optimized-out.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules-es6/src/optimized-out.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules-es6/src/optimized-out.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules/input.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules/input.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules/input.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules/input.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules/src/mod1.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules/src/mod1.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules/src/mod1.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules/src/mod1.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules/src/mod10.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules/src/mod10.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules/src/mod10.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules/src/mod10.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules/src/mod11.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules/src/mod11.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules/src/mod11.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules/src/mod11.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules/src/mod12.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules/src/mod12.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules/src/mod12.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules/src/mod12.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules/src/mod2.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules/src/mod2.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules/src/mod2.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules/src/mod2.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules/src/mod3.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules/src/mod3.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules/src/mod3.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules/src/mod3.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules/src/mod4.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules/src/mod4.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules/src/mod4.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules/src/mod4.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules/src/mod5.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules/src/mod5.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules/src/mod5.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules/src/mod5.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules/src/mod6.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules/src/mod6.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules/src/mod6.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules/src/mod6.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules/src/mod7.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules/src/mod7.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules/src/mod7.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules/src/mod7.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules/src/mod8.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules/src/mod8.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules/src/mod8.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules/src/mod8.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules/src/mod9.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules/src/mod9.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules/src/mod9.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules/src/mod9.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules/src/optimized-out.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules/src/optimized-out.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/esmodules/src/optimized-out.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/esmodules/src/optimized-out.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/eval-maps/input.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/eval-maps/input.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/eval-maps/input.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/eval-maps/input.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/for-loops/input.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/for-loops/input.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/for-loops/input.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/for-loops/input.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/for-of/input.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/for-of/input.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/for-of/input.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/for-of/input.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/functions/input.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/functions/input.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/functions/input.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/functions/input.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/lex-and-nonlex/input.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/lex-and-nonlex/input.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/lex-and-nonlex/input.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/lex-and-nonlex/input.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/line-start-bindings-es6/input.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/line-start-bindings-es6/input.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/line-start-bindings-es6/input.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/line-start-bindings-es6/input.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/modules-cjs/input.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/modules-cjs/input.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/modules-cjs/input.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/modules-cjs/input.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/out-of-order-declarations-cjs/input.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/out-of-order-declarations-cjs/input.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/out-of-order-declarations-cjs/input.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/out-of-order-declarations-cjs/input.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/out-of-order-declarations-cjs/src/mod.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/out-of-order-declarations-cjs/src/mod.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/out-of-order-declarations-cjs/src/mod.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/out-of-order-declarations-cjs/src/mod.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/shadowed-vars/input.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/shadowed-vars/input.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/shadowed-vars/input.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/shadowed-vars/input.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/step-over-for-of-array-closure/input.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/step-over-for-of-array-closure/input.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/step-over-for-of-array-closure/input.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/step-over-for-of-array-closure/input.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/step-over-for-of-array/input.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/step-over-for-of-array/input.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/step-over-for-of-array/input.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/step-over-for-of-array/input.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/step-over-for-of-closure/input.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/step-over-for-of-closure/input.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/step-over-for-of-closure/input.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/step-over-for-of-closure/input.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/step-over-for-of/input.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/step-over-for-of/input.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/step-over-for-of/input.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/step-over-for-of/input.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/step-over-function-params/input.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/step-over-function-params/input.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/step-over-function-params/input.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/step-over-function-params/input.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/step-over-regenerator-await/input.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/step-over-regenerator-await/input.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/step-over-regenerator-await/input.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/step-over-regenerator-await/input.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/switches/input.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/switches/input.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/switches/input.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/switches/input.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/this-arguments-bindings/input.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/this-arguments-bindings/input.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/this-arguments-bindings/input.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/this-arguments-bindings/input.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/try-catches/input.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/try-catches/input.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/try-catches/input.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/try-catches/input.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/type-module/input.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/type-module/input.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/type-module/input.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/type-module/input.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/type-script-cjs/input.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/type-script-cjs/input.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/type-script-cjs/input.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/type-script-cjs/input.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/typescript-classes/input.ts b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/typescript-classes/input.ts
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/typescript-classes/input.ts
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/typescript-classes/input.ts
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/typescript-classes/src/mod.ts b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/typescript-classes/src/mod.ts
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/typescript-classes/src/mod.ts
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/typescript-classes/src/mod.ts
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/webpack-functions/input.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/webpack-functions/input.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/webpack-functions/input.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/webpack-functions/input.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/webpack-line-mappings/input.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/webpack-line-mappings/input.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/webpack-line-mappings/input.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/webpack-line-mappings/input.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/webpack-line-mappings/src/mod1.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/webpack-line-mappings/src/mod1.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/fixtures/webpack-line-mappings/src/mod1.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/fixtures/webpack-line-mappings/src/mod1.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/babel-bindings-with-flow.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/babel-bindings-with-flow.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/babel-bindings-with-flow.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/babel-bindings-with-flow.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/babel-bindings-with-flow.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/babel-bindings-with-flow.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/babel-bindings-with-flow.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/babel-bindings-with-flow.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/babel-classes.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/babel-classes.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/babel-classes.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/babel-classes.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/babel-classes.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/babel-classes.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/babel-classes.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/babel-classes.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/babel-flowtype-bindings.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/babel-flowtype-bindings.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/babel-flowtype-bindings.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/babel-flowtype-bindings.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/babel-flowtype-bindings.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/babel-flowtype-bindings.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/babel-flowtype-bindings.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/babel-flowtype-bindings.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/classes.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/classes.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/classes.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/classes.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/classes.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/classes.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/classes.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/classes.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/esmodules-cjs.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/esmodules-cjs.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/esmodules-cjs.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/esmodules-cjs.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/esmodules-cjs.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/esmodules-cjs.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/esmodules-cjs.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/esmodules-cjs.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/esmodules-es6.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/esmodules-es6.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/esmodules-es6.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/esmodules-es6.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/esmodules-es6.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/esmodules-es6.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/esmodules-es6.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/esmodules-es6.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/esmodules.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/esmodules.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/esmodules.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/esmodules.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/esmodules.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/esmodules.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/esmodules.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/esmodules.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/eval-maps.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/eval-maps.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/eval-maps.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/eval-maps.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/eval-maps.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/eval-maps.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/eval-maps.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/eval-maps.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/for-loops.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/for-loops.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/for-loops.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/for-loops.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/for-loops.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/for-loops.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/for-loops.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/for-loops.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/for-of.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/for-of.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/for-of.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/for-of.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/for-of.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/for-of.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/for-of.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/for-of.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/functions.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/functions.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/functions.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/functions.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/functions.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/functions.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/functions.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/functions.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/lex-and-nonlex.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/lex-and-nonlex.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/lex-and-nonlex.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/lex-and-nonlex.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/lex-and-nonlex.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/lex-and-nonlex.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/lex-and-nonlex.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/lex-and-nonlex.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/line-start-bindings-es6.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/line-start-bindings-es6.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/line-start-bindings-es6.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/line-start-bindings-es6.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/line-start-bindings-es6.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/line-start-bindings-es6.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/line-start-bindings-es6.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/line-start-bindings-es6.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/modules-cjs.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/modules-cjs.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/modules-cjs.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/modules-cjs.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/modules-cjs.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/modules-cjs.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/modules-cjs.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/modules-cjs.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/out-of-order-declarations-cjs.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/out-of-order-declarations-cjs.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/out-of-order-declarations-cjs.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/out-of-order-declarations-cjs.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/out-of-order-declarations-cjs.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/out-of-order-declarations-cjs.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/out-of-order-declarations-cjs.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/out-of-order-declarations-cjs.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/shadowed-vars.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/shadowed-vars.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/shadowed-vars.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/shadowed-vars.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/shadowed-vars.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/shadowed-vars.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/shadowed-vars.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/shadowed-vars.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/step-over-for-of-array-closure.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/step-over-for-of-array-closure.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/step-over-for-of-array-closure.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/step-over-for-of-array-closure.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/step-over-for-of-array-closure.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/step-over-for-of-array-closure.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/step-over-for-of-array-closure.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/step-over-for-of-array-closure.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/step-over-for-of-array.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/step-over-for-of-array.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/step-over-for-of-array.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/step-over-for-of-array.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/step-over-for-of-array.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/step-over-for-of-array.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/step-over-for-of-array.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/step-over-for-of-array.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/step-over-for-of-closure.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/step-over-for-of-closure.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/step-over-for-of-closure.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/step-over-for-of-closure.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/step-over-for-of-closure.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/step-over-for-of-closure.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/step-over-for-of-closure.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/step-over-for-of-closure.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/step-over-for-of.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/step-over-for-of.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/step-over-for-of.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/step-over-for-of.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/step-over-for-of.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/step-over-for-of.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/step-over-for-of.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/step-over-for-of.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/step-over-function-params.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/step-over-function-params.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/step-over-function-params.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/step-over-function-params.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/step-over-function-params.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/step-over-function-params.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/step-over-function-params.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/step-over-function-params.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/step-over-regenerator-await.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/step-over-regenerator-await.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/step-over-regenerator-await.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/step-over-regenerator-await.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/step-over-regenerator-await.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/step-over-regenerator-await.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/step-over-regenerator-await.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/step-over-regenerator-await.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/switches.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/switches.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/switches.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/switches.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/switches.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/switches.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/switches.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/switches.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/this-arguments-bindings.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/this-arguments-bindings.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/this-arguments-bindings.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/this-arguments-bindings.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/this-arguments-bindings.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/this-arguments-bindings.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/this-arguments-bindings.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/this-arguments-bindings.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/try-catches.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/try-catches.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/try-catches.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/try-catches.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/try-catches.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/try-catches.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/try-catches.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/try-catches.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/type-module.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/type-module.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/type-module.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/type-module.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/type-module.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/type-module.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/type-module.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/type-module.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/type-script-cjs.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/type-script-cjs.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/type-script-cjs.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/type-script-cjs.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/type-script-cjs.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/type-script-cjs.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/type-script-cjs.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/type-script-cjs.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/typescript-classes.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/typescript-classes.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/typescript-classes.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/typescript-classes.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/typescript-classes.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/typescript-classes.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/typescript-classes.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/typescript-classes.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/webpack-functions.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/webpack-functions.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/webpack-functions.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/webpack-functions.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/webpack-functions.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/webpack-functions.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/webpack-functions.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/webpack-functions.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/webpack-line-mappings.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/webpack-line-mappings.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/webpack-line-mappings.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/webpack-line-mappings.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/webpack-line-mappings.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/webpack-line-mappings.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/parcel/webpack-line-mappings.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/parcel/webpack-line-mappings.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/babel-bindings-with-flow.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/babel-bindings-with-flow.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/babel-bindings-with-flow.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/babel-bindings-with-flow.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/babel-bindings-with-flow.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/babel-bindings-with-flow.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/babel-bindings-with-flow.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/babel-bindings-with-flow.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/babel-classes.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/babel-classes.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/babel-classes.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/babel-classes.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/babel-classes.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/babel-classes.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/babel-classes.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/babel-classes.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/babel-flowtype-bindings.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/babel-flowtype-bindings.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/babel-flowtype-bindings.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/babel-flowtype-bindings.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/babel-flowtype-bindings.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/babel-flowtype-bindings.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/babel-flowtype-bindings.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/babel-flowtype-bindings.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/classes.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/classes.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/classes.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/classes.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/classes.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/classes.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/classes.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/classes.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/esmodules-es6.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/esmodules-es6.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/esmodules-es6.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/esmodules-es6.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/esmodules-es6.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/esmodules-es6.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/esmodules-es6.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/esmodules-es6.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/esmodules.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/esmodules.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/esmodules.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/esmodules.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/esmodules.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/esmodules.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/esmodules.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/esmodules.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/eval-maps.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/eval-maps.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/eval-maps.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/eval-maps.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/eval-maps.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/eval-maps.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/eval-maps.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/eval-maps.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/for-loops.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/for-loops.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/for-loops.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/for-loops.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/for-loops.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/for-loops.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/for-loops.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/for-loops.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/for-of.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/for-of.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/for-of.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/for-of.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/for-of.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/for-of.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/for-of.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/for-of.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/functions.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/functions.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/functions.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/functions.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/functions.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/functions.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/functions.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/functions.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/lex-and-nonlex.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/lex-and-nonlex.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/lex-and-nonlex.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/lex-and-nonlex.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/lex-and-nonlex.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/lex-and-nonlex.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/lex-and-nonlex.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/lex-and-nonlex.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/line-start-bindings-es6.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/line-start-bindings-es6.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/line-start-bindings-es6.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/line-start-bindings-es6.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/line-start-bindings-es6.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/line-start-bindings-es6.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/line-start-bindings-es6.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/line-start-bindings-es6.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/shadowed-vars.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/shadowed-vars.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/shadowed-vars.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/shadowed-vars.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/shadowed-vars.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/shadowed-vars.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/shadowed-vars.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/shadowed-vars.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/step-over-for-of-array-closure.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/step-over-for-of-array-closure.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/step-over-for-of-array-closure.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/step-over-for-of-array-closure.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/step-over-for-of-array-closure.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/step-over-for-of-array-closure.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/step-over-for-of-array-closure.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/step-over-for-of-array-closure.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/step-over-for-of-array.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/step-over-for-of-array.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/step-over-for-of-array.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/step-over-for-of-array.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/step-over-for-of-array.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/step-over-for-of-array.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/step-over-for-of-array.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/step-over-for-of-array.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/step-over-for-of-closure.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/step-over-for-of-closure.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/step-over-for-of-closure.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/step-over-for-of-closure.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/step-over-for-of-closure.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/step-over-for-of-closure.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/step-over-for-of-closure.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/step-over-for-of-closure.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/step-over-for-of.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/step-over-for-of.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/step-over-for-of.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/step-over-for-of.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/step-over-for-of.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/step-over-for-of.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/step-over-for-of.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/step-over-for-of.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/step-over-function-params.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/step-over-function-params.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/step-over-function-params.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/step-over-function-params.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/step-over-function-params.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/step-over-function-params.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/step-over-function-params.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/step-over-function-params.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/step-over-regenerator-await.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/step-over-regenerator-await.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/step-over-regenerator-await.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/step-over-regenerator-await.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/step-over-regenerator-await.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/step-over-regenerator-await.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/step-over-regenerator-await.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/step-over-regenerator-await.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/switches.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/switches.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/switches.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/switches.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/switches.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/switches.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/switches.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/switches.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/this-arguments-bindings.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/this-arguments-bindings.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/this-arguments-bindings.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/this-arguments-bindings.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/this-arguments-bindings.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/this-arguments-bindings.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/this-arguments-bindings.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/this-arguments-bindings.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/try-catches.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/try-catches.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/try-catches.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/try-catches.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/try-catches.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/try-catches.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/try-catches.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/try-catches.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/type-module.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/type-module.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/type-module.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/type-module.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/type-module.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/type-module.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/type-module.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/type-module.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/webpack-functions.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/webpack-functions.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/webpack-functions.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/webpack-functions.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/webpack-functions.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/webpack-functions.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/webpack-functions.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/webpack-functions.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/webpack-line-mappings.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/webpack-line-mappings.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/webpack-line-mappings.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/webpack-line-mappings.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/webpack-line-mappings.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/webpack-line-mappings.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel6/webpack-line-mappings.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel6/webpack-line-mappings.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/babel-bindings-with-flow.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/babel-bindings-with-flow.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/babel-bindings-with-flow.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/babel-bindings-with-flow.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/babel-bindings-with-flow.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/babel-bindings-with-flow.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/babel-bindings-with-flow.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/babel-bindings-with-flow.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/babel-classes.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/babel-classes.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/babel-classes.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/babel-classes.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/babel-classes.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/babel-classes.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/babel-classes.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/babel-classes.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/babel-flowtype-bindings.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/babel-flowtype-bindings.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/babel-flowtype-bindings.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/babel-flowtype-bindings.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/babel-flowtype-bindings.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/babel-flowtype-bindings.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/babel-flowtype-bindings.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/babel-flowtype-bindings.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/classes.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/classes.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/classes.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/classes.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/classes.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/classes.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/classes.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/classes.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/esmodules-es6.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/esmodules-es6.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/esmodules-es6.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/esmodules-es6.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/esmodules-es6.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/esmodules-es6.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/esmodules-es6.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/esmodules-es6.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/esmodules.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/esmodules.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/esmodules.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/esmodules.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/esmodules.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/esmodules.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/esmodules.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/esmodules.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/eval-maps.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/eval-maps.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/eval-maps.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/eval-maps.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/eval-maps.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/eval-maps.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/eval-maps.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/eval-maps.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/for-loops.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/for-loops.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/for-loops.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/for-loops.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/for-loops.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/for-loops.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/for-loops.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/for-loops.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/for-of.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/for-of.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/for-of.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/for-of.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/for-of.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/for-of.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/for-of.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/for-of.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/functions.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/functions.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/functions.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/functions.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/functions.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/functions.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/functions.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/functions.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/lex-and-nonlex.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/lex-and-nonlex.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/lex-and-nonlex.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/lex-and-nonlex.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/lex-and-nonlex.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/lex-and-nonlex.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/lex-and-nonlex.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/lex-and-nonlex.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/line-start-bindings-es6.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/line-start-bindings-es6.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/line-start-bindings-es6.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/line-start-bindings-es6.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/line-start-bindings-es6.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/line-start-bindings-es6.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/line-start-bindings-es6.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/line-start-bindings-es6.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/shadowed-vars.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/shadowed-vars.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/shadowed-vars.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/shadowed-vars.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/shadowed-vars.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/shadowed-vars.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/shadowed-vars.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/shadowed-vars.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/step-over-for-of-array-closure.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/step-over-for-of-array-closure.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/step-over-for-of-array-closure.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/step-over-for-of-array-closure.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/step-over-for-of-array-closure.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/step-over-for-of-array-closure.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/step-over-for-of-array-closure.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/step-over-for-of-array-closure.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/step-over-for-of-array.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/step-over-for-of-array.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/step-over-for-of-array.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/step-over-for-of-array.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/step-over-for-of-array.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/step-over-for-of-array.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/step-over-for-of-array.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/step-over-for-of-array.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/step-over-for-of-closure.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/step-over-for-of-closure.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/step-over-for-of-closure.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/step-over-for-of-closure.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/step-over-for-of-closure.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/step-over-for-of-closure.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/step-over-for-of-closure.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/step-over-for-of-closure.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/step-over-for-of.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/step-over-for-of.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/step-over-for-of.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/step-over-for-of.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/step-over-for-of.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/step-over-for-of.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/step-over-for-of.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/step-over-for-of.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/step-over-function-params.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/step-over-function-params.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/step-over-function-params.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/step-over-function-params.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/step-over-function-params.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/step-over-function-params.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/step-over-function-params.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/step-over-function-params.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/step-over-regenerator-await.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/step-over-regenerator-await.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/step-over-regenerator-await.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/step-over-regenerator-await.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/step-over-regenerator-await.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/step-over-regenerator-await.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/step-over-regenerator-await.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/step-over-regenerator-await.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/switches.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/switches.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/switches.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/switches.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/switches.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/switches.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/switches.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/switches.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/this-arguments-bindings.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/this-arguments-bindings.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/this-arguments-bindings.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/this-arguments-bindings.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/this-arguments-bindings.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/this-arguments-bindings.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/this-arguments-bindings.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/this-arguments-bindings.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/try-catches.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/try-catches.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/try-catches.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/try-catches.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/try-catches.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/try-catches.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/try-catches.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/try-catches.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/type-module.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/type-module.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/type-module.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/type-module.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/type-module.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/type-module.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/type-module.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/type-module.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/webpack-functions.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/webpack-functions.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/webpack-functions.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/webpack-functions.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/webpack-functions.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/webpack-functions.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/webpack-functions.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/webpack-functions.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/webpack-line-mappings.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/webpack-line-mappings.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/webpack-line-mappings.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/webpack-line-mappings.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/webpack-line-mappings.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/webpack-line-mappings.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup-babel7/webpack-line-mappings.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup-babel7/webpack-line-mappings.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/classes.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/classes.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/classes.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/classes.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/classes.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/classes.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/classes.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/classes.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/esmodules-es6.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/esmodules-es6.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/esmodules-es6.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/esmodules-es6.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/esmodules-es6.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/esmodules-es6.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/esmodules-es6.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/esmodules-es6.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/esmodules.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/esmodules.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/esmodules.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/esmodules.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/esmodules.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/esmodules.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/esmodules.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/esmodules.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/eval-maps.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/eval-maps.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/eval-maps.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/eval-maps.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/eval-maps.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/eval-maps.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/eval-maps.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/eval-maps.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/for-loops.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/for-loops.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/for-loops.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/for-loops.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/for-loops.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/for-loops.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/for-loops.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/for-loops.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/for-of.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/for-of.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/for-of.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/for-of.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/for-of.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/for-of.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/for-of.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/for-of.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/functions.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/functions.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/functions.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/functions.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/functions.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/functions.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/functions.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/functions.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/lex-and-nonlex.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/lex-and-nonlex.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/lex-and-nonlex.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/lex-and-nonlex.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/lex-and-nonlex.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/lex-and-nonlex.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/lex-and-nonlex.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/lex-and-nonlex.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/line-start-bindings-es6.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/line-start-bindings-es6.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/line-start-bindings-es6.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/line-start-bindings-es6.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/line-start-bindings-es6.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/line-start-bindings-es6.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/line-start-bindings-es6.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/line-start-bindings-es6.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/shadowed-vars.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/shadowed-vars.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/shadowed-vars.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/shadowed-vars.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/shadowed-vars.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/shadowed-vars.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/shadowed-vars.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/shadowed-vars.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/step-over-for-of-array-closure.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/step-over-for-of-array-closure.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/step-over-for-of-array-closure.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/step-over-for-of-array-closure.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/step-over-for-of-array-closure.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/step-over-for-of-array-closure.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/step-over-for-of-array-closure.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/step-over-for-of-array-closure.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/step-over-for-of-array.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/step-over-for-of-array.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/step-over-for-of-array.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/step-over-for-of-array.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/step-over-for-of-array.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/step-over-for-of-array.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/step-over-for-of-array.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/step-over-for-of-array.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/step-over-for-of-closure.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/step-over-for-of-closure.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/step-over-for-of-closure.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/step-over-for-of-closure.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/step-over-for-of-closure.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/step-over-for-of-closure.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/step-over-for-of-closure.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/step-over-for-of-closure.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/step-over-for-of.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/step-over-for-of.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/step-over-for-of.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/step-over-for-of.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/step-over-for-of.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/step-over-for-of.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/step-over-for-of.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/step-over-for-of.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/step-over-function-params.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/step-over-function-params.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/step-over-function-params.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/step-over-function-params.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/step-over-function-params.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/step-over-function-params.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/step-over-function-params.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/step-over-function-params.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/step-over-regenerator-await.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/step-over-regenerator-await.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/step-over-regenerator-await.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/step-over-regenerator-await.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/step-over-regenerator-await.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/step-over-regenerator-await.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/step-over-regenerator-await.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/step-over-regenerator-await.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/switches.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/switches.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/switches.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/switches.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/switches.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/switches.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/switches.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/switches.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/this-arguments-bindings.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/this-arguments-bindings.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/this-arguments-bindings.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/this-arguments-bindings.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/this-arguments-bindings.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/this-arguments-bindings.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/this-arguments-bindings.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/this-arguments-bindings.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/try-catches.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/try-catches.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/try-catches.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/try-catches.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/try-catches.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/try-catches.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/try-catches.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/try-catches.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/type-module.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/type-module.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/type-module.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/type-module.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/type-module.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/type-module.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/type-module.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/type-module.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/typescript-classes.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/typescript-classes.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/typescript-classes.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/typescript-classes.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/typescript-classes.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/typescript-classes.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/typescript-classes.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/typescript-classes.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/webpack-functions.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/webpack-functions.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/webpack-functions.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/webpack-functions.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/webpack-functions.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/webpack-functions.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/webpack-functions.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/webpack-functions.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/webpack-line-mappings.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/webpack-line-mappings.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/webpack-line-mappings.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/webpack-line-mappings.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/webpack-line-mappings.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/webpack-line-mappings.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/rollup/webpack-line-mappings.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/rollup/webpack-line-mappings.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/babel-bindings-with-flow.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/babel-bindings-with-flow.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/babel-bindings-with-flow.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/babel-bindings-with-flow.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/babel-bindings-with-flow.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/babel-bindings-with-flow.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/babel-bindings-with-flow.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/babel-bindings-with-flow.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/babel-classes.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/babel-classes.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/babel-classes.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/babel-classes.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/babel-classes.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/babel-classes.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/babel-classes.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/babel-classes.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/babel-flowtype-bindings.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/babel-flowtype-bindings.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/babel-flowtype-bindings.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/babel-flowtype-bindings.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/babel-flowtype-bindings.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/babel-flowtype-bindings.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/babel-flowtype-bindings.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/babel-flowtype-bindings.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/classes.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/classes.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/classes.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/classes.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/classes.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/classes.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/classes.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/classes.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/esmodules-cjs.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/esmodules-cjs.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/esmodules-cjs.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/esmodules-cjs.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/esmodules-cjs.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/esmodules-cjs.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/esmodules-cjs.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/esmodules-cjs.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/esmodules-es6.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/esmodules-es6.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/esmodules-es6.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/esmodules-es6.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/esmodules-es6.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/esmodules-es6.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/esmodules-es6.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/esmodules-es6.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/esmodules.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/esmodules.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/esmodules.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/esmodules.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/esmodules.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/esmodules.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/esmodules.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/esmodules.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/eval-maps.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/eval-maps.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/eval-maps.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/eval-maps.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/eval-maps.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/eval-maps.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/eval-maps.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/eval-maps.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/for-loops.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/for-loops.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/for-loops.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/for-loops.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/for-loops.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/for-loops.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/for-loops.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/for-loops.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/for-of.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/for-of.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/for-of.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/for-of.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/for-of.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/for-of.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/for-of.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/for-of.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/functions.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/functions.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/functions.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/functions.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/functions.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/functions.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/functions.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/functions.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/lex-and-nonlex.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/lex-and-nonlex.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/lex-and-nonlex.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/lex-and-nonlex.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/lex-and-nonlex.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/lex-and-nonlex.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/lex-and-nonlex.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/lex-and-nonlex.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/line-start-bindings-es6.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/line-start-bindings-es6.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/line-start-bindings-es6.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/line-start-bindings-es6.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/line-start-bindings-es6.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/line-start-bindings-es6.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/line-start-bindings-es6.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/line-start-bindings-es6.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/modules-cjs.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/modules-cjs.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/modules-cjs.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/modules-cjs.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/modules-cjs.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/modules-cjs.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/modules-cjs.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/modules-cjs.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/out-of-order-declarations-cjs.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/out-of-order-declarations-cjs.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/out-of-order-declarations-cjs.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/out-of-order-declarations-cjs.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/out-of-order-declarations-cjs.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/out-of-order-declarations-cjs.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/out-of-order-declarations-cjs.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/out-of-order-declarations-cjs.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/shadowed-vars.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/shadowed-vars.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/shadowed-vars.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/shadowed-vars.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/shadowed-vars.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/shadowed-vars.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/shadowed-vars.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/shadowed-vars.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/step-over-for-of-array-closure.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/step-over-for-of-array-closure.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/step-over-for-of-array-closure.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/step-over-for-of-array-closure.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/step-over-for-of-array-closure.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/step-over-for-of-array-closure.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/step-over-for-of-array-closure.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/step-over-for-of-array-closure.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/step-over-for-of-array.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/step-over-for-of-array.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/step-over-for-of-array.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/step-over-for-of-array.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/step-over-for-of-array.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/step-over-for-of-array.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/step-over-for-of-array.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/step-over-for-of-array.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/step-over-for-of-closure.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/step-over-for-of-closure.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/step-over-for-of-closure.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/step-over-for-of-closure.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/step-over-for-of-closure.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/step-over-for-of-closure.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/step-over-for-of-closure.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/step-over-for-of-closure.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/step-over-for-of.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/step-over-for-of.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/step-over-for-of.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/step-over-for-of.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/step-over-for-of.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/step-over-for-of.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/step-over-for-of.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/step-over-for-of.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/step-over-function-params.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/step-over-function-params.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/step-over-function-params.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/step-over-function-params.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/step-over-function-params.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/step-over-function-params.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/step-over-function-params.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/step-over-function-params.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/step-over-regenerator-await.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/step-over-regenerator-await.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/step-over-regenerator-await.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/step-over-regenerator-await.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/step-over-regenerator-await.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/step-over-regenerator-await.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/step-over-regenerator-await.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/step-over-regenerator-await.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/switches.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/switches.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/switches.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/switches.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/switches.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/switches.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/switches.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/switches.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/this-arguments-bindings.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/this-arguments-bindings.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/this-arguments-bindings.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/this-arguments-bindings.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/this-arguments-bindings.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/this-arguments-bindings.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/this-arguments-bindings.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/this-arguments-bindings.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/try-catches.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/try-catches.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/try-catches.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/try-catches.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/try-catches.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/try-catches.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/try-catches.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/try-catches.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/type-module.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/type-module.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/type-module.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/type-module.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/type-module.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/type-module.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/type-module.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/type-module.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/type-script-cjs.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/type-script-cjs.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/type-script-cjs.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/type-script-cjs.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/type-script-cjs.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/type-script-cjs.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/type-script-cjs.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/type-script-cjs.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/typescript-classes.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/typescript-classes.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/typescript-classes.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/typescript-classes.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/typescript-classes.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/typescript-classes.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/typescript-classes.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/typescript-classes.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/webpack-functions.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/webpack-functions.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/webpack-functions.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/webpack-functions.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/webpack-functions.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/webpack-functions.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/webpack-functions.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/webpack-functions.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/webpack-line-mappings.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/webpack-line-mappings.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/webpack-line-mappings.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/webpack-line-mappings.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/webpack-line-mappings.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/webpack-line-mappings.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel6/webpack-line-mappings.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel6/webpack-line-mappings.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/babel-bindings-with-flow.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/babel-bindings-with-flow.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/babel-bindings-with-flow.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/babel-bindings-with-flow.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/babel-bindings-with-flow.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/babel-bindings-with-flow.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/babel-bindings-with-flow.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/babel-bindings-with-flow.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/babel-classes.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/babel-classes.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/babel-classes.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/babel-classes.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/babel-classes.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/babel-classes.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/babel-classes.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/babel-classes.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/babel-flowtype-bindings.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/babel-flowtype-bindings.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/babel-flowtype-bindings.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/babel-flowtype-bindings.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/babel-flowtype-bindings.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/babel-flowtype-bindings.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/babel-flowtype-bindings.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/babel-flowtype-bindings.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/classes.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/classes.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/classes.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/classes.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/classes.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/classes.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/classes.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/classes.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/esmodules-cjs.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/esmodules-cjs.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/esmodules-cjs.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/esmodules-cjs.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/esmodules-cjs.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/esmodules-cjs.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/esmodules-cjs.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/esmodules-cjs.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/esmodules-es6.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/esmodules-es6.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/esmodules-es6.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/esmodules-es6.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/esmodules-es6.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/esmodules-es6.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/esmodules-es6.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/esmodules-es6.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/esmodules.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/esmodules.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/esmodules.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/esmodules.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/esmodules.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/esmodules.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/esmodules.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/esmodules.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/eval-maps.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/eval-maps.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/eval-maps.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/eval-maps.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/eval-maps.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/eval-maps.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/eval-maps.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/eval-maps.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/for-loops.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/for-loops.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/for-loops.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/for-loops.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/for-loops.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/for-loops.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/for-loops.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/for-loops.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/for-of.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/for-of.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/for-of.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/for-of.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/for-of.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/for-of.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/for-of.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/for-of.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/functions.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/functions.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/functions.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/functions.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/functions.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/functions.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/functions.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/functions.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/lex-and-nonlex.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/lex-and-nonlex.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/lex-and-nonlex.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/lex-and-nonlex.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/lex-and-nonlex.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/lex-and-nonlex.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/lex-and-nonlex.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/lex-and-nonlex.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/line-start-bindings-es6.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/line-start-bindings-es6.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/line-start-bindings-es6.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/line-start-bindings-es6.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/line-start-bindings-es6.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/line-start-bindings-es6.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/line-start-bindings-es6.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/line-start-bindings-es6.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/modules-cjs.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/modules-cjs.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/modules-cjs.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/modules-cjs.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/modules-cjs.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/modules-cjs.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/modules-cjs.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/modules-cjs.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/out-of-order-declarations-cjs.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/out-of-order-declarations-cjs.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/out-of-order-declarations-cjs.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/out-of-order-declarations-cjs.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/out-of-order-declarations-cjs.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/out-of-order-declarations-cjs.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/out-of-order-declarations-cjs.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/out-of-order-declarations-cjs.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/shadowed-vars.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/shadowed-vars.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/shadowed-vars.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/shadowed-vars.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/shadowed-vars.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/shadowed-vars.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/shadowed-vars.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/shadowed-vars.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/step-over-for-of-array-closure.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/step-over-for-of-array-closure.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/step-over-for-of-array-closure.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/step-over-for-of-array-closure.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/step-over-for-of-array-closure.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/step-over-for-of-array-closure.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/step-over-for-of-array-closure.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/step-over-for-of-array-closure.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/step-over-for-of-array.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/step-over-for-of-array.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/step-over-for-of-array.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/step-over-for-of-array.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/step-over-for-of-array.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/step-over-for-of-array.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/step-over-for-of-array.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/step-over-for-of-array.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/step-over-for-of-closure.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/step-over-for-of-closure.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/step-over-for-of-closure.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/step-over-for-of-closure.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/step-over-for-of-closure.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/step-over-for-of-closure.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/step-over-for-of-closure.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/step-over-for-of-closure.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/step-over-for-of.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/step-over-for-of.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/step-over-for-of.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/step-over-for-of.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/step-over-for-of.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/step-over-for-of.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/step-over-for-of.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/step-over-for-of.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/step-over-function-params.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/step-over-function-params.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/step-over-function-params.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/step-over-function-params.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/step-over-function-params.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/step-over-function-params.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/step-over-function-params.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/step-over-function-params.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/step-over-regenerator-await.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/step-over-regenerator-await.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/step-over-regenerator-await.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/step-over-regenerator-await.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/step-over-regenerator-await.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/step-over-regenerator-await.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/step-over-regenerator-await.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/step-over-regenerator-await.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/switches.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/switches.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/switches.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/switches.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/switches.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/switches.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/switches.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/switches.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/this-arguments-bindings.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/this-arguments-bindings.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/this-arguments-bindings.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/this-arguments-bindings.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/this-arguments-bindings.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/this-arguments-bindings.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/this-arguments-bindings.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/this-arguments-bindings.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/try-catches.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/try-catches.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/try-catches.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/try-catches.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/try-catches.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/try-catches.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/try-catches.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/try-catches.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/type-module.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/type-module.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/type-module.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/type-module.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/type-module.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/type-module.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/type-module.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/type-module.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/type-script-cjs.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/type-script-cjs.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/type-script-cjs.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/type-script-cjs.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/type-script-cjs.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/type-script-cjs.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/type-script-cjs.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/type-script-cjs.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/webpack-functions.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/webpack-functions.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/webpack-functions.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/webpack-functions.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/webpack-functions.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/webpack-functions.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/webpack-functions.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/webpack-functions.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/webpack-line-mappings.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/webpack-line-mappings.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/webpack-line-mappings.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/webpack-line-mappings.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/webpack-line-mappings.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/webpack-line-mappings.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3-babel7/webpack-line-mappings.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3-babel7/webpack-line-mappings.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/classes.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/classes.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/classes.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/classes.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/classes.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/classes.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/classes.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/classes.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/esmodules-cjs.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/esmodules-cjs.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/esmodules-cjs.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/esmodules-cjs.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/esmodules-cjs.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/esmodules-cjs.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/esmodules-cjs.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/esmodules-cjs.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/esmodules-es6.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/esmodules-es6.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/esmodules-es6.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/esmodules-es6.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/esmodules-es6.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/esmodules-es6.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/esmodules-es6.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/esmodules-es6.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/esmodules.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/esmodules.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/esmodules.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/esmodules.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/esmodules.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/esmodules.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/esmodules.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/esmodules.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/eval-maps.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/eval-maps.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/eval-maps.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/eval-maps.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/eval-maps.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/eval-maps.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/eval-maps.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/eval-maps.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/for-loops.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/for-loops.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/for-loops.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/for-loops.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/for-loops.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/for-loops.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/for-loops.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/for-loops.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/for-of.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/for-of.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/for-of.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/for-of.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/for-of.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/for-of.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/for-of.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/for-of.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/functions.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/functions.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/functions.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/functions.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/functions.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/functions.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/functions.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/functions.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/lex-and-nonlex.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/lex-and-nonlex.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/lex-and-nonlex.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/lex-and-nonlex.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/lex-and-nonlex.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/lex-and-nonlex.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/lex-and-nonlex.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/lex-and-nonlex.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/line-start-bindings-es6.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/line-start-bindings-es6.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/line-start-bindings-es6.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/line-start-bindings-es6.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/line-start-bindings-es6.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/line-start-bindings-es6.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/line-start-bindings-es6.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/line-start-bindings-es6.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/modules-cjs.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/modules-cjs.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/modules-cjs.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/modules-cjs.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/modules-cjs.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/modules-cjs.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/modules-cjs.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/modules-cjs.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/out-of-order-declarations-cjs.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/out-of-order-declarations-cjs.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/out-of-order-declarations-cjs.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/out-of-order-declarations-cjs.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/out-of-order-declarations-cjs.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/out-of-order-declarations-cjs.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/out-of-order-declarations-cjs.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/out-of-order-declarations-cjs.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/shadowed-vars.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/shadowed-vars.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/shadowed-vars.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/shadowed-vars.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/shadowed-vars.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/shadowed-vars.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/shadowed-vars.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/shadowed-vars.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/step-over-for-of-array-closure.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/step-over-for-of-array-closure.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/step-over-for-of-array-closure.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/step-over-for-of-array-closure.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/step-over-for-of-array-closure.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/step-over-for-of-array-closure.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/step-over-for-of-array-closure.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/step-over-for-of-array-closure.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/step-over-for-of-array.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/step-over-for-of-array.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/step-over-for-of-array.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/step-over-for-of-array.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/step-over-for-of-array.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/step-over-for-of-array.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/step-over-for-of-array.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/step-over-for-of-array.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/step-over-for-of-closure.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/step-over-for-of-closure.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/step-over-for-of-closure.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/step-over-for-of-closure.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/step-over-for-of-closure.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/step-over-for-of-closure.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/step-over-for-of-closure.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/step-over-for-of-closure.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/step-over-for-of.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/step-over-for-of.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/step-over-for-of.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/step-over-for-of.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/step-over-for-of.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/step-over-for-of.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/step-over-for-of.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/step-over-for-of.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/step-over-function-params.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/step-over-function-params.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/step-over-function-params.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/step-over-function-params.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/step-over-function-params.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/step-over-function-params.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/step-over-function-params.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/step-over-function-params.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/step-over-regenerator-await.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/step-over-regenerator-await.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/step-over-regenerator-await.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/step-over-regenerator-await.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/step-over-regenerator-await.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/step-over-regenerator-await.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/step-over-regenerator-await.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/step-over-regenerator-await.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/switches.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/switches.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/switches.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/switches.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/switches.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/switches.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/switches.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/switches.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/this-arguments-bindings.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/this-arguments-bindings.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/this-arguments-bindings.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/this-arguments-bindings.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/this-arguments-bindings.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/this-arguments-bindings.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/this-arguments-bindings.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/this-arguments-bindings.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/try-catches.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/try-catches.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/try-catches.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/try-catches.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/try-catches.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/try-catches.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/try-catches.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/try-catches.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/type-module.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/type-module.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/type-module.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/type-module.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/type-module.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/type-module.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/type-module.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/type-module.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/type-script-cjs.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/type-script-cjs.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/type-script-cjs.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/type-script-cjs.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/type-script-cjs.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/type-script-cjs.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/type-script-cjs.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/type-script-cjs.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/typescript-classes.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/typescript-classes.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/typescript-classes.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/typescript-classes.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/typescript-classes.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/typescript-classes.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/typescript-classes.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/typescript-classes.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/webpack-functions.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/webpack-functions.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/webpack-functions.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/webpack-functions.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/webpack-functions.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/webpack-functions.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/webpack-functions.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/webpack-functions.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/webpack-line-mappings.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/webpack-line-mappings.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/webpack-line-mappings.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/webpack-line-mappings.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/webpack-line-mappings.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/webpack-line-mappings.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack3/webpack-line-mappings.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack3/webpack-line-mappings.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/babel-bindings-with-flow.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/babel-bindings-with-flow.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/babel-bindings-with-flow.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/babel-bindings-with-flow.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/babel-bindings-with-flow.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/babel-bindings-with-flow.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/babel-bindings-with-flow.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/babel-bindings-with-flow.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/babel-classes.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/babel-classes.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/babel-classes.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/babel-classes.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/babel-classes.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/babel-classes.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/babel-classes.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/babel-classes.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/babel-flowtype-bindings.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/babel-flowtype-bindings.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/babel-flowtype-bindings.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/babel-flowtype-bindings.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/babel-flowtype-bindings.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/babel-flowtype-bindings.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/babel-flowtype-bindings.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/babel-flowtype-bindings.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/classes.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/classes.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/classes.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/classes.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/classes.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/classes.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/classes.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/classes.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/esmodules-cjs.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/esmodules-cjs.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/esmodules-cjs.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/esmodules-cjs.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/esmodules-cjs.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/esmodules-cjs.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/esmodules-cjs.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/esmodules-cjs.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/esmodules-es6.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/esmodules-es6.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/esmodules-es6.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/esmodules-es6.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/esmodules-es6.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/esmodules-es6.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/esmodules-es6.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/esmodules-es6.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/esmodules.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/esmodules.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/esmodules.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/esmodules.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/esmodules.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/esmodules.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/esmodules.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/esmodules.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/eval-maps.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/eval-maps.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/eval-maps.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/eval-maps.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/eval-maps.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/eval-maps.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/eval-maps.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/eval-maps.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/for-loops.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/for-loops.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/for-loops.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/for-loops.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/for-loops.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/for-loops.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/for-loops.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/for-loops.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/for-of.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/for-of.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/for-of.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/for-of.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/for-of.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/for-of.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/for-of.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/for-of.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/functions.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/functions.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/functions.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/functions.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/functions.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/functions.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/functions.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/functions.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/lex-and-nonlex.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/lex-and-nonlex.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/lex-and-nonlex.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/lex-and-nonlex.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/lex-and-nonlex.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/lex-and-nonlex.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/lex-and-nonlex.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/lex-and-nonlex.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/line-start-bindings-es6.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/line-start-bindings-es6.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/line-start-bindings-es6.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/line-start-bindings-es6.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/line-start-bindings-es6.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/line-start-bindings-es6.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/line-start-bindings-es6.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/line-start-bindings-es6.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/modules-cjs.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/modules-cjs.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/modules-cjs.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/modules-cjs.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/modules-cjs.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/modules-cjs.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/modules-cjs.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/modules-cjs.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/out-of-order-declarations-cjs.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/out-of-order-declarations-cjs.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/out-of-order-declarations-cjs.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/out-of-order-declarations-cjs.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/out-of-order-declarations-cjs.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/out-of-order-declarations-cjs.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/out-of-order-declarations-cjs.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/out-of-order-declarations-cjs.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/shadowed-vars.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/shadowed-vars.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/shadowed-vars.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/shadowed-vars.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/shadowed-vars.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/shadowed-vars.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/shadowed-vars.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/shadowed-vars.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/step-over-for-of-array-closure.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/step-over-for-of-array-closure.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/step-over-for-of-array-closure.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/step-over-for-of-array-closure.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/step-over-for-of-array-closure.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/step-over-for-of-array-closure.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/step-over-for-of-array-closure.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/step-over-for-of-array-closure.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/step-over-for-of-array.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/step-over-for-of-array.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/step-over-for-of-array.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/step-over-for-of-array.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/step-over-for-of-array.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/step-over-for-of-array.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/step-over-for-of-array.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/step-over-for-of-array.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/step-over-for-of-closure.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/step-over-for-of-closure.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/step-over-for-of-closure.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/step-over-for-of-closure.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/step-over-for-of-closure.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/step-over-for-of-closure.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/step-over-for-of-closure.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/step-over-for-of-closure.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/step-over-for-of.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/step-over-for-of.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/step-over-for-of.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/step-over-for-of.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/step-over-for-of.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/step-over-for-of.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/step-over-for-of.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/step-over-for-of.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/step-over-function-params.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/step-over-function-params.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/step-over-function-params.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/step-over-function-params.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/step-over-function-params.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/step-over-function-params.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/step-over-function-params.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/step-over-function-params.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/step-over-regenerator-await.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/step-over-regenerator-await.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/step-over-regenerator-await.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/step-over-regenerator-await.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/step-over-regenerator-await.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/step-over-regenerator-await.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/step-over-regenerator-await.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/step-over-regenerator-await.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/switches.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/switches.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/switches.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/switches.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/switches.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/switches.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/switches.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/switches.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/this-arguments-bindings.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/this-arguments-bindings.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/this-arguments-bindings.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/this-arguments-bindings.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/this-arguments-bindings.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/this-arguments-bindings.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/this-arguments-bindings.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/this-arguments-bindings.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/try-catches.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/try-catches.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/try-catches.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/try-catches.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/try-catches.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/try-catches.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/try-catches.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/try-catches.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/type-module.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/type-module.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/type-module.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/type-module.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/type-module.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/type-module.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/type-module.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/type-module.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/type-script-cjs.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/type-script-cjs.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/type-script-cjs.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/type-script-cjs.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/type-script-cjs.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/type-script-cjs.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/type-script-cjs.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/type-script-cjs.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/webpack-functions.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/webpack-functions.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/webpack-functions.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/webpack-functions.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/webpack-functions.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/webpack-functions.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/webpack-functions.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/webpack-functions.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/webpack-line-mappings.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/webpack-line-mappings.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/webpack-line-mappings.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/webpack-line-mappings.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/webpack-line-mappings.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/webpack-line-mappings.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel6/webpack-line-mappings.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel6/webpack-line-mappings.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/babel-bindings-with-flow.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/babel-bindings-with-flow.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/babel-bindings-with-flow.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/babel-bindings-with-flow.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/babel-bindings-with-flow.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/babel-bindings-with-flow.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/babel-bindings-with-flow.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/babel-bindings-with-flow.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/babel-classes.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/babel-classes.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/babel-classes.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/babel-classes.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/babel-classes.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/babel-classes.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/babel-classes.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/babel-classes.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/babel-flowtype-bindings.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/babel-flowtype-bindings.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/babel-flowtype-bindings.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/babel-flowtype-bindings.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/babel-flowtype-bindings.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/babel-flowtype-bindings.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/babel-flowtype-bindings.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/babel-flowtype-bindings.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/classes.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/classes.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/classes.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/classes.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/classes.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/classes.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/classes.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/classes.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/esmodules-cjs.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/esmodules-cjs.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/esmodules-cjs.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/esmodules-cjs.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/esmodules-cjs.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/esmodules-cjs.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/esmodules-cjs.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/esmodules-cjs.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/esmodules-es6.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/esmodules-es6.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/esmodules-es6.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/esmodules-es6.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/esmodules-es6.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/esmodules-es6.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/esmodules-es6.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/esmodules-es6.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/esmodules.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/esmodules.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/esmodules.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/esmodules.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/esmodules.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/esmodules.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/esmodules.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/esmodules.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/eval-maps.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/eval-maps.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/eval-maps.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/eval-maps.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/eval-maps.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/eval-maps.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/eval-maps.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/eval-maps.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/for-loops.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/for-loops.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/for-loops.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/for-loops.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/for-loops.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/for-loops.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/for-loops.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/for-loops.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/for-of.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/for-of.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/for-of.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/for-of.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/for-of.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/for-of.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/for-of.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/for-of.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/functions.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/functions.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/functions.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/functions.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/functions.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/functions.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/functions.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/functions.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/lex-and-nonlex.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/lex-and-nonlex.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/lex-and-nonlex.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/lex-and-nonlex.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/lex-and-nonlex.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/lex-and-nonlex.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/lex-and-nonlex.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/lex-and-nonlex.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/line-start-bindings-es6.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/line-start-bindings-es6.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/line-start-bindings-es6.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/line-start-bindings-es6.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/line-start-bindings-es6.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/line-start-bindings-es6.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/line-start-bindings-es6.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/line-start-bindings-es6.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/modules-cjs.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/modules-cjs.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/modules-cjs.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/modules-cjs.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/modules-cjs.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/modules-cjs.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/modules-cjs.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/modules-cjs.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/out-of-order-declarations-cjs.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/out-of-order-declarations-cjs.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/out-of-order-declarations-cjs.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/out-of-order-declarations-cjs.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/out-of-order-declarations-cjs.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/out-of-order-declarations-cjs.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/out-of-order-declarations-cjs.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/out-of-order-declarations-cjs.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/shadowed-vars.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/shadowed-vars.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/shadowed-vars.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/shadowed-vars.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/shadowed-vars.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/shadowed-vars.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/shadowed-vars.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/shadowed-vars.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/step-over-for-of-array-closure.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/step-over-for-of-array-closure.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/step-over-for-of-array-closure.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/step-over-for-of-array-closure.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/step-over-for-of-array-closure.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/step-over-for-of-array-closure.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/step-over-for-of-array-closure.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/step-over-for-of-array-closure.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/step-over-for-of-array.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/step-over-for-of-array.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/step-over-for-of-array.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/step-over-for-of-array.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/step-over-for-of-array.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/step-over-for-of-array.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/step-over-for-of-array.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/step-over-for-of-array.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/step-over-for-of-closure.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/step-over-for-of-closure.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/step-over-for-of-closure.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/step-over-for-of-closure.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/step-over-for-of-closure.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/step-over-for-of-closure.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/step-over-for-of-closure.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/step-over-for-of-closure.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/step-over-for-of.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/step-over-for-of.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/step-over-for-of.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/step-over-for-of.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/step-over-for-of.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/step-over-for-of.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/step-over-for-of.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/step-over-for-of.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/step-over-function-params.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/step-over-function-params.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/step-over-function-params.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/step-over-function-params.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/step-over-function-params.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/step-over-function-params.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/step-over-function-params.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/step-over-function-params.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/step-over-regenerator-await.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/step-over-regenerator-await.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/step-over-regenerator-await.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/step-over-regenerator-await.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/step-over-regenerator-await.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/step-over-regenerator-await.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/step-over-regenerator-await.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/step-over-regenerator-await.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/switches.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/switches.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/switches.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/switches.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/switches.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/switches.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/switches.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/switches.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/this-arguments-bindings.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/this-arguments-bindings.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/this-arguments-bindings.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/this-arguments-bindings.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/this-arguments-bindings.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/this-arguments-bindings.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/this-arguments-bindings.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/this-arguments-bindings.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/try-catches.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/try-catches.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/try-catches.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/try-catches.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/try-catches.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/try-catches.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/try-catches.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/try-catches.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/type-module.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/type-module.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/type-module.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/type-module.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/type-module.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/type-module.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/type-module.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/type-module.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/type-script-cjs.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/type-script-cjs.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/type-script-cjs.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/type-script-cjs.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/type-script-cjs.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/type-script-cjs.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/type-script-cjs.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/type-script-cjs.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/webpack-functions.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/webpack-functions.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/webpack-functions.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/webpack-functions.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/webpack-functions.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/webpack-functions.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/webpack-functions.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/webpack-functions.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/webpack-line-mappings.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/webpack-line-mappings.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/webpack-line-mappings.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/webpack-line-mappings.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/webpack-line-mappings.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/webpack-line-mappings.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4-babel7/webpack-line-mappings.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4-babel7/webpack-line-mappings.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/classes.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/classes.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/classes.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/classes.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/classes.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/classes.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/classes.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/classes.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/esmodules-cjs.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/esmodules-cjs.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/esmodules-cjs.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/esmodules-cjs.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/esmodules-cjs.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/esmodules-cjs.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/esmodules-cjs.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/esmodules-cjs.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/esmodules-es6.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/esmodules-es6.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/esmodules-es6.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/esmodules-es6.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/esmodules-es6.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/esmodules-es6.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/esmodules-es6.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/esmodules-es6.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/esmodules.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/esmodules.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/esmodules.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/esmodules.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/esmodules.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/esmodules.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/esmodules.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/esmodules.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/eval-maps.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/eval-maps.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/eval-maps.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/eval-maps.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/eval-maps.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/eval-maps.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/eval-maps.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/eval-maps.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/for-loops.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/for-loops.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/for-loops.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/for-loops.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/for-loops.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/for-loops.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/for-loops.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/for-loops.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/for-of.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/for-of.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/for-of.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/for-of.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/for-of.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/for-of.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/for-of.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/for-of.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/functions.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/functions.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/functions.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/functions.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/functions.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/functions.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/functions.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/functions.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/lex-and-nonlex.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/lex-and-nonlex.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/lex-and-nonlex.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/lex-and-nonlex.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/lex-and-nonlex.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/lex-and-nonlex.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/lex-and-nonlex.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/lex-and-nonlex.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/line-start-bindings-es6.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/line-start-bindings-es6.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/line-start-bindings-es6.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/line-start-bindings-es6.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/line-start-bindings-es6.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/line-start-bindings-es6.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/line-start-bindings-es6.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/line-start-bindings-es6.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/modules-cjs.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/modules-cjs.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/modules-cjs.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/modules-cjs.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/modules-cjs.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/modules-cjs.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/modules-cjs.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/modules-cjs.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/out-of-order-declarations-cjs.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/out-of-order-declarations-cjs.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/out-of-order-declarations-cjs.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/out-of-order-declarations-cjs.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/out-of-order-declarations-cjs.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/out-of-order-declarations-cjs.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/out-of-order-declarations-cjs.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/out-of-order-declarations-cjs.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/shadowed-vars.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/shadowed-vars.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/shadowed-vars.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/shadowed-vars.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/shadowed-vars.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/shadowed-vars.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/shadowed-vars.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/shadowed-vars.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/step-over-for-of-array-closure.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/step-over-for-of-array-closure.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/step-over-for-of-array-closure.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/step-over-for-of-array-closure.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/step-over-for-of-array-closure.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/step-over-for-of-array-closure.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/step-over-for-of-array-closure.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/step-over-for-of-array-closure.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/step-over-for-of-array.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/step-over-for-of-array.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/step-over-for-of-array.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/step-over-for-of-array.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/step-over-for-of-array.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/step-over-for-of-array.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/step-over-for-of-array.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/step-over-for-of-array.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/step-over-for-of-closure.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/step-over-for-of-closure.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/step-over-for-of-closure.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/step-over-for-of-closure.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/step-over-for-of-closure.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/step-over-for-of-closure.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/step-over-for-of-closure.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/step-over-for-of-closure.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/step-over-for-of.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/step-over-for-of.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/step-over-for-of.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/step-over-for-of.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/step-over-for-of.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/step-over-for-of.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/step-over-for-of.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/step-over-for-of.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/step-over-function-params.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/step-over-function-params.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/step-over-function-params.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/step-over-function-params.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/step-over-function-params.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/step-over-function-params.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/step-over-function-params.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/step-over-function-params.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/step-over-regenerator-await.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/step-over-regenerator-await.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/step-over-regenerator-await.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/step-over-regenerator-await.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/step-over-regenerator-await.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/step-over-regenerator-await.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/step-over-regenerator-await.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/step-over-regenerator-await.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/switches.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/switches.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/switches.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/switches.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/switches.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/switches.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/switches.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/switches.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/this-arguments-bindings.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/this-arguments-bindings.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/this-arguments-bindings.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/this-arguments-bindings.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/this-arguments-bindings.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/this-arguments-bindings.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/this-arguments-bindings.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/this-arguments-bindings.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/try-catches.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/try-catches.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/try-catches.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/try-catches.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/try-catches.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/try-catches.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/try-catches.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/try-catches.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/type-module.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/type-module.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/type-module.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/type-module.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/type-module.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/type-module.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/type-module.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/type-module.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/type-script-cjs.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/type-script-cjs.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/type-script-cjs.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/type-script-cjs.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/type-script-cjs.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/type-script-cjs.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/type-script-cjs.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/type-script-cjs.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/typescript-classes.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/typescript-classes.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/typescript-classes.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/typescript-classes.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/typescript-classes.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/typescript-classes.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/typescript-classes.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/typescript-classes.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/webpack-functions.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/webpack-functions.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/webpack-functions.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/webpack-functions.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/webpack-functions.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/webpack-functions.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/webpack-functions.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/webpack-functions.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/webpack-line-mappings.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/webpack-line-mappings.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/webpack-line-mappings.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/webpack-line-mappings.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/webpack-line-mappings.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/webpack-line-mappings.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/output/webpack4/webpack-line-mappings.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/output/webpack4/webpack-line-mappings.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/package.json b/devtools/client/debugger/test/mochitest/examples/sourcemapped/package.json
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/package.json
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/package.json
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/polyfill-bundle.js b/devtools/client/debugger/test/mochitest/examples/sourcemapped/polyfill-bundle.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/polyfill-bundle.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/polyfill-bundle.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/tsconfig.json b/devtools/client/debugger/test/mochitest/examples/sourcemapped/tsconfig.json
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/tsconfig.json
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/tsconfig.json
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemapped/yarn.lock b/devtools/client/debugger/test/mochitest/examples/sourcemapped/yarn.lock
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemapped/yarn.lock
rename to devtools/client/debugger/test/mochitest/examples/sourcemapped/yarn.lock
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemaps-reload/.babelrc b/devtools/client/debugger/test/mochitest/examples/sourcemaps-reload/.babelrc
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemaps-reload/.babelrc
rename to devtools/client/debugger/test/mochitest/examples/sourcemaps-reload/.babelrc
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemaps-reload/README.md b/devtools/client/debugger/test/mochitest/examples/sourcemaps-reload/README.md
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemaps-reload/README.md
rename to devtools/client/debugger/test/mochitest/examples/sourcemaps-reload/README.md
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemaps-reload/doc-sourcemaps-reload.html b/devtools/client/debugger/test/mochitest/examples/sourcemaps-reload/doc-sourcemaps-reload.html
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemaps-reload/doc-sourcemaps-reload.html
rename to devtools/client/debugger/test/mochitest/examples/sourcemaps-reload/doc-sourcemaps-reload.html
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemaps-reload/doc-sourcemaps-reload2.html b/devtools/client/debugger/test/mochitest/examples/sourcemaps-reload/doc-sourcemaps-reload2.html
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemaps-reload/doc-sourcemaps-reload2.html
rename to devtools/client/debugger/test/mochitest/examples/sourcemaps-reload/doc-sourcemaps-reload2.html
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemaps-reload/doc-sourcemaps-reload3.html b/devtools/client/debugger/test/mochitest/examples/sourcemaps-reload/doc-sourcemaps-reload3.html
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemaps-reload/doc-sourcemaps-reload3.html
rename to devtools/client/debugger/test/mochitest/examples/sourcemaps-reload/doc-sourcemaps-reload3.html
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemaps-reload/package.json b/devtools/client/debugger/test/mochitest/examples/sourcemaps-reload/package.json
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemaps-reload/package.json
rename to devtools/client/debugger/test/mochitest/examples/sourcemaps-reload/package.json
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemaps-reload/v1.bundle.js b/devtools/client/debugger/test/mochitest/examples/sourcemaps-reload/v1.bundle.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemaps-reload/v1.bundle.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemaps-reload/v1.bundle.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemaps-reload/v1.bundle.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemaps-reload/v1.bundle.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemaps-reload/v1.bundle.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemaps-reload/v1.bundle.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemaps-reload/v1.js b/devtools/client/debugger/test/mochitest/examples/sourcemaps-reload/v1.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemaps-reload/v1.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemaps-reload/v1.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemaps-reload/v2.bundle.js b/devtools/client/debugger/test/mochitest/examples/sourcemaps-reload/v2.bundle.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemaps-reload/v2.bundle.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemaps-reload/v2.bundle.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemaps-reload/v2.bundle.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemaps-reload/v2.bundle.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemaps-reload/v2.bundle.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemaps-reload/v2.bundle.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemaps-reload/v2.js b/devtools/client/debugger/test/mochitest/examples/sourcemaps-reload/v2.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemaps-reload/v2.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemaps-reload/v2.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemaps-reload/v3.bundle.js b/devtools/client/debugger/test/mochitest/examples/sourcemaps-reload/v3.bundle.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemaps-reload/v3.bundle.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemaps-reload/v3.bundle.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemaps-reload/v3.bundle.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemaps-reload/v3.bundle.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemaps-reload/v3.bundle.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemaps-reload/v3.bundle.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemaps-reload/v3.js b/devtools/client/debugger/test/mochitest/examples/sourcemaps-reload/v3.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemaps-reload/v3.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemaps-reload/v3.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemaps-reload/webpack.config.js b/devtools/client/debugger/test/mochitest/examples/sourcemaps-reload/webpack.config.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemaps-reload/webpack.config.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemaps-reload/webpack.config.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemaps/bundle.js b/devtools/client/debugger/test/mochitest/examples/sourcemaps/bundle.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemaps/bundle.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemaps/bundle.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemaps/bundle.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemaps/bundle.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemaps/bundle.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemaps/bundle.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemaps2/main.js b/devtools/client/debugger/test/mochitest/examples/sourcemaps2/main.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemaps2/main.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemaps2/main.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemaps2/main.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemaps2/main.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemaps2/main.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemaps2/main.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemaps2/main.min.js b/devtools/client/debugger/test/mochitest/examples/sourcemaps2/main.min.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemaps2/main.min.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemaps2/main.min.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemaps3/.babelrc b/devtools/client/debugger/test/mochitest/examples/sourcemaps3/.babelrc
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemaps3/.babelrc
rename to devtools/client/debugger/test/mochitest/examples/sourcemaps3/.babelrc
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemaps3/.gitignore b/devtools/client/debugger/test/mochitest/examples/sourcemaps3/.gitignore
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemaps3/.gitignore
rename to devtools/client/debugger/test/mochitest/examples/sourcemaps3/.gitignore
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemaps3/bundle.js b/devtools/client/debugger/test/mochitest/examples/sourcemaps3/bundle.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemaps3/bundle.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemaps3/bundle.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemaps3/bundle.js.map b/devtools/client/debugger/test/mochitest/examples/sourcemaps3/bundle.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemaps3/bundle.js.map
rename to devtools/client/debugger/test/mochitest/examples/sourcemaps3/bundle.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemaps3/package.json b/devtools/client/debugger/test/mochitest/examples/sourcemaps3/package.json
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemaps3/package.json
rename to devtools/client/debugger/test/mochitest/examples/sourcemaps3/package.json
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemaps3/sorted.js b/devtools/client/debugger/test/mochitest/examples/sourcemaps3/sorted.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemaps3/sorted.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemaps3/sorted.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemaps3/test.js b/devtools/client/debugger/test/mochitest/examples/sourcemaps3/test.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemaps3/test.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemaps3/test.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sourcemaps3/webpack.config.js b/devtools/client/debugger/test/mochitest/examples/sourcemaps3/webpack.config.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sourcemaps3/webpack.config.js
rename to devtools/client/debugger/test/mochitest/examples/sourcemaps3/webpack.config.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sum/sum.js b/devtools/client/debugger/test/mochitest/examples/sum/sum.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sum/sum.js
rename to devtools/client/debugger/test/mochitest/examples/sum/sum.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sum/sum.min.js b/devtools/client/debugger/test/mochitest/examples/sum/sum.min.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sum/sum.min.js
rename to devtools/client/debugger/test/mochitest/examples/sum/sum.min.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/sum/sum.min.js.map b/devtools/client/debugger/test/mochitest/examples/sum/sum.min.js.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/sum/sum.min.js.map
rename to devtools/client/debugger/test/mochitest/examples/sum/sum.min.js.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/times2.js b/devtools/client/debugger/test/mochitest/examples/times2.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/times2.js
rename to devtools/client/debugger/test/mochitest/examples/times2.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/top-level.js b/devtools/client/debugger/test/mochitest/examples/top-level.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/top-level.js
rename to devtools/client/debugger/test/mochitest/examples/top-level.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/wasm-sourcemaps/README.md b/devtools/client/debugger/test/mochitest/examples/wasm-sourcemaps/README.md
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/wasm-sourcemaps/README.md
rename to devtools/client/debugger/test/mochitest/examples/wasm-sourcemaps/README.md
diff --git a/devtools/client/debugger/new/test/mochitest/examples/wasm-sourcemaps/fib.c b/devtools/client/debugger/test/mochitest/examples/wasm-sourcemaps/fib.c
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/wasm-sourcemaps/fib.c
rename to devtools/client/debugger/test/mochitest/examples/wasm-sourcemaps/fib.c
diff --git a/devtools/client/debugger/new/test/mochitest/examples/wasm-sourcemaps/fib.debug.wasm b/devtools/client/debugger/test/mochitest/examples/wasm-sourcemaps/fib.debug.wasm
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/wasm-sourcemaps/fib.debug.wasm
rename to devtools/client/debugger/test/mochitest/examples/wasm-sourcemaps/fib.debug.wasm
diff --git a/devtools/client/debugger/new/test/mochitest/examples/wasm-sourcemaps/fib.wasm b/devtools/client/debugger/test/mochitest/examples/wasm-sourcemaps/fib.wasm
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/wasm-sourcemaps/fib.wasm
rename to devtools/client/debugger/test/mochitest/examples/wasm-sourcemaps/fib.wasm
diff --git a/devtools/client/debugger/new/test/mochitest/examples/wasm-sourcemaps/fib.wasm.map b/devtools/client/debugger/test/mochitest/examples/wasm-sourcemaps/fib.wasm.map
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/wasm-sourcemaps/fib.wasm.map
rename to devtools/client/debugger/test/mochitest/examples/wasm-sourcemaps/fib.wasm.map
diff --git a/devtools/client/debugger/new/test/mochitest/examples/wasm-sourcemaps/utils.js b/devtools/client/debugger/test/mochitest/examples/wasm-sourcemaps/utils.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/wasm-sourcemaps/utils.js
rename to devtools/client/debugger/test/mochitest/examples/wasm-sourcemaps/utils.js
diff --git a/devtools/client/debugger/new/test/mochitest/examples/webpack.config.js b/devtools/client/debugger/test/mochitest/examples/webpack.config.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/examples/webpack.config.js
rename to devtools/client/debugger/test/mochitest/examples/webpack.config.js
diff --git a/devtools/client/debugger/new/test/mochitest/head.js b/devtools/client/debugger/test/mochitest/head.js
similarity index 92%
rename from devtools/client/debugger/new/test/mochitest/head.js
rename to devtools/client/debugger/test/mochitest/head.js
index 4ea3838d6668..d9cbf4559643 100644
--- a/devtools/client/debugger/new/test/mochitest/head.js
+++ b/devtools/client/debugger/test/mochitest/head.js
@@ -39,12 +39,12 @@ Services.scriptloader.loadSubScript(
);
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
);
const EXAMPLE_URL =
- "http://example.com/browser/devtools/client/debugger/new/test/mochitest/examples/";
+ "http://example.com/browser/devtools/client/debugger/test/mochitest/examples/";
// NOTE: still experimental, the screenshots might not be exactly correct
diff --git a/devtools/client/debugger/new/test/mochitest/helpers.js b/devtools/client/debugger/test/mochitest/helpers.js
similarity index 99%
rename from devtools/client/debugger/new/test/mochitest/helpers.js
rename to devtools/client/debugger/test/mochitest/helpers.js
index 0fa7edd33a1a..1abddd4e6116 100644
--- a/devtools/client/debugger/new/test/mochitest/helpers.js
+++ b/devtools/client/debugger/test/mochitest/helpers.js
@@ -10,7 +10,7 @@
// Import helpers for the new debugger
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
);
@@ -20,7 +20,7 @@ var asyncStorage = require("devtools/shared/async-storage");
const {
getSelectedLocation
-} = require("devtools/client/debugger/new/src/utils/source-maps");
+} = require("devtools/client/debugger/src/utils/source-maps");
const sourceUtils = {
isLoaded: source => source.loadedState === "loaded"
diff --git a/devtools/client/debugger/new/test/mochitest/helpers/context.js b/devtools/client/debugger/test/mochitest/helpers/context.js
similarity index 100%
rename from devtools/client/debugger/new/test/mochitest/helpers/context.js
rename to devtools/client/debugger/test/mochitest/helpers/context.js
diff --git a/devtools/client/debugger/new/webpack.config.js b/devtools/client/debugger/webpack.config.js
similarity index 100%
rename from devtools/client/debugger/new/webpack.config.js
rename to devtools/client/debugger/webpack.config.js
diff --git a/devtools/client/debugger/new/yarn.lock b/devtools/client/debugger/yarn.lock
similarity index 99%
rename from devtools/client/debugger/new/yarn.lock
rename to devtools/client/debugger/yarn.lock
index e2ef55959bed..0774c1eeb535 100644
--- a/devtools/client/debugger/new/yarn.lock
+++ b/devtools/client/debugger/yarn.lock
@@ -3359,6 +3359,77 @@ devtools-launchpad@^0.0.150:
webpack-hot-middleware "^2.18.2"
ws "^1.0.1"
+devtools-launchpad@^0.0.151:
+ version "0.0.151"
+ resolved "https://registry.yarnpkg.com/devtools-launchpad/-/devtools-launchpad-0.0.151.tgz#b7b3a5592b0b4369566e1a82802252a3f55b93f3"
+ dependencies:
+ amd-loader "0.0.8"
+ autoprefixer "^7.1.2"
+ babel-cli "^6.7.5"
+ babel-core "^6.25.0"
+ babel-eslint "^7.1.0"
+ babel-loader "^7.1.1"
+ babel-plugin-module-resolver "^2.2.0"
+ babel-plugin-transform-async-to-generator "^6.16.0"
+ babel-plugin-transform-flow-strip-types "^6.14.0"
+ babel-plugin-transform-runtime "^6.7.5"
+ babel-plugin-webpack-alias "^2.1.1"
+ babel-polyfill "^6.7.4"
+ babel-preset-es2015 "^6.24.1"
+ babel-preset-react "^6.24.1"
+ babel-register "^6.18.0"
+ body-parser "^1.15.2"
+ check-node-version "^3.2.0"
+ chrome-remote-interface "0.17.0"
+ classnames "^2.2.5"
+ co "=4.6.0"
+ css-loader "^0.26.1"
+ debug "^3.1.0"
+ devtools-config "^0.0.16"
+ devtools-connection "^1.0.6"
+ devtools-contextmenu "~1.0.3"
+ devtools-environment "^0.0.5"
+ devtools-license-check "^0.7.0"
+ devtools-mc-assets "^0.0.7"
+ devtools-modules "~1.1.1"
+ devtools-sprintf-js "^1.0.3"
+ express "^4.13.4"
+ express-static "^1.2.5"
+ extract-text-webpack-plugin "^3.0.0"
+ fs-extra "^2.0.0"
+ fuzzaldrin-plus "^0.4.0"
+ geckodriver "=1.12.2"
+ immutable "^3.7.6"
+ json-loader "^0.5.4"
+ md5 "^2.2.1"
+ mime-types "^2.1.18"
+ minimist "^1.2.0"
+ mustache "^2.2.1"
+ node-static "^0.7.7"
+ postcss "^6.0.6"
+ postcss-class-namespace "^0.1.0"
+ postcss-loader "^2.0.6"
+ postcss-url-mapper "^1.2.0"
+ prop-types "^15.6.0"
+ properties-parser "^0.3.1"
+ ps-node "^0.1.4"
+ raw-loader "^0.5.1"
+ react "^16.4.1"
+ react-dom "^16.4.1"
+ react-dom-factories "^1.0.2"
+ react-redux "^5.0.6"
+ redux "^3.7.2"
+ selenium-webdriver "=3.6.0"
+ style-loader "^0.18.2"
+ svg-inline-loader "^0.8.0"
+ svg-inline-react "3.0.0"
+ url-loader "^0.5.9"
+ webpack "^3.3.0"
+ webpack-dev-middleware "^1.11.0"
+ webpack-env-loader-plugin "^1.0.0"
+ webpack-hot-middleware "^2.18.2"
+ ws "^1.0.1"
+
devtools-license-check@^0.7.0:
version "0.7.0"
resolved "https://registry.yarnpkg.com/devtools-license-check/-/devtools-license-check-0.7.0.tgz#62e5fd224dcb5c6cf10f1de56ea55f341817bd35"
@@ -3921,18 +3992,9 @@ eslint-plugin-jsx-a11y@^6.1.2:
has "^1.0.3"
jsx-ast-utils "^2.0.1"
-eslint-plugin-mozilla@1.1.1:
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/eslint-plugin-mozilla/-/eslint-plugin-mozilla-1.1.1.tgz#84464335d5d806541e38df3480c777f01d8ebe8c"
- dependencies:
- htmlparser2 "3.10.0"
- ini-parser "0.0.2"
- sax "1.2.4"
-
eslint-plugin-mozilla@1.1.3:
version "1.1.3"
resolved "https://registry.yarnpkg.com/eslint-plugin-mozilla/-/eslint-plugin-mozilla-1.1.3.tgz#412da74dc772f61c0c6ec0cccb925ec19680a011"
- integrity sha512-XFR4pby4G99bgArNbBCzG8mlpO8Zuqd+FC1MJChL0druU8W7sBru2n2A7NuD/0KuamSZDpACefruzPP3KezymQ==
dependencies:
htmlparser2 "3.10.0"
ini-parser "0.0.2"
@@ -5405,14 +5467,6 @@ http-signature@~1.2.0:
jsprim "^1.2.2"
sshpk "^1.7.0"
-httpplease@^0.16.4:
- version "0.16.4"
- resolved "https://registry.yarnpkg.com/httpplease/-/httpplease-0.16.4.tgz#d382ebe230ef5079080b4e9ffebf316a9e75c0da"
- dependencies:
- urllite "~0.5.0"
- xmlhttprequest "*"
- xtend "~3.0.0"
-
https-browserify@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
@@ -11620,12 +11674,6 @@ urljoin@^0.1.5:
dependencies:
extend "~2.0.0"
-urllite@~0.5.0:
- version "0.5.0"
- resolved "https://registry.yarnpkg.com/urllite/-/urllite-0.5.0.tgz#1b7bb9ca3fb0db9520de113466bbcf7cc341451a"
- dependencies:
- xtend "~4.0.0"
-
use@^3.1.0:
version "3.1.1"
resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
@@ -12085,18 +12133,10 @@ xmlbuilder@~9.0.1:
version "9.0.7"
resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
-xmlhttprequest@*:
- version "1.8.0"
- resolved "https://registry.yarnpkg.com/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz#67fe075c5c24fef39f9d65f5f7b7fe75171968fc"
-
-xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.0, xtend@~4.0.1:
+xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
-xtend@~3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/xtend/-/xtend-3.0.0.tgz#5cce7407baf642cba7becda568111c493f59665a"
-
y18n@^3.2.1:
version "3.2.1"
resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
diff --git a/devtools/client/definitions.js b/devtools/client/definitions.js
index 6ae3d2b606b7..0c09e73b76f9 100644
--- a/devtools/client/definitions.js
+++ b/devtools/client/definitions.js
@@ -11,7 +11,7 @@ const osString = Services.appinfo.OS;
loader.lazyGetter(this, "OptionsPanel", () => require("devtools/client/framework/toolbox-options").OptionsPanel);
loader.lazyGetter(this, "InspectorPanel", () => require("devtools/client/inspector/panel").InspectorPanel);
loader.lazyGetter(this, "WebConsolePanel", () => require("devtools/client/webconsole/panel").WebConsolePanel);
-loader.lazyGetter(this, "NewDebuggerPanel", () => require("devtools/client/debugger/new/panel").DebuggerPanel);
+loader.lazyGetter(this, "NewDebuggerPanel", () => require("devtools/client/debugger/panel").DebuggerPanel);
loader.lazyGetter(this, "StyleEditorPanel", () => require("devtools/client/styleeditor/panel").StyleEditorPanel);
loader.lazyGetter(this, "MemoryPanel", () => require("devtools/client/memory/panel").MemoryPanel);
loader.lazyGetter(this, "PerformancePanel", () => require("devtools/client/performance/panel").PerformancePanel);
@@ -133,7 +133,7 @@ Tools.jsdebugger = {
accesskey: l10n("debuggerMenu.accesskey"),
ordinal: 3,
icon: "chrome://devtools/skin/images/tool-debugger.svg",
- url: "chrome://devtools/content/debugger/new/index.html",
+ url: "chrome://devtools/content/debugger/index.html",
label: l10n("ToolboxDebugger.label"),
panelLabel: l10n("ToolboxDebugger.panelLabel"),
get tooltip() {
diff --git a/devtools/client/framework/test/browser.ini b/devtools/client/framework/test/browser.ini
index 173f23d2c564..3d6a47d0d08e 100644
--- a/devtools/client/framework/test/browser.ini
+++ b/devtools/client/framework/test/browser.ini
@@ -46,9 +46,9 @@ support-files =
sjs_code_bundle_reload_map.sjs
test_browser_toolbox_debugger.js
test_chrome_page.html
- !/devtools/client/debugger/new/test/mochitest/head.js
- !/devtools/client/debugger/new/test/mochitest/helpers.js
- !/devtools/client/debugger/new/test/mochitest/helpers/context.js
+ !/devtools/client/debugger/test/mochitest/head.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/shared-redux-head.js
diff --git a/devtools/client/framework/test/browser_browser_toolbox_debugger.js b/devtools/client/framework/test/browser_browser_toolbox_debugger.js
index a03ae9980366..916b781c7969 100644
--- a/devtools/client/framework/test/browser_browser_toolbox_debugger.js
+++ b/devtools/client/framework/test/browser_browser_toolbox_debugger.js
@@ -17,9 +17,9 @@ requestLongerTimeout(4);
const { fetch } = require("devtools/shared/DevToolsUtils");
-const debuggerHeadURL = CHROME_URL_ROOT + "../../debugger/new/test/mochitest/head.js";
-const helpersURL = CHROME_URL_ROOT + "../../debugger/new/test/mochitest/helpers.js";
-const helpersContextURL = CHROME_URL_ROOT + "../../debugger/new/test/mochitest/helpers/context.js";
+const debuggerHeadURL = CHROME_URL_ROOT + "../../debugger/test/mochitest/head.js";
+const helpersURL = CHROME_URL_ROOT + "../../debugger/test/mochitest/helpers.js";
+const helpersContextURL = CHROME_URL_ROOT + "../../debugger/test/mochitest/helpers/context.js";
const testScriptURL = CHROME_URL_ROOT + "test_browser_toolbox_debugger.js";
add_task(async function runTest() {
diff --git a/devtools/client/inspector/markup/test/browser.ini b/devtools/client/inspector/markup/test/browser.ini
index 0173258f7d38..693b8263113b 100644
--- a/devtools/client/inspector/markup/test/browser.ini
+++ b/devtools/client/inspector/markup/test/browser.ini
@@ -78,8 +78,8 @@ support-files =
lib_react_with_addons_15.3.1_min.js
lib_react_with_addons_15.4.1.js
react_external_listeners.js
- !/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/inspector/test/head.js
!/devtools/client/inspector/test/shared-head.js
!/devtools/client/shared/test/shared-head.js
diff --git a/devtools/client/inspector/markup/test/browser_markup_shadowdom_open_debugger.js b/devtools/client/inspector/markup/test/browser_markup_shadowdom_open_debugger.js
index d0cb6762166d..4261d9e82626 100644
--- a/devtools/client/inspector/markup/test/browser_markup_shadowdom_open_debugger.js
+++ b/devtools/client/inspector/markup/test/browser_markup_shadowdom_open_debugger.js
@@ -10,14 +10,14 @@
// Test that the markup view is correctly updated to show those items if the custom
// element definition happens after opening the inspector.
-/* 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 TEST_URL = `data:text/html;charset=utf-8,` + encodeURIComponent(`
diff --git a/devtools/client/jar.mn b/devtools/client/jar.mn
index 01d52087d1f4..90d9e72409f2 100644
--- a/devtools/client/jar.mn
+++ b/devtools/client/jar.mn
@@ -25,7 +25,7 @@ devtools.jar:
content/shared/sourceeditor/codemirror/lib/codemirror.css (shared/sourceeditor/codemirror/lib/codemirror.css)
content/shared/sourceeditor/codemirror/mozilla.css (shared/sourceeditor/codemirror/mozilla.css)
content/shared/sourceeditor/codemirror/cmiframe.html (shared/sourceeditor/codemirror/cmiframe.html)
- content/debugger/new/index.html (debugger/new/index.html)
+ content/debugger/index.html (debugger/index.html)
content/performance/index.xul (performance/index.xul)
content/performance-new/index.xhtml (performance-new/index.xhtml)
content/performance-new/frame-script.js (performance-new/frame-script.js)
diff --git a/devtools/client/shared/build/build-debugger.js b/devtools/client/shared/build/build-debugger.js
index e2a7eae115bc..7c46748abc51 100644
--- a/devtools/client/shared/build/build-debugger.js
+++ b/devtools/client/shared/build/build-debugger.js
@@ -154,7 +154,7 @@ function transformMC({ types: t }) {
// Handle require() to files bundled in vendor.js.
// e.g. require("some-module");
- // -> require("devtools/client/debugger/new/dist/vendors").vendored["some-module"];
+ // -> require("devtools/client/debugger/dist/vendors").vendored["some-module"];
const isVendored = VENDORS.some(vendored => value.endsWith(vendored));
if (isVendored) {
// components/shared/Svg is required using various relative paths.
@@ -165,7 +165,7 @@ function transformMC({ types: t }) {
// Transform the required path to require vendors.js
path.replaceWith(
- t.stringLiteral("devtools/client/debugger/new/dist/vendors")
+ t.stringLiteral("devtools/client/debugger/dist/vendors")
);
// Append `.vendored["some-module"]` after the require().
diff --git a/devtools/client/shared/build/build.js b/devtools/client/shared/build/build.js
index b1a77fc21f83..5a45d535b2d4 100644
--- a/devtools/client/shared/build/build.js
+++ b/devtools/client/shared/build/build.js
@@ -17,7 +17,7 @@ const defaultPlugins = [
function transform(filePath) {
// Use the extra plugins only for the debugger
- const plugins = filePath.includes("devtools/client/debugger/new")
+ const plugins = filePath.includes("devtools/client/debugger")
? require("./build-debugger")(filePath)
: defaultPlugins;
diff --git a/devtools/client/shared/build/node-templates.mozbuild b/devtools/client/shared/build/node-templates.mozbuild
index 3156d192f026..5bf54ad04a37 100644
--- a/devtools/client/shared/build/node-templates.mozbuild
+++ b/devtools/client/shared/build/node-templates.mozbuild
@@ -11,7 +11,7 @@ def CompiledModules(*modules):
base = FINAL_TARGET_FILES.chrome.devtools.modules
compiled_directory_whitelist = (
- "devtools/client/debugger/new/src",
+ "devtools/client/debugger/src",
)
if not RELATIVEDIR.startswith(compiled_directory_whitelist):
diff --git a/devtools/client/shared/components/SmartTrace.css b/devtools/client/shared/components/SmartTrace.css
index 1ea20d7813a2..a6c925ae5097 100644
--- a/devtools/client/shared/components/SmartTrace.css
+++ b/devtools/client/shared/components/SmartTrace.css
@@ -141,7 +141,7 @@
}
.group .img.arrow {
- mask: url("resource://devtools/client/debugger/new/images/arrow.svg");
+ mask: url("resource://devtools/client/debugger/images/arrow.svg");
mask-size: auto;
margin-inline-end: 4px;
background-color: var(--theme-icon-dimmed-color);
diff --git a/devtools/client/shared/components/SmartTrace.js b/devtools/client/shared/components/SmartTrace.js
index 863eeb025c39..fc8ae7ddd83e 100644
--- a/devtools/client/shared/components/SmartTrace.js
+++ b/devtools/client/shared/components/SmartTrace.js
@@ -10,8 +10,8 @@ const { LocalizationHelper } = require("devtools/shared/l10n");
const l10n = new LocalizationHelper("devtools/client/locales/components.properties");
const dbgL10n = new LocalizationHelper("devtools/client/locales/debugger.properties");
-const Frames = createFactory(require("devtools/client/debugger/new/src/components/SecondaryPanes/Frames/index").Frames);
-const { annotateFrames } = require("devtools/client/debugger/new/src/utils/pause/frames/annotateFrames");
+const Frames = createFactory(require("devtools/client/debugger/src/components/SecondaryPanes/Frames/index").Frames);
+const { annotateFrames } = require("devtools/client/debugger/src/utils/pause/frames/annotateFrames");
class SmartTrace extends Component {
static get propTypes() {
diff --git a/devtools/client/shared/components/reps/reps.css b/devtools/client/shared/components/reps/reps.css
index 903c94ffe0ba..512ae412cf0b 100644
--- a/devtools/client/shared/components/reps/reps.css
+++ b/devtools/client/shared/components/reps/reps.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);
@@ -420,17 +420,22 @@ button.invoke-getter {
}
.tree.object-inspector .block .object-label::before {
- content: "\2632 ";
+ content: "\2632";
font-size: 1.1em;
+ display: inline;
+ padding-inline-end: 2px;
+ line-height: 14px;
}
.object-inspector .object-delimiter {
color: var(--theme-comment);
+ white-space: pre-wrap;
}
.object-inspector .tree-node .arrow {
display: inline-block;
vertical-align: middle;
+ margin-inline-start: -1px;
}
/* Focused styles */
diff --git a/devtools/client/shared/components/reps/reps.js b/devtools/client/shared/components/reps/reps.js
index ac6bfdfba873..9132d44f6da1 100644
--- a/devtools/client/shared/components/reps/reps.js
+++ b/devtools/client/shared/components/reps/reps.js
@@ -2877,9 +2877,7 @@ function parseStackString(stack) {
// Given the input: "scriptLocation:2:100"
// Result:
// ["scriptLocation:2:100", "scriptLocation", "2", "100"]
- const locationParts = location
- ? location.match(/^(.*):(\d+):(\d+)$/)
- : null;
+ const locationParts = location ? location.match(/^(.*):(\d+):(\d+)$/) : null;
if (location && locationParts) {
const [, filename, line, column] = locationParts;
@@ -3742,7 +3740,63 @@ module.exports = {
// Dependencies
const validProtocols = /(http|https|ftp|data|resource|chrome):/i;
-const tokenSplitRegex = /(\s|\'|\"|\\)+/;
+
+// URL Regex, common idioms:
+//
+// Lead-in (URL):
+// ( Capture because we need to know if there was a lead-in
+// character so we can include it as part of the text
+// preceding the match. We lack look-behind matching.
+// ^| The URL can start at the beginning of the string.
+// [\s(,;'"`] Or whitespace or some punctuation that does not imply
+// a context which would preclude a URL.
+// )
+//
+// We do not need a trailing look-ahead because our regex's will terminate
+// because they run out of characters they can eat.
+
+// What we do not attempt to have the regexp do:
+// - Avoid trailing '.' and ')' characters. We let our greedy match absorb
+// these, but have a separate regex for extra characters to leave off at the
+// end.
+//
+// The Regex (apart from lead-in/lead-out):
+// ( Begin capture of the URL
+// (?: (potential detect beginnings)
+// https?:\/\/| Start with "http" or "https"
+// www\d{0,3}[.][a-z0-9.\-]{2,249}|
+// Start with "www", up to 3 numbers, then "." then
+// something that looks domain-namey. We differ from the
+// next case in that we do not constrain the top-level
+// domain as tightly and do not require a trailing path
+// indicator of "/". This is IDN root compatible.
+// [a-z0-9.\-]{2,250}[.][a-z]{2,4}\/
+// Detect a non-www domain, but requiring a trailing "/"
+// to indicate a path. This only detects IDN domains
+// with a non-IDN root. This is reasonable in cases where
+// there is no explicit http/https start us out, but
+// unreasonable where there is. Our real fix is the bug
+// to port the Thunderbird/gecko linkification logic.
+//
+// Domain names can be up to 253 characters long, and are
+// limited to a-zA-Z0-9 and '-'. The roots don't have
+// hyphens unless they are IDN roots. Root zones can be
+// found here: http://www.iana.org/domains/root/db
+// )
+// [-\w.!~*'();,/?:@&=+$#%]*
+// path onwards. We allow the set of characters that
+// encodeURI does not escape plus the result of escaping
+// (so also '%')
+// )
+// eslint-disable-next-line max-len
+const urlRegex = /(^|[\s(,;'"`])((?:https?:\/\/|www\d{0,3}[.][a-z0-9.\-]{2,249}|[a-z0-9.\-]{2,250}[.][a-z]{2,4}\/)[-\w.!~*'();,/?:@&=+$#%]*)/im;
+
+// Set of terminators that are likely to have been part of the context rather
+// than part of the URL and so should be uneaten. This is '(', ',', ';', plus
+// quotes and question end-ing punctuation and the potential permutations with
+// parentheses (english-specific).
+const uneatLastUrlCharsRegex = /(?:[),;.!?`'"]|[.!?]\)|\)[.!?])$/;
+
const ELLIPSIS = "\u2026";
const dom = __webpack_require__(1);
const { span } = dom;
@@ -4102,7 +4156,7 @@ function containsURL(grip) {
* @param string token
* The token.
* @return boolean
- * Whenther the token is a URL.
+ * Whether the token is a URL.
*/
function isURL(token) {
try {
@@ -4156,9 +4210,10 @@ module.exports = {
maybeEscapePropertyName,
getGripPreviewItems,
getGripType,
- tokenSplitRegex,
ellipsisElement,
- ELLIPSIS
+ ELLIPSIS,
+ uneatLastUrlCharsRegex,
+ urlRegex
};
/***/ }),
@@ -4320,15 +4375,15 @@ const PropTypes = __webpack_require__(0);
const {
containsURL,
- isURL,
escapeString,
getGripType,
rawCropString,
sanitizeString,
wrapRender,
isGrip,
- tokenSplitRegex,
- ELLIPSIS
+ ELLIPSIS,
+ uneatLastUrlCharsRegex,
+ urlRegex
} = __webpack_require__(2);
const dom = __webpack_require__(1);
@@ -4346,7 +4401,8 @@ StringRep.propTypes = {
object: PropTypes.object.isRequired,
openLink: PropTypes.func,
className: PropTypes.string,
- title: PropTypes.string
+ title: PropTypes.string,
+ isInContentPage: PropTypes.bool
};
function StringRep(props) {
@@ -4359,7 +4415,8 @@ function StringRep(props) {
escapeWhitespace = true,
member,
openLink,
- title
+ title,
+ isInContentPage
} = props;
let text = object;
@@ -4394,7 +4451,7 @@ function StringRep(props) {
if (!isLong) {
if (containsURL(text)) {
- return span(config, ...getLinkifiedElements(text, shouldCrop && cropLimit, openLink));
+ return span(config, ...getLinkifiedElements(text, shouldCrop && cropLimit, openLink, isInContentPage));
}
// Cropping of longString has been handled before formatting.
@@ -4467,55 +4524,70 @@ function maybeCropString(opts, text) {
* @param {String} text: The actual string to linkify.
* @param {Integer | null} cropLimit
* @param {Function} openLink: Function handling the link opening.
+ * @param {Boolean} isInContentPage: pass true if the reps is rendered in
+ * the content page (e.g. in JSONViewer).
* @returns {Array}
*/
-function getLinkifiedElements(text, cropLimit, openLink) {
+function getLinkifiedElements(text, cropLimit, openLink, isInContentPage) {
const halfLimit = Math.ceil((cropLimit - ELLIPSIS.length) / 2);
const startCropIndex = cropLimit ? halfLimit : null;
const endCropIndex = cropLimit ? text.length - halfLimit : null;
- // As we walk through the tokens of the source string, we make sure to
- // preserve the original whitespace that separated the tokens.
- let currentIndex = 0;
const items = [];
- for (const token of text.split(tokenSplitRegex)) {
- if (isURL(token)) {
- // Let's grab all the non-url strings before the link.
- const tokenStart = text.indexOf(token, currentIndex);
- let nonUrlText = text.slice(currentIndex, tokenStart);
- nonUrlText = getCroppedString(nonUrlText, currentIndex, startCropIndex, endCropIndex);
- if (nonUrlText) {
- items.push(nonUrlText);
- }
-
- // Update the index to match the beginning of the token.
- currentIndex = tokenStart;
-
- const linkText = getCroppedString(token, currentIndex, startCropIndex, endCropIndex);
- if (linkText) {
- items.push(a({
- className: "url",
- title: token,
- draggable: false,
- onClick: openLink ? e => {
- e.preventDefault();
- openLink(token, e);
- } : null
- }, linkText));
- }
-
- currentIndex = tokenStart + token.length;
+ let currentIndex = 0;
+ let contentStart;
+ while (true) {
+ const url = urlRegex.exec(text);
+ // Pick the regexp with the earlier content; index will always be zero.
+ if (!url) {
+ break;
}
+ contentStart = url.index + url[1].length;
+ if (contentStart > 0) {
+ const nonUrlText = text.substring(0, contentStart);
+ items.push(getCroppedString(nonUrlText, currentIndex, startCropIndex, endCropIndex));
+ }
+
+ // There are some final characters for a URL that are much more likely
+ // to have been part of the enclosing text rather than the end of the
+ // URL.
+ let useUrl = url[2];
+ const uneat = uneatLastUrlCharsRegex.exec(useUrl);
+ if (uneat) {
+ useUrl = useUrl.substring(0, uneat.index);
+ }
+
+ currentIndex = currentIndex + contentStart;
+ const linkText = getCroppedString(useUrl, currentIndex, startCropIndex, endCropIndex);
+
+ if (linkText) {
+ items.push(a({
+ className: "url",
+ title: useUrl,
+ draggable: false,
+ // Because we don't want the link to be open in the current
+ // panel's frame, we only render the href attribute if `openLink`
+ // exists (so we can preventDefault) or if the reps will be
+ // displayed in content page (e.g. in the JSONViewer).
+ href: openLink || isInContentPage ? useUrl : null,
+ onClick: openLink ? e => {
+ e.preventDefault();
+ openLink(useUrl, e);
+ } : null
+ }, linkText));
+ }
+
+ currentIndex = currentIndex + useUrl.length;
+ text = text.substring(url.index + url[1].length + useUrl.length);
}
// Clean up any non-URL text at the end of the source string,
// i.e. not handled in the loop.
- if (currentIndex !== text.length) {
- let nonUrlText = text.slice(currentIndex, text.length);
+ if (text.length > 0) {
if (currentIndex < endCropIndex) {
- nonUrlText = getCroppedString(nonUrlText, currentIndex, startCropIndex, endCropIndex);
+ text = getCroppedString(text, currentIndex, startCropIndex, endCropIndex);
}
- items.push(nonUrlText);
+ items.push(text);
}
return items;
@@ -5624,10 +5696,15 @@ function DateTime(props) {
const grip = props.object;
let date;
try {
+ const dateObject = new Date(grip.preview.timestamp);
+ // Calling `toISOString` will throw if the date is invalid,
+ // so we can render an `Invalid Date` element.
+ dateObject.toISOString();
+
date = span({
"data-link-actor-id": grip.actor,
className: "objectBox"
- }, getTitle(grip), span({ className: "Date" }, new Date(grip.preview.timestamp).toISOString()));
+ }, getTitle(grip), span({ className: "Date" }, dateObject.toString()));
} catch (e) {
date = span({ className: "objectBox" }, "Invalid Date");
}
diff --git a/devtools/client/shared/test/browser.ini b/devtools/client/shared/test/browser.ini
index 3726ad3d496e..6c1979207558 100644
--- a/devtools/client/shared/test/browser.ini
+++ b/devtools/client/shared/test/browser.ini
@@ -60,8 +60,8 @@ support-files =
test-mocked-module.js
testactors.js
!/devtools/client/responsive.html/test/browser/devices.json
- !/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
[browser_autocomplete_popup.js]
[browser_browserloader_mocks.js]
diff --git a/devtools/client/shared/test/browser_dbg_worker-console-04.js b/devtools/client/shared/test/browser_dbg_worker-console-04.js
index 9d55a61c547f..881876c56bc8 100644
--- a/devtools/client/shared/test/browser_dbg_worker-console-04.js
+++ b/devtools/client/shared/test/browser_dbg_worker-console-04.js
@@ -32,9 +32,11 @@ add_task(async function testPausedByConsole() {
info("Check Date objects can be used in the console");
const jsterm = await getSplitConsole(toolbox);
- let executed = await jsterm.execute("new Date(0)");
- ok(executed.textContent.includes("1970-01-01T00:00:00.000Z"),
- "Text for message appeared correct");
+ let executed = await jsterm.execute("new Date(2013, 3, 1)");
+ ok(
+ executed.textContent.includes("Mon Apr 01 2013 00:00:00"),
+ "Date object has expected text content"
+ );
info("Check RegExp objects can be used in the console");
executed = await jsterm.execute("new RegExp('.*')");
diff --git a/devtools/client/shared/test/helper_workers.js b/devtools/client/shared/test/helper_workers.js
index 4797fdbffe46..a01de379f80f 100644
--- a/devtools/client/shared/test/helper_workers.js
+++ b/devtools/client/shared/test/helper_workers.js
@@ -4,10 +4,10 @@
"use strict";
-/* import-globals-from ../../debugger/new/test/mochitest/helpers.js */
-/* import-globals-from ../../debugger/new/test/mochitest/helpers/context.js */
+/* import-globals-from ../../debugger/test/mochitest/helpers.js */
+/* import-globals-from ../../debugger/test/mochitest/helpers/context.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);
var { DebuggerServer } = require("devtools/server/main");
diff --git a/devtools/client/webconsole/test/components/evaluation-result.test.js b/devtools/client/webconsole/test/components/evaluation-result.test.js
index 3f702947a755..fa3ea53ace3c 100644
--- a/devtools/client/webconsole/test/components/evaluation-result.test.js
+++ b/devtools/client/webconsole/test/components/evaluation-result.test.js
@@ -13,20 +13,25 @@ const Provider = createFactory(require("react-redux").Provider);
const { setupStore } = require("devtools/client/webconsole/test/helpers");
// Components under test.
-const EvaluationResult = createFactory(require("devtools/client/webconsole/components/message-types/EvaluationResult"));
+const EvaluationResult = createFactory(
+ require("devtools/client/webconsole/components/message-types/EvaluationResult")
+);
const { INDENT_WIDTH } = require("devtools/client/webconsole/components/MessageIndent");
// Test fakes.
-const { stubPreparedMessages } = require("devtools/client/webconsole/test/fixtures/stubs/index");
+const {
+ stubPreparedMessages,
+} = require("devtools/client/webconsole/test/fixtures/stubs/index");
const serviceContainer = require("devtools/client/webconsole/test/fixtures/serviceContainer");
describe("EvaluationResult component:", () => {
- it("renders a grip result", () => {
+ it.skip("renders a grip result", () => {
const message = stubPreparedMessages.get("new Date(0)");
// We need to wrap the ConsoleApiElement in a Provider in order for the
// ObjectInspector to work.
- const wrapper = render(Provider({ store: setupStore() },
- EvaluationResult({ message, serviceContainer })));
+ const wrapper = render(
+ Provider({ store: setupStore() }, EvaluationResult({ message, serviceContainer }))
+ );
expect(wrapper.find(".message-body").text()).toBe("Date 1970-01-01T00:00:00.000Z");
@@ -38,8 +43,9 @@ describe("EvaluationResult component:", () => {
const message = stubPreparedMessages.get("asdf()");
const wrapper = render(EvaluationResult({ message, serviceContainer }));
- expect(wrapper.find(".message-body").text())
- .toBe("ReferenceError: asdf is not defined[Learn More]");
+ expect(wrapper.find(".message-body").text()).toBe(
+ "ReferenceError: asdf is not defined[Learn More]"
+ );
expect(wrapper.hasClass("message")).toBe(true);
expect(wrapper.hasClass("error")).toBe(true);
@@ -75,8 +81,9 @@ describe("EvaluationResult component:", () => {
const message = stubPreparedMessages.get("inspect({a: 1})");
// We need to wrap the ConsoleApiElement in a Provider in order for the
// ObjectInspector to work.
- const wrapper = render(Provider({ store: setupStore() },
- EvaluationResult({ message, serviceContainer })));
+ const wrapper = render(
+ Provider({ store: setupStore() }, EvaluationResult({ message, serviceContainer }))
+ );
expect(wrapper.find(".message-body").text()).toBe("Object { a: 1 }");
});
@@ -85,8 +92,9 @@ describe("EvaluationResult component:", () => {
const message = stubPreparedMessages.get("cd(document)");
const wrapper = render(EvaluationResult({ message, serviceContainer }));
- expect(wrapper.find(".message-body").text())
- .toBe("Cannot cd() to the given window. Invalid argument.");
+ expect(wrapper.find(".message-body").text()).toBe(
+ "Cannot cd() to the given window. Invalid argument."
+ );
});
it("displays a [Learn more] link", () => {
@@ -95,9 +103,9 @@ describe("EvaluationResult component:", () => {
const message = stubPreparedMessages.get("asdf()");
serviceContainer.openLink = sinon.spy();
- const wrapper = mount(Provider({store},
- EvaluationResult({message, serviceContainer})
- ));
+ const wrapper = mount(
+ Provider({ store }, EvaluationResult({ message, serviceContainer }))
+ );
const url =
"https://developer.mozilla.org/docs/Web/JavaScript/Reference/Errors/Not_defined";
@@ -116,16 +124,22 @@ describe("EvaluationResult component:", () => {
const indent = 10;
// We need to wrap the ConsoleApiElement in a Provider in order for the
// ObjectInspector to work.
- let wrapper = render(Provider({ store: setupStore() }, EvaluationResult({
- message: Object.assign({}, message, {indent}),
- serviceContainer,
- })));
+ let wrapper = render(
+ Provider(
+ { store: setupStore() },
+ EvaluationResult({
+ message: Object.assign({}, message, { indent }),
+ serviceContainer,
+ })
+ )
+ );
let indentEl = wrapper.find(".indent");
expect(indentEl.prop("style").width).toBe(`${indent * INDENT_WIDTH}px`);
expect(indentEl.prop("data-indent")).toBe(`${indent}`);
- wrapper = render(Provider({ store: setupStore() },
- EvaluationResult({ message, serviceContainer})));
+ wrapper = render(
+ Provider({ store: setupStore() }, EvaluationResult({ message, serviceContainer }))
+ );
indentEl = wrapper.find(".indent");
expect(indentEl.prop("style").width).toBe(`0`);
expect(indentEl.prop("data-indent")).toBe(`0`);
@@ -144,11 +158,16 @@ describe("EvaluationResult component:", () => {
const message = stubPreparedMessages.get("new Date(0)");
// We need to wrap the ConsoleApiElement in a Provider in order for the
// ObjectInspector to work.
- const wrapper = render(Provider({ store: setupStore() }, EvaluationResult({
- message,
- serviceContainer,
- timestampsVisible: true,
- })));
+ const wrapper = render(
+ Provider(
+ { store: setupStore() },
+ EvaluationResult({
+ message,
+ serviceContainer,
+ timestampsVisible: true,
+ })
+ )
+ );
const { timestampString } = require("devtools/client/webconsole/webconsole-l10n");
expect(wrapper.find(".timestamp").text()).toBe(timestampString(message.timeStamp));
@@ -158,11 +177,16 @@ describe("EvaluationResult component:", () => {
const message = stubPreparedMessages.get("new Date(0)");
// We need to wrap the ConsoleApiElement in a Provider in order for the
// ObjectInspector to work.
- const wrapper = render(Provider({ store: setupStore() }, EvaluationResult({
- message,
- serviceContainer,
- timestampsVisible: false,
- })));
+ const wrapper = render(
+ Provider(
+ { store: setupStore() },
+ EvaluationResult({
+ message,
+ serviceContainer,
+ timestampsVisible: false,
+ })
+ )
+ );
expect(wrapper.find(".timestamp").length).toBe(0);
});
diff --git a/devtools/client/webconsole/test/mochitest/browser.ini b/devtools/client/webconsole/test/mochitest/browser.ini
index 4c54e5eb398d..0158415862a1 100644
--- a/devtools/client/webconsole/test/mochitest/browser.ini
+++ b/devtools/client/webconsole/test/mochitest/browser.ini
@@ -124,8 +124,8 @@ support-files =
!/devtools/client/netmonitor/test/sjs_cors-test-server.sjs
!/image/test/mochitest/blue.png
!/devtools/client/shared/test/shared-head.js
- !/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/telemetry-test-helpers.js
!/devtools/client/shared/test/test-actor.js
!/devtools/client/shared/test/test-actor-registry.js
diff --git a/devtools/client/webconsole/test/mochitest/head.js b/devtools/client/webconsole/test/mochitest/head.js
index b69e9bf7d876..b7aff0c3b109 100644
--- a/devtools/client/webconsole/test/mochitest/head.js
+++ b/devtools/client/webconsole/test/mochitest/head.js
@@ -21,15 +21,15 @@ Services.scriptloader.loadSubScript(
this);
// Import helpers for the new debugger
-/* 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);
// Import helpers for the new debugger
-/* 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);
var {HUDService} = require("devtools/client/webconsole/hudservice");
diff --git a/devtools/client/webconsole/test/yarn.lock b/devtools/client/webconsole/test/yarn.lock
new file mode 100644
index 000000000000..dba0ab7b3c3f
--- /dev/null
+++ b/devtools/client/webconsole/test/yarn.lock
@@ -0,0 +1,2602 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@types/node@*":
+ version "11.13.2"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-11.13.2.tgz#dc85dde46aa8740bb4aed54b8104250f8f849503"
+
+abab@^1.0.3:
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.4.tgz#5faad9c2c07f60dd76770f71cf025b62a63cfd4e"
+
+acorn-globals@^3.1.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-3.1.0.tgz#fd8270f71fbb4996b004fa880ee5d46573a731bf"
+ dependencies:
+ acorn "^4.0.4"
+
+acorn@^4.0.4:
+ version "4.0.13"
+ resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
+
+airbnb-prop-types@^2.12.0:
+ version "2.13.1"
+ resolved "https://registry.yarnpkg.com/airbnb-prop-types/-/airbnb-prop-types-2.13.1.tgz#abcae3f683c0c918aae5e0a1df6232e39e0abfa5"
+ dependencies:
+ array.prototype.find "^2.0.4"
+ function.prototype.name "^1.1.0"
+ has "^1.0.3"
+ is-regex "^1.0.4"
+ object-is "^1.0.1"
+ object.assign "^4.1.0"
+ object.entries "^1.1.0"
+ prop-types "^15.7.2"
+ prop-types-exact "^1.2.0"
+ react-is "^16.8.6"
+
+ajv@^6.5.5:
+ version "6.10.0"
+ resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz#90d0d54439da587cd7e843bfb7045f50bd22bdf1"
+ dependencies:
+ fast-deep-equal "^2.0.1"
+ fast-json-stable-stringify "^2.0.0"
+ json-schema-traverse "^0.4.1"
+ uri-js "^4.2.2"
+
+ansi-escapes@^1.4.0:
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
+
+ansi-regex@^2.0.0, ansi-regex@^2.1.1:
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+
+ansi-styles@^2.2.1:
+ version "2.2.1"
+ resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+
+ansi-styles@^3.0.0:
+ version "3.2.1"
+ resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+ dependencies:
+ color-convert "^1.9.0"
+
+anymatch@^1.3.0:
+ version "1.3.2"
+ resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a"
+ dependencies:
+ micromatch "^2.1.5"
+ normalize-path "^2.0.0"
+
+append-transform@^0.4.0:
+ version "0.4.0"
+ resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-0.4.0.tgz#d76ebf8ca94d276e247a36bad44a4b74ab611991"
+ dependencies:
+ default-require-extensions "^1.0.0"
+
+argparse@^1.0.7:
+ version "1.0.10"
+ resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
+ dependencies:
+ sprintf-js "~1.0.2"
+
+arr-diff@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
+ dependencies:
+ arr-flatten "^1.0.1"
+
+arr-flatten@^1.0.1:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
+
+array-equal@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
+
+array-filter@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-1.0.0.tgz#baf79e62e6ef4c2a4c0b831232daffec251f9d83"
+
+array-unique@^0.2.1:
+ version "0.2.1"
+ resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
+
+array.prototype.find@^2.0.4:
+ version "2.0.4"
+ resolved "https://registry.yarnpkg.com/array.prototype.find/-/array.prototype.find-2.0.4.tgz#556a5c5362c08648323ddaeb9de9d14bc1864c90"
+ dependencies:
+ define-properties "^1.1.2"
+ es-abstract "^1.7.0"
+
+array.prototype.flat@^1.2.1:
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.1.tgz#812db8f02cad24d3fab65dd67eabe3b8903494a4"
+ dependencies:
+ define-properties "^1.1.2"
+ es-abstract "^1.10.0"
+ function-bind "^1.1.1"
+
+arrify@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
+
+asn1@~0.2.3:
+ version "0.2.4"
+ resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
+ dependencies:
+ safer-buffer "~2.1.0"
+
+assert-plus@1.0.0, assert-plus@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+
+async@^2.1.4:
+ version "2.6.2"
+ resolved "https://registry.yarnpkg.com/async/-/async-2.6.2.tgz#18330ea7e6e313887f5d2f2a904bac6fe4dd5381"
+ dependencies:
+ lodash "^4.17.11"
+
+asynckit@^0.4.0:
+ version "0.4.0"
+ resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+
+aws-sign2@~0.7.0:
+ version "0.7.0"
+ resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+
+aws4@^1.8.0:
+ version "1.8.0"
+ resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
+
+babel-code-frame@^6.26.0:
+ version "6.26.0"
+ resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
+ dependencies:
+ chalk "^1.1.3"
+ esutils "^2.0.2"
+ js-tokens "^3.0.2"
+
+babel-core@^6.0.0, babel-core@^6.26.0:
+ version "6.26.3"
+ resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.3.tgz#b2e2f09e342d0f0c88e2f02e067794125e75c207"
+ dependencies:
+ babel-code-frame "^6.26.0"
+ babel-generator "^6.26.0"
+ babel-helpers "^6.24.1"
+ babel-messages "^6.23.0"
+ babel-register "^6.26.0"
+ babel-runtime "^6.26.0"
+ babel-template "^6.26.0"
+ babel-traverse "^6.26.0"
+ babel-types "^6.26.0"
+ babylon "^6.18.0"
+ convert-source-map "^1.5.1"
+ debug "^2.6.9"
+ json5 "^0.5.1"
+ lodash "^4.17.4"
+ minimatch "^3.0.4"
+ path-is-absolute "^1.0.1"
+ private "^0.1.8"
+ slash "^1.0.0"
+ source-map "^0.5.7"
+
+babel-generator@^6.18.0, babel-generator@^6.26.0:
+ version "6.26.1"
+ resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90"
+ dependencies:
+ babel-messages "^6.23.0"
+ babel-runtime "^6.26.0"
+ babel-types "^6.26.0"
+ detect-indent "^4.0.0"
+ jsesc "^1.3.0"
+ lodash "^4.17.4"
+ source-map "^0.5.7"
+ trim-right "^1.0.1"
+
+babel-helpers@^6.24.1:
+ version "6.24.1"
+ resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2"
+ dependencies:
+ babel-runtime "^6.22.0"
+ babel-template "^6.24.1"
+
+babel-jest@^20.0.3:
+ version "20.0.3"
+ resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-20.0.3.tgz#e4a03b13dc10389e140fc645d09ffc4ced301671"
+ dependencies:
+ babel-core "^6.0.0"
+ babel-plugin-istanbul "^4.0.0"
+ babel-preset-jest "^20.0.3"
+
+babel-messages@^6.23.0:
+ version "6.23.0"
+ resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
+ dependencies:
+ babel-runtime "^6.22.0"
+
+babel-plugin-istanbul@^4.0.0:
+ version "4.1.6"
+ resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.6.tgz#36c59b2192efce81c5b378321b74175add1c9a45"
+ dependencies:
+ babel-plugin-syntax-object-rest-spread "^6.13.0"
+ find-up "^2.1.0"
+ istanbul-lib-instrument "^1.10.1"
+ test-exclude "^4.2.1"
+
+babel-plugin-jest-hoist@^20.0.3:
+ version "20.0.3"
+ resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-20.0.3.tgz#afedc853bd3f8dc3548ea671fbe69d03cc2c1767"
+
+babel-plugin-syntax-object-rest-spread@^6.13.0:
+ version "6.13.0"
+ resolved "https://registry.yarnpkg.com/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5"
+
+babel-preset-jest@^20.0.3:
+ version "20.0.3"
+ resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-20.0.3.tgz#cbacaadecb5d689ca1e1de1360ebfc66862c178a"
+ dependencies:
+ babel-plugin-jest-hoist "^20.0.3"
+
+babel-register@^6.26.0:
+ version "6.26.0"
+ resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071"
+ dependencies:
+ babel-core "^6.26.0"
+ babel-runtime "^6.26.0"
+ core-js "^2.5.0"
+ home-or-tmp "^2.0.0"
+ lodash "^4.17.4"
+ mkdirp "^0.5.1"
+ source-map-support "^0.4.15"
+
+babel-runtime@^6.22.0, babel-runtime@^6.26.0, babel-runtime@^6.6.1:
+ version "6.26.0"
+ resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
+ dependencies:
+ core-js "^2.4.0"
+ regenerator-runtime "^0.11.0"
+
+babel-template@^6.16.0, babel-template@^6.24.1, babel-template@^6.26.0:
+ version "6.26.0"
+ resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02"
+ dependencies:
+ babel-runtime "^6.26.0"
+ babel-traverse "^6.26.0"
+ babel-types "^6.26.0"
+ babylon "^6.18.0"
+ lodash "^4.17.4"
+
+babel-traverse@^6.18.0, babel-traverse@^6.26.0:
+ version "6.26.0"
+ resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"
+ dependencies:
+ babel-code-frame "^6.26.0"
+ babel-messages "^6.23.0"
+ babel-runtime "^6.26.0"
+ babel-types "^6.26.0"
+ babylon "^6.18.0"
+ debug "^2.6.8"
+ globals "^9.18.0"
+ invariant "^2.2.2"
+ lodash "^4.17.4"
+
+babel-types@^6.18.0, babel-types@^6.26.0:
+ version "6.26.0"
+ resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
+ dependencies:
+ babel-runtime "^6.26.0"
+ esutils "^2.0.2"
+ lodash "^4.17.4"
+ to-fast-properties "^1.0.3"
+
+babylon@^6.18.0:
+ version "6.18.0"
+ resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
+
+balanced-match@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
+
+bcrypt-pbkdf@^1.0.0:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
+ dependencies:
+ tweetnacl "^0.14.3"
+
+boolbase@~1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
+
+brace-expansion@^1.1.7:
+ version "1.1.11"
+ resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+ dependencies:
+ balanced-match "^1.0.0"
+ concat-map "0.0.1"
+
+braces@^1.8.2:
+ version "1.8.5"
+ resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
+ dependencies:
+ expand-range "^1.8.1"
+ preserve "^0.2.0"
+ repeat-element "^1.1.2"
+
+browser-resolve@^1.11.2:
+ version "1.11.3"
+ resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.3.tgz#9b7cbb3d0f510e4cb86bdbd796124d28b5890af6"
+ dependencies:
+ resolve "1.1.7"
+
+browser-stdout@1.3.1:
+ version "1.3.1"
+ resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
+
+bser@1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/bser/-/bser-1.0.2.tgz#381116970b2a6deea5646dd15dd7278444b56169"
+ dependencies:
+ node-int64 "^0.4.0"
+
+bser@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/bser/-/bser-2.0.0.tgz#9ac78d3ed5d915804fd87acb158bc797147a1719"
+ dependencies:
+ node-int64 "^0.4.0"
+
+builtin-modules@^1.0.0:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
+
+callsites@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50"
+
+camelcase@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
+
+caseless@~0.12.0:
+ version "0.12.0"
+ resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+
+chalk@^1.1.3:
+ version "1.1.3"
+ resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
+ dependencies:
+ ansi-styles "^2.2.1"
+ escape-string-regexp "^1.0.2"
+ has-ansi "^2.0.0"
+ strip-ansi "^3.0.0"
+ supports-color "^2.0.0"
+
+cheerio@^1.0.0-rc.2:
+ version "1.0.0-rc.3"
+ resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.3.tgz#094636d425b2e9c0f4eb91a46c05630c9a1a8bf6"
+ dependencies:
+ css-select "~1.2.0"
+ dom-serializer "~0.1.1"
+ entities "~1.1.1"
+ htmlparser2 "^3.9.1"
+ lodash "^4.15.0"
+ parse5 "^3.0.1"
+
+ci-info@^1.5.0:
+ version "1.6.0"
+ resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz#2ca20dbb9ceb32d4524a683303313f0304b1e497"
+
+cliui@^3.2.0:
+ version "3.2.0"
+ resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
+ dependencies:
+ string-width "^1.0.1"
+ strip-ansi "^3.0.1"
+ wrap-ansi "^2.0.0"
+
+code-point-at@^1.0.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+
+color-convert@^1.9.0:
+ version "1.9.3"
+ resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+ dependencies:
+ color-name "1.1.3"
+
+color-name@1.1.3:
+ version "1.1.3"
+ resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+
+colors@^1.1.2:
+ version "1.3.3"
+ resolved "https://registry.yarnpkg.com/colors/-/colors-1.3.3.tgz#39e005d546afe01e01f9c4ca8fa50f686a01205d"
+
+combined-stream@^1.0.6, combined-stream@~1.0.6:
+ version "1.0.7"
+ resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828"
+ dependencies:
+ delayed-stream "~1.0.0"
+
+commander@2.15.1:
+ version "2.15.1"
+ resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
+
+commander@^2.19.0:
+ version "2.20.0"
+ resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
+
+commander@~2.19.0:
+ version "2.19.0"
+ resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
+
+concat-map@0.0.1:
+ version "0.0.1"
+ resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+
+content-type-parser@^1.0.1:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/content-type-parser/-/content-type-parser-1.0.2.tgz#caabe80623e63638b2502fd4c7f12ff4ce2352e7"
+
+convert-source-map@^1.4.0, convert-source-map@^1.5.1:
+ version "1.6.0"
+ resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20"
+ dependencies:
+ safe-buffer "~5.1.1"
+
+core-js@^0.8.3:
+ version "0.8.4"
+ resolved "https://registry.yarnpkg.com/core-js/-/core-js-0.8.4.tgz#c22665f1e0d1b9c3c5e1b08dabd1f108695e4fcf"
+
+core-js@^2.4.0, core-js@^2.5.0:
+ version "2.6.5"
+ resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.5.tgz#44bc8d249e7fb2ff5d00e0341a7ffb94fbf67895"
+
+core-util-is@1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+
+css-select@~1.2.0:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858"
+ dependencies:
+ boolbase "~1.0.0"
+ css-what "2.1"
+ domutils "1.5.1"
+ nth-check "~1.0.1"
+
+css-what@2.1:
+ version "2.1.3"
+ resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2"
+
+cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0":
+ version "0.3.6"
+ resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.6.tgz#f85206cee04efa841f3c5982a74ba96ab20d65ad"
+
+"cssstyle@>= 0.2.37 < 0.3.0":
+ version "0.2.37"
+ resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-0.2.37.tgz#541097234cb2513c83ceed3acddc27ff27987d54"
+ dependencies:
+ cssom "0.3.x"
+
+dashdash@^1.12.0:
+ version "1.14.1"
+ resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+ dependencies:
+ assert-plus "^1.0.0"
+
+debug@3.1.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+ dependencies:
+ ms "2.0.0"
+
+debug@^2.6.8, debug@^2.6.9:
+ version "2.6.9"
+ resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+ dependencies:
+ ms "2.0.0"
+
+debug@^3.1.0:
+ version "3.2.6"
+ resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
+ dependencies:
+ ms "^2.1.1"
+
+decamelize@^1.1.1:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+
+deep-is@~0.1.3:
+ version "0.1.3"
+ resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
+
+default-require-extensions@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-1.0.0.tgz#f37ea15d3e13ffd9b437d33e1a75b5fb97874cb8"
+ dependencies:
+ strip-bom "^2.0.0"
+
+define-properties@^1.1.2, define-properties@^1.1.3, define-properties@~1.1.2:
+ version "1.1.3"
+ resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
+ dependencies:
+ object-keys "^1.0.12"
+
+delayed-stream@~1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+
+detect-indent@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208"
+ dependencies:
+ repeating "^2.0.0"
+
+devtools-modules@0.0.37:
+ version "0.0.37"
+ resolved "https://registry.yarnpkg.com/devtools-modules/-/devtools-modules-0.0.37.tgz#29b0041e444fe8b08aae3833b5433ab004d012b3"
+ dependencies:
+ jest "^20.0.4"
+ punycode "^2.1.0"
+
+diff@3.5.0, diff@^3.2.0:
+ version "3.5.0"
+ resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
+
+discontinuous-range@1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/discontinuous-range/-/discontinuous-range-1.0.0.tgz#e38331f0844bba49b9a9cb71c771585aab1bc65a"
+
+dom-serializer@0, dom-serializer@~0.1.1:
+ version "0.1.1"
+ resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.1.tgz#1ec4059e284babed36eec2941d4a970a189ce7c0"
+ dependencies:
+ domelementtype "^1.3.0"
+ entities "^1.1.1"
+
+dom-walk@^0.1.0:
+ version "0.1.1"
+ resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.1.tgz#672226dc74c8f799ad35307df936aba11acd6018"
+
+domelementtype@1, domelementtype@^1.3.0, domelementtype@^1.3.1:
+ version "1.3.1"
+ resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f"
+
+domhandler@^2.3.0:
+ version "2.4.2"
+ resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803"
+ dependencies:
+ domelementtype "1"
+
+domutils@1.5.1:
+ version "1.5.1"
+ resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
+ dependencies:
+ dom-serializer "0"
+ domelementtype "1"
+
+domutils@^1.5.1:
+ version "1.7.0"
+ resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a"
+ dependencies:
+ dom-serializer "0"
+ domelementtype "1"
+
+ecc-jsbn@~0.1.1:
+ version "0.1.2"
+ resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
+ dependencies:
+ jsbn "~0.1.0"
+ safer-buffer "^2.1.0"
+
+entities@^1.1.1, entities@~1.1.1:
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
+
+enzyme-adapter-react-16@^1.1.1:
+ version "1.12.1"
+ resolved "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.12.1.tgz#6a2d74c80559d35ac0a91ca162fa45f4186290cf"
+ dependencies:
+ enzyme-adapter-utils "^1.11.0"
+ object.assign "^4.1.0"
+ object.values "^1.1.0"
+ prop-types "^15.7.2"
+ react-is "^16.8.6"
+ react-test-renderer "^16.0.0-0"
+ semver "^5.6.0"
+
+enzyme-adapter-utils@^1.11.0:
+ version "1.11.0"
+ resolved "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.11.0.tgz#6ffff782b1b57dd46c72a845a91fc4103956a117"
+ dependencies:
+ airbnb-prop-types "^2.12.0"
+ function.prototype.name "^1.1.0"
+ object.assign "^4.1.0"
+ object.fromentries "^2.0.0"
+ prop-types "^15.7.2"
+ semver "^5.6.0"
+
+enzyme@^3.3.0:
+ version "3.9.0"
+ resolved "https://registry.yarnpkg.com/enzyme/-/enzyme-3.9.0.tgz#2b491f06ca966eb56b6510068c7894a7e0be3909"
+ dependencies:
+ array.prototype.flat "^1.2.1"
+ cheerio "^1.0.0-rc.2"
+ function.prototype.name "^1.1.0"
+ has "^1.0.3"
+ html-element-map "^1.0.0"
+ is-boolean-object "^1.0.0"
+ is-callable "^1.1.4"
+ is-number-object "^1.0.3"
+ is-regex "^1.0.4"
+ is-string "^1.0.4"
+ is-subset "^0.1.1"
+ lodash.escape "^4.0.1"
+ lodash.isequal "^4.5.0"
+ object-inspect "^1.6.0"
+ object-is "^1.0.1"
+ object.assign "^4.1.0"
+ object.entries "^1.0.4"
+ object.values "^1.0.4"
+ raf "^3.4.0"
+ rst-selector-parser "^2.2.3"
+ string.prototype.trim "^1.1.2"
+
+errno@~0.1.7:
+ version "0.1.7"
+ resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
+ dependencies:
+ prr "~1.0.1"
+
+error-ex@^1.2.0:
+ version "1.3.2"
+ resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
+ dependencies:
+ is-arrayish "^0.2.1"
+
+es-abstract@^1.10.0, es-abstract@^1.11.0, es-abstract@^1.12.0, es-abstract@^1.5.0, es-abstract@^1.7.0:
+ version "1.13.0"
+ resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9"
+ dependencies:
+ es-to-primitive "^1.2.0"
+ function-bind "^1.1.1"
+ has "^1.0.3"
+ is-callable "^1.1.4"
+ is-regex "^1.0.4"
+ object-keys "^1.0.12"
+
+es-to-primitive@^1.2.0:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz#edf72478033456e8dda8ef09e00ad9650707f377"
+ dependencies:
+ is-callable "^1.1.4"
+ is-date-object "^1.0.1"
+ is-symbol "^1.0.2"
+
+escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2:
+ version "1.0.5"
+ resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+
+escodegen@^1.6.1:
+ version "1.11.1"
+ resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.11.1.tgz#c485ff8d6b4cdb89e27f4a856e91f118401ca510"
+ dependencies:
+ esprima "^3.1.3"
+ estraverse "^4.2.0"
+ esutils "^2.0.2"
+ optionator "^0.8.1"
+ optionalDependencies:
+ source-map "~0.6.1"
+
+esprima@^3.1.3:
+ version "3.1.3"
+ resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
+
+esprima@^4.0.0:
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+
+estraverse@^4.2.0:
+ version "4.2.0"
+ resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
+
+esutils@^2.0.2:
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
+
+exec-sh@^0.2.0:
+ version "0.2.2"
+ resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.2.2.tgz#2a5e7ffcbd7d0ba2755bdecb16e5a427dfbdec36"
+ dependencies:
+ merge "^1.2.0"
+
+expand-brackets@^0.1.4:
+ version "0.1.5"
+ resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
+ dependencies:
+ is-posix-bracket "^0.1.0"
+
+expand-range@^1.8.1:
+ version "1.8.2"
+ resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
+ dependencies:
+ fill-range "^2.1.0"
+
+expect@^1.16.0:
+ version "1.20.2"
+ resolved "https://registry.yarnpkg.com/expect/-/expect-1.20.2.tgz#d458fe4c56004036bae3232416a3f6361f04f965"
+ dependencies:
+ define-properties "~1.1.2"
+ has "^1.0.1"
+ is-equal "^1.5.1"
+ is-regex "^1.0.3"
+ object-inspect "^1.1.0"
+ object-keys "^1.0.9"
+ tmatch "^2.0.1"
+
+extend@~3.0.2:
+ version "3.0.2"
+ resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+
+extglob@^0.3.1:
+ version "0.3.2"
+ resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
+ dependencies:
+ is-extglob "^1.0.0"
+
+extsprintf@1.3.0:
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+
+extsprintf@^1.2.0:
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
+
+fast-deep-equal@^2.0.1:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
+
+fast-json-stable-stringify@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
+
+fast-levenshtein@~2.0.4:
+ version "2.0.6"
+ resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+
+fb-watchman@^1.8.0:
+ version "1.9.2"
+ resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-1.9.2.tgz#a24cf47827f82d38fb59a69ad70b76e3b6ae7383"
+ dependencies:
+ bser "1.0.2"
+
+fb-watchman@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.0.tgz#54e9abf7dfa2f26cd9b1636c588c1afc05de5d58"
+ dependencies:
+ bser "^2.0.0"
+
+filename-regex@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
+
+fileset@^2.0.2:
+ version "2.0.3"
+ resolved "https://registry.yarnpkg.com/fileset/-/fileset-2.0.3.tgz#8e7548a96d3cc2327ee5e674168723a333bba2a0"
+ dependencies:
+ glob "^7.0.3"
+ minimatch "^3.0.3"
+
+fill-range@^2.1.0:
+ version "2.2.4"
+ resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565"
+ dependencies:
+ is-number "^2.1.0"
+ isobject "^2.0.0"
+ randomatic "^3.0.0"
+ repeat-element "^1.1.2"
+ repeat-string "^1.5.2"
+
+find-up@^1.0.0:
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
+ dependencies:
+ path-exists "^2.0.0"
+ pinkie-promise "^2.0.0"
+
+find-up@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
+ dependencies:
+ locate-path "^2.0.0"
+
+for-in@^1.0.1:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
+
+for-own@^0.1.4:
+ version "0.1.5"
+ resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
+ dependencies:
+ for-in "^1.0.1"
+
+forever-agent@~0.6.1:
+ version "0.6.1"
+ resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+
+form-data@~2.3.2:
+ version "2.3.3"
+ resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
+ dependencies:
+ asynckit "^0.4.0"
+ combined-stream "^1.0.6"
+ mime-types "^2.1.12"
+
+formatio@1.1.1:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/formatio/-/formatio-1.1.1.tgz#5ed3ccd636551097383465d996199100e86161e9"
+ dependencies:
+ samsam "~1.1"
+
+fs.realpath@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+
+function-bind@^1.0.2, function-bind@^1.1.1:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+
+function.prototype.name@^1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.0.tgz#8bd763cc0af860a859cc5d49384d74b932cd2327"
+ dependencies:
+ define-properties "^1.1.2"
+ function-bind "^1.1.1"
+ is-callable "^1.1.3"
+
+get-caller-file@^1.0.1:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
+
+getpass@^0.1.1:
+ version "0.1.7"
+ resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+ dependencies:
+ assert-plus "^1.0.0"
+
+glob-base@^0.3.0:
+ version "0.3.0"
+ resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
+ dependencies:
+ glob-parent "^2.0.0"
+ is-glob "^2.0.0"
+
+glob-parent@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
+ dependencies:
+ is-glob "^2.0.0"
+
+glob@7.1.2:
+ version "7.1.2"
+ resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
+ dependencies:
+ fs.realpath "^1.0.0"
+ inflight "^1.0.4"
+ inherits "2"
+ minimatch "^3.0.4"
+ once "^1.3.0"
+ path-is-absolute "^1.0.0"
+
+glob@^7.0.3, glob@^7.1.1, glob@^7.1.3:
+ version "7.1.3"
+ resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
+ dependencies:
+ fs.realpath "^1.0.0"
+ inflight "^1.0.4"
+ inherits "2"
+ minimatch "^3.0.4"
+ once "^1.3.0"
+ path-is-absolute "^1.0.0"
+
+global@^4.3.2:
+ version "4.3.2"
+ resolved "https://registry.yarnpkg.com/global/-/global-4.3.2.tgz#e76989268a6c74c38908b1305b10fc0e394e9d0f"
+ dependencies:
+ min-document "^2.19.0"
+ process "~0.5.1"
+
+globals@^9.18.0:
+ version "9.18.0"
+ resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
+
+graceful-fs@^4.1.11, graceful-fs@^4.1.2:
+ version "4.1.15"
+ resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
+
+growl@1.10.5:
+ version "1.10.5"
+ resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
+
+growly@^1.3.0:
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
+
+handlebars@^4.0.3:
+ version "4.1.1"
+ resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.1.tgz#6e4e41c18ebe7719ae4d38e5aca3d32fa3dd23d3"
+ dependencies:
+ neo-async "^2.6.0"
+ optimist "^0.6.1"
+ source-map "^0.6.1"
+ optionalDependencies:
+ uglify-js "^3.1.4"
+
+har-schema@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
+
+har-validator@~5.1.0:
+ version "5.1.3"
+ resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080"
+ dependencies:
+ ajv "^6.5.5"
+ har-schema "^2.0.0"
+
+has-ansi@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
+ dependencies:
+ ansi-regex "^2.0.0"
+
+has-flag@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
+
+has-flag@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+
+has-symbols@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44"
+
+has@^1.0.1, has@^1.0.3:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
+ dependencies:
+ function-bind "^1.1.1"
+
+he@1.1.1:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
+
+home-or-tmp@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8"
+ dependencies:
+ os-homedir "^1.0.0"
+ os-tmpdir "^1.0.1"
+
+hosted-git-info@^2.1.4:
+ version "2.7.1"
+ resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047"
+
+html-element-map@^1.0.0:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/html-element-map/-/html-element-map-1.0.1.tgz#3c4fcb4874ebddfe4283b51c8994e7713782b592"
+ dependencies:
+ array-filter "^1.0.0"
+
+html-encoding-sniffer@^1.0.1:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz#e70d84b94da53aa375e11fe3a351be6642ca46f8"
+ dependencies:
+ whatwg-encoding "^1.0.1"
+
+htmlparser2@^3.9.1:
+ version "3.10.1"
+ resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f"
+ dependencies:
+ domelementtype "^1.3.1"
+ domhandler "^2.3.0"
+ domutils "^1.5.1"
+ entities "^1.1.1"
+ inherits "^2.0.1"
+ readable-stream "^3.1.1"
+
+http-signature@~1.2.0:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+ dependencies:
+ assert-plus "^1.0.0"
+ jsprim "^1.2.2"
+ sshpk "^1.7.0"
+
+iconv-lite@0.4.24:
+ version "0.4.24"
+ resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
+ dependencies:
+ safer-buffer ">= 2.1.2 < 3"
+
+inflight@^1.0.4:
+ version "1.0.6"
+ resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+ dependencies:
+ once "^1.3.0"
+ wrappy "1"
+
+inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3:
+ version "2.0.3"
+ resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+
+invariant@^2.2.2:
+ version "2.2.4"
+ resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
+ dependencies:
+ loose-envify "^1.0.0"
+
+invert-kv@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
+
+is-arrayish@^0.2.1:
+ version "0.2.1"
+ resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
+
+is-arrow-function@^2.0.3:
+ version "2.0.3"
+ resolved "https://registry.yarnpkg.com/is-arrow-function/-/is-arrow-function-2.0.3.tgz#29be2c2d8d9450852b8bbafb635ba7b8d8e87ec2"
+ dependencies:
+ is-callable "^1.0.4"
+
+is-boolean-object@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.0.0.tgz#98f8b28030684219a95f375cfbd88ce3405dff93"
+
+is-buffer@^1.1.5:
+ version "1.1.6"
+ resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
+
+is-builtin-module@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
+ dependencies:
+ builtin-modules "^1.0.0"
+
+is-callable@^1.0.4, is-callable@^1.1.3, is-callable@^1.1.4:
+ version "1.1.4"
+ resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
+
+is-ci@^1.0.10:
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz#e3779c8ee17fccf428488f6e281187f2e632841c"
+ dependencies:
+ ci-info "^1.5.0"
+
+is-date-object@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
+
+is-dotfile@^1.0.0:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
+
+is-equal-shallow@^0.1.3:
+ version "0.1.3"
+ resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
+ dependencies:
+ is-primitive "^2.0.0"
+
+is-equal@^1.5.1:
+ version "1.5.5"
+ resolved "https://registry.yarnpkg.com/is-equal/-/is-equal-1.5.5.tgz#5e85f1957e052883247feb386965a3bba15fbb3d"
+ dependencies:
+ has "^1.0.1"
+ is-arrow-function "^2.0.3"
+ is-boolean-object "^1.0.0"
+ is-callable "^1.1.3"
+ is-date-object "^1.0.1"
+ is-generator-function "^1.0.6"
+ is-number-object "^1.0.3"
+ is-regex "^1.0.3"
+ is-string "^1.0.4"
+ is-symbol "^1.0.1"
+ object.entries "^1.0.4"
+
+is-extendable@^0.1.1:
+ version "0.1.1"
+ resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
+
+is-extglob@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
+
+is-finite@^1.0.0:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa"
+ dependencies:
+ number-is-nan "^1.0.0"
+
+is-fullwidth-code-point@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+ dependencies:
+ number-is-nan "^1.0.0"
+
+is-generator-function@^1.0.6:
+ version "1.0.7"
+ resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.7.tgz#d2132e529bb0000a7f80794d4bdf5cd5e5813522"
+
+is-glob@^2.0.0, is-glob@^2.0.1:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
+ dependencies:
+ is-extglob "^1.0.0"
+
+is-number-object@^1.0.3:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.3.tgz#f265ab89a9f445034ef6aff15a8f00b00f551799"
+
+is-number@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
+ dependencies:
+ kind-of "^3.0.2"
+
+is-number@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
+
+is-posix-bracket@^0.1.0:
+ version "0.1.1"
+ resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
+
+is-primitive@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
+
+is-regex@^1.0.3, is-regex@^1.0.4:
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
+ dependencies:
+ has "^1.0.1"
+
+is-string@^1.0.4:
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.4.tgz#cc3a9b69857d621e963725a24caeec873b826e64"
+
+is-subset@^0.1.1:
+ version "0.1.1"
+ resolved "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6"
+
+is-symbol@^1.0.1, is-symbol@^1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz#a055f6ae57192caee329e7a860118b497a950f38"
+ dependencies:
+ has-symbols "^1.0.0"
+
+is-typedarray@~1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+
+is-utf8@^0.2.0:
+ version "0.2.1"
+ resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
+
+is-wsl@^1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
+
+isarray@1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+
+isexe@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+
+isobject@^2.0.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+ dependencies:
+ isarray "1.0.0"
+
+isstream@~0.1.2:
+ version "0.1.2"
+ resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+
+istanbul-api@^1.1.1:
+ version "1.3.7"
+ resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.3.7.tgz#a86c770d2b03e11e3f778cd7aedd82d2722092aa"
+ dependencies:
+ async "^2.1.4"
+ fileset "^2.0.2"
+ istanbul-lib-coverage "^1.2.1"
+ istanbul-lib-hook "^1.2.2"
+ istanbul-lib-instrument "^1.10.2"
+ istanbul-lib-report "^1.1.5"
+ istanbul-lib-source-maps "^1.2.6"
+ istanbul-reports "^1.5.1"
+ js-yaml "^3.7.0"
+ mkdirp "^0.5.1"
+ once "^1.4.0"
+
+istanbul-lib-coverage@^1.0.1, istanbul-lib-coverage@^1.2.1:
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.1.tgz#ccf7edcd0a0bb9b8f729feeb0930470f9af664f0"
+
+istanbul-lib-hook@^1.2.2:
+ version "1.2.2"
+ resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.2.2.tgz#bc6bf07f12a641fbf1c85391d0daa8f0aea6bf86"
+ dependencies:
+ append-transform "^0.4.0"
+
+istanbul-lib-instrument@^1.10.1, istanbul-lib-instrument@^1.10.2, istanbul-lib-instrument@^1.4.2:
+ version "1.10.2"
+ resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.2.tgz#1f55ed10ac3c47f2bdddd5307935126754d0a9ca"
+ dependencies:
+ babel-generator "^6.18.0"
+ babel-template "^6.16.0"
+ babel-traverse "^6.18.0"
+ babel-types "^6.18.0"
+ babylon "^6.18.0"
+ istanbul-lib-coverage "^1.2.1"
+ semver "^5.3.0"
+
+istanbul-lib-report@^1.1.5:
+ version "1.1.5"
+ resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.1.5.tgz#f2a657fc6282f96170aaf281eb30a458f7f4170c"
+ dependencies:
+ istanbul-lib-coverage "^1.2.1"
+ mkdirp "^0.5.1"
+ path-parse "^1.0.5"
+ supports-color "^3.1.2"
+
+istanbul-lib-source-maps@^1.1.0, istanbul-lib-source-maps@^1.2.6:
+ version "1.2.6"
+ resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.6.tgz#37b9ff661580f8fca11232752ee42e08c6675d8f"
+ dependencies:
+ debug "^3.1.0"
+ istanbul-lib-coverage "^1.2.1"
+ mkdirp "^0.5.1"
+ rimraf "^2.6.1"
+ source-map "^0.5.3"
+
+istanbul-reports@^1.5.1:
+ version "1.5.1"
+ resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.5.1.tgz#97e4dbf3b515e8c484caea15d6524eebd3ff4e1a"
+ dependencies:
+ handlebars "^4.0.3"
+
+jest-changed-files@^20.0.3:
+ version "20.0.3"
+ resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-20.0.3.tgz#9394d5cc65c438406149bef1bf4d52b68e03e3f8"
+
+jest-cli@^20.0.4:
+ version "20.0.4"
+ resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-20.0.4.tgz#e532b19d88ae5bc6c417e8b0593a6fe954b1dc93"
+ dependencies:
+ ansi-escapes "^1.4.0"
+ callsites "^2.0.0"
+ chalk "^1.1.3"
+ graceful-fs "^4.1.11"
+ is-ci "^1.0.10"
+ istanbul-api "^1.1.1"
+ istanbul-lib-coverage "^1.0.1"
+ istanbul-lib-instrument "^1.4.2"
+ istanbul-lib-source-maps "^1.1.0"
+ jest-changed-files "^20.0.3"
+ jest-config "^20.0.4"
+ jest-docblock "^20.0.3"
+ jest-environment-jsdom "^20.0.3"
+ jest-haste-map "^20.0.4"
+ jest-jasmine2 "^20.0.4"
+ jest-message-util "^20.0.3"
+ jest-regex-util "^20.0.3"
+ jest-resolve-dependencies "^20.0.3"
+ jest-runtime "^20.0.4"
+ jest-snapshot "^20.0.3"
+ jest-util "^20.0.3"
+ micromatch "^2.3.11"
+ node-notifier "^5.0.2"
+ pify "^2.3.0"
+ slash "^1.0.0"
+ string-length "^1.0.1"
+ throat "^3.0.0"
+ which "^1.2.12"
+ worker-farm "^1.3.1"
+ yargs "^7.0.2"
+
+jest-config@^20.0.4:
+ version "20.0.4"
+ resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-20.0.4.tgz#e37930ab2217c913605eff13e7bd763ec48faeea"
+ dependencies:
+ chalk "^1.1.3"
+ glob "^7.1.1"
+ jest-environment-jsdom "^20.0.3"
+ jest-environment-node "^20.0.3"
+ jest-jasmine2 "^20.0.4"
+ jest-matcher-utils "^20.0.3"
+ jest-regex-util "^20.0.3"
+ jest-resolve "^20.0.4"
+ jest-validate "^20.0.3"
+ pretty-format "^20.0.3"
+
+jest-diff@^20.0.3:
+ version "20.0.3"
+ resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-20.0.3.tgz#81f288fd9e675f0fb23c75f1c2b19445fe586617"
+ dependencies:
+ chalk "^1.1.3"
+ diff "^3.2.0"
+ jest-matcher-utils "^20.0.3"
+ pretty-format "^20.0.3"
+
+jest-docblock@^20.0.3:
+ version "20.0.3"
+ resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-20.0.3.tgz#17bea984342cc33d83c50fbe1545ea0efaa44712"
+
+jest-environment-jsdom@^20.0.3:
+ version "20.0.3"
+ resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-20.0.3.tgz#048a8ac12ee225f7190417713834bb999787de99"
+ dependencies:
+ jest-mock "^20.0.3"
+ jest-util "^20.0.3"
+ jsdom "^9.12.0"
+
+jest-environment-node@^20.0.3:
+ version "20.0.3"
+ resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-20.0.3.tgz#d488bc4612af2c246e986e8ae7671a099163d403"
+ dependencies:
+ jest-mock "^20.0.3"
+ jest-util "^20.0.3"
+
+jest-haste-map@^20.0.4:
+ version "20.0.5"
+ resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-20.0.5.tgz#abad74efb1a005974a7b6517e11010709cab9112"
+ dependencies:
+ fb-watchman "^2.0.0"
+ graceful-fs "^4.1.11"
+ jest-docblock "^20.0.3"
+ micromatch "^2.3.11"
+ sane "~1.6.0"
+ worker-farm "^1.3.1"
+
+jest-jasmine2@^20.0.4:
+ version "20.0.4"
+ resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-20.0.4.tgz#fcc5b1411780d911d042902ef1859e852e60d5e1"
+ dependencies:
+ chalk "^1.1.3"
+ graceful-fs "^4.1.11"
+ jest-diff "^20.0.3"
+ jest-matcher-utils "^20.0.3"
+ jest-matchers "^20.0.3"
+ jest-message-util "^20.0.3"
+ jest-snapshot "^20.0.3"
+ once "^1.4.0"
+ p-map "^1.1.1"
+
+jest-matcher-utils@^20.0.3:
+ version "20.0.3"
+ resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-20.0.3.tgz#b3a6b8e37ca577803b0832a98b164f44b7815612"
+ dependencies:
+ chalk "^1.1.3"
+ pretty-format "^20.0.3"
+
+jest-matchers@^20.0.3:
+ version "20.0.3"
+ resolved "https://registry.yarnpkg.com/jest-matchers/-/jest-matchers-20.0.3.tgz#ca69db1c32db5a6f707fa5e0401abb55700dfd60"
+ dependencies:
+ jest-diff "^20.0.3"
+ jest-matcher-utils "^20.0.3"
+ jest-message-util "^20.0.3"
+ jest-regex-util "^20.0.3"
+
+jest-message-util@^20.0.3:
+ version "20.0.3"
+ resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-20.0.3.tgz#6aec2844306fcb0e6e74d5796c1006d96fdd831c"
+ dependencies:
+ chalk "^1.1.3"
+ micromatch "^2.3.11"
+ slash "^1.0.0"
+
+jest-mock@^20.0.3:
+ version "20.0.3"
+ resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-20.0.3.tgz#8bc070e90414aa155c11a8d64c869a0d5c71da59"
+
+jest-regex-util@^20.0.3:
+ version "20.0.3"
+ resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-20.0.3.tgz#85bbab5d133e44625b19faf8c6aa5122d085d762"
+
+jest-resolve-dependencies@^20.0.3:
+ version "20.0.3"
+ resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-20.0.3.tgz#6e14a7b717af0f2cb3667c549de40af017b1723a"
+ dependencies:
+ jest-regex-util "^20.0.3"
+
+jest-resolve@^20.0.4:
+ version "20.0.4"
+ resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-20.0.4.tgz#9448b3e8b6bafc15479444c6499045b7ffe597a5"
+ dependencies:
+ browser-resolve "^1.11.2"
+ is-builtin-module "^1.0.0"
+ resolve "^1.3.2"
+
+jest-runtime@^20.0.4:
+ version "20.0.4"
+ resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-20.0.4.tgz#a2c802219c4203f754df1404e490186169d124d8"
+ dependencies:
+ babel-core "^6.0.0"
+ babel-jest "^20.0.3"
+ babel-plugin-istanbul "^4.0.0"
+ chalk "^1.1.3"
+ convert-source-map "^1.4.0"
+ graceful-fs "^4.1.11"
+ jest-config "^20.0.4"
+ jest-haste-map "^20.0.4"
+ jest-regex-util "^20.0.3"
+ jest-resolve "^20.0.4"
+ jest-util "^20.0.3"
+ json-stable-stringify "^1.0.1"
+ micromatch "^2.3.11"
+ strip-bom "3.0.0"
+ yargs "^7.0.2"
+
+jest-snapshot@^20.0.3:
+ version "20.0.3"
+ resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-20.0.3.tgz#5b847e1adb1a4d90852a7f9f125086e187c76566"
+ dependencies:
+ chalk "^1.1.3"
+ jest-diff "^20.0.3"
+ jest-matcher-utils "^20.0.3"
+ jest-util "^20.0.3"
+ natural-compare "^1.4.0"
+ pretty-format "^20.0.3"
+
+jest-util@^20.0.3:
+ version "20.0.3"
+ resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-20.0.3.tgz#0c07f7d80d82f4e5a67c6f8b9c3fe7f65cfd32ad"
+ dependencies:
+ chalk "^1.1.3"
+ graceful-fs "^4.1.11"
+ jest-message-util "^20.0.3"
+ jest-mock "^20.0.3"
+ jest-validate "^20.0.3"
+ leven "^2.1.0"
+ mkdirp "^0.5.1"
+
+jest-validate@^20.0.3:
+ version "20.0.3"
+ resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-20.0.3.tgz#d0cfd1de4f579f298484925c280f8f1d94ec3cab"
+ dependencies:
+ chalk "^1.1.3"
+ jest-matcher-utils "^20.0.3"
+ leven "^2.1.0"
+ pretty-format "^20.0.3"
+
+jest@^20.0.4:
+ version "20.0.4"
+ resolved "https://registry.yarnpkg.com/jest/-/jest-20.0.4.tgz#3dd260c2989d6dad678b1e9cc4d91944f6d602ac"
+ dependencies:
+ jest-cli "^20.0.4"
+
+"js-tokens@^3.0.0 || ^4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
+
+js-tokens@^3.0.2:
+ version "3.0.2"
+ resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
+
+js-yaml@^3.7.0:
+ version "3.13.1"
+ resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
+ dependencies:
+ argparse "^1.0.7"
+ esprima "^4.0.0"
+
+jsbn@~0.1.0:
+ version "0.1.1"
+ resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+
+jsdom-global@^2.0.0:
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/jsdom-global/-/jsdom-global-2.1.1.tgz#47d46fe77f6167baf5d34431d3bb59fc41b0915a"
+
+jsdom@^9.12.0, jsdom@^9.4.1:
+ version "9.12.0"
+ resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-9.12.0.tgz#e8c546fffcb06c00d4833ca84410fed7f8a097d4"
+ dependencies:
+ abab "^1.0.3"
+ acorn "^4.0.4"
+ acorn-globals "^3.1.0"
+ array-equal "^1.0.0"
+ content-type-parser "^1.0.1"
+ cssom ">= 0.3.2 < 0.4.0"
+ cssstyle ">= 0.2.37 < 0.3.0"
+ escodegen "^1.6.1"
+ html-encoding-sniffer "^1.0.1"
+ nwmatcher ">= 1.3.9 < 2.0.0"
+ parse5 "^1.5.1"
+ request "^2.79.0"
+ sax "^1.2.1"
+ symbol-tree "^3.2.1"
+ tough-cookie "^2.3.2"
+ webidl-conversions "^4.0.0"
+ whatwg-encoding "^1.0.1"
+ whatwg-url "^4.3.0"
+ xml-name-validator "^2.0.1"
+
+jsesc@^1.3.0:
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
+
+json-schema-traverse@^0.4.1:
+ version "0.4.1"
+ resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
+
+json-schema@0.2.3:
+ version "0.2.3"
+ resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
+
+json-stable-stringify@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
+ dependencies:
+ jsonify "~0.0.0"
+
+json-stringify-safe@~5.0.1:
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+
+json5@^0.5.1:
+ version "0.5.1"
+ resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
+
+jsonify@~0.0.0:
+ version "0.0.0"
+ resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
+
+jsprim@^1.2.2:
+ version "1.4.1"
+ resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
+ dependencies:
+ assert-plus "1.0.0"
+ extsprintf "1.3.0"
+ json-schema "0.2.3"
+ verror "1.10.0"
+
+kind-of@^3.0.2:
+ version "3.2.2"
+ resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
+ dependencies:
+ is-buffer "^1.1.5"
+
+kind-of@^6.0.0:
+ version "6.0.2"
+ resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
+
+lcid@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
+ dependencies:
+ invert-kv "^1.0.0"
+
+leven@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/leven/-/leven-2.1.0.tgz#c2e7a9f772094dee9d34202ae8acce4687875580"
+
+levn@~0.3.0:
+ version "0.3.0"
+ resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+ dependencies:
+ prelude-ls "~1.1.2"
+ type-check "~0.3.2"
+
+load-json-file@^1.0.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
+ dependencies:
+ graceful-fs "^4.1.2"
+ parse-json "^2.2.0"
+ pify "^2.0.0"
+ pinkie-promise "^2.0.0"
+ strip-bom "^2.0.0"
+
+locate-path@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
+ dependencies:
+ p-locate "^2.0.0"
+ path-exists "^3.0.0"
+
+lodash.escape@^4.0.1:
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-4.0.1.tgz#c9044690c21e04294beaa517712fded1fa88de98"
+
+lodash.flattendeep@^4.4.0:
+ version "4.4.0"
+ resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2"
+
+lodash.isequal@^4.5.0:
+ version "4.5.0"
+ resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
+
+lodash@^4.15.0, lodash@^4.17.11, lodash@^4.17.4:
+ version "4.17.11"
+ resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
+
+lolex@1.3.2:
+ version "1.3.2"
+ resolved "https://registry.yarnpkg.com/lolex/-/lolex-1.3.2.tgz#7c3da62ffcb30f0f5a80a2566ca24e45d8a01f31"
+
+loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.4.0:
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
+ dependencies:
+ js-tokens "^3.0.0 || ^4.0.0"
+
+makeerror@1.0.x:
+ version "1.0.11"
+ resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c"
+ dependencies:
+ tmpl "1.0.x"
+
+math-random@^1.0.1:
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c"
+
+merge@^1.2.0:
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145"
+
+micromatch@^2.1.5, micromatch@^2.3.11:
+ version "2.3.11"
+ resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
+ dependencies:
+ arr-diff "^2.0.0"
+ array-unique "^0.2.1"
+ braces "^1.8.2"
+ expand-brackets "^0.1.4"
+ extglob "^0.3.1"
+ filename-regex "^2.0.0"
+ is-extglob "^1.0.0"
+ is-glob "^2.0.1"
+ kind-of "^3.0.2"
+ normalize-path "^2.0.1"
+ object.omit "^2.0.0"
+ parse-glob "^3.0.4"
+ regex-cache "^0.4.2"
+
+mime-db@~1.38.0:
+ version "1.38.0"
+ resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.38.0.tgz#1a2aab16da9eb167b49c6e4df2d9c68d63d8e2ad"
+
+mime-types@^2.1.12, mime-types@~2.1.19:
+ version "2.1.22"
+ resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.22.tgz#fe6b355a190926ab7698c9a0556a11199b2199bd"
+ dependencies:
+ mime-db "~1.38.0"
+
+min-document@^2.19.0:
+ version "2.19.0"
+ resolved "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685"
+ dependencies:
+ dom-walk "^0.1.0"
+
+minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
+ version "3.0.4"
+ resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+ dependencies:
+ brace-expansion "^1.1.7"
+
+minimist@0.0.8:
+ version "0.0.8"
+ resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+
+minimist@^1.1.1:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+
+minimist@~0.0.1:
+ version "0.0.10"
+ resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
+
+mkdirp@0.5.1, mkdirp@^0.5.1:
+ version "0.5.1"
+ resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+ dependencies:
+ minimist "0.0.8"
+
+mocha@^5.0.1:
+ version "5.2.0"
+ resolved "https://registry.yarnpkg.com/mocha/-/mocha-5.2.0.tgz#6d8ae508f59167f940f2b5b3c4a612ae50c90ae6"
+ dependencies:
+ browser-stdout "1.3.1"
+ commander "2.15.1"
+ debug "3.1.0"
+ diff "3.5.0"
+ escape-string-regexp "1.0.5"
+ glob "7.1.2"
+ growl "1.10.5"
+ he "1.1.1"
+ minimatch "3.0.4"
+ mkdirp "0.5.1"
+ supports-color "5.4.0"
+
+mock-local-storage@^1.0.5:
+ version "1.1.8"
+ resolved "https://registry.yarnpkg.com/mock-local-storage/-/mock-local-storage-1.1.8.tgz#82a3f7c666bf955d64b286cb71207478f1a29bf7"
+ dependencies:
+ core-js "^0.8.3"
+ global "^4.3.2"
+
+moo@^0.4.3:
+ version "0.4.3"
+ resolved "https://registry.yarnpkg.com/moo/-/moo-0.4.3.tgz#3f847a26f31cf625a956a87f2b10fbc013bfd10e"
+
+ms@2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+
+ms@^2.1.1:
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
+
+natural-compare@^1.4.0:
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
+
+nearley@^2.7.10:
+ version "2.16.0"
+ resolved "https://registry.yarnpkg.com/nearley/-/nearley-2.16.0.tgz#77c297d041941d268290ec84b739d0ee297e83a7"
+ dependencies:
+ commander "^2.19.0"
+ moo "^0.4.3"
+ railroad-diagrams "^1.0.0"
+ randexp "0.4.6"
+ semver "^5.4.1"
+
+neo-async@^2.6.0:
+ version "2.6.0"
+ resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.0.tgz#b9d15e4d71c6762908654b5183ed38b753340835"
+
+node-int64@^0.4.0:
+ version "0.4.0"
+ resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
+
+node-notifier@^5.0.2:
+ version "5.4.0"
+ resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-5.4.0.tgz#7b455fdce9f7de0c63538297354f3db468426e6a"
+ dependencies:
+ growly "^1.3.0"
+ is-wsl "^1.1.0"
+ semver "^5.5.0"
+ shellwords "^0.1.1"
+ which "^1.3.0"
+
+normalize-package-data@^2.3.2:
+ version "2.5.0"
+ resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
+ dependencies:
+ hosted-git-info "^2.1.4"
+ resolve "^1.10.0"
+ semver "2 || 3 || 4 || 5"
+ validate-npm-package-license "^3.0.1"
+
+normalize-path@^2.0.0, normalize-path@^2.0.1:
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
+ dependencies:
+ remove-trailing-separator "^1.0.1"
+
+nth-check@~1.0.1:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"
+ dependencies:
+ boolbase "~1.0.0"
+
+number-is-nan@^1.0.0:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+
+"nwmatcher@>= 1.3.9 < 2.0.0":
+ version "1.4.4"
+ resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.4.tgz#2285631f34a95f0d0395cd900c96ed39b58f346e"
+
+oauth-sign@~0.9.0:
+ version "0.9.0"
+ resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
+
+object-assign@^4.1.0, object-assign@^4.1.1:
+ version "4.1.1"
+ resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+
+object-inspect@^1.1.0, object-inspect@^1.6.0:
+ version "1.6.0"
+ resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.6.0.tgz#c70b6cbf72f274aab4c34c0c82f5167bf82cf15b"
+
+object-is@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.0.1.tgz#0aa60ec9989a0b3ed795cf4d06f62cf1ad6539b6"
+
+object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.0.9:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
+
+object.assign@^4.1.0:
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
+ dependencies:
+ define-properties "^1.1.2"
+ function-bind "^1.1.1"
+ has-symbols "^1.0.0"
+ object-keys "^1.0.11"
+
+object.entries@^1.0.4, object.entries@^1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.0.tgz#2024fc6d6ba246aee38bdb0ffd5cfbcf371b7519"
+ dependencies:
+ define-properties "^1.1.3"
+ es-abstract "^1.12.0"
+ function-bind "^1.1.1"
+ has "^1.0.3"
+
+object.fromentries@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.0.tgz#49a543d92151f8277b3ac9600f1e930b189d30ab"
+ dependencies:
+ define-properties "^1.1.2"
+ es-abstract "^1.11.0"
+ function-bind "^1.1.1"
+ has "^1.0.1"
+
+object.omit@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
+ dependencies:
+ for-own "^0.1.4"
+ is-extendable "^0.1.1"
+
+object.values@^1.0.4, object.values@^1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.0.tgz#bf6810ef5da3e5325790eaaa2be213ea84624da9"
+ dependencies:
+ define-properties "^1.1.3"
+ es-abstract "^1.12.0"
+ function-bind "^1.1.1"
+ has "^1.0.3"
+
+once@^1.3.0, once@^1.4.0:
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+ dependencies:
+ wrappy "1"
+
+optimist@^0.6.1:
+ version "0.6.1"
+ resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
+ dependencies:
+ minimist "~0.0.1"
+ wordwrap "~0.0.2"
+
+optionator@^0.8.1:
+ version "0.8.2"
+ resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
+ dependencies:
+ deep-is "~0.1.3"
+ fast-levenshtein "~2.0.4"
+ levn "~0.3.0"
+ prelude-ls "~1.1.2"
+ type-check "~0.3.2"
+ wordwrap "~1.0.0"
+
+os-homedir@^1.0.0:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
+
+os-locale@^1.4.0:
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
+ dependencies:
+ lcid "^1.0.0"
+
+os-tmpdir@^1.0.1:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+
+p-limit@^1.1.0:
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
+ dependencies:
+ p-try "^1.0.0"
+
+p-locate@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
+ dependencies:
+ p-limit "^1.1.0"
+
+p-map@^1.1.1:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
+
+p-try@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
+
+parse-glob@^3.0.4:
+ version "3.0.4"
+ resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
+ dependencies:
+ glob-base "^0.3.0"
+ is-dotfile "^1.0.0"
+ is-extglob "^1.0.0"
+ is-glob "^2.0.0"
+
+parse-json@^2.2.0:
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
+ dependencies:
+ error-ex "^1.2.0"
+
+parse5@^1.5.1:
+ version "1.5.1"
+ resolved "https://registry.yarnpkg.com/parse5/-/parse5-1.5.1.tgz#9b7f3b0de32be78dc2401b17573ccaf0f6f59d94"
+
+parse5@^3.0.1:
+ version "3.0.3"
+ resolved "https://registry.yarnpkg.com/parse5/-/parse5-3.0.3.tgz#042f792ffdd36851551cf4e9e066b3874ab45b5c"
+ dependencies:
+ "@types/node" "*"
+
+path-exists@^2.0.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
+ dependencies:
+ pinkie-promise "^2.0.0"
+
+path-exists@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
+
+path-is-absolute@^1.0.0, path-is-absolute@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+
+path-parse@^1.0.5, path-parse@^1.0.6:
+ version "1.0.6"
+ resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
+
+path-type@^1.0.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
+ dependencies:
+ graceful-fs "^4.1.2"
+ pify "^2.0.0"
+ pinkie-promise "^2.0.0"
+
+performance-now@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
+
+pify@^2.0.0, pify@^2.3.0:
+ version "2.3.0"
+ resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
+
+pinkie-promise@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
+ dependencies:
+ pinkie "^2.0.0"
+
+pinkie@^2.0.0:
+ version "2.0.4"
+ resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
+
+prelude-ls@~1.1.2:
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
+
+preserve@^0.2.0:
+ version "0.2.0"
+ resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
+
+pretty-format@^20.0.3:
+ version "20.0.3"
+ resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-20.0.3.tgz#020e350a560a1fe1a98dc3beb6ccffb386de8b14"
+ dependencies:
+ ansi-regex "^2.1.1"
+ ansi-styles "^3.0.0"
+
+private@^0.1.8:
+ version "0.1.8"
+ resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
+
+process@~0.5.1:
+ version "0.5.2"
+ resolved "https://registry.yarnpkg.com/process/-/process-0.5.2.tgz#1638d8a8e34c2f440a91db95ab9aeb677fc185cf"
+
+prop-types-exact@^1.2.0:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/prop-types-exact/-/prop-types-exact-1.2.0.tgz#825d6be46094663848237e3925a98c6e944e9869"
+ dependencies:
+ has "^1.0.3"
+ object.assign "^4.1.0"
+ reflect.ownkeys "^0.2.0"
+
+prop-types@^15.6.2, prop-types@^15.7.2:
+ version "15.7.2"
+ resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
+ dependencies:
+ loose-envify "^1.4.0"
+ object-assign "^4.1.1"
+ react-is "^16.8.1"
+
+prr@~1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
+
+psl@^1.1.24, psl@^1.1.28:
+ version "1.1.31"
+ resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.31.tgz#e9aa86d0101b5b105cbe93ac6b784cd547276184"
+
+punycode@^1.4.1:
+ version "1.4.1"
+ resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+
+punycode@^2.1.0, punycode@^2.1.1:
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
+
+qs@~6.5.2:
+ version "6.5.2"
+ resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
+
+raf@^3.4.0:
+ version "3.4.1"
+ resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.1.tgz#0742e99a4a6552f445d73e3ee0328af0ff1ede39"
+ dependencies:
+ performance-now "^2.1.0"
+
+railroad-diagrams@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz#eb7e6267548ddedfb899c1b90e57374559cddb7e"
+
+randexp@0.4.6:
+ version "0.4.6"
+ resolved "https://registry.yarnpkg.com/randexp/-/randexp-0.4.6.tgz#e986ad5e5e31dae13ddd6f7b3019aa7c87f60ca3"
+ dependencies:
+ discontinuous-range "1.0.0"
+ ret "~0.1.10"
+
+randomatic@^3.0.0:
+ version "3.1.1"
+ resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.1.tgz#b776efc59375984e36c537b2f51a1f0aff0da1ed"
+ dependencies:
+ is-number "^4.0.0"
+ kind-of "^6.0.0"
+ math-random "^1.0.1"
+
+react-is@^16.8.1, react-is@^16.8.6:
+ version "16.8.6"
+ resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.6.tgz#5bbc1e2d29141c9fbdfed456343fe2bc430a6a16"
+
+react-test-renderer@^16.0.0-0:
+ version "16.8.6"
+ resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.8.6.tgz#188d8029b8c39c786f998aa3efd3ffe7642d5ba1"
+ dependencies:
+ object-assign "^4.1.1"
+ prop-types "^15.6.2"
+ react-is "^16.8.6"
+ scheduler "^0.13.6"
+
+read-pkg-up@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
+ dependencies:
+ find-up "^1.0.0"
+ read-pkg "^1.0.0"
+
+read-pkg@^1.0.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
+ dependencies:
+ load-json-file "^1.0.0"
+ normalize-package-data "^2.3.2"
+ path-type "^1.0.0"
+
+readable-stream@^3.1.1:
+ version "3.3.0"
+ resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.3.0.tgz#cb8011aad002eb717bf040291feba8569c986fb9"
+ dependencies:
+ inherits "^2.0.3"
+ string_decoder "^1.1.1"
+ util-deprecate "^1.0.1"
+
+reflect.ownkeys@^0.2.0:
+ version "0.2.0"
+ resolved "https://registry.yarnpkg.com/reflect.ownkeys/-/reflect.ownkeys-0.2.0.tgz#749aceec7f3fdf8b63f927a04809e90c5c0b3460"
+
+regenerator-runtime@^0.11.0:
+ version "0.11.1"
+ resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
+
+regex-cache@^0.4.2:
+ version "0.4.4"
+ resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
+ dependencies:
+ is-equal-shallow "^0.1.3"
+
+remove-trailing-separator@^1.0.1:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
+
+repeat-element@^1.1.2:
+ version "1.1.3"
+ resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
+
+repeat-string@^1.5.2:
+ version "1.6.1"
+ resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+
+repeating@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
+ dependencies:
+ is-finite "^1.0.0"
+
+request@^2.79.0:
+ version "2.88.0"
+ resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
+ dependencies:
+ aws-sign2 "~0.7.0"
+ aws4 "^1.8.0"
+ caseless "~0.12.0"
+ combined-stream "~1.0.6"
+ extend "~3.0.2"
+ forever-agent "~0.6.1"
+ form-data "~2.3.2"
+ har-validator "~5.1.0"
+ http-signature "~1.2.0"
+ is-typedarray "~1.0.0"
+ isstream "~0.1.2"
+ json-stringify-safe "~5.0.1"
+ mime-types "~2.1.19"
+ oauth-sign "~0.9.0"
+ performance-now "^2.1.0"
+ qs "~6.5.2"
+ safe-buffer "^5.1.2"
+ tough-cookie "~2.4.3"
+ tunnel-agent "^0.6.0"
+ uuid "^3.3.2"
+
+require-directory@^2.1.1:
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+
+require-hacker@^2.1.4:
+ version "2.1.4"
+ resolved "https://registry.yarnpkg.com/require-hacker/-/require-hacker-2.1.4.tgz#1683da866119495e0ffcda8ebed9bbcf556849f2"
+ dependencies:
+ babel-runtime "^6.6.1"
+ colors "^1.1.2"
+
+require-main-filename@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
+
+resolve@1.1.7:
+ version "1.1.7"
+ resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
+
+resolve@^1.10.0, resolve@^1.3.2:
+ version "1.10.0"
+ resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.10.0.tgz#3bdaaeaf45cc07f375656dfd2e54ed0810b101ba"
+ dependencies:
+ path-parse "^1.0.6"
+
+ret@~0.1.10:
+ version "0.1.15"
+ resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
+
+rimraf@^2.6.1:
+ version "2.6.3"
+ resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
+ dependencies:
+ glob "^7.1.3"
+
+rst-selector-parser@^2.2.3:
+ version "2.2.3"
+ resolved "https://registry.yarnpkg.com/rst-selector-parser/-/rst-selector-parser-2.2.3.tgz#81b230ea2fcc6066c89e3472de794285d9b03d91"
+ dependencies:
+ lodash.flattendeep "^4.4.0"
+ nearley "^2.7.10"
+
+safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+ version "5.1.2"
+ resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+
+"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
+ version "2.1.2"
+ resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+
+samsam@1.1.2:
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.1.2.tgz#bec11fdc83a9fda063401210e40176c3024d1567"
+
+samsam@~1.1:
+ version "1.1.3"
+ resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.1.3.tgz#9f5087419b4d091f232571e7fa52e90b0f552621"
+
+sane@~1.6.0:
+ version "1.6.0"
+ resolved "https://registry.yarnpkg.com/sane/-/sane-1.6.0.tgz#9610c452307a135d29c1fdfe2547034180c46775"
+ dependencies:
+ anymatch "^1.3.0"
+ exec-sh "^0.2.0"
+ fb-watchman "^1.8.0"
+ minimatch "^3.0.2"
+ minimist "^1.1.1"
+ walker "~1.0.5"
+ watch "~0.10.0"
+
+sax@^1.2.1:
+ version "1.2.4"
+ resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
+
+scheduler@^0.13.6:
+ version "0.13.6"
+ resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.6.tgz#466a4ec332467b31a91b9bf74e5347072e4cd889"
+ dependencies:
+ loose-envify "^1.1.0"
+ object-assign "^4.1.1"
+
+"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.6.0:
+ version "5.7.0"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
+
+set-blocking@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+
+shellwords@^0.1.1:
+ version "0.1.1"
+ resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
+
+sinon@^1.17.5:
+ version "1.17.7"
+ resolved "https://registry.yarnpkg.com/sinon/-/sinon-1.17.7.tgz#4542a4f49ba0c45c05eb2e9dd9d203e2b8efe0bf"
+ dependencies:
+ formatio "1.1.1"
+ lolex "1.3.2"
+ samsam "1.1.2"
+ util ">=0.10.3 <1"
+
+slash@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
+
+source-map-support@^0.4.15:
+ version "0.4.18"
+ resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
+ dependencies:
+ source-map "^0.5.6"
+
+source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7:
+ version "0.5.7"
+ resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+
+source-map@^0.6.1, source-map@~0.6.1:
+ version "0.6.1"
+ resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+
+spdx-correct@^3.0.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz#fb83e504445268f154b074e218c87c003cd31df4"
+ dependencies:
+ spdx-expression-parse "^3.0.0"
+ spdx-license-ids "^3.0.0"
+
+spdx-exceptions@^2.1.0:
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz#2ea450aee74f2a89bfb94519c07fcd6f41322977"
+
+spdx-expression-parse@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0"
+ dependencies:
+ spdx-exceptions "^2.1.0"
+ spdx-license-ids "^3.0.0"
+
+spdx-license-ids@^3.0.0:
+ version "3.0.4"
+ resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz#75ecd1a88de8c184ef015eafb51b5b48bfd11bb1"
+
+sprintf-js@~1.0.2:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+
+sshpk@^1.7.0:
+ version "1.16.1"
+ resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
+ dependencies:
+ asn1 "~0.2.3"
+ assert-plus "^1.0.0"
+ bcrypt-pbkdf "^1.0.0"
+ dashdash "^1.12.0"
+ ecc-jsbn "~0.1.1"
+ getpass "^0.1.1"
+ jsbn "~0.1.0"
+ safer-buffer "^2.0.2"
+ tweetnacl "~0.14.0"
+
+string-length@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/string-length/-/string-length-1.0.1.tgz#56970fb1c38558e9e70b728bf3de269ac45adfac"
+ dependencies:
+ strip-ansi "^3.0.0"
+
+string-width@^1.0.1, string-width@^1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+ dependencies:
+ code-point-at "^1.0.0"
+ is-fullwidth-code-point "^1.0.0"
+ strip-ansi "^3.0.0"
+
+string.prototype.trim@^1.1.2:
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.1.2.tgz#d04de2c89e137f4d7d206f086b5ed2fae6be8cea"
+ dependencies:
+ define-properties "^1.1.2"
+ es-abstract "^1.5.0"
+ function-bind "^1.0.2"
+
+string_decoder@^1.1.1:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.2.0.tgz#fe86e738b19544afe70469243b2a1ee9240eae8d"
+ dependencies:
+ safe-buffer "~5.1.0"
+
+strip-ansi@^3.0.0, strip-ansi@^3.0.1:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+ dependencies:
+ ansi-regex "^2.0.0"
+
+strip-bom@3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
+
+strip-bom@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
+ dependencies:
+ is-utf8 "^0.2.0"
+
+supports-color@5.4.0:
+ version "5.4.0"
+ resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54"
+ dependencies:
+ has-flag "^3.0.0"
+
+supports-color@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
+
+supports-color@^3.1.2:
+ version "3.2.3"
+ resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
+ dependencies:
+ has-flag "^1.0.0"
+
+symbol-tree@^3.2.1:
+ version "3.2.2"
+ resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
+
+test-exclude@^4.2.1:
+ version "4.2.3"
+ resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.2.3.tgz#a9a5e64474e4398339245a0a769ad7c2f4a97c20"
+ dependencies:
+ arrify "^1.0.1"
+ micromatch "^2.3.11"
+ object-assign "^4.1.0"
+ read-pkg-up "^1.0.1"
+ require-main-filename "^1.0.1"
+
+throat@^3.0.0:
+ version "3.2.0"
+ resolved "https://registry.yarnpkg.com/throat/-/throat-3.2.0.tgz#50cb0670edbc40237b9e347d7e1f88e4620af836"
+
+tmatch@^2.0.1:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/tmatch/-/tmatch-2.0.1.tgz#0c56246f33f30da1b8d3d72895abaf16660f38cf"
+
+tmpl@1.0.x:
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
+
+to-fast-properties@^1.0.3:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
+
+tough-cookie@^2.3.2:
+ version "2.5.0"
+ resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
+ dependencies:
+ psl "^1.1.28"
+ punycode "^2.1.1"
+
+tough-cookie@~2.4.3:
+ version "2.4.3"
+ resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
+ dependencies:
+ psl "^1.1.24"
+ punycode "^1.4.1"
+
+tr46@~0.0.3:
+ version "0.0.3"
+ resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
+
+trim-right@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
+
+tunnel-agent@^0.6.0:
+ version "0.6.0"
+ resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+ dependencies:
+ safe-buffer "^5.0.1"
+
+tweetnacl@^0.14.3, tweetnacl@~0.14.0:
+ version "0.14.5"
+ resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+
+type-check@~0.3.2:
+ version "0.3.2"
+ resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
+ dependencies:
+ prelude-ls "~1.1.2"
+
+uglify-js@^3.1.4:
+ version "3.5.3"
+ resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.5.3.tgz#d490bb5347f23025f0c1bc0dee901d98e4d6b063"
+ dependencies:
+ commander "~2.19.0"
+ source-map "~0.6.1"
+
+uri-js@^4.2.2:
+ version "4.2.2"
+ resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
+ dependencies:
+ punycode "^2.1.0"
+
+util-deprecate@^1.0.1:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+
+"util@>=0.10.3 <1":
+ version "0.11.1"
+ resolved "https://registry.yarnpkg.com/util/-/util-0.11.1.tgz#3236733720ec64bb27f6e26f421aaa2e1b588d61"
+ dependencies:
+ inherits "2.0.3"
+
+uuid@^3.3.2:
+ version "3.3.2"
+ resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
+
+validate-npm-package-license@^3.0.1:
+ version "3.0.4"
+ resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
+ dependencies:
+ spdx-correct "^3.0.0"
+ spdx-expression-parse "^3.0.0"
+
+verror@1.10.0:
+ version "1.10.0"
+ resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
+ dependencies:
+ assert-plus "^1.0.0"
+ core-util-is "1.0.2"
+ extsprintf "^1.2.0"
+
+walker@~1.0.5:
+ version "1.0.7"
+ resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"
+ dependencies:
+ makeerror "1.0.x"
+
+watch@~0.10.0:
+ version "0.10.0"
+ resolved "https://registry.yarnpkg.com/watch/-/watch-0.10.0.tgz#77798b2da0f9910d595f1ace5b0c2258521f21dc"
+
+webidl-conversions@^3.0.0:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
+
+webidl-conversions@^4.0.0:
+ version "4.0.2"
+ resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
+
+whatwg-encoding@^1.0.1:
+ version "1.0.5"
+ resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0"
+ dependencies:
+ iconv-lite "0.4.24"
+
+whatwg-url@^4.3.0:
+ version "4.8.0"
+ resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-4.8.0.tgz#d2981aa9148c1e00a41c5a6131166ab4683bbcc0"
+ dependencies:
+ tr46 "~0.0.3"
+ webidl-conversions "^3.0.0"
+
+which-module@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
+
+which@^1.2.12, which@^1.3.0:
+ version "1.3.1"
+ resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+ dependencies:
+ isexe "^2.0.0"
+
+wordwrap@~0.0.2:
+ version "0.0.3"
+ resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
+
+wordwrap@~1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
+
+worker-farm@^1.3.1:
+ version "1.6.0"
+ resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.6.0.tgz#aecc405976fab5a95526180846f0dba288f3a4a0"
+ dependencies:
+ errno "~0.1.7"
+
+wrap-ansi@^2.0.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
+ dependencies:
+ string-width "^1.0.1"
+ strip-ansi "^3.0.1"
+
+wrappy@1:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+
+xml-name-validator@^2.0.1:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-2.0.1.tgz#4d8b8f1eccd3419aa362061becef515e1e559635"
+
+y18n@^3.2.1:
+ version "3.2.1"
+ resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
+
+yargs-parser@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"
+ dependencies:
+ camelcase "^3.0.0"
+
+yargs@^7.0.2:
+ version "7.1.0"
+ resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8"
+ dependencies:
+ camelcase "^3.0.0"
+ cliui "^3.2.0"
+ decamelize "^1.1.1"
+ get-caller-file "^1.0.1"
+ os-locale "^1.4.0"
+ read-pkg-up "^1.0.1"
+ require-directory "^2.1.1"
+ require-main-filename "^1.0.1"
+ set-blocking "^2.0.0"
+ string-width "^1.0.2"
+ which-module "^1.0.0"
+ y18n "^3.2.1"
+ yargs-parser "^5.0.0"
diff --git a/devtools/client/webconsole/webconsole.js b/devtools/client/webconsole/webconsole.js
index 813dd2bf13fd..a9667cad53fc 100644
--- a/devtools/client/webconsole/webconsole.js
+++ b/devtools/client/webconsole/webconsole.js
@@ -298,10 +298,10 @@ class WebConsole {
}
this._parserService =
- require("devtools/client/debugger/new/src/workers/parser/index");
+ require("devtools/client/debugger/src/workers/parser/index");
this._parserService.start(
- "resource://devtools/client/debugger/new/dist/parser-worker.js",
+ "resource://devtools/client/debugger/dist/parser-worker.js",
this.chromeUtilsWindow);
return this._parserService;
}
diff --git a/devtools/client/webreplay/components/WebReplayPlayer.js b/devtools/client/webreplay/components/WebReplayPlayer.js
index 6884c4ef719a..1ce3402588b0 100644
--- a/devtools/client/webreplay/components/WebReplayPlayer.js
+++ b/devtools/client/webreplay/components/WebReplayPlayer.js
@@ -18,7 +18,7 @@ const getFormatStr = (key, a) => L10N.getFormatStr(`toolbox.replay.${key}`, a);
const { div } = dom;
const markerWidth = 7;
-const imgResource = "resource://devtools/client/debugger/new/images";
+const imgResource = "resource://devtools/client/debugger/images";
const imgChrome = "chrome://devtools/skin/images";
const shouldLog = false;
diff --git a/devtools/client/webreplay/mochitest/browser.ini b/devtools/client/webreplay/mochitest/browser.ini
index 78a658d80134..75596840d7a1 100644
--- a/devtools/client/webreplay/mochitest/browser.ini
+++ b/devtools/client/webreplay/mochitest/browser.ini
@@ -10,8 +10,8 @@ support-files =
!/devtools/client/shared/test/telemetry-test-helpers.js
!/devtools/client/shared/test/test-actor-registry.js
!/devtools/client/shared/test/test-actor.js
- !/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/inspector/test/shared-head.js
examples/doc_rr_basic.html
examples/doc_rr_continuous.html
diff --git a/devtools/client/webreplay/mochitest/head.js b/devtools/client/webreplay/mochitest/head.js
index 30ed66dafc48..e7a1a410387a 100644
--- a/devtools/client/webreplay/mochitest/head.js
+++ b/devtools/client/webreplay/mochitest/head.js
@@ -12,7 +12,7 @@ Services.scriptloader.loadSubScript(
);
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
);
diff --git a/layout/style/test/gtest/example.css b/layout/style/test/gtest/example.css
index a124db5a4e5b..1467cc5d6451 100644
--- a/layout/style/test/gtest/example.css
+++ b/layout/style/test/gtest/example.css
@@ -1,4 +1,4 @@
-/* Copied from devtools/client/debugger/new/debugger.css on 2017-04-03 */
+/* Copied from devtools/client/debugger/debugger.css on 2017-04-03 */
.landing-page {
flex: 1;
diff --git a/taskcluster/ci/source-test/node.yml b/taskcluster/ci/source-test/node.yml
index 4c96546c7c0f..d1dd5619c55d 100644
--- a/taskcluster/ci/source-test/node.yml
+++ b/taskcluster/ci/source-test/node.yml
@@ -15,14 +15,14 @@ debugger-tests:
command: >
cd /builds/worker/checkouts/gecko/ &&
npm install &&
- cd /builds/worker/checkouts/gecko/devtools/client/debugger/new/ &&
+ cd /builds/worker/checkouts/gecko/devtools/client/debugger/ &&
yarn &&
yarn flow &&
yarn test &&
yarn lint
when:
files-changed:
- - 'devtools/client/debugger/new/**'
+ - 'devtools/client/debugger/**'
devtools-tests:
description: devtools node-based tests (for instance jest)
diff --git a/taskcluster/taskgraph/test/automationrelevance.json b/taskcluster/taskgraph/test/automationrelevance.json
index 8adfc446d6e0..721bd1264b56 100644
--- a/taskcluster/taskgraph/test/automationrelevance.json
+++ b/taskcluster/taskgraph/test/automationrelevance.json
@@ -18,7 +18,7 @@
"branch": "default"
},
"files": [
- "devtools/client/debugger/new/index.html"
+ "devtools/client/debugger/index.html"
],
"node": "ae2144aa4356b65c2f8c0de8c9082dcb7e330e24",
"parents": [
diff --git a/taskcluster/taskgraph/test/test_files_changed.py b/taskcluster/taskgraph/test/test_files_changed.py
index a19f15eed4ea..e23c88459f1e 100644
--- a/taskcluster/taskgraph/test/test_files_changed.py
+++ b/taskcluster/taskgraph/test/test_files_changed.py
@@ -17,7 +17,7 @@ PARAMS = {
}
FILES_CHANGED = [
- 'devtools/client/debugger/new/index.html',
+ 'devtools/client/debugger/index.html',
'devtools/client/inspector/test/browser_inspector_highlighter-eyedropper-events.js',
'devtools/client/inspector/test/head.js',
'devtools/client/themes/rules.css',
diff --git a/testing/runtimes/mochitest-devtools-chrome-e10s.runtimes.json b/testing/runtimes/mochitest-devtools-chrome-e10s.runtimes.json
index d18f68492763..f570b2bde86b 100644
--- a/testing/runtimes/mochitest-devtools-chrome-e10s.runtimes.json
+++ b/testing/runtimes/mochitest-devtools-chrome-e10s.runtimes.json
@@ -15,38 +15,38 @@
"devtools/client/aboutdebugging/test/browser_addons_remove.js": 4510,
"devtools/client/aboutdebugging/test/browser_service_workers_not_compatible.js": 5357,
"devtools/client/aboutdebugging/test/browser_service_workers_status.js": 5267,
- "devtools/client/debugger/new/test/mochitest/browser_dbg-breaking-from-console.js": 7303,
- "devtools/client/debugger/new/test/mochitest/browser_dbg-breaking.js": 7881,
- "devtools/client/debugger/new/test/mochitest/browser_dbg-breakpoints-cond.js": 5276,
- "devtools/client/debugger/new/test/mochitest/browser_dbg-breakpoints-reloading.js": 7538,
- "devtools/client/debugger/new/test/mochitest/browser_dbg-breakpoints.js": 10182,
- "devtools/client/debugger/new/test/mochitest/browser_dbg-call-stack.js": 9493,
- "devtools/client/debugger/new/test/mochitest/browser_dbg-console.js": 4155,
- "devtools/client/debugger/new/test/mochitest/browser_dbg-debugger-buttons.js": 9855,
- "devtools/client/debugger/new/test/mochitest/browser_dbg-editor-gutter.js": 5728,
- "devtools/client/debugger/new/test/mochitest/browser_dbg-editor-highlight.js": 5959,
- "devtools/client/debugger/new/test/mochitest/browser_dbg-editor-mode.js": 6946,
- "devtools/client/debugger/new/test/mochitest/browser_dbg-editor-select.js": 10780,
- "devtools/client/debugger/new/test/mochitest/browser_dbg-expressions.js": 7688,
- "devtools/client/debugger/new/test/mochitest/browser_dbg-iframes.js": 7488,
- "devtools/client/debugger/new/test/mochitest/browser_dbg-navigation.js": 11012,
- "devtools/client/debugger/new/test/mochitest/browser_dbg-pause-exceptions.js": 7356,
- "devtools/client/debugger/new/test/mochitest/browser_dbg-pretty-print-paused.js": 7409,
- "devtools/client/debugger/new/test/mochitest/browser_dbg-pretty-print.js": 8390,
- "devtools/client/debugger/new/test/mochitest/browser_dbg-scopes-mutations.js": 8656,
- "devtools/client/debugger/new/test/mochitest/browser_dbg-scopes.js": 6767,
- "devtools/client/debugger/new/test/mochitest/browser_dbg-search-file.js": 5707,
- "devtools/client/debugger/new/test/mochitest/browser_dbg-search-project.js": 5490,
- "devtools/client/debugger/new/test/mochitest/browser_dbg-search-sources.js": 4359,
- "devtools/client/debugger/new/test/mochitest/browser_dbg-sourcemaps-bogus.js": 5731,
- "devtools/client/debugger/new/test/mochitest/browser_dbg-sourcemaps-reloading.js": 7493,
- "devtools/client/debugger/new/test/mochitest/browser_dbg-sourcemaps.js": 12821,
- "devtools/client/debugger/new/test/mochitest/browser_dbg-sourcemaps2.js": 6064,
- "devtools/client/debugger/new/test/mochitest/browser_dbg-sources.js": 8745,
- "devtools/client/debugger/new/test/mochitest/browser_dbg-tabs.js": 13022,
- "devtools/client/debugger/new/test/mochitest/browser_dbg-toggling-tools.js": 5105,
- "devtools/client/debugger/new/test/mochitest/browser_dbg_keyboard-shortcuts.js": 5173,
- "devtools/client/debugger/new/test/mochitest/browser_dbg_keyboard_navigation.js": 4535,
+ "devtools/client/debugger/test/mochitest/browser_dbg-breaking-from-console.js": 7303,
+ "devtools/client/debugger/test/mochitest/browser_dbg-breaking.js": 7881,
+ "devtools/client/debugger/test/mochitest/browser_dbg-breakpoints-cond.js": 5276,
+ "devtools/client/debugger/test/mochitest/browser_dbg-breakpoints-reloading.js": 7538,
+ "devtools/client/debugger/test/mochitest/browser_dbg-breakpoints.js": 10182,
+ "devtools/client/debugger/test/mochitest/browser_dbg-call-stack.js": 9493,
+ "devtools/client/debugger/test/mochitest/browser_dbg-console.js": 4155,
+ "devtools/client/debugger/test/mochitest/browser_dbg-debugger-buttons.js": 9855,
+ "devtools/client/debugger/test/mochitest/browser_dbg-editor-gutter.js": 5728,
+ "devtools/client/debugger/test/mochitest/browser_dbg-editor-highlight.js": 5959,
+ "devtools/client/debugger/test/mochitest/browser_dbg-editor-mode.js": 6946,
+ "devtools/client/debugger/test/mochitest/browser_dbg-editor-select.js": 10780,
+ "devtools/client/debugger/test/mochitest/browser_dbg-expressions.js": 7688,
+ "devtools/client/debugger/test/mochitest/browser_dbg-iframes.js": 7488,
+ "devtools/client/debugger/test/mochitest/browser_dbg-navigation.js": 11012,
+ "devtools/client/debugger/test/mochitest/browser_dbg-pause-exceptions.js": 7356,
+ "devtools/client/debugger/test/mochitest/browser_dbg-pretty-print-paused.js": 7409,
+ "devtools/client/debugger/test/mochitest/browser_dbg-pretty-print.js": 8390,
+ "devtools/client/debugger/test/mochitest/browser_dbg-scopes-mutations.js": 8656,
+ "devtools/client/debugger/test/mochitest/browser_dbg-scopes.js": 6767,
+ "devtools/client/debugger/test/mochitest/browser_dbg-search-file.js": 5707,
+ "devtools/client/debugger/test/mochitest/browser_dbg-search-project.js": 5490,
+ "devtools/client/debugger/test/mochitest/browser_dbg-search-sources.js": 4359,
+ "devtools/client/debugger/test/mochitest/browser_dbg-sourcemaps-bogus.js": 5731,
+ "devtools/client/debugger/test/mochitest/browser_dbg-sourcemaps-reloading.js": 7493,
+ "devtools/client/debugger/test/mochitest/browser_dbg-sourcemaps.js": 12821,
+ "devtools/client/debugger/test/mochitest/browser_dbg-sourcemaps2.js": 6064,
+ "devtools/client/debugger/test/mochitest/browser_dbg-sources.js": 8745,
+ "devtools/client/debugger/test/mochitest/browser_dbg-tabs.js": 13022,
+ "devtools/client/debugger/test/mochitest/browser_dbg-toggling-tools.js": 5105,
+ "devtools/client/debugger/test/mochitest/browser_dbg_keyboard-shortcuts.js": 5173,
+ "devtools/client/debugger/test/mochitest/browser_dbg_keyboard_navigation.js": 4535,
"devtools/client/debugger/test/mochitest/browser_dbg_addon-panels.js": 4824,
"devtools/client/debugger/test/mochitest/browser_dbg_addon-sources.js": 4421,
"devtools/client/debugger/test/mochitest/browser_dbg_addon-workers-dbg-enabled.js": 4600,
diff --git a/testing/runtimes/mochitest-devtools-chrome.runtimes.json b/testing/runtimes/mochitest-devtools-chrome.runtimes.json
index c7d8369e8012..e7bd6e9b7810 100644
--- a/testing/runtimes/mochitest-devtools-chrome.runtimes.json
+++ b/testing/runtimes/mochitest-devtools-chrome.runtimes.json
@@ -16,31 +16,31 @@
"devtools/client/commandline/test/browser_cmd_commands.js": 4915,
"devtools/client/commandline/test/browser_cmd_csscoverage_startstop.js": 5247,
"devtools/client/commandline/test/browser_cmd_highlight_04.js": 8023,
- "devtools/client/debugger/new/test/mochitest/browser_dbg-breaking-from-console.js": 7179,
- "devtools/client/debugger/new/test/mochitest/browser_dbg-breaking.js": 9496,
- "devtools/client/debugger/new/test/mochitest/browser_dbg-breakpoints-cond.js": 6806,
- "devtools/client/debugger/new/test/mochitest/browser_dbg-breakpoints.js": 12290,
- "devtools/client/debugger/new/test/mochitest/browser_dbg-call-stack.js": 10108,
- "devtools/client/debugger/new/test/mochitest/browser_dbg-debugger-buttons.js": 12733,
- "devtools/client/debugger/new/test/mochitest/browser_dbg-editor-gutter.js": 7846,
- "devtools/client/debugger/new/test/mochitest/browser_dbg-editor-highlight.js": 5898,
- "devtools/client/debugger/new/test/mochitest/browser_dbg-editor-mode.js": 7228,
- "devtools/client/debugger/new/test/mochitest/browser_dbg-editor-select.js": 16329,
- "devtools/client/debugger/new/test/mochitest/browser_dbg-expressions.js": 7658,
- "devtools/client/debugger/new/test/mochitest/browser_dbg-iframes.js": 9124,
- "devtools/client/debugger/new/test/mochitest/browser_dbg-navigation.js": 13006,
- "devtools/client/debugger/new/test/mochitest/browser_dbg-pause-exceptions.js": 5784,
- "devtools/client/debugger/new/test/mochitest/browser_dbg-pretty-print-paused.js": 8012,
- "devtools/client/debugger/new/test/mochitest/browser_dbg-pretty-print.js": 10460,
- "devtools/client/debugger/new/test/mochitest/browser_dbg-scopes-mutations.js": 7819,
- "devtools/client/debugger/new/test/mochitest/browser_dbg-scopes.js": 7923,
- "devtools/client/debugger/new/test/mochitest/browser_dbg-sourcemaps-bogus.js": 5548,
- "devtools/client/debugger/new/test/mochitest/browser_dbg-sourcemaps-reloading.js": 8179,
- "devtools/client/debugger/new/test/mochitest/browser_dbg-sourcemaps.js": 13900,
- "devtools/client/debugger/new/test/mochitest/browser_dbg-sourcemaps2.js": 6133,
- "devtools/client/debugger/new/test/mochitest/browser_dbg-sources.js": 7369,
- "devtools/client/debugger/new/test/mochitest/browser_dbg-tabs.js": 13291,
- "devtools/client/debugger/new/test/mochitest/browser_dbg_keyboard-shortcuts.js": 9276,
+ "devtools/client/debugger/test/mochitest/browser_dbg-breaking-from-console.js": 7179,
+ "devtools/client/debugger/test/mochitest/browser_dbg-breaking.js": 9496,
+ "devtools/client/debugger/test/mochitest/browser_dbg-breakpoints-cond.js": 6806,
+ "devtools/client/debugger/test/mochitest/browser_dbg-breakpoints.js": 12290,
+ "devtools/client/debugger/test/mochitest/browser_dbg-call-stack.js": 10108,
+ "devtools/client/debugger/test/mochitest/browser_dbg-debugger-buttons.js": 12733,
+ "devtools/client/debugger/test/mochitest/browser_dbg-editor-gutter.js": 7846,
+ "devtools/client/debugger/test/mochitest/browser_dbg-editor-highlight.js": 5898,
+ "devtools/client/debugger/test/mochitest/browser_dbg-editor-mode.js": 7228,
+ "devtools/client/debugger/test/mochitest/browser_dbg-editor-select.js": 16329,
+ "devtools/client/debugger/test/mochitest/browser_dbg-expressions.js": 7658,
+ "devtools/client/debugger/test/mochitest/browser_dbg-iframes.js": 9124,
+ "devtools/client/debugger/test/mochitest/browser_dbg-navigation.js": 13006,
+ "devtools/client/debugger/test/mochitest/browser_dbg-pause-exceptions.js": 5784,
+ "devtools/client/debugger/test/mochitest/browser_dbg-pretty-print-paused.js": 8012,
+ "devtools/client/debugger/test/mochitest/browser_dbg-pretty-print.js": 10460,
+ "devtools/client/debugger/test/mochitest/browser_dbg-scopes-mutations.js": 7819,
+ "devtools/client/debugger/test/mochitest/browser_dbg-scopes.js": 7923,
+ "devtools/client/debugger/test/mochitest/browser_dbg-sourcemaps-bogus.js": 5548,
+ "devtools/client/debugger/test/mochitest/browser_dbg-sourcemaps-reloading.js": 8179,
+ "devtools/client/debugger/test/mochitest/browser_dbg-sourcemaps.js": 13900,
+ "devtools/client/debugger/test/mochitest/browser_dbg-sourcemaps2.js": 6133,
+ "devtools/client/debugger/test/mochitest/browser_dbg-sources.js": 7369,
+ "devtools/client/debugger/test/mochitest/browser_dbg-tabs.js": 13291,
+ "devtools/client/debugger/test/mochitest/browser_dbg_keyboard-shortcuts.js": 9276,
"devtools/client/debugger/test/mochitest/browser_dbg_aaa_run_first_leaktest.js": 6987,
"devtools/client/debugger/test/mochitest/browser_dbg_addon-modules-unpacked.js": 5029,
"devtools/client/debugger/test/mochitest/browser_dbg_addon-modules.js": 5403,
diff --git a/testing/talos/talos/tests/devtools/addon/content/tests/debugger/debugger-helpers.js b/testing/talos/talos/tests/devtools/addon/content/tests/debugger/debugger-helpers.js
index aaeb1c2e0624..32c0d06a5305 100644
--- a/testing/talos/talos/tests/devtools/addon/content/tests/debugger/debugger-helpers.js
+++ b/testing/talos/talos/tests/devtools/addon/content/tests/debugger/debugger-helpers.js
@@ -9,7 +9,7 @@ const { openToolboxAndLog, reloadPageAndLog } = require("../head");
/*
* These methods are used for working with debugger state changes in order
* to make it easier to manipulate the ui and test different behavior. These
- * methods roughly reflect those found in debugger/new/test/mochi/head.js with
+ * methods roughly reflect those found in debugger/test/mochi/head.js with
* a few exceptions. The `dbg` object is not exactly the same, and the methods
* have been simplified. We may want to consider unifying them in the future
*/
diff --git a/toolkit/content/license.html b/toolkit/content/license.html
index a2e4382d60c5..84c08cff4905 100644
--- a/toolkit/content/license.html
+++ b/toolkit/content/license.html
@@ -2803,7 +2803,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Babel License
This license applies to this file in the directory
- devtools/client/debugger/new/debugger.js/.
+ devtools/client/debugger/debugger.js/.
@@ -2834,7 +2834,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Babylon License
This license applies to this file in the directory
- devtools/client/debugger/new/debugger.js/.
+ devtools/client/debugger/debugger.js/.
@@ -3270,7 +3270,7 @@ OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
fuzz-aldrin License
This license applies to some of the code in
- devtools/client/debugger/new/debugger.js.
+ devtools/client/debugger/debugger.js.
Copyright (c) 2015 Jean Christophe Roy
@@ -4901,7 +4901,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
node-md5 License
This license applies to some of the code in
- devtools/client/debugger/new/debugger.js.