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

Sm/pr-feedback-doctor #829

Merged
merged 3 commits into from
May 23, 2024
Merged

Sm/pr-feedback-doctor #829

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
122d38d
refactor: without undefined, defers npm run
mshanemc May 23, 2024
342bd84
refactor: change conditional
mshanemc May 23, 2024
62b1fef
refactor: env, env, or config
mshanemc May 23, 2024
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
31 changes: 15 additions & 16 deletions src/hooks/diagnostics.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,23 @@ import { NpmModule } from '../shared/npmCommand.js';
type HookFunction = (options: { doctor: SfDoctor }) => Promise<[void]>;
export const hook: HookFunction = (options) => Promise.all([registryCheck(options)]);

// eslint-disable-next-line @typescript-eslint/require-await
Copy link
Contributor Author

Choose a reason for hiding this comment

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

require-await and floating-promises below are valid errors. that map>async thing shouldn't return until the async calls are done running.

const registryCheck = async (options: { doctor: SfDoctor }): Promise<void> => {
// find npm install
const npm = new NpmModule('');
const config = npm.run('config get registry').stdout.trim();
const customRegistry =
process.env.npm_config_registry ?? process.env.NPM_CONFIG_REGISTRY ?? config !== 'https://registry.npmjs.org/'
? config
: undefined;
// eslint-disable-next-line @typescript-eslint/no-floating-promises
[
// npm and yarn registries
'https://registry.npmjs.org',
'https://registry.yarnpkg.com',
customRegistry,
]
// incase customRegistry is undefined, prevent printing an extra line
.filter((u) => u)
.map(async (url) => {
await Promise.all(
[
...new Set([
// npm and yarn registries
'https://registry.npmjs.org',
'https://registry.yarnpkg.com',
process.env.npm_config_registry ??
process.env.NPM_CONFIG_REGISTRY ??
npm.run('config get registry').stdout.trim()
? config
: 'https://registry.npmjs.org',
Copy link
Contributor Author

Choose a reason for hiding this comment

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

removes the possibility of undefined. the Set handles the duplicate conditional

]),
].map(async (url) => {
try {
const results = npm.ping(url);

Expand All @@ -44,5 +42,6 @@ const registryCheck = async (options: { doctor: SfDoctor }): Promise<void> => {
`Cannot reach ${url} - potential network configuration error, check proxies, firewalls, environment variables`
);
}
});
})
);
};
Loading