Merge branch 'dev' into michael/IR-1983-Highlight

* dev: (63 commits)
  hotfix vrm0 data not being where we expect it (#10236)
  Update tween.js version (#10241)
  Added ProjectPermissionDatabaseType
  physics bug fix (#10221)
  updated the background to use the color with when in wireframe render mode (#10231)
  vrm expressionmanager was being thrown away it is actually needed for viseme support to work (#10230)
  IR-1887-Asset-Preview-breaking-if-you-click-gltf-that-is-in-the-scene (#10208)
  query function fix (#10229)
  IR-2102 Material/Plugin Parameters (#10180)
  Fixed webcam light not turning off when camera paused. (#10224)
  Made client's server.js not bound to a specific host (#10223)
  Update FeathersHooks.tsx (#10228)
  Updated app name
  feat(setup): update logo and components props (#10204)
  Changes for feature flag schema to be string enum (#10225)
  Cleaned location hooks (#10216)
  Ir 1652 interactable input refactor (#10219)
  IR-2018 Refactor the Select component to disable search functionality for the dropdown only (#10206)
  refactor: Update Primus initialization to include pathname in server URL (#10205)
  Move physics enter/exit back to reactors (#10193)
  ...

# Conflicts:
#	packages/editor/src/components/element/ElementList.tsx
#	packages/editor/src/components/properties/PostProcessingSettingsEditor.tsx
#	packages/engine/src/scene/SceneModule.ts
#	packages/spatial/src/renderer/components/PostProcessingComponent.tsx
#	packages/spatial/src/renderer/functions/configureEffectComposer.ts

.env.local.default

@@ -16,7 +16,7 @@ KEY=certs/key.pem
 # ALLOW_OUT_OF_DATE_PROJECTS=false
 
 # Client variables ---------------
-APP_TITLE="Ethereal Engine"
+APP_TITLE="IR Engine"
 APP_LOGO=https://etherealengine-static.s3-us-east-1.amazonaws.com/logo.png
 APP_URL=https://localhost:3000
 APP_HOST=localhost:3000
@@ -41,13 +41,13 @@ VITE_SERVER_PORT=3030
 VITE_CORS_SERVER_PORT=3035
 VITE_INSTANCESERVER_HOST=localhost
 VITE_INSTANCESERVER_PORT=3031
-VITE_FEATHERS_STORE_KEY=EtherealEngine-Auth-Store
+VITE_FEATHERS_STORE_KEY=IREngine-Auth-Store
 VITE_EMAILJS_SERVICE_ID=
 VITE_EMAILJS_TEMPLATE_ID=
 VITE_EMAILJS_USER_ID=
 VITE_ROOT_REDIRECT=false
 VITE_READY_PLAYER_ME_URL=https://xre.readyplayer.me
-VITE_AVATURN_URL="https://demo.avaturn.dev" #using public one 
+VITE_AVATURN_URL="https://demo.avaturn.dev" #using public one
 VITE_AVATURN_API=https://api.avaturn.me/
 VITE_PWA_ENABLED=false
 VITE_SOURCEMAPS=false
@@ -75,7 +75,6 @@ MYSQL_TEST_PORT=3305
 MYSQL_TEST_URL=
 # --------------------------------
 
-
 # Server variables ---------------
 SERVER_MODE=local
 SERVER_HOST=localhost
@@ -99,16 +98,13 @@ GOOGLE_ANALYTICS_TRACKING_ID=
 HUB_ENDPOINT=https://etherealengine.io
 INSTANCESERVER_UNREACHABLE_TIMEOUT_SECONDS=10
 
-
 MATCHMAKER_EMULATION_MODE=true
 # --------------------------------
 
-
 # Task server variables ---------------
 TASKSERVER_PORT=3033
 # --------------------------------
 
-
 # Kubernates ---------------------
 KUBERNETES=false
 KUBERNETES_SERVICE_HOST=
@@ -195,13 +191,11 @@ STORAGE_AWS_ACCESS_KEY_ID=server
 STORAGE_AWS_ACCESS_KEY_SECRET=password
 # --------------------------------
 
-
 # Chargebee variables ------------
 CHARGEBEE_SITE=etherealengine-test
 CHARGEBEE_API_KEY=
 # --------------------------------
 
-
 # Redish variables ---------------
 REDIS_ENABLED=true
 REDIS_ADDRESS=localhost

.github/workflows/ir-engine-dev-deploy.yml

@@ -0,0 +1,17 @@
+name: IR Engine Dev Deployment
+
+on:
+  push:
+    branches: [dev]
+
+jobs:
+  remote-dispatch-dev-deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Send Remote Dispatch to Deploy Dev
+        id: check-secrets-webhook
+        run: |
+          curl -H "Authorization: token ${{ secrets.IR_ORG_ACCESS_TOKEN }}" \
+              -H 'Accept: application/vnd.github.everest-preview+json' \
+              ${{ secrets.IR_ENGINE_OPS_API_URL }} \
+              -d '{"event_type": "deploy-dev"}'

.prettierrc.json

@@ -12,7 +12,7 @@
   "arrowParens": "always",
   "proseWrap": "never",
   "endOfLine": "lf",
-  "importOrder": ["<THIRD_PARTY_MODULES>", "", "^@etherealengine/(.*)$", "", "^@mui/(.*)$", "", "^[./]"],
-  "plugins": ["@ianvs/prettier-plugin-sort-imports", "prettier-plugin-organize-imports", "prettier-plugin-tailwindcss"],
+  "importOrder": ["<THIRD_PARTY_MODULES>", "", "^@etherealengine/(.*)$", "", "^[./]"],
+  "plugins": ["prettier-plugin-organize-imports", "@ianvs/prettier-plugin-sort-imports", "prettier-plugin-tailwindcss"],
   "tailwindFunctions": ["twMerge"]
 }

.vscode/launch.json

@@ -84,6 +84,12 @@
             "request": "launch",
             "type": "node-terminal",
         },
+        {
+            "command": "cd packages/editor && npm run test",
+            "name": "npm run test - editor",
+            "request": "launch",
+            "type": "node-terminal",
+        },
         {
             "command": "cd packages/spatial && npm run test",
             "name": "npm run test - spatial",

packages/client-core/i18n/en/admin.json

@@ -640,6 +640,7 @@
     },
     "server": {
       "servers": "Servers",
+      "migrations": "Migrations",
       "loading": "Fetching Server Info",
       "loadingLogs": "Fetching Server Logs",
       "name": "Name",
@@ -670,7 +671,13 @@
       "downloadLogs": "Download Logs",
       "removePod": "Remove Pod",
       "confirmPodDelete": "Do you want to delete pod",
-      "viewLogs": "View Logs"
+      "viewLogs": "View Logs",
+      "columns": {
+        "id": "ID",
+        "name": "Name",
+        "batch": "Batch",
+        "migration_time": "Migration Time"
+      }
     },
     "recording": {
       "columns": {

packages/client-core/i18n/en/editor.json

@@ -237,6 +237,14 @@
       "description": "Anchors this entity to a real life reference",
       "lbl-name": "Anchor Name"
     },
+    "input": {
+      "name": "Input Component",
+      "description": "Input component that listens for input events and passes them to InputSink components",
+      "lbl-activationDistance": "Proximity focus distance",
+      "lbl-sinkTarget": "Sink Target",
+      "lbl-addSinkTarget": "Add Sink Target",
+      "lbl-removeSinkTarget": "Remove Sink Target"
+    },
     "interactable": {
       "name": "Interactable",
       "description": "An interactable component with an optional XRUI with text of Label that can trigger callbacks",
@@ -1034,6 +1042,8 @@
       "copyURL": "Copy URL",
       "openInNewTab": "Open URL in New Tab",
       "deleteAsset": "Delete Asset",
+      "prefab": "Prefab",
+      "prefab-search" : "Search Prefabs ...",
       "components": "Components",
       "components-search": "Search Components ...",
       "component-detail": {
@@ -1119,7 +1129,8 @@
     "scene-assets": {
       "no-category": "No category selected",
       "search-placeholder": "Search for an asset ...",
-      "preview": "Preview"
+      "preview" : "Preview",
+      "info-drag-drop": "Drag and Drop these items into the scene"
     }
   },
   "hierarchy": {

packages/client-core/package.json

@@ -36,7 +36,7 @@
     "@feathersjs/client": "5.0.5",
     "@feathersjs/primus-client": "4.5.15",
     "@feathersjs/rest-client": "5.0.5",
-    "@hookstate/core": "4.0.0-rc21",
+    "@hookstate/core": "npm:@speigg/hookstate@4.0.1-fix-111-106.2",
     "@hookstate/localstored": "4.0.0-rc21",
     "@iconify/react": "4.1.0",
     "@mui/icons-material": "5.11.11",

packages/client-core/src/API.ts

@@ -50,7 +50,7 @@ export class API {
   static createAPI = () => {
     const feathersClient = feathers()
 
-    const primus = new Primus(config.client.serverUrl, {
+    const primus = new Primus(`${config.client.serverUrl}?pathName=${window.location.pathname}`, {
       withCredentials: true
     })
     feathersClient.configure(primusClient(primus, { timeout: 10000 }))

packages/client-core/src/admin/AllowedAdminRoutesState.tsx

@@ -23,9 +23,10 @@ All portions of the code written by the Ethereal Engine team are Copyright © 20
 Ethereal Engine. All Rights Reserved.
 */
 
-import { defineState } from '@etherealengine/hyperflux'
 import React from 'react'
 
+import { defineState } from '@etherealengine/hyperflux'
+
 export type AdminRouteStateType = {
   name: string
   scope: string | string[]

packages/client-core/src/admin/DefaultAdminRoutes.tsx

@@ -23,7 +23,6 @@ All portions of the code written by the Ethereal Engine team are Copyright © 20
 Ethereal Engine. All Rights Reserved.
 */
 
-import { clientSettingPath } from '@etherealengine/common/src/schema.type.module'
 import React, { lazy } from 'react'
 import { HiOutlineCube } from 'react-icons/hi'
 import {
@@ -38,6 +37,9 @@ import {
   HiUserCircle
 } from 'react-icons/hi2'
 import { RiSendPlaneFill } from 'react-icons/ri'
+
+import { clientSettingPath } from '@etherealengine/common/src/schema.type.module'
+
 import { AdminRouteStateType } from './AllowedAdminRoutesState'
 
 const Avatars = lazy(() => import('./components/avatar'))

packages/client-core/src/admin/adminRoutes.tsx

@@ -26,18 +26,21 @@ Ethereal Engine. All Rights Reserved.
 import React, { lazy, useEffect } from 'react'
 import { Link, Route, Routes, useLocation } from 'react-router-dom'
 
-import { getMutableState, getState, NO_PROXY, useHookstate } from '@etherealengine/hyperflux'
+import { ThemeState } from '@etherealengine/client-core/src/common/services/ThemeService'
+import { getMutableState, getState, NO_PROXY, useHookstate, useMutableState } from '@etherealengine/hyperflux'
 
 import { AuthState } from '../user/services/AuthService'
 import { AllowedAdminRoutesState } from './AllowedAdminRoutesState'
 import Projects from './components/project'
 
-import { ThemeState } from '@etherealengine/client-core/src/common/services/ThemeService'
 import '@etherealengine/engine/src/EngineModule'
-import Button from '@etherealengine/ui/src/primitives/tailwind/Button'
-import PopupMenu from '@etherealengine/ui/src/primitives/tailwind/PopupMenu'
+
 import { useTranslation } from 'react-i18next'
 import { HiMiniMoon, HiMiniSun } from 'react-icons/hi2'
+
+import Button from '@etherealengine/ui/src/primitives/tailwind/Button'
+import PopupMenu from '@etherealengine/ui/src/primitives/tailwind/PopupMenu'
+
 import { RouterState } from '../common/services/RouterService'
 import { DefaultAdminRoutes } from './DefaultAdminRoutes'
 
@@ -108,7 +111,7 @@ const AdminRoutes = () => {
   const location = useLocation()
   const admin = useHookstate(getMutableState(AuthState)).user
 
-  const allowedRoutes = useHookstate(getMutableState(AllowedAdminRoutesState))
+  const allowedRoutes = useMutableState(AllowedAdminRoutesState)
 
   const scopes = admin?.scopes?.value
 

packages/client-core/src/admin/allowedRoutes.tsx

@@ -27,8 +27,8 @@ import { t } from 'i18next'
 import React, { Suspense } from 'react'
 import { Route, Routes, useLocation } from 'react-router-dom'
 
-import { getMutableState, NO_PROXY } from '@etherealengine/hyperflux'
-import { useHookstate } from '@hookstate/core'
+import { NO_PROXY, useMutableState } from '@etherealengine/hyperflux'
+
 import { Redirect } from '../common/components/Redirect'
 import { LoadingCircle } from '../components/LoadingCircle'
 import { AllowedAdminRoutesState } from './AllowedAdminRoutesState'
@@ -37,7 +37,7 @@ const AllowedRoutes = () => {
   const location = useLocation()
   const { pathname } = location
 
-  const allowedRoutes = useHookstate(getMutableState(AllowedAdminRoutesState))
+  const allowedRoutes = useMutableState(AllowedAdminRoutesState)
 
   const path = pathname.split('/')[2]
 

packages/client-core/src/admin/common/DrawerView.tsx

@@ -23,9 +23,8 @@ All portions of the code written by the Ethereal Engine team are Copyright © 20
 Ethereal Engine. All Rights Reserved.
 */
 
-import React from 'react'
-
 import Drawer, { DrawerClasses } from '@mui/material/Drawer'
+import React from 'react'
 
 import styles from '../old-styles/admin.module.scss'
 

packages/client-core/src/admin/common/Location/LocationDrawer.tsx

@@ -30,21 +30,21 @@ import InputSelect, { InputMenuItem } from '@etherealengine/client-core/src/comm
 import InputSwitch from '@etherealengine/client-core/src/common/components/InputSwitch'
 import InputText from '@etherealengine/client-core/src/common/components/InputText'
 import {
+  assetPath,
   LocationData,
   LocationID,
-  LocationType,
-  assetPath,
-  locationPath
+  locationPath,
+  LocationType
 } from '@etherealengine/common/src/schema.type.module'
-import { NO_PROXY, getMutableState, useHookstate } from '@etherealengine/hyperflux'
+import { AssetType } from '@etherealengine/common/src/schemas/assets/asset.schema'
+import { getMutableState, NO_PROXY, useHookstate } from '@etherealengine/hyperflux'
+import { useFind, useGet, useMutation } from '@etherealengine/spatial/src/common/functions/FeathersHooks'
 import Button from '@etherealengine/ui/src/primitives/mui/Button'
 import Container from '@etherealengine/ui/src/primitives/mui/Container'
 import DialogActions from '@etherealengine/ui/src/primitives/mui/DialogActions'
 import DialogTitle from '@etherealengine/ui/src/primitives/mui/DialogTitle'
 import Grid from '@etherealengine/ui/src/primitives/mui/Grid'
 
-import { AssetType } from '@etherealengine/common/src/schemas/assets/asset.schema'
-import { useFind, useGet, useMutation } from '@etherealengine/spatial/src/common/functions/FeathersHooks'
 import { NotificationService } from '../../../common/services/NotificationService'
 import { AuthState } from '../../../user/services/AuthService'
 import styles from '../../old-styles/admin.module.scss'