Skip to content

Commit 2d3938c

Browse files
niemyjskiniemyjski
committed
Fixed module imports & ensure all imports have a .js extension
https://gils-blog.tayar.org/posts/using-jsm-esm-in-nodejs-a-practical-guide-part-3/
1 parent 7309505 commit 2d3938c

File tree

65 files changed

+311
-286
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+311
-286
lines changed

Diff for: ‎packages/angularjs/package.json

+6-1
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,13 @@
2424
},
2525
"private": true,
2626
"license": "Apache-2.0",
27-
"module": "dist/index.js",
27+
"type": "module",
28+
"main": "dist/index.js",
2829
"types": "dist/index.d.ts",
30+
"exports": {
31+
".": "./dist/index.js",
32+
"./package.json": "./package.json"
33+
},
2934
"scripts": {
3035
"lint": "eslint --cache --ext .ts",
3136
"lint:fix": "eslint --fix",

Diff for: ‎packages/browser/package.json

+6-1
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,13 @@
2424
},
2525
"private": true,
2626
"license": "Apache-2.0",
27-
"module": "dist/index.js",
27+
"type": "module",
28+
"main": "dist/index.js",
2829
"types": "dist/index.d.ts",
30+
"exports": {
31+
".": "./dist/index.js",
32+
"./package.json": "./package.json"
33+
},
2934
"scripts": {
3035
"lint": "eslint --cache --ext .ts",
3136
"lint:fix": "eslint --fix",

Diff for: ‎packages/browser/src/index.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ import {
88

99
import * as TraceKit from 'TraceKit';
1010

11-
import { DefaultErrorParser } from './services/DefaultErrorParser';
12-
import { DefaultModuleCollector } from './services/DefaultModuleCollector';
13-
import { DefaultRequestInfoCollector } from './services/DefaultRequestInfoCollector';
14-
import { BrowserStorage } from './storage/BrowserStorage';
15-
import { BrowserStorageProvider } from './storage/BrowserStorageProvider';
16-
import { DefaultSubmissionAdapter } from './submission/DefaultSubmissionAdapter';
11+
import { DefaultErrorParser } from './services/DefaultErrorParser.js';
12+
import { DefaultModuleCollector } from './services/DefaultModuleCollector.js';
13+
import { DefaultRequestInfoCollector } from './services/DefaultRequestInfoCollector.js';
14+
import { BrowserStorage } from './storage/BrowserStorage.js';
15+
import { BrowserStorageProvider } from './storage/BrowserStorageProvider.js';
16+
import { DefaultSubmissionAdapter } from './submission/DefaultSubmissionAdapter.js';
1717

1818
function init() {
1919
function getDefaultsSettingsFromScriptTag(): IConfigurationSettings {

Diff for: ‎packages/browser/src/storage/BrowserStorageProvider.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {
33
IStorageProvider
44
} from '@exceptionless/core';
55

6-
import { BrowserStorage } from './BrowserStorage';
6+
import { BrowserStorage } from './BrowserStorage.js';
77

88
export class BrowserStorageProvider implements IStorageProvider {
99
public queue: IStorage;

Diff for: ‎packages/browser/tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"extends": "../../tsconfig.json",
33
"compilerOptions": {
4-
"lib": ["DOM", "ESNext"],
4+
"lib": ["DOM", "ES2020"],
55
"outDir": "dist",
66
"rootDir": "src"
77
},

Diff for: ‎packages/core/package.json

+6-1
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,13 @@
2424
},
2525
"private": true,
2626
"license": "Apache-2.0",
27-
"module": "dist/index.js",
27+
"type": "module",
28+
"main": "dist/index.js",
2829
"types": "dist/index.d.ts",
30+
"exports": {
31+
".": "./dist/index.js",
32+
"./package.json": "./package.json"
33+
},
2934
"jest": {
3035
"moduleNameMapper": {
3136
"^@exceptionless/(.*)$": "<rootDir>/../$1/src"

Diff for: ‎packages/core/src/EventBuilder.ts

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import { ExceptionlessClient } from './ExceptionlessClient';
2-
import { IEvent } from './models/IEvent';
3-
import { IManualStackingInfo } from './models/IManualStackingInfo';
4-
import { IRequestInfo } from "./models/IRequestInfo";
5-
import { IUserInfo } from './models/IUserInfo';
6-
import { ContextData } from './plugins/ContextData';
7-
import { EventPluginContext } from './plugins/EventPluginContext';
8-
import { Utils } from './Utils';
1+
import { ExceptionlessClient } from './ExceptionlessClient.js';
2+
import { IEvent } from './models/IEvent.js';
3+
import { IManualStackingInfo } from './models/IManualStackingInfo.js';
4+
import { IRequestInfo } from "./models/IRequestInfo.js";
5+
import { IUserInfo } from './models/IUserInfo.js';
6+
import { ContextData } from './plugins/ContextData.js';
7+
import { EventPluginContext } from './plugins/EventPluginContext.js';
8+
import { Utils } from './Utils.js';
99

1010
export class EventBuilder {
1111
public target: IEvent;

Diff for: ‎packages/core/src/ExceptionlessClient.ts

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import { Configuration } from './configuration/Configuration';
2-
import { IConfigurationSettings } from './configuration/IConfigurationSettings';
3-
import { SettingsManager } from './configuration/SettingsManager';
4-
import { EventBuilder } from './EventBuilder';
5-
import { IEvent } from './models/IEvent';
6-
import { IUserDescription } from './models/IUserDescription';
7-
import { ContextData } from './plugins/ContextData';
8-
import { EventPluginContext } from './plugins/EventPluginContext';
9-
import { EventPluginManager } from './plugins/EventPluginManager';
10-
import { SubmissionResponse } from './submission/SubmissionResponse';
1+
import { Configuration } from './configuration/Configuration.js';
2+
import { IConfigurationSettings } from './configuration/IConfigurationSettings.js';
3+
import { SettingsManager } from './configuration/SettingsManager.js';
4+
import { EventBuilder } from './EventBuilder.js';
5+
import { IEvent } from './models/IEvent.js';
6+
import { IUserDescription } from './models/IUserDescription.js';
7+
import { ContextData } from './plugins/ContextData.js';
8+
import { EventPluginContext } from './plugins/EventPluginContext.js';
9+
import { EventPluginManager } from './plugins/EventPluginManager.js';
10+
import { SubmissionResponse } from './submission/SubmissionResponse.js';
1111

1212
export class ExceptionlessClient {
1313
/**

Diff for: ‎packages/core/src/configuration/Configuration.ts

+24-24
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
1-
import { DefaultLastReferenceIdManager } from '../lastReferenceIdManager/DefaultLastReferenceIdManager';
2-
import { ILastReferenceIdManager } from '../lastReferenceIdManager/ILastReferenceIdManager';
3-
import { ILog } from '../logging/ILog';
4-
import { NullLog } from '../logging/NullLog';
5-
import { IUserInfo } from '../models/IUserInfo';
6-
import { HeartbeatPlugin } from '../plugins/default/HeartbeatPlugin';
7-
import { ReferenceIdPlugin } from '../plugins/default/ReferenceIdPlugin';
8-
import { EventPluginContext } from '../plugins/EventPluginContext';
9-
import { EventPluginManager } from '../plugins/EventPluginManager';
10-
import { IEventPlugin } from '../plugins/IEventPlugin';
11-
import { DefaultEventQueue } from '../queue/DefaultEventQueue';
12-
import { IEventQueue } from '../queue/IEventQueue';
13-
import { IEnvironmentInfoCollector } from '../services/IEnvironmentInfoCollector';
14-
import { IErrorParser } from '../services/IErrorParser';
15-
import { IModuleCollector } from '../services/IModuleCollector';
16-
import { IRequestInfoCollector } from '../services/IRequestInfoCollector';
17-
import { InMemoryStorageProvider } from '../storage/InMemoryStorageProvider';
18-
import { IStorageProvider } from '../storage/IStorageProvider';
19-
import { DefaultSubmissionClient } from '../submission/DefaultSubmissionClient';
20-
import { ISubmissionAdapter } from '../submission/ISubmissionAdapter';
21-
import { ISubmissionClient } from '../submission/ISubmissionClient';
22-
import { Utils } from '../Utils';
23-
import { IConfigurationSettings } from './IConfigurationSettings';
24-
import { SettingsManager } from './SettingsManager';
1+
import { DefaultLastReferenceIdManager } from '../lastReferenceIdManager/DefaultLastReferenceIdManager.js';
2+
import { ILastReferenceIdManager } from '../lastReferenceIdManager/ILastReferenceIdManager.js';
3+
import { ILog } from '../logging/ILog.js';
4+
import { NullLog } from '../logging/NullLog.js';
5+
import { IUserInfo } from '../models/IUserInfo.js';
6+
import { HeartbeatPlugin } from '../plugins/default/HeartbeatPlugin.js';
7+
import { ReferenceIdPlugin } from '../plugins/default/ReferenceIdPlugin.js';
8+
import { EventPluginContext } from '../plugins/EventPluginContext.js';
9+
import { EventPluginManager } from '../plugins/EventPluginManager.js';
10+
import { IEventPlugin } from '../plugins/IEventPlugin.js';
11+
import { DefaultEventQueue } from '../queue/DefaultEventQueue.js';
12+
import { IEventQueue } from '../queue/IEventQueue.js';
13+
import { IEnvironmentInfoCollector } from '../services/IEnvironmentInfoCollector.js';
14+
import { IErrorParser } from '../services/IErrorParser.js';
15+
import { IModuleCollector } from '../services/IModuleCollector.js';
16+
import { IRequestInfoCollector } from '../services/IRequestInfoCollector.js';
17+
import { InMemoryStorageProvider } from '../storage/InMemoryStorageProvider.js';
18+
import { IStorageProvider } from '../storage/IStorageProvider.js';
19+
import { DefaultSubmissionClient } from '../submission/DefaultSubmissionClient.js';
20+
import { ISubmissionAdapter } from '../submission/ISubmissionAdapter.js';
21+
import { ISubmissionClient } from '../submission/ISubmissionClient.js';
22+
import { Utils } from '../Utils.js';
23+
import { IConfigurationSettings } from './IConfigurationSettings.js';
24+
import { SettingsManager } from './SettingsManager.js';
2525

2626
export class Configuration implements IConfigurationSettings {
2727
/**

Diff for: ‎packages/core/src/configuration/IConfigurationSettings.ts

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import { ILastReferenceIdManager } from '../lastReferenceIdManager/ILastReferenceIdManager';
2-
import { ILog } from '../logging/ILog';
3-
import { IEventQueue } from '../queue/IEventQueue';
4-
import { IEnvironmentInfoCollector } from '../services/IEnvironmentInfoCollector';
5-
import { IErrorParser } from '../services/IErrorParser';
6-
import { IModuleCollector } from '../services/IModuleCollector';
7-
import { IRequestInfoCollector } from '../services/IRequestInfoCollector';
8-
import { IStorageProvider } from '../storage/IStorageProvider';
9-
import { ISubmissionAdapter } from '../submission/ISubmissionAdapter';
10-
import { ISubmissionClient } from '../submission/ISubmissionClient';
1+
import { ILastReferenceIdManager } from '../lastReferenceIdManager/ILastReferenceIdManager.js';
2+
import { ILog } from '../logging/ILog.js';
3+
import { IEventQueue } from '../queue/IEventQueue.js';
4+
import { IEnvironmentInfoCollector } from '../services/IEnvironmentInfoCollector.js';
5+
import { IErrorParser } from '../services/IErrorParser.js';
6+
import { IModuleCollector } from '../services/IModuleCollector.js';
7+
import { IRequestInfoCollector } from '../services/IRequestInfoCollector.js';
8+
import { IStorageProvider } from '../storage/IStorageProvider.js';
9+
import { ISubmissionAdapter } from '../submission/ISubmissionAdapter.js';
10+
import { ISubmissionClient } from '../submission/ISubmissionClient.js';
1111

1212
export interface IConfigurationSettings {
1313
apiKey?: string;

Diff for: ‎packages/core/src/configuration/SettingsManager.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { SettingsResponse } from '../submission/SettingsResponse';
2-
import { Utils } from '../Utils';
3-
import { Configuration } from './Configuration';
1+
import { SettingsResponse } from '../submission/SettingsResponse.js';
2+
import { Configuration } from './Configuration.js';
3+
import { Utils } from '../Utils.js';
44

55
interface ISettingsWithVersion {
66
version: number;

Diff for: ‎packages/core/src/index.ts

+56-56
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,65 @@
1-
export { Configuration } from './configuration/Configuration';
2-
export { IConfigurationSettings } from './configuration/IConfigurationSettings';
3-
export { SettingsManager } from './configuration/SettingsManager';
1+
export { Configuration } from './configuration/Configuration.js';
2+
export { IConfigurationSettings } from './configuration/IConfigurationSettings.js';
3+
export { SettingsManager } from './configuration/SettingsManager.js';
44

5-
export { DefaultLastReferenceIdManager } from './lastReferenceIdManager/DefaultLastReferenceIdManager';
6-
export { ILastReferenceIdManager } from './lastReferenceIdManager/ILastReferenceIdManager';
5+
export { DefaultLastReferenceIdManager } from './lastReferenceIdManager/DefaultLastReferenceIdManager.js';
6+
export { ILastReferenceIdManager } from './lastReferenceIdManager/ILastReferenceIdManager.js';
77

8-
export { ILog } from './logging/ILog';
9-
export { NullLog } from './logging/NullLog';
8+
export { ILog } from './logging/ILog.js';
9+
export { NullLog } from './logging/NullLog.js';
1010

11-
export { IClientConfiguration } from './models/IClientConfiguration';
12-
export { IEnvironmentInfo } from './models/IEnvironmentInfo';
13-
export { IError } from './models/IError';
14-
export { IEvent } from './models/IEvent';
15-
export { IInnerError } from './models/IInnerError';
16-
export { IManualStackingInfo } from './models/IManualStackingInfo';
17-
export { IMethod } from './models/IMethod';
18-
export { IModule } from './models/IModule';
19-
export { IParameter } from './models/IParameter';
20-
export { IRequestInfo } from './models/IRequestInfo';
21-
export { IStackFrame } from './models/IStackFrame';
22-
export { IUserDescription } from './models/IUserDescription';
23-
export { IUserInfo } from './models/IUserInfo';
11+
export { IClientConfiguration } from './models/IClientConfiguration.js';
12+
export { IEnvironmentInfo } from './models/IEnvironmentInfo.js';
13+
export { IError } from './models/IError.js';
14+
export { IEvent } from './models/IEvent.js';
15+
export { IInnerError } from './models/IInnerError.js';
16+
export { IManualStackingInfo } from './models/IManualStackingInfo.js';
17+
export { IMethod } from './models/IMethod.js';
18+
export { IModule } from './models/IModule.js';
19+
export { IParameter } from './models/IParameter.js';
20+
export { IRequestInfo } from './models/IRequestInfo.js';
21+
export { IStackFrame } from './models/IStackFrame.js';
22+
export { IUserDescription } from './models/IUserDescription.js';
23+
export { IUserInfo } from './models/IUserInfo.js';
2424

25-
export { ConfigurationDefaultsPlugin } from './plugins/default/ConfigurationDefaultsPlugin';
26-
export { DuplicateCheckerPlugin } from './plugins/default/DuplicateCheckerPlugin';
27-
export { EnvironmentInfoPlugin } from './plugins/default/EnvironmentInfoPlugin';
28-
export { ErrorPlugin } from './plugins/default/ErrorPlugin';
29-
export { EventExclusionPlugin } from './plugins/default/EventExclusionPlugin';
30-
export { HeartbeatPlugin } from './plugins/default/HeartbeatPlugin';
31-
export { ModuleInfoPlugin } from './plugins/default/ModuleInfoPlugin';
32-
export { ReferenceIdPlugin } from './plugins/default/ReferenceIdPlugin';
33-
export { RequestInfoPlugin } from './plugins/default/RequestInfoPlugin';
34-
export { SubmissionMethodPlugin } from './plugins/default/SubmissionMethodPlugin';
35-
export { ContextData } from './plugins/ContextData';
36-
export { EventPluginContext } from './plugins/EventPluginContext';
37-
export { EventPluginManager } from './plugins/EventPluginManager';
38-
export { IEventPlugin } from './plugins/IEventPlugin';
25+
export { ConfigurationDefaultsPlugin } from './plugins/default/ConfigurationDefaultsPlugin.js';
26+
export { DuplicateCheckerPlugin } from './plugins/default/DuplicateCheckerPlugin.js';
27+
export { EnvironmentInfoPlugin } from './plugins/default/EnvironmentInfoPlugin.js';
28+
export { ErrorPlugin } from './plugins/default/ErrorPlugin.js';
29+
export { EventExclusionPlugin } from './plugins/default/EventExclusionPlugin.js';
30+
export { HeartbeatPlugin } from './plugins/default/HeartbeatPlugin.js';
31+
export { ModuleInfoPlugin } from './plugins/default/ModuleInfoPlugin.js';
32+
export { ReferenceIdPlugin } from './plugins/default/ReferenceIdPlugin.js';
33+
export { RequestInfoPlugin } from './plugins/default/RequestInfoPlugin.js';
34+
export { SubmissionMethodPlugin } from './plugins/default/SubmissionMethodPlugin.js';
35+
export { ContextData } from './plugins/ContextData.js';
36+
export { EventPluginContext } from './plugins/EventPluginContext.js';
37+
export { EventPluginManager } from './plugins/EventPluginManager.js';
38+
export { IEventPlugin } from './plugins/IEventPlugin.js';
3939

40-
export { DefaultEventQueue } from './queue/DefaultEventQueue'
41-
export { IEventQueue } from './queue/IEventQueue'
40+
export { DefaultEventQueue } from './queue/DefaultEventQueue.js'
41+
export { IEventQueue } from './queue/IEventQueue.js'
4242

43-
export { IEnvironmentInfoCollector } from './services/IEnvironmentInfoCollector';
44-
export { IErrorParser } from './services/IErrorParser';
45-
export { IModuleCollector } from './services/IModuleCollector';
46-
export { IRequestInfoCollector } from './services/IRequestInfoCollector';
43+
export { IEnvironmentInfoCollector } from './services/IEnvironmentInfoCollector.js';
44+
export { IErrorParser } from './services/IErrorParser.js';
45+
export { IModuleCollector } from './services/IModuleCollector.js';
46+
export { IRequestInfoCollector } from './services/IRequestInfoCollector.js';
4747

48-
export { InMemoryStorage } from './storage/InMemoryStorage';
49-
export { InMemoryStorageProvider } from './storage/InMemoryStorageProvider';
50-
export { IStorage } from './storage/IStorage';
51-
export { IStorageItem } from './storage/IStorageItem';
52-
export { IStorageProvider } from './storage/IStorageProvider';
53-
export { KeyValueStorageBase } from './storage/KeyValueStorageBase';
48+
export { InMemoryStorage } from './storage/InMemoryStorage.js';
49+
export { InMemoryStorageProvider } from './storage/InMemoryStorageProvider.js';
50+
export { IStorage } from './storage/IStorage.js';
51+
export { IStorageItem } from './storage/IStorageItem.js';
52+
export { IStorageProvider } from './storage/IStorageProvider.js';
53+
export { KeyValueStorageBase } from './storage/KeyValueStorageBase.js';
5454

55-
export { DefaultSubmissionClient } from './submission/DefaultSubmissionClient';
56-
export { ISubmissionAdapter } from './submission/ISubmissionAdapter';
57-
export { ISubmissionClient } from './submission/ISubmissionClient';
58-
export { SettingsResponse } from './submission/SettingsResponse';
59-
export { SubmissionCallback } from './submission/SubmissionCallback';
60-
export { SubmissionRequest } from './submission/SubmissionRequest';
61-
export { SubmissionResponse } from './submission/SubmissionResponse';
55+
export { DefaultSubmissionClient } from './submission/DefaultSubmissionClient.js';
56+
export { ISubmissionAdapter } from './submission/ISubmissionAdapter.js';
57+
export { ISubmissionClient } from './submission/ISubmissionClient.js';
58+
export { SettingsResponse } from './submission/SettingsResponse.js';
59+
export { SubmissionCallback } from './submission/SubmissionCallback.js';
60+
export { SubmissionRequest } from './submission/SubmissionRequest.js';
61+
export { SubmissionResponse } from './submission/SubmissionResponse.js';
6262

63-
export { EventBuilder } from './EventBuilder';
64-
export { ExceptionlessClient } from './ExceptionlessClient';
65-
export { Utils } from './Utils';
63+
export { EventBuilder } from './EventBuilder.js';
64+
export { ExceptionlessClient } from './ExceptionlessClient.js';
65+
export { Utils } from './Utils.js';

Diff for: ‎packages/core/src/lastReferenceIdManager/DefaultLastReferenceIdManager.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ILastReferenceIdManager } from './ILastReferenceIdManager';
1+
import { ILastReferenceIdManager } from './ILastReferenceIdManager.js';
22

33
export class DefaultLastReferenceIdManager implements ILastReferenceIdManager {
44
/**

Diff for: ‎packages/core/src/logging/NullLog.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* eslint-disable @typescript-eslint/no-unused-vars */
2-
import { ILog } from './ILog';
2+
import { ILog } from './ILog.js';
33

44
export class NullLog implements ILog {
55
public trace(message: string): void { }

Diff for: ‎packages/core/src/models/IError.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { IInnerError } from './IInnerError';
2-
import { IModule } from './IModule';
1+
import { IInnerError } from './IInnerError.js';
2+
import { IModule } from './IModule.js';
33

44
export interface IError extends IInnerError {
55
modules?: IModule[];

Diff for: ‎packages/core/src/models/IInnerError.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { IMethod } from './IMethod';
2-
import { IStackFrame } from './IStackFrame';
1+
import { IMethod } from './IMethod.js';
2+
import { IStackFrame } from './IStackFrame.js';
33

44
export interface IInnerError {
55
message?: string;

Diff for: ‎packages/core/src/models/IMethod.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { IParameter } from './IParameter';
1+
import { IParameter } from './IParameter.js';
22

33
export interface IMethod {
44
data?: any;

Diff for: ‎packages/core/src/models/IStackFrame.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { IMethod } from './IMethod';
1+
import { IMethod } from './IMethod.js';
22

33
export interface IStackFrame extends IMethod {
44
file_name?: string;

Diff for: ‎packages/core/src/plugins/EventPluginContext.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { ExceptionlessClient } from '../ExceptionlessClient';
2-
import { ILog } from '../logging/ILog';
3-
import { IEvent } from '../models/IEvent';
4-
import { ContextData } from './ContextData';
1+
import { ExceptionlessClient } from '../ExceptionlessClient.js';
2+
import { ILog } from '../logging/ILog.js';
3+
import { IEvent } from '../models/IEvent.js';
4+
import { ContextData } from './ContextData.js';
55

66
export class EventPluginContext {
77
public cancelled: boolean = false;

0 commit comments

Comments
 (0)