Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DevTools: Include Edge in browser name detection #22584

Merged
merged 1 commit into from
Oct 19, 2021
Merged

DevTools: Include Edge in browser name detection #22584

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions packages/react-devtools-extensions/src/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,25 @@

import type {BrowserTheme} from 'react-devtools-shared/src/devtools/views/DevTools';

const IS_CHROME = navigator.userAgent.indexOf('Firefox') < 0;
const IS_EDGE = navigator.userAgent.indexOf('Edg') >= 0;
const IS_FIREFOX = navigator.userAgent.indexOf('Firefox') >= 0;
const IS_CHROME = IS_EDGE === false && IS_FIREFOX === false;
Comment on lines +5 to +7
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is probably fine, but I wonder if it would be more future proof to inject a constant for this since we have separate build targets for the three browsers?

For instance, this script:

react/packages/react-devtools-extensions/build.js

Lines 55 to 57 in 2af4a79

const build = async (tempPath, manifestPath) => {
const binPath = join(tempPath, 'bin');
const zipPath = join(tempPath, 'zip');

Could be updated to receive a browser param, which scripts like this one could pass in:

react/packages/react-devtools-extensions/edge/build.js

Line 14 in 2af4a79

await build('edge');

Then I think we could set an ENV flag for the WebPack targets:

react/packages/react-devtools-extensions/build.js

Lines 67 to 82 in 2af4a79

execSync(
`${webpackPath} --config webpack.config.js --output-path ${binPath}`,
{
cwd: __dirname,
env: process.env,
stdio: 'inherit',
},
);
execSync(
`${webpackPath} --config webpack.backend.js --output-path ${binPath}`,
{
cwd: __dirname,
env: process.env,
stdio: 'inherit',
},
);

I don't feel strongly about this. What you've got is totally fine.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that’s a good idea! i’m going to land this for now and we can do that in a follow up?


export type BrowserName = 'Chrome' | 'Firefox';
export type BrowserName = 'Chrome' | 'Firefox' | 'Edge';

export function getBrowserName(): BrowserName {
return IS_CHROME ? 'Chrome' : 'Firefox';
if (IS_EDGE) {
return 'Edge';
}
if (IS_FIREFOX) {
return 'Firefox';
}
if (IS_CHROME) {
return 'Chrome';
}
throw new Error(
'Expected browser name to be one of Chrome, Edge or Firefox.',
);
}

export function getBrowserTheme(): BrowserTheme {
Expand Down