Skip to content

Commit 88aec72

Browse files
committed
fix: rename Router to VRRouter to avoid naming conflicts in WebXR implementation
1 parent 6b51b25 commit 88aec72

File tree

3 files changed

+10
-11
lines changed

3 files changed

+10
-11
lines changed

public/js/deps.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@ export { Router, transitions, renderer, componentLoader };
1616
// Import and re-export state-manager
1717
import { createStore, StoreConnector } from './modules/state-manager/dist/index.js';
1818
export { createStore, StoreConnector };
19-
// Import and re-export spa-router (commented out to avoid duplicate exports)
20-
// export { Router, transitions, renderer, componentLoader } from 'https://esm.sh/@profullstack/[email protected]';
19+
// Import and re-export spa-router
20+
export { Router, transitions, renderer, componentLoader } from 'https://esm.sh/@profullstack/[email protected]';
2121

2222
// Import and re-export localizer from compiled version
2323
import localizerDefault from './modules/localizer/dist/index.mjs';
2424
export const localizer = localizerDefault;
2525
export function _t(key, options = {}) {
2626
return localizer.translate(key, options);
2727
}
28-
// Import and re-export localizer (commented out to avoid duplicate exports)
29-
// export { localizer, _t } from 'https://esm.sh/@profullstack/[email protected]';
28+
// Import and re-export localizer
29+
export { localizer, _t } from 'https://esm.sh/@profullstack/[email protected]';
3030

3131
// Import and re-export enhanced-router
3232
export * as enhancedRouter from 'https://esm.sh/@profullstack/[email protected]';
@@ -37,5 +37,4 @@ export * as authSystem from 'https://esm.sh/@profullstack/[email protected]';
3737
export * as paymentGateway from 'https://esm.sh/@profullstack/[email protected]';
3838
export * as stateManager from 'https://esm.sh/@profullstack/[email protected]';
3939
export * as storageService from 'https://esm.sh/@profullstack/[email protected]';
40-
// Commented out to avoid duplicate exports
41-
// export { StoreConnector, createStore } from 'https://esm.sh/@profullstack/[email protected]';
40+
export { StoreConnector, createStore } from 'https://esm.sh/@profullstack/[email protected]';

webxr/js/deps.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
* dependencies if needed.
77
*/
88

9-
// Import and re-export spa-router
10-
import { Router } from 'https://esm.sh/@profullstack/[email protected]';
9+
// Import and re-export spa-router with a different name to avoid conflicts
10+
import { Router as VRRouter } from 'https://esm.sh/@profullstack/[email protected]';
1111
import * as transitions from 'https://esm.sh/@profullstack/[email protected]/src/transitions.js';
1212
import * as renderer from 'https://esm.sh/@profullstack/[email protected]/src/renderer.js';
1313
import * as componentLoader from 'https://esm.sh/@profullstack/[email protected]/src/component-loader.js';
14-
export { Router, transitions, renderer, componentLoader };
14+
export { VRRouter, transitions, renderer, componentLoader };
1515

1616
// Import and re-export enhanced-router
1717
export * as enhancedRouter from 'https://esm.sh/@profullstack/[email protected]';

webxr/src/ui/vr-router.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* allowing for different "scenes" or "views" within the VR environment.
66
*/
77

8-
import { Router } from '/webxr/js/deps.js';
8+
import { VRRouter as SPARouter } from '/webxr/js/deps.js';
99

1010
export class VRRouter extends HTMLElement {
1111
constructor() {
@@ -69,7 +69,7 @@ export class VRRouter extends HTMLElement {
6969
};
7070

7171
// Initialize the router
72-
this.router = new Router(routerConfig);
72+
this.router = new SPARouter(routerConfig);
7373

7474
// Navigate to the initial route
7575
const initialRoute = this.getAttribute('initial-route') || '/';

0 commit comments

Comments
 (0)