Skip to content

Commit 3a954ca

Browse files
vzaidmanfacebook-github-bot
authored andcommitted
don't require projectRoot in devMiddleware (facebook#53921)
Summary: Pull Request resolved: facebook#53921 Changelog: [Internal] `devMiddleware` removed the unused option `projectRoot` This option was used only in a dead branch of the code inside `InspectorProxy`. The scenario where it appeared was enabling resolving script sources (`Debugger.getScriptSource`) starting with `file://` which were coming from the file system. However, we don't seem to ever point scripts at the filesystem this way. Reviewed By: huntie Differential Revision: D82739662 fbshipit-source-id: 9a130eaa83cb94ae0e36a5a1102c56ff8a36cffc
1 parent 2dfb36e commit 3a954ca

File tree

14 files changed

+29
-79
lines changed

14 files changed

+29
-79
lines changed

packages/community-cli-plugin/src/commands/start/runServer.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ async function runServer(
119119
watchFolders,
120120
});
121121
const {middleware, websocketEndpoints} = createDevMiddleware({
122-
projectRoot,
123122
serverBaseUrl: devServerUrl,
124123
logger: createDevMiddlewareLogger(terminalReporter),
125124
});

packages/dev-middleware/src/__tests__/InspectorProxyCdpRewritingHacks-test.js

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ import {
2121
withServerForEachTest,
2222
} from './ServerUtils';
2323
import {createHash} from 'crypto';
24-
import fs from 'fs';
25-
import path from 'path';
26-
27-
const fsPromise = fs.promises;
2824

2925
// WebSocket is unreliable when using fake timers.
3026
jest.useRealTimers();
@@ -47,7 +43,6 @@ describe.each(['HTTP', 'HTTPS'])(
4743

4844
const serverRef = withServerForEachTest({
4945
logger: undefined,
50-
projectRoot: __dirname,
5146
secure: protocol === 'HTTPS',
5247
});
5348

@@ -472,14 +467,7 @@ describe.each(['HTTP', 'HTTPS'])(
472467
}
473468
});
474469

