Merge pull request #1232 from mozilla/remove-aframe-default-components

Don't need to disable aframe default components

package.json

@@ -43,7 +43,6 @@
     "@fortawesome/react-fontawesome": "^0.1.0",
     "aframe": "github:mozillareality/aframe#hubs/master",
     "aframe-billboard-component": "^2.0.0",
-    "aframe-inspector": "^0.8.3",
     "aframe-physics-system": "github:mozillareality/aframe-physics-system#hubs/ammo_driver",
     "aframe-rounded": "^1.0.3",
     "aframe-slice9-component": "^1.0.0",

src/hub.html

@@ -49,7 +49,6 @@
         action-to-event__mute="path: /actions/muteMic; event: action_mute;"
         freeze-controller="toggleEvent: action_freeze"
         personal-space-bubble="debug: false;"
-        vr-mode-ui="enabled: false"
         stats-plus="false"
         rotate-selected-object
         environment-map="loadDefault: false"

src/hub.js

@@ -536,7 +536,6 @@ document.addEventListener("DOMContentLoaded", async () => {
   }
 
   const scene = document.querySelector("a-scene");
-  scene.removeAttribute("keyboard-shortcuts"); // Remove F and ESC hotkeys from aframe
   scene.setAttribute("shadow", { enabled: window.APP.quality !== "low" }); // Disable shadows on low quality
 
   // Physics needs to be ready before spawning anything.

src/react-components/avatar-selector.js

@@ -154,7 +154,6 @@ class AvatarSelector extends Component {
     return (
       <div className="avatar-selector">
         <a-scene
-          vr-mode-ui="enabled: false"
           ref={sce => (this.scene = sce)}
           background="color: #aaa"
           environment-map=""

src/scene-entry-manager.js

@@ -7,7 +7,6 @@ const isBotMode = qsTruthy("bot");
 const isMobile = AFRAME.utils.device.isMobile();
 const isDebug = qsTruthy("debug");
 const qs = new URLSearchParams(location.search);
-const aframeInspectorUrl = require("file-loader?name=assets/js/[name]-[hash].[ext]!aframe-inspector/dist/aframe-inspector.min.js");
 
 import { addMedia, getPromotionTokenForFile } from "./utils/media-utils";
 import {
@@ -52,10 +51,6 @@ export default class SceneEntryManager {
     playerCamera.removeAttribute("scene-preview-camera");
     playerCamera.object3D.position.set(0, playerHeight, 0);
 
-    // Get aframe inspector url using the webpack file-loader.
-    // Set the aframe-inspector url to our hosted copy.
-    this.scene.setAttribute("inspector", { url: aframeInspectorUrl });
-
     if (isDebug) {
       NAF.connection.adapter.session.options.verbose = true;
     }

src/scene.html

@@ -41,7 +41,6 @@
         loading-screen="enabled: false"
         renderer="antialias: true; gammaOutput: true; sortObjects: true; physicallyCorrectLights: true; colorManagement: true; alpha: false;"
         shadow="type: pcfsoft"
-        vr-mode-ui="enabled: false"
         environment-map="loadDefault: false"
     >
         <a-entity