Permalink
Browse files

Move debugger client code to its own folder

Reviewed By: davidaurelio

Differential Revision: D5899764

fbshipit-source-id: 3498dd71a11b47841a492cf77df7c887404c1719
  • Loading branch information...
rafeca authored and facebook-github-bot committed Sep 26, 2017
1 parent 31904d5 commit e6596dc1027adcb7aa37d68944b48e4b4fcb6636
@@ -5,12 +5,12 @@
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
*
* @format
*/
'use strict';
const fs = require('fs');
const launchChrome = require('../util/launchChrome');
const path = require('path');
const {exec} = require('child_process');
@@ -21,7 +21,8 @@ function launchChromeDevTools(port) {
}
function escapePath(pathname) {
return '"' + pathname + '"'; // " Can escape paths with spaces in OS X, Windows, and *nix
// " Can escape paths with spaces in OS X, Windows, and *nix
return '"' + pathname + '"';
}
function launchDevTools({port, projectRoots}, isChromeConnected) {
@@ -31,7 +32,7 @@ function launchDevTools({port, projectRoots}, isChromeConnected) {
var projects = projectRoots.map(escapePath).join(' ');
var command = customDebugger + ' ' + projects;
console.log('Starting custom debugger by executing: ' + command);
exec(command, function (error, stdout, stderr) {
exec(command, function(error, stdout, stderr) {
if (error !== null) {
console.log('Error while starting custom debugger: ' + error);
}
@@ -44,29 +45,22 @@ function launchDevTools({port, projectRoots}, isChromeConnected) {
module.exports = function(options, isChromeConnected) {
return function(req, res, next) {
if (req.url === '/debugger-ui') {
var debuggerPath = path.join(__dirname, '..', 'util', 'debugger.html');
res.writeHead(200, {'Content-Type': 'text/html'});
fs.createReadStream(debuggerPath).pipe(res);
} else if (req.url === '/debuggerWorker.js') {
var workerPath = path.join(__dirname, '..', 'util', 'debuggerWorker.js');
res.writeHead(200, {'Content-Type': 'application/javascript'});
fs.createReadStream(workerPath).pipe(res);
} else if (req.url === '/launch-safari-devtools') {
if (req.url === '/launch-safari-devtools') {
// TODO: remove `console.log` and dev tools binary
console.log(
'We removed support for Safari dev-tools. ' +
'If you still need this, please let us know.'
'If you still need this, please let us know.',
);
} else if (req.url === '/launch-chrome-devtools') {
// TODO: Remove this case in the future
console.log(
'The method /launch-chrome-devtools is deprecated. You are ' +
' probably using an application created with an older CLI with the ' +
' packager of a newer CLI. Please upgrade your application: ' +
'https://facebook.github.io/react-native/docs/upgrading.html');
launchDevTools(options, isChromeConnected);
res.end('OK');
' probably using an application created with an older CLI with the ' +
' packager of a newer CLI. Please upgrade your application: ' +
'https://facebook.github.io/react-native/docs/upgrading.html',
);
launchDevTools(options, isChromeConnected);
res.end('OK');
} else if (req.url === '/launch-js-devtools') {
launchDevTools(options, isChromeConnected);
res.end('OK');
@@ -97,6 +97,10 @@ function runServer(
const app = connect()
.use(loadRawBodyMiddleware)
.use(connect.compress())
.use(
'/debugger-ui',
connect.static(path.join(__dirname, 'util', 'debugger-ui')),
)
.use(
getDevToolsMiddleware(args, () => wsProxy && wsProxy.isChromeConnected()),
)

0 comments on commit e6596dc

Please sign in to comment.