475-
test('reads source from disk', async () => {
476-
// Should be just 'foo\n', but the newline can get mangled by the OS
477-
// and/or SCM, so let's read the source of truth from disk.
478-
const fileRealContents = await fsPromise.readFile(
479-
path.join(__dirname, '__fixtures__', 'mock-source-file.txt'),
480-
'utf8',
481-
);
482-
470+
test('throws when attempting to pass a filesystem url', async () => {
483471
const {device, debugger_} = await createAndConnectTarget(
484472
serverRef,
485473
autoCleanup.signal,
@@ -490,6 +478,7 @@ describe.each(['HTTP', 'HTTPS'])(
490478
vm: 'bar-vm',
491479
},
492480
);
481+
493482
try {
494483
await sendFromTargetToDebugger(device, debugger_, 'page1', {
495484
method: 'Debugger.scriptParsed',
@@ -500,7 +489,7 @@ describe.each(['HTTP', 'HTTPS'])(
500489
endLine: 0,
501490
startColumn: 0,
502491
endColumn: 0,
503-
hash: createHash('sha256').update(fileRealContents).digest('hex'),
492+
hash: createHash('sha256').update('').digest('hex'),
504493
},
505494
});
506495
const response = await debugger_.sendAndGetResponse({
@@ -511,8 +500,15 @@ describe.each(['HTTP', 'HTTPS'])(
511500
},
512501
});
513502
expect(response.result).toEqual(
514-
expect.objectContaining({scriptSource: fileRealContents}),
503+
expect.objectContaining({
504+
error: {
505+
message: expect.stringContaining(
506+
'Can\'t parse requested URL "__fixtures__/mock-source-file.txt"',
507+
),
508+
},
509+
}),
515510
);
511+
516512
// The device does not receive the getScriptSource request, since it
517513
// is handled by the proxy.
518514
expect(device.wrappedEventParsed).not.toBeCalledWith({

packages/dev-middleware/src/__tests__/InspectorProxyCdpTransport-test.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ describe.each(['HTTP', 'HTTPS'])(
3333
protocol => {
3434
const serverRef = withServerForEachTest({
3535
logger: undefined,
36-
projectRoot: '',
3736
secure: protocol === 'HTTPS',
3837
});
3938
const autoCleanup = withAbortSignalForEachTest();

packages/dev-middleware/src/__tests__/InspectorProxyCustomMessageHandler-test.js

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ describe('inspector proxy device message middleware', () => {
3939
const createCustomMessageHandler = jest.fn().mockImplementation(() => null);
4040
const {server} = await createServer({
4141
logger: undefined,
42-
projectRoot: '',
4342
unstable_customInspectorMessageHandler: createCustomMessageHandler,
4443
});
4544

@@ -83,7 +82,6 @@ describe('inspector proxy device message middleware', () => {
8382
const createCustomMessageHandler = jest.fn().mockImplementation(() => null);
8483
const {server} = await createServer({
8584
logger: undefined,
86-
projectRoot: '',
8785
unstable_customInspectorMessageHandler: createCustomMessageHandler,
8886
});
8987
const {serverBaseUrl, serverBaseWsUrl} = serverRefUrls(server);
@@ -169,7 +167,6 @@ describe('inspector proxy device message middleware', () => {
169167

170168
const {server} = await createServer({
171169
logger: undefined,
172-
projectRoot: '',
173170
unstable_customInspectorMessageHandler: createCustomMessageHandler,
174171
});
175172

@@ -231,7 +228,6 @@ describe('inspector proxy device message middleware', () => {
231228
const handleDeviceMessage = jest.fn();
232229
const {server} = await createServer({
233230
logger: undefined,
234-
projectRoot: '',
235231
unstable_customInspectorMessageHandler: () => ({
236232
handleDeviceMessage,
237233
handleDebuggerMessage() {},
@@ -264,7 +260,6 @@ describe('inspector proxy device message middleware', () => {
264260
const handleDeviceMessage = jest.fn();
265261
const {server} = await createServer({
266262
logger: undefined,
267-
projectRoot: '',
268263
unstable_customInspectorMessageHandler: () => ({
269264
handleDeviceMessage,
270265
handleDebuggerMessage() {},
@@ -304,7 +299,6 @@ describe('inspector proxy device message middleware', () => {
304299
const handleDebuggerMessage = jest.fn();
305300
const {server} = await createServer({
306301
logger: undefined,
307-
projectRoot: '',
308302
unstable_customInspectorMessageHandler: () => ({
309303
handleDeviceMessage() {},
310304
handleDebuggerMessage,
@@ -341,7 +335,6 @@ describe('inspector proxy device message middleware', () => {
341335
const handleDebuggerMessage = jest.fn();
342336
const {server} = await createServer({
343337
logger: undefined,
344-
projectRoot: '',
345338
unstable_customInspectorMessageHandler: () => ({
346339
handleDeviceMessage() {},
347340
handleDebuggerMessage,

packages/dev-middleware/src/__tests__/InspectorProxyDeviceHandoff-test.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ const PAGE_DEFAULTS = {
3737
describe('inspector-proxy device socket handoff', () => {
3838
const serverRef = withServerForEachTest({
3939
logger: undefined,
40-
projectRoot: '',
4140
});
4241
const autoCleanup = withAbortSignalForEachTest();
4342
afterEach(() => {

packages/dev-middleware/src/__tests__/InspectorProxyHttpApi-test.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ jest.useFakeTimers();
2727
describe('inspector proxy HTTP API', () => {
2828
const serverRef = withServerForEachTest({
2929
logger: undefined,
30-
projectRoot: '',
3130
});
3231
const autoCleanup = withAbortSignalForEachTest();
3332
afterEach(() => {
@@ -261,7 +260,6 @@ describe('inspector proxy HTTP API', () => {
261260
describe('HTTP vs HTTPS', () => {
262261
const secureServerRef = withServerForEachTest({
263262
logger: undefined,
264-
projectRoot: '',
265263
secure: true,
266264
});
267265

packages/dev-middleware/src/__tests__/InspectorProxyReactNativeReloads-test.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ jest.setTimeout(10000);
2525
describe('inspector proxy React Native reloads', () => {
2626
const serverRef = withServerForEachTest({
2727
logger: undefined,
28-
projectRoot: '',
2928
});
3029
const autoCleanup = withAbortSignalForEachTest();
3130
afterEach(() => {

packages/dev-middleware/src/__tests__/StandaloneFuseboxShell-test.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ describe('enableStandaloneFuseboxShell experiment', () => {
3434
};
3535
const serverRef = withServerForEachTest({
3636
logger: undefined,
37-
projectRoot: '',
3837
unstable_browserLauncher: BrowserLauncherWithFuseboxShell,
3938
unstable_experiments: {
4039
enableStandaloneFuseboxShell: true,

packages/dev-middleware/src/__tests__/__fixtures__/mock-source-file.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

packages/dev-middleware/src/__tests__/embedderScriptStub-test.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ jest.setTimeout(10000);
1717
describe('embedder script', () => {
1818
const serverRef = withServerForEachTest({
1919
logger: undefined,
20-
projectRoot: '',
2120
});
2221

2322
test('is always served', async () => {

0 commit comments

Comments
 (0)