+
+ {children}
+
+
+ ` that actually receives the
+ // overflow styles until after the first paint. On the initial frame the ancestor walk returns `null`,
+ // so we retry a handful of times via rAF to ensure we subscribe once Material-UI finishes mounting.
+ const tryAttach = () => {
+ if (this.sidebarScrollArea) return; // already attached
+ const container = this.containerRef.current;
+ const el = container ? getScrollableAncestor(container) : null;
+ if (el) {
+ this.sidebarScrollArea = el;
+ if (this.sidebarScrollArea.addEventListener) {
+ this.sidebarScrollArea.addEventListener("scroll", this.handleSidebarScrolling, { passive: true });
+ }
+ this.handleSidebarScrolling();
+ return;
+ }
+ if (this.attachAttemptsLeft > 0) {
+ this.attachAttemptsLeft -= 1;
+ this.rafId = requestAnimationFrame(tryAttach);
+ }
+ };
+
+ this.attachAttemptsLeft = 5;
+ tryAttach();
+ window.addEventListener("resize", this.handleSidebarScrolling);
+ // Defer initial compute to ensure layout stabilized
+ this.rafId = requestAnimationFrame(this.handleSidebarScrolling);
+ }
+
+ componentWillUnmount() {
+ if (this.rafId) cancelAnimationFrame(this.rafId);
+ if (this.sidebarScrollArea && this.sidebarScrollArea.removeEventListener) {
+ this.sidebarScrollArea.removeEventListener("scroll", this.handleSidebarScrolling);
+ }
+ window.removeEventListener("resize", this.handleSidebarScrolling);
+ }
+
render() {
if (configs.ITA_SERVER == "turkey") {
return (
-
-
+
- Scene management +
- Avatar management +
- User accounts +
- Server configuration +
- Hamburger menu toggle +
- Collapsible sidebar +
- Touch-friendly interface +
- Responsive navigation +
- {getMessageComponent(message, intl)} + ))} +
-
+
+ {permissionMessage( + { + permission: message.body.permission, + status: message.body.status + }, + intl + )} + +
))}
- do a two-finger tap to open the menu on their avatar,
- then tap the {hide} button or the volume buttons on their avatar.
- do a two-finger tap to open the menu on their avatar,
- then tap the {hide} button or the volume buttons on their avatar.
- press {tab} to open the menu on their avatar,
- then click the {hide} button or the volume buttons on their avatar.
- press {tab} to open the menu on their avatar,
- then click the {hide} button or the volume buttons on their avatar.
- hold down {A} or {X} on a controller to open the menu on their avatar,
- then tap the {hide} button or the volume buttons on their avatar.
- hold down {A} or {X} on a controller to open the menu on their avatar,
- then tap the {hide} button or the volume buttons on their avatar.
-
+
+
+);
+
+// Default layout story
+export const DefaultLayout = {
+ render: () => {
+ const history = createMemoryHistory();
+
+ const customLayout = props => (
+ Hubs Admin Panel
++ This is the default admin layout with React Admin v3.19.12 and ResponsiveAppBar integration. + On mobile devices, you'll see a hamburger menu in the top bar to toggle the sidebar. +
+ +
+
+ Admin Features
+-
+
+ {React.createElement(customLayout, {
+ children:
+
+ {React.createElement(customLayout, {
+ children: (
+
+
+
+ )
+ })}
+ Mobile View
++ This demonstrates the mobile responsive AppBar with hamburger menu. + Click the hamburger (☰) icon in the top bar to toggle the sidebar. +
+ +
+
+ Mobile Features
+-
+
+
+
+
+ {chunks}
}} /> {showNewsletterSignup && ( diff --git a/src/react-components/auth/SignInModal.stories.js b/src/react-components/auth/SignInModal.stories.js index ca2a5a8ad7..89f71429f1 100644 --- a/src/react-components/auth/SignInModal.stories.js +++ b/src/react-components/auth/SignInModal.stories.js @@ -44,7 +44,7 @@ export const RoomSubmit = () => (
{sender} |
- {messages.map(message => getMessageComponent(message, intl))}
-
+ {messages.map(message => (
+
-
{messages.map(message => (
-
+
+
+
}
/>
);
@@ -24,10 +25,12 @@ export const Base = () => (
export const Active = () => (
+
+
+
}
/>
);
@@ -35,9 +38,11 @@ export const Active = () => (
export const OnlyPeople = () => (
+
+
+
}
/>
);
diff --git a/src/react-components/room/EnterOnDeviceModal.stories.js b/src/react-components/room/EnterOnDeviceModal.stories.js
index 544816a7fc..03c910f932 100644
--- a/src/react-components/room/EnterOnDeviceModal.stories.js
+++ b/src/react-components/room/EnterOnDeviceModal.stories.js
@@ -19,4 +19,4 @@ export const VrNotSupported = () => (
- {entries.map(entry => {
- return (
-
-
+
+
+
+
}
/>
);
diff --git a/src/react-components/room/NotificationsContainer.js b/src/react-components/room/NotificationsContainer.js
index ddf1faa292..aab3e37c30 100644
--- a/src/react-components/room/NotificationsContainer.js
+++ b/src/react-components/room/NotificationsContainer.js
@@ -2,12 +2,13 @@ import React from "react";
import PropTypes from "prop-types";
import classNames from "classnames";
import styles from "./NotificationsContainer.scss";
+import isMobile from "../../utils/is-mobile";
-const isMobile = AFRAME.utils.device.isMobile();
+const isMobileDevice = isMobile();
export function NotificationsContainer({ className, children, ...rest }) {
return (
-
+ {entries.map(entry => {
+ return (
+
+
+
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
+
+ Test
+
}
- sidebar={Sketchfab or in our collection ."
values={{
- // eslint-disable-next-line react/display-name
sketchfablink: chunks => (
),
- // eslint-disable-next-line react/display-name
+
collectionlink: chunks => (
{chunks}
@@ -68,7 +67,6 @@ export function ObjectUrlModal({ showModelCollectionLink, modelCollectionUrl, on
id="object-url-modal.message"
defaultMessage="Upload or paste a link to an image, video, model, or scene. Models can be found on Sketchfab ."
values={{
- // eslint-disable-next-line react/display-name
sketchfablink: chunks => (
(
{objects.map(object => (
@@ -55,6 +56,7 @@ export const Base = () => (
export const Empty = () => (
console.log(e)} canChangeScene />} />
+ console.log(e)} canChangeScene />}
+ />
);
diff --git a/src/react-components/room/RoomSidebar.stories.js b/src/react-components/room/RoomSidebar.stories.js
index 5e3f25cbf1..cd6a869476 100644
--- a/src/react-components/room/RoomSidebar.stories.js
+++ b/src/react-components/room/RoomSidebar.stories.js
@@ -42,10 +42,21 @@ const room = {
}
};
-export const SceneOwner = () =>
),
- // eslint-disable-next-line react/display-name
+
glblink: chunks => (
{chunks}
@@ -45,7 +45,6 @@ export function SceneUrlModal({ enableSpoke, editorName, onValidateUrl, onSubmit
id="scene-url-modal.message"
defaultMessage="Paste a URL to a scene or a URL to a GLB ."
values={{
- // eslint-disable-next-line react/display-name
glblink: chunks => (
{chunks}
diff --git a/src/react-components/room/SpectatingLabel.stories.js b/src/react-components/room/SpectatingLabel.stories.js
index 6eaa405fd7..571c31fe43 100644
--- a/src/react-components/room/SpectatingLabel.stories.js
+++ b/src/react-components/room/SpectatingLabel.stories.js
@@ -9,4 +9,12 @@ export default {
}
};
-export const Base = () =>
+
+ }
+ />
+);
diff --git a/src/react-components/room/Tip.stories.js b/src/react-components/room/Tip.stories.js
index 5986933027..9306298785 100644
--- a/src/react-components/room/Tip.stories.js
+++ b/src/react-components/room/Tip.stories.js
@@ -25,18 +25,24 @@ Tips.propTypes = {
step: PropTypes.string
};
+// Test cases where the actual software works fine, but the Storybook is wrong, have been commented out.
+// Test cases that are identical to desktop cases haven't been created.
const TOOLTIP_STEPS = {
"tips.desktop.welcome": "Desktop Welcome Message",
"tips.desktop.locomotion": "Desktop Locomotion",
"tips.desktop.turning": "Desktop Turning",
+ "tips.desktop.defense": "Desktop Defense",
"tips.desktop.invite": "Desktop Invite",
"tips.desktop.end": "Desktop End",
"tips.desktop.menu": "Desktop Menu",
- "tips.mobile.welcome": "Mobile Welcome Message",
- "tips.mobile.locomotion": "Mobile Locomotion",
- "tips.mobile.turning": "Mobile Turning",
- "tips.mobile.end": "Mobile End",
- "tips.mobile.menu": "Mobile Menu"
+ // "tips.mobile.locomotion": "Mobile Locomotion",
+ // "tips.mobile.turning": "Mobile Turning",
+ // "tips.mobile.defense": "Mobile Defense",
+ // "tips.mobile.menu": "Mobile Menu",
+ "tips.standalone.locomotion": "Standalone Locomotion",
+ "tips.standalone.turning": "Standalone Turning",
+ "tips.standalone.defense": "Standalone Defense",
+ "tips.standalone.invite": "Standalone Invite"
};
export const Tooltips = ({ step }) =>
{children}
);
diff --git a/src/react-components/room/ObjectMenu.stories.js b/src/react-components/room/ObjectMenu.stories.js
index 6d7eef3d1a..448bf51073 100644
--- a/src/react-components/room/ObjectMenu.stories.js
+++ b/src/react-components/room/ObjectMenu.stories.js
@@ -1,5 +1,6 @@
/* eslint-disable @calm/react-intl/missing-formatted-message */
import React from "react";
+import { Column } from "../layout/Column";
import { RoomLayout } from "../layout/RoomLayout";
import { ReactComponent as PinIcon } from "../icons/Pin.svg";
import { ReactComponent as LinkIcon } from "../icons/Link.svg";
@@ -16,24 +17,26 @@ export const Base = () => (
+
+
+
+
+
+
+
+
+
+
+
}
/>
);
@@ -42,25 +45,31 @@ export const WithSidebarOpen = () => (
+
+
+
+
+
+
+
+
+
+
+
+ }
+ sidebar={
+ Hubs requires microphone permissions in Safari.
Please reload and allow microphone access to continue.
" values={{ - // eslint-disable-next-line react/display-name p: chunks =>{chunks}
}} /> diff --git a/src/react-components/room/SceneUrlModal.js b/src/react-components/room/SceneUrlModal.js index 56f244fc47..c33691513a 100644 --- a/src/react-components/room/SceneUrlModal.js +++ b/src/react-components/room/SceneUrlModal.js @@ -32,7 +32,7 @@ export function SceneUrlModal({ enableSpoke, editorName, onValidateUrl, onSubmit {editorName}Welcome to {appName}
Let's take a quick look to get comfortable with the controls
" + defaultMessage: "Welcome to {appName}
Let's take a quick look to get comfortable with the controls
" }, "tips.mobile.locomotion": { id: "tips.mobile.locomotion", @@ -53,11 +52,13 @@ const onboardingMessages = defineMessages({ }, "tips.mobile.defense": { id: "tips.mobile.defense", - defaultMessage: "If you find an avatar being a nuisance
or too loud or soft,
If you find an avatar being a nuisance
or too loud or soft,
No one else is here.
Tap the {invite} button in the lower left or select Invite from the {menu} menu to share this room.
" + defaultMessage: + "No one else is here.
Tap the {invite} button in the lower left or select Invite from the {menu} menu to share this room.
" }, "tips.desktop.locomotion": { id: "tips.desktop.locomotion", @@ -69,7 +70,8 @@ const onboardingMessages = defineMessages({ }, "tips.desktop.defense": { id: "tips.desktop.defense", - defaultMessage: "If you find an avatar being a nuisance
or too loud or soft,
If you find an avatar being a nuisance
or too loud or soft,
If you find an avatar being a nuisance
or too loud or soft,
If you find an avatar being a nuisance
or too loud or soft,
No one else is here.
To share this room, exit VR then click the {invite} button in the lower left.
" + defaultMessage: + "No one else is here.
To share this room, exit VR then click the {invite} button in the lower left.
" }, "tips.end": { id: "tips.end", @@ -130,7 +134,7 @@ function isStep(step, item) { } function maxSteps(step) { - return isStep(step, "desktop") ? 4 : (isStep(step, "mobile") ? 4 : 4); + return isStep(step, "desktop") ? 4 : isStep(step, "mobile") ? 4 : 4; } function Key({ children }) { @@ -314,11 +318,9 @@ function onboardingSteps({ intl, step }) { ol: chunks =>- {chunks}
{chunks}
, @@ -357,7 +362,12 @@ function onboardingSteps({ intl, step }) { type: Step, params: { p: chunks =>{chunks}
, - menu:{chunks}
, p2: chunks =>{chunks}
, - B: ({chunks}
, + p: chunks =>{chunks}
} }, navigationBar: { @@ -415,7 +425,7 @@ function onboardingSteps({ intl, step }) { control: { type: Step, params: { - p: chunks =>{chunks}
, + p: chunks =>{chunks}
}, messageId: "tips.end" } diff --git a/src/react-components/room/UserProfileSidebar.stories.js b/src/react-components/room/UserProfileSidebar.stories.js index e320b7cb33..9e6f1e25af 100644 --- a/src/react-components/room/UserProfileSidebar.stories.js +++ b/src/react-components/room/UserProfileSidebar.stories.js @@ -11,6 +11,7 @@ export default { export const AllPermissions = () => (
-
- url ? (
-
- {chunks}
-
- ) : (
- <>{chunks}
- )
- }}
- />
- ;
+ return (
+
+
+ url ? (
+
+ {chunks}
+
+ ) : (
+ <>{chunks}
+ )
+ }}
+ />
+
+ );
} else if (source) {
return (
diff --git a/src/react-components/scene-ui.stories.js b/src/react-components/scene-ui.stories.js
new file mode 100644
index 0000000000..203f2f8f41
--- /dev/null
+++ b/src/react-components/scene-ui.stories.js
@@ -0,0 +1,74 @@
+import React from "react";
+import SceneUI from "./scene-ui";
+
+export default {
+ title: "scene-ui",
+ parameters: {
+ layout: "fullscreen"
+ }
+};
+
+export const Base = () => (
+
- Test
+ console.log("back button pressed")} />}>
+ Column component
}
/>
diff --git a/src/react-components/tokens/Tokens.stories.js b/src/react-components/tokens/Tokens.stories.js
index d527487449..3a2caf6d3c 100644
--- a/src/react-components/tokens/Tokens.stories.js
+++ b/src/react-components/tokens/Tokens.stories.js
@@ -16,34 +16,34 @@ const scopes = ["read_rooms", "write_rooms", "another_long_scope_here"];
const dummyTokens = [
{
- account_id: "1234567890",
+ account_id: 1234567890,
id: "1",
- inserted_at: 1234,
+ inserted_at: "2023-08-19T10:30:00Z",
is_revoked: false,
scopes: ["write_rooms", "read_rooms"],
subject_type: "app",
token: "(Redacted)",
- updated_at: 1234
+ updated_at: "2023-08-19T10:30:00Z"
},
{
- account_id: "1123456789",
+ account_id: 1123456789,
id: "2",
- inserted_at: 1234,
+ inserted_at: "2023-08-18T15:45:00Z",
is_revoked: false,
scopes: ["write_rooms", "read_rooms"],
subject_type: "account",
token: "(Redacted)",
- updated_at: 1234
+ updated_at: "2023-08-18T15:45:00Z"
},
{
- account_id: "1234567890",
+ account_id: 1234567890,
id: "3",
- inserted_at: 1234,
+ inserted_at: "2023-08-17T09:15:00Z",
is_revoked: false,
scopes: ["write_rooms", "read_rooms"],
subject_type: "account",
token: "(Redacted)",
- updated_at: 1234
+ updated_at: "2023-08-17T09:15:00Z"
}
];
@@ -70,27 +70,26 @@ export const NoAccessPage = () => {
export const TokenListPage = ({ children }) => (
{children}
-
);
export const EmptyTokenListPage = () => (
-
);
export const RevokeTokenModalPage = () => (
-
);
-// eslint-disable-next-line react/prop-types
export function ModalRevokeToken() {
- return
{children}
-
);
export const ModalSaveTokenPage = () => (
-
-
);
diff --git a/src/react-components/ui-root.js b/src/react-components/ui-root.js
index 99be6fe365..f8daf23c1d 100644
--- a/src/react-components/ui-root.js
+++ b/src/react-components/ui-root.js
@@ -1131,7 +1131,8 @@ class UIRoot extends Component {
const canCreateRoom = !configs.feature("disable_room_creation") || configs.isAdmin();
const canCloseRoom = this.props.hubChannel && !!this.props.hubChannel.canOrWillIfCreator("close_hub");
- const isModerator = this.props.hubChannel && this.props.hubChannel.canOrWillIfCreator("kick_users") && !isThisMobileVR;
+ const isModerator =
+ this.props.hubChannel && this.props.hubChannel.canOrWillIfCreator("kick_users") && !isThisMobileVR;
const moreMenu = [
{
diff --git a/src/react-components/video-message.js b/src/react-components/video-message.js
index 07688a6e4b..5f5e9f57d1 100644
--- a/src/react-components/video-message.js
+++ b/src/react-components/video-message.js
@@ -33,7 +33,7 @@ export default function VideoMessage({ name, body: { src: url }, className, mayS
defaultMessage="{name} took a video."
values={{
name: {name},
- // eslint-disable-next-line react/display-name
+
a: chunks => (
diff --git a/src/scene-entry-manager.js b/src/scene-entry-manager.js
index 810eba7565..843da88a6f 100644
--- a/src/scene-entry-manager.js
+++ b/src/scene-entry-manager.js
@@ -337,7 +337,7 @@ export default class SceneEntryManager {
// Sometimes dataTransfer text contains a valid URL, so try for that.
try {
url = new URL(e.dataTransfer.getData("text")).href;
- } catch (e) {
+ } catch {
// Nope, not this time.
}
}
@@ -541,8 +541,8 @@ export default class SceneEntryManager {
const audioStream = audioEl.captureStream
? audioEl.captureStream()
: audioEl.mozCaptureStream
- ? audioEl.mozCaptureStream()
- : null;
+ ? audioEl.mozCaptureStream()
+ : null;
if (audioStream) {
let audioVolume = Number(qs.get("audio_volume") || "1.0");
diff --git a/src/subscriptions.js b/src/subscriptions.js
index dc43e0bf3b..837840bb7f 100644
--- a/src/subscriptions.js
+++ b/src/subscriptions.js
@@ -89,6 +89,7 @@ export default class Subscriptions {
)
return null;
} catch (e) {
+ console.warn("failed to set push notification manager permissions state ", e);
return null; // Chrome can throw here complaining about userVisible if push is not right
}
const sub = await this.registration.pushManager.getSubscription();
diff --git a/src/support.js b/src/support.js
index 8769d72c96..65668097c6 100644
--- a/src/support.js
+++ b/src/support.js
@@ -24,6 +24,7 @@ function syntaxSupported(syntax) {
eval(syntax);
return true;
} catch (e) {
+ console.warn("syntax unsupported: ", e);
return false;
}
}
diff --git a/src/systems/character-controller-system.js b/src/systems/character-controller-system.js
index c4203e9609..546fd26e25 100644
--- a/src/systems/character-controller-system.js
+++ b/src/systems/character-controller-system.js
@@ -266,8 +266,8 @@ export class CharacterControllerSystem {
(preferences.disableMovement
? 0
: preferences.disableBackwardsMovement
- ? Math.min(0, zCharacterAcceleration)
- : zCharacterAcceleration)
+ ? Math.min(0, zCharacterAcceleration)
+ : zCharacterAcceleration)
);
}
const lerpC = vrMode ? 0 : 0.85; // TODO: To support drifting ("ice skating"), motion needs to keep initial direction
diff --git a/src/systems/tips.js b/src/systems/tips.js
index ec09e3160c..ef06b2817d 100644
--- a/src/systems/tips.js
+++ b/src/systems/tips.js
@@ -28,7 +28,7 @@ let localStorageCache = null;
let finished = false; // Optimization, lets system skip altogether once finished.
const isMobile = AFRAME.utils.device.isMobile();
-const isThisMobileVR = AFRAME.utils.device.isMobileVR(); // used every tick
+const isThisMobileVR = AFRAME.utils.device.isMobileVR(); // used every tick
const tipPlatform = () => {
if (isThisMobileVR) return "standalone";
diff --git a/src/systems/userinput/userinput.js b/src/systems/userinput/userinput.js
index 5c3f62a614..268facc1b9 100644
--- a/src/systems/userinput/userinput.js
+++ b/src/systems/userinput/userinput.js
@@ -439,16 +439,19 @@ AFRAME.registerSystem("userinput", {
gamepadDisconnected(inputSource);
}
for (const inputSource of added) {
- inputSource.gamepad.isWebXRGamepad = true;
- inputSource.gamepad.targetRaySpace = inputSource.targetRaySpace;
- inputSource.gamepad.primaryProfile = inputSource.profiles[0];
- // inputSource.gamepad.hand is a read-only property and still an experimental property.
- // We read this property elsewhere. Only Firefox supports this property now.
- // So we set this property if it's undefined.
- if (inputSource.gamepad.hand === undefined) {
- inputSource.gamepad.hand = inputSource.handedness;
+ // inputSource.gamepad is null if the device isn't gamepad-like
+ if (inputSource.gamepad) {
+ inputSource.gamepad.isWebXRGamepad = true;
+ inputSource.gamepad.targetRaySpace = inputSource.targetRaySpace;
+ inputSource.gamepad.primaryProfile = inputSource.profiles[0];
+ // inputSource.gamepad.hand is a read-only property and still an experimental property.
+ // We read this property elsewhere. Only Firefox supports this property now.
+ // So we set this property if it's undefined.
+ if (inputSource.gamepad.hand === undefined) {
+ inputSource.gamepad.hand = inputSource.handedness;
+ }
+ gamepadConnected(inputSource);
}
- gamepadConnected(inputSource);
}
};
diff --git a/src/systems/waypoint-system.js b/src/systems/waypoint-system.js
index 5354c0a630..6075a9f921 100644
--- a/src/systems/waypoint-system.js
+++ b/src/systems/waypoint-system.js
@@ -28,7 +28,10 @@ const calculateIconTransform = (function () {
} else {
scale = 0.1 + 0.05 * distance;
}
- forward.copy(camToWaypoint).projectOnPlane(up.set(0, 1, 0)).normalize();
+ forward
+ .copy(camToWaypoint)
+ .projectOnPlane(up.set(0, 1, 0))
+ .normalize();
return outMat4
.makeBasis(
diff --git a/src/utils/is-mobile.js b/src/utils/is-mobile.js
index e8281e7e6c..358a9129f9 100644
--- a/src/utils/is-mobile.js
+++ b/src/utils/is-mobile.js
@@ -43,7 +43,6 @@ export function isMobileVR() {
const isMobile = (function () {
let _isMobile = false;
(function (a) {
- // eslint-disable-next-line no-useless-escape
if (MOBILE_RE.test(a) || TABLET_RE.test(a.substr(0, 4))) {
_isMobile = true;
}
diff --git a/src/utils/media-url-utils.js b/src/utils/media-url-utils.js
index f917ad175c..17fab20ab0 100644
--- a/src/utils/media-url-utils.js
+++ b/src/utils/media-url-utils.js
@@ -48,6 +48,7 @@ export const scaledThumbnailUrlFor = (url, width, height) => {
}
}
} catch (e) {
+ console.warn("couldn't determine thumbnail media type, falling back to png. ", e);
extension = ".png";
}
@@ -64,6 +65,7 @@ export const scaledThumbnailUrlFor = (url, width, height) => {
if (retHostname === urlHostname) return url;
}
} catch (e) {
+ console.warn("couldn't parse server URL ", e);
return thumbnailUrl;
}
@@ -81,7 +83,7 @@ export const proxiedUrlFor = url => {
try {
const parsedUrl = new URL(url);
if (isNonCorsProxyDomain(parsedUrl.hostname)) return url;
- } catch (e) {
+ } catch {
// Ignore
}
@@ -177,6 +179,7 @@ async function isHubsServer(url) {
try {
isHubsServer = (await fetch(proxiedUrlFor(origin), { method: "HEAD" })).headers.has("hub-name");
} catch (e) {
+ console.warn("couldn't fetch hubs server ", e);
isHubsServer = false;
}
originIsHubsServer.set(origin, isHubsServer);
diff --git a/src/utils/media-utils.js b/src/utils/media-utils.js
index 466b78e2f7..a72a58dabd 100644
--- a/src/utils/media-utils.js
+++ b/src/utils/media-utils.js
@@ -70,7 +70,7 @@ export const resolveUrl = async (url, quality = null, version = 1, bustCache) =>
try {
const body = await response.text();
throw new Error(message + " " + body);
- } catch (e) {
+ } catch {
throw new Error(message + " " + response.statusText);
}
}
@@ -593,10 +593,11 @@ export function parseURL(text) {
let url;
try {
url = new URL(text);
- } catch (e) {
+ } catch {
try {
url = new URL(`https://${text}`);
} catch (e) {
+ console.warn("invalid URL ", e);
return null;
}
}
diff --git a/src/utils/phoenix-utils.js b/src/utils/phoenix-utils.js
index e484780b45..a2b2e08d49 100644
--- a/src/utils/phoenix-utils.js
+++ b/src/utils/phoenix-utils.js
@@ -191,7 +191,7 @@ export function fetchReticulumAuthenticatedWithToken(token, url, method = "GET",
const result = await r.text();
try {
return JSON.parse(result);
- } catch (e) {
+ } catch {
// Some reticulum responses, particularly DELETE requests, don't return json.
return result;
}
diff --git a/src/utils/vr-caps-detect.js b/src/utils/vr-caps-detect.js
index 6ebba5c51a..daaa2d0379 100644
--- a/src/utils/vr-caps-detect.js
+++ b/src/utils/vr-caps-detect.js
@@ -84,8 +84,8 @@ export async function getAvailableVREntryTypes() {
const screen = isThisMobileVR
? VR_DEVICE_AVAILABILITY.no
: isIDevice && isUIWebView
- ? VR_DEVICE_AVAILABILITY.maybe
- : VR_DEVICE_AVAILABILITY.yes;
+ ? VR_DEVICE_AVAILABILITY.maybe
+ : VR_DEVICE_AVAILABILITY.yes;
// HACK -- we prompt the user to install firefox if they click the VR button on a non-WebVR compatible
// browser. Without this check if you have FF on Mac/Linux you'll get the confusing flow of having a
diff --git a/tsconfig.json b/tsconfig.json
index 60088b491a..3198a7f5bb 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -4,13 +4,20 @@
"noImplicitAny": true,
"strictNullChecks": true,
"moduleResolution": "node",
- "module": "es6",
- "target": "es6",
+ "moduleDetection": "auto",
+ "module": "es2020",
+ "target": "es2020",
"jsx": "react",
+ "allowSyntheticDefaultImports": true,
+ // TODO: enable and work through the many trivial issues
+ // "importsNotUsedAsValues": "error",
+ // "preserveValueImports": true,
+ // "strict": false,
"allowJs": true,
"noEmit": true,
"isolatedModules": true,
"esModuleInterop": true,
+ "forceConsistentCasingInFileNames": true,
"skipLibCheck": true,
"typeRoots": ["./node_modules/@types", "./types"]
},
diff --git a/webpack.config.js b/webpack.config.js
index 0a3f660491..0d9477b699 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -302,6 +302,17 @@ module.exports = async (env, argv) => {
three$: path.resolve(__dirname, "./node_modules/three/build/three.module.js"),
bitecs$: path.resolve(__dirname, "./node_modules/bitecs/dist/index.mjs"),
+ // UMD libraries that need explicit module resolution to work with ES6 imports
+ "js-cookie": path.resolve(__dirname, "./node_modules/js-cookie/src/js.cookie.js"),
+ "jwt-decode": path.resolve(__dirname, "./node_modules/jwt-decode/lib/index.js"),
+ "event-target-shim": path.resolve(__dirname, "./node_modules/event-target-shim/dist/event-target-shim.mjs"),
+ "linkify-it": path.resolve(__dirname, "./node_modules/linkify-it/index.js"),
+ "hls.js": path.resolve(__dirname, "./node_modules/hls.js/dist/hls.js"),
+ "url-toolkit": path.resolve(__dirname, "./node_modules/url-toolkit/src/url-toolkit.js"),
+
+ // Fix for pdfjs-dist v4 ES module imports
+ "process/browser": path.resolve(__dirname, "./node_modules/process/browser.js"),
+
// TODO these aliases are reequired because `three` only "exports" stuff in examples/jsm
"three/examples/js/libs/basis/basis_transcoder.js": basisTranscoderPath,
"three/examples/js/libs/draco/gltf/draco_wasm_wrapper.js": dracoWasmWrapperPath,
@@ -317,10 +328,11 @@ module.exports = async (env, argv) => {
// Buffer on the global object if it exists, so webpack will polyfill on its behalf
Buffer: false,
fs: false,
- stream: require.resolve("stream-browserify"),
- path: require.resolve("path-browserify")
+ // Modern browsers have these APIs natively, no need for polyfills
+ stream: false,
+ path: false
},
- extensions: [".ts", ".tsx", ".js", ".jsx"]
+ extensions: [".mjs", ".ts", ".tsx", ".js", ".jsx"]
},
entry: {
support: path.join(__dirname, "src", "support.js"),
@@ -341,10 +353,7 @@ module.exports = async (env, argv) => {
filename: "assets/js/[name]-[chunkhash].js",
publicPath: process.env.BASE_ASSETS_PATH || ""
},
- optimization: {
- minimize: argv.mode === "production" ? true : false
- },
- target: ["web", "es5"], // use es5 for webpack runtime to maximize compatibility
+ target: ["web", "es2020"], // use es2020 for modern browsers as defined in browserslistrc
devtool: argv.mode === "production" ? "source-map" : "inline-source-map",
devServer: {
client: {
@@ -431,6 +440,22 @@ module.exports = async (env, argv) => {
},
module: {
rules: [
+ // Force CommonJS handling for specific problematic modules - must be first rule
+ {
+ test: /\.js$/,
+ include: function (modulePath) {
+ // More comprehensive matching for CommonJS modules
+ return /node_modules[/\\](es-errors|side-channel|qs|jsonschema|url|punycode|querystring|has-symbols|function-bind|get-intrinsic|call-bind|define-properties|has-property-descriptors|gopd|object-inspect)/.test(
+ modulePath
+ );
+ },
+ type: "javascript/auto",
+ parser: {
+ requireEnsure: false,
+ requireInclude: false,
+ amd: false
+ }
+ },
{
test: /\.html$/,
loader: "html-loader",
@@ -446,7 +471,7 @@ module.exports = async (env, argv) => {
}
}
},
- // On legacy browsers we want to show a "unsupported browser" page. That page needs to run on older browsers so w set the targeet to ie11.
+ // On legacy browsers we want to show a "unsupported browser" page. That page needs to run on older browsers so w set the target to ie11.
// Note: We do not actually include any polyfills so the code in these files just needs to be written with bare minimum browser APIs
{
test: [
@@ -488,11 +513,15 @@ module.exports = async (env, argv) => {
loader: "babel-loader"
},
// pdfjs uses features that break in IOS14, so we want to run it through babel https://github.com/mozilla/pdf.js/issues/14327
- // TODO remove when iOS 16 is out as we support last 2 major versions in our .browserslistrc so this will become a noop in terms of fixing that error
+ // Also handle .mjs files from pdfjs-dist v4
{
- test: /\.js$/,
+ test: /\.(js|mjs)$/,
include: [path.resolve(__dirname, "node_modules", "pdfjs-dist")],
- loader: "babel-loader"
+ loader: "babel-loader",
+ type: "javascript/auto",
+ resolve: {
+ fullySpecified: false
+ }
},
{
// We use babel to handle typescript so that features are correctly polyfilled for our targeted browsers. It also ends up being
@@ -593,6 +622,7 @@ module.exports = async (env, argv) => {
]
},
optimization: {
+ minimize: argv.mode === "production",
splitChunks: {
maxAsyncRequests: 10,
maxInitialRequests: 10,
+
@@ -87,24 +87,26 @@ class SceneUI extends Component {
source = url && url.includes("sketchfab.com") ? "Sketchfab" : "";
if (remix) {
-
-