Skip to content

Commit f0d813d

Browse files
committed
Fix build issues in webpack
1 parent aeec8ae commit f0d813d

34 files changed

Lines changed: 177 additions & 179 deletions

packages/phoenix-event-display/configs/webpack.conf.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ module.exports = {
1212
exclude: /node_modules/,
1313
options: {
1414
loader: 'ts',
15-
target: 'es2018',
15+
target: 'es2020',
1616
},
1717
},
1818
],

packages/phoenix-event-display/src/browser.ts

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
import { LoadingManager } from 'three';
2-
import { EventDisplay } from './event-display.js';
3-
import { Cut } from './lib/models/cut.model.js';
4-
import { PresetView } from './lib/models/preset-view.model.js';
5-
import { PrettySymbols } from './helpers/pretty-symbols.js';
6-
import { RKHelper } from './helpers/rk-helper.js';
7-
import { RungeKutta } from './helpers/runge-kutta.js';
8-
import { InfoLogger } from './helpers/info-logger.js';
9-
import { CMSLoader } from './loaders/cms-loader.js';
10-
import { JiveXMLLoader } from './loaders/jivexml-loader.js';
11-
import { JSRootEventLoader } from './loaders/jsroot-event-loader.js';
12-
import { CMSObjects } from './loaders/objects/cms-objects.js';
13-
import { PhoenixObjects } from './loaders/objects/phoenix-objects.js';
14-
import { PhoenixLoader } from './loaders/phoenix-loader.js';
15-
import { Edm4hepJsonLoader } from './loaders/edm4hep-json-loader.js';
16-
import { ScriptLoader } from './loaders/script-loader.js';
17-
import { TrackmlLoader } from './loaders/trackml-loader.js';
18-
import { StateManager } from './managers/state-manager.js';
19-
import { URLOptionsManager } from './managers/url-options-manager.js';
20-
import { ThreeManager } from './managers/three-manager/index.js';
21-
import { UIManager } from './managers/ui-manager/index.js';
22-
import { PhoenixMenuNode } from './managers/ui-manager/phoenix-menu/phoenix-menu-node.js';
2+
import { EventDisplay } from './event-display';
3+
import { Cut } from './lib/models/cut.model';
4+
import { PresetView } from './lib/models/preset-view.model';
5+
import { PrettySymbols } from './helpers/pretty-symbols';
6+
import { RKHelper } from './helpers/rk-helper';
7+
import { RungeKutta } from './helpers/runge-kutta';
8+
import { InfoLogger } from './helpers/info-logger';
9+
import { CMSLoader } from './loaders/cms-loader';
10+
import { JiveXMLLoader } from './loaders/jivexml-loader';
11+
import { JSRootEventLoader } from './loaders/jsroot-event-loader';
12+
import { CMSObjects } from './loaders/objects/cms-objects';
13+
import { PhoenixObjects } from './loaders/objects/phoenix-objects';
14+
import { PhoenixLoader } from './loaders/phoenix-loader';
15+
import { Edm4hepJsonLoader } from './loaders/edm4hep-json-loader';
16+
import { ScriptLoader } from './loaders/script-loader';
17+
import { TrackmlLoader } from './loaders/trackml-loader';
18+
import { StateManager } from './managers/state-manager';
19+
import { URLOptionsManager } from './managers/url-options-manager';
20+
import { ThreeManager } from './managers/three-manager/index';
21+
import { UIManager } from './managers/ui-manager/index';
22+
import { PhoenixMenuNode } from './managers/ui-manager/phoenix-menu/phoenix-menu-node';
2323

