HMR Config and Authentication Fallback Spinner

.env.local.default

@@ -21,6 +21,8 @@ APP_URL=https://localhost:3000
 APP_HOST=localhost:3000
 APP_PORT=3000
 
+VITE_HMR=false
+
 # Vite variables - Exposed to client side
 VITE_FORCE_CLIENT_LOG_AGGREGATE=false
 VITE_GA_TRACKING_ID=

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

@@ -16,6 +16,7 @@
   },
   "loader": {
     "connecting": "Connecting...",
+    "authenticating": "Authenticating...",
     "starting": "Starting...",
     "loadingLocation": "Loading locations...",
     "loadingEngine": "Loading engine...",

packages/client-core/src/API.ts

@@ -10,7 +10,7 @@ import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine'
 
 import primusClient from './util/primus-client'
 
-type FeathersClient = FeathersApplication<ServiceTypes> &
+export type FeathersClient = FeathersApplication<ServiceTypes> &
   AuthenticationClient & {
     primus: Primus
     authentication: AuthenticationClient

packages/client-core/src/util/wait-for-client-authenticated.ts

@@ -1,8 +1,11 @@
-import { API } from '../API'
+import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine'
+
+import { FeathersClient } from '../API'
 
 async function waitForClientAuthenticated(): Promise<void> {
-  //console.log('Client authenticated?', client.authentication?.authenticated)
-  if (API.instance.client.authentication?.authenticated === true) return Promise.resolve()
+  const api = Engine.instance.api as FeathersClient
+  console.log('Client authenticated?', api.authentication?.authenticated)
+  if (api.authentication?.authenticated === true) return
   else
     return await new Promise((resolve) =>
       setTimeout(async () => {

packages/client/src/route/public.tsx

@@ -11,6 +11,7 @@ import {
   AdminClientSettingsState,
   ClientSettingsServiceReceptor
 } from '@etherealengine/client-core/src/admin/services/Setting/ClientSettingService'
+import { FeathersClient } from '@etherealengine/client-core/src/API'
 import ErrorBoundary from '@etherealengine/client-core/src/common/components/ErrorBoundary'
 import { ProjectServiceReceptor } from '@etherealengine/client-core/src/common/services/ProjectService'
 import {
@@ -21,6 +22,7 @@ import {
 import { LoadingCircle } from '@etherealengine/client-core/src/components/LoadingCircle'
 import { LocationServiceReceptor } from '@etherealengine/client-core/src/social/services/LocationService'
 import { AuthService, AuthServiceReceptor } from '@etherealengine/client-core/src/user/services/AuthService'
+import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine'
 import { addActionReceptor, getMutableState, removeActionReceptor, useHookstate } from '@etherealengine/hyperflux'
 
 import $404 from '../pages/404'
@@ -101,6 +103,10 @@ function RouterComp() {
       return routesReady.set(true)
   }, [clientSettingsState.client.length, authSettingsState.authSettings.length, customRoutes])
 
+  if (!(Engine.instance.api as FeathersClient).authentication?.authenticated) {
+    return <LoadingCircle message={t('common:loader.authenticating')} />
+  }
+
   if (!routesReady.value) {
     return <LoadingCircle message={t('common:loader.loadingRoutes')} />
   }

packages/client/vite.config.ts

@@ -134,7 +134,7 @@ export default defineConfig(async () => {
 
   const returned = {
     server: {
-      hmr: true,
+      hmr: process.env.VITE_HMR,
       host: process.env['VITE_APP_HOST'],
       port: process.env['VITE_APP_PORT'],
       headers: {