[Sync 129] small clean up items

Author: darkwing

.travis.yml

@@ -12,7 +12,7 @@ env:
   global:
     - DISPLAY=':99.0'
     - YARN_VERSION='1.9.4'
-    - MC_COMMIT='f7dc130bc082' # https://hg.mozilla.org/mozilla-central/shortlog
+    - MC_COMMIT='78bc178af584' # https://hg.mozilla.org/mozilla-central/shortlog
 
 notifications:
   slack:

assets/panel/moz.build

@@ -9,7 +9,7 @@ DIRS += [
   'src',
 ]
 
-include('node-templates.mozbuild')
+include('../../shared/build/node-templates.mozbuild')
 
 DevToolsModules(
     'panel.js',

assets/panel/panel.js

@@ -129,11 +129,11 @@ DebuggerPanel.prototype = {
   },
 
   selectSourceURL(url, line) {
-    this._actions.selectSourceURL(url, { line });
+    return this._actions.selectSourceURL(url, { line });
   },
 
   selectSource(sourceId, line) {
-    this._actions.selectSource(sourceId, { line });
+    return this._actions.selectSource(sourceId, { line });
   },
 
   getSourceByActorId(sourceId) {

assets/panel/prefs.js

@@ -52,11 +52,12 @@ pref("devtools.debugger.file-search-regex-match", false);
 pref("devtools.debugger.project-directory-root", "");
 pref("devtools.debugger.skip-pausing", false);
 pref("devtools.debugger.logging", false);
+pref("devtools.debugger.map-scopes-enabled", false);
 
 pref("devtools.debugger.features.wasm", true);
 pref("devtools.debugger.features.shortcuts", true);
 pref("devtools.debugger.features.root", true);
-pref("devtools.debugger.features.column-breakpoints", false);
+pref("devtools.debugger.features.column-breakpoints", true);
 pref("devtools.debugger.features.chrome-scopes", false);
 pref("devtools.debugger.features.map-scopes", true);
 pref("devtools.debugger.features.remove-command-bar-options", false);

bin/copy-assets.js

@@ -25,6 +25,8 @@ const moz_build_tpl = `
 # 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__
+
 DevToolsModules(
 __FILES__
 )
@@ -101,14 +103,13 @@ function copySVGs({ projectPath, mcPath }) {
       path.join(mcImagesPath, `${file}`)
     )
   );
-
   const mozBuildText = moz_build_tpl
+    .replace('__dirs__', "DIRS += [\n  'sources',\n]")
     .replace('__FILES__',files.map(f => `    '${f}',`).join("\n"))
 
   const mozBuildPath = path.join(mcPath, "devtools/client/debugger/new/images/moz.build");
   fs.writeFileSync(mozBuildPath, mozBuildText, "utf-8");
 
-
   const sourceFiles = fs.readdirSync(path.join(projectImagesPath, "sources"))
     .filter(file => file.match(/svg$/))
     .filter(file => usedSvgs.some(svg => svg.includes(file)));
@@ -120,12 +121,12 @@ function copySVGs({ projectPath, mcPath }) {
     )
   );
   const mozBuildSourceText = moz_build_tpl
+    .replace('__dirs__', '')
     .replace('__FILES__',sourceFiles.map(f => `    '${f}',`).join("\n"))
 
   const mozBuildSourcePath = path.join(mcPath, "devtools/client/debugger/new/images/sources/moz.build");
   fs.writeFileSync(mozBuildSourcePath, mozBuildSourceText, "utf-8");
 
-
   console.log("[copy-assets] - Svg.js");
   copyFile(
     path.join(projectPath, "/images/Svg.js"),

bin/copy-modules.js

@@ -54,7 +54,7 @@ DIRS += [
 __DIRS__
 ]
 
-DebuggerModules(
+CompiledModules(
 __FILES__
 )
 `;