2424
if (typeof globalThis !== 'undefined') {
2525
// `globalThis` makes Phoenix modules available in the browser

packages/phoenix-event-display/src/event-display.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
import { httpRequest, openFile } from 'jsroot';
22
import { settings as jsrootSettings } from 'jsroot';
33
import { build } from 'jsroot/geom';
4-
import { ThreeManager } from './managers/three-manager/index.js';
5-
import { UIManager } from './managers/ui-manager/index.js';
6-
import { InfoLogger } from './helpers/info-logger.js';
7-
import type { Configuration } from './lib/types/configuration.js';
8-
import { StateManager } from './managers/state-manager.js';
9-
import { LoadingManager } from './managers/loading-manager.js';
10-
import { URLOptionsManager } from './managers/url-options-manager.js';
11-
import { ActiveVariable } from './helpers/active-variable.js';
12-
import type { AnimationPreset } from './managers/three-manager/animations-manager.js';
13-
import { XRSessionType } from './managers/three-manager/xr/xr-manager.js';
14-
import { getLabelTitle } from './helpers/labels.js';
15-
import { PhoenixLoader } from './loaders/phoenix-loader.js';
4+
import { ThreeManager } from './managers/three-manager/index';
5+
import { UIManager } from './managers/ui-manager/index';
6+
import { InfoLogger } from './helpers/info-logger';
7+
import type { Configuration } from './lib/types/configuration';
8+
import { StateManager } from './managers/state-manager';
9+
import { LoadingManager } from './managers/loading-manager';
10+
import { URLOptionsManager } from './managers/url-options-manager';
11+
import { ActiveVariable } from './helpers/active-variable';
12+
import type { AnimationPreset } from './managers/three-manager/animations-manager';
13+
import { XRSessionType } from './managers/three-manager/xr/xr-manager';
14+
import { getLabelTitle } from './helpers/labels';
15+
import { PhoenixLoader } from './loaders/phoenix-loader';
1616

1717
declare global {
1818
/**

packages/phoenix-event-display/src/helpers/rk-helper.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { RungeKutta } from './runge-kutta.js';
1+
import { RungeKutta } from './runge-kutta';
22
import { Vector3 } from 'three';
3-
import { CoordinateHelper } from './coordinate-helper.js';
3+
import { CoordinateHelper } from './coordinate-helper';
44

55
/**
66
* Helper methods for RungeKutta functions.
Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,50 @@
11
// Event display
2-
export * from './event-display.js';
2+
export * from './event-display';
33

44
// Three
5-
export * from './managers/three-manager/index.js';
6-
export * from './managers/three-manager/animations-manager.js';
7-
export * from './managers/three-manager/controls-manager.js';
8-
export * from './managers/three-manager/effects-manager.js';
9-
export * from './managers/three-manager/export-manager.js';
10-
export * from './managers/three-manager/import-manager.js';
11-
export * from './managers/three-manager/renderer-manager.js';
12-
export * from './managers/three-manager/scene-manager.js';
13-
export * from './managers/three-manager/selection-manager.js';
14-
export * from './managers/three-manager/xr/xr-manager.js';
15-
export * from './managers/three-manager/xr/vr-manager.js';
16-
export * from './managers/three-manager/xr/ar-manager.js';
5+
export * from './managers/three-manager/index';
6+
export * from './managers/three-manager/animations-manager';
7+
export * from './managers/three-manager/controls-manager';
8+
export * from './managers/three-manager/effects-manager';
9+
export * from './managers/three-manager/export-manager';
10+
export * from './managers/three-manager/import-manager';
11+
export * from './managers/three-manager/renderer-manager';
12+
export * from './managers/three-manager/scene-manager';
13+
export * from './managers/three-manager/selection-manager';
14+
export * from './managers/three-manager/xr/xr-manager';
15+
export * from './managers/three-manager/xr/vr-manager';
16+
export * from './managers/three-manager/xr/ar-manager';
1717

1818
// UI
19-
export * from './managers/ui-manager/index.js';
20-
export * from './managers/ui-manager/phoenix-menu/phoenix-menu-node.js';
19+
export * from './managers/ui-manager/index';
20+
export * from './managers/ui-manager/phoenix-menu/phoenix-menu-node';
2121

2222
// Extras
23-
export * from './lib/types/configuration.js';
24-
export * from './lib/models/cut.model.js';
25-
export * from './lib/models/preset-view.model.js';
23+
export * from './lib/types/configuration';
24+
export * from './lib/models/cut.model';
25+
export * from './lib/models/preset-view.model';
2626

2727
// Helpers
28-
export * from './helpers/info-logger.js';
29-
export * from './helpers/rk-helper.js';
30-
export * from './helpers/runge-kutta.js';
31-
export * from './helpers/pretty-symbols.js';
32-
export * from './helpers/active-variable.js';
33-
export * from './helpers/zip.js';
28+
export * from './helpers/info-logger';
29+
export * from './helpers/rk-helper';
30+
export * from './helpers/runge-kutta';
31+
export * from './helpers/pretty-symbols';
32+
export * from './helpers/active-variable';
33+
export * from './helpers/zip';
3434

3535
// Loaders
36-
export * from './loaders/event-data-loader.js';
37-
export * from './loaders/cms-loader.js';
38-
export * from './loaders/jivexml-loader.js';
39-
export * from './loaders/jsroot-event-loader.js';
40-
export * from './loaders/phoenix-loader.js';
41-
export * from './loaders/edm4hep-json-loader.js';
42-
export * from './loaders/script-loader.js';
43-
export * from './loaders/trackml-loader.js';
44-
export * from './loaders/objects/cms-objects.js';
45-
export * from './loaders/objects/phoenix-objects.js';
36+
export * from './loaders/event-data-loader';
37+
export * from './loaders/cms-loader';
38+
export * from './loaders/jivexml-loader';
39+
export * from './loaders/jsroot-event-loader';
40+
export * from './loaders/phoenix-loader';
41+
export * from './loaders/edm4hep-json-loader';
42+
export * from './loaders/script-loader';
43+
export * from './loaders/trackml-loader';
44+
export * from './loaders/objects/cms-objects';
45+
export * from './loaders/objects/phoenix-objects';
4646

4747
// Managers
48-
export * from './managers/state-manager.js';
49-
export * from './managers/loading-manager.js';
50-
export * from './managers/url-options-manager.js';
48+
export * from './managers/state-manager';
49+
export * from './managers/loading-manager';
50+
export * from './managers/url-options-manager';

packages/phoenix-event-display/src/lib/types/configuration.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { PresetView } from '../models/preset-view.model.js';
2-
import type { EventDataLoader } from '../../loaders/event-data-loader.js';
3-
import type { PhoenixMenuNode } from '../../managers/ui-manager/phoenix-menu/phoenix-menu-node.js';
4-
import type { AnimationPreset } from '../../managers/three-manager/animations-manager.js';
1+
import { PresetView } from '../models/preset-view.model';
2+
import type { EventDataLoader } from '../../loaders/event-data-loader';
3+
import type { PhoenixMenuNode } from '../../managers/ui-manager/phoenix-menu/phoenix-menu-node';
4+
import type { AnimationPreset } from '../../managers/three-manager/animations-manager';
55

66
/**
77
* Configuration of the event display.

packages/phoenix-event-display/src/loaders/cms-loader.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { PhoenixLoader } from './phoenix-loader.js';
1+
import { PhoenixLoader } from './phoenix-loader';
22
import { Vector3, QuadraticBezierCurve3 } from 'three';
3-
import { CMSObjects } from './objects/cms-objects.js';
3+
import { CMSObjects } from './objects/cms-objects';
44
import JSZip from 'jszip';
55

66
/**

packages/phoenix-event-display/src/loaders/edm4hep-json-loader.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { PhoenixLoader } from './phoenix-loader.js';
1+
import { PhoenixLoader } from './phoenix-loader';
22

33
/**
44
* Edm4hepJsonLoader for loading EDM4hep json dumps

packages/phoenix-event-display/src/loaders/event-data-loader.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { ThreeManager } from '../managers/three-manager/index.js';
2-
import { UIManager } from '../managers/ui-manager/index.js';
3-
import { InfoLogger } from '../helpers/info-logger.js';
1+
import { ThreeManager } from '../managers/three-manager/index';
2+
import { UIManager } from '../managers/ui-manager/index';
3+
import { InfoLogger } from '../helpers/info-logger';
44

55
/**
66
* Event data loader for implementing different event data loaders.

packages/phoenix-event-display/src/loaders/jivexml-loader.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { PhoenixLoader } from './phoenix-loader.js';
2-
import { CoordinateHelper } from '../helpers/coordinate-helper.js';
1+
import { PhoenixLoader } from './phoenix-loader';
2+
import { CoordinateHelper } from '../helpers/coordinate-helper';
33

44
/**
55
* PhoenixLoader for processing and loading an event from the JiveXML data format.

0 commit comments

Comments
 (0)