Skip to content

Commit 24ff62e

Browse files
committed
Fixed a bug with universal apps where require.main.filename will not be set in webpack 4
1 parent 02711d0 commit 24ff62e

File tree

2 files changed

+11
-12
lines changed

2 files changed

+11
-12
lines changed

src/services/NodeModuleCollector.ts

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ export class NodeModuleCollector implements IModuleCollector {
1111
private installedModules: { [id: string]: IModule } = {};
1212

1313
public getModules(context: EventPluginContext): IModule[] {
14-
this.initialize();
15-
16-
if (!require.main) {
14+
if (!require.main || !require.main.filename) {
1715
return [];
1816
}
1917

18+
this.initialize();
19+
2020
const modulePath = path.dirname(require.main.filename) + '/node_modules/';
2121
const pathLength = modulePath.length;
2222

@@ -41,14 +41,13 @@ export class NodeModuleCollector implements IModuleCollector {
4141

4242
this.initialized = true;
4343

44-
const output = child.spawnSync('npm', ['ls', '--depth=0', '--json']).stdout;
45-
46-
if (!output) {
47-
return;
48-
}
49-
5044
let json;
5145
try {
46+
const output = child.spawnSync('npm', ['ls', '--depth=0', '--json']).stdout;
47+
if (!output) {
48+
return;
49+
}
50+
5251
json = JSON.parse(output.toString());
5352
} catch (e) {
5453
return;

src/storage/NodeFileStorage.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ export class NodeFileStorage extends KeyValueStorageBase {
1212
super(maxItems);
1313

1414
if (!folder) {
15-
folder = Path.join(Path.dirname(require.main.filename), '.exceptionless');
15+
folder = require.main && require.main.filename ? Path.join(Path.dirname(require.main.filename), '.exceptionless') : '.exceptionless';
1616
}
1717

18-
const subfolder = Path.join(folder, namespace);
19-
this.directory = Path.resolve(subfolder);
18+
const subFolder = Path.join(folder, namespace);
19+
this.directory = Path.resolve(subFolder);
2020
this.prefix = prefix;
2121
this.fs = fs ? fs : Fs;
2222

0 commit comments

Comments
 (0)