Skip to content

Commit a74ab58

Browse files
fix
Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>
1 parent d0d18fb commit a74ab58

1 file changed

Lines changed: 6 additions & 16 deletions

File tree

code/extensions/che-api/src/extension.ts

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -29,23 +29,13 @@ const ENABLE_NAVIGATOR_DIAGNOSTICS = process.env.CHE_API_NAVIGATOR_DIAGNOSTICS !
2929

3030
type DependencyProbe = {
3131
moduleName: string;
32-
resolverName: string;
32+
resolvedPath: string;
3333
loader: () => Promise<unknown>;
3434
};
3535

36-
function safeResolveModule(moduleName: string): string {
37-
try {
38-
// eslint-disable-next-line no-restricted-globals
39-
return require.resolve(moduleName);
40-
} catch (error) {
41-
return `unresolved (${String(error)})`;
42-
}
43-
}
44-
4536
async function probeDependencyLoad(probe: DependencyProbe): Promise<void> {
46-
const resolvedPath = safeResolveModule(probe.resolverName);
4737
const start = Date.now();
48-
console.info(`${NAVIGATOR_DIAG_PREFIX} START loading '${probe.moduleName}' (resolved: ${resolvedPath})`);
38+
console.info(`${NAVIGATOR_DIAG_PREFIX} START loading '${probe.moduleName}' (resolved: ${probe.resolvedPath})`);
4939
try {
5040
await probe.loader();
5141
console.info(`${NAVIGATOR_DIAG_PREFIX} DONE loading '${probe.moduleName}' in ${Date.now() - start}ms`);
@@ -63,22 +53,22 @@ async function runNavigatorDependencyDiagnostics(): Promise<void> {
6353
const probes: DependencyProbe[] = [
6454
{
6555
moduleName: 'axios',
66-
resolverName: 'axios',
56+
resolvedPath: require.resolve('axios'),
6757
loader: () => import('axios')
6858
},
6959
{
7060
moduleName: 'oauth4webapi',
71-
resolverName: 'oauth4webapi',
61+
resolvedPath: require.resolve('oauth4webapi'),
7262
loader: () => import('oauth4webapi')
7363
},
7464
{
7565
moduleName: 'openid-client',
76-
resolverName: 'openid-client',
66+
resolvedPath: require.resolve('openid-client'),
7767
loader: () => import('openid-client')
7868
},
7969
{
8070
moduleName: '@kubernetes/client-node',
81-
resolverName: '@kubernetes/client-node',
71+
resolvedPath: require.resolve('@kubernetes/client-node'),
8272
loader: () => import('@kubernetes/client-node')
8373
}
8474
];

0 commit comments

Comments
 (0)