Merge pull request #100 from EtherealEngine/project-orgnames

project-orgnames
EtherealEngine · Aug 18, 2024 · 2eecdc3 · 2eecdc3
2 parents 2ab6196 + fc51d8e
commit 2eecdc3
Show file tree

Hide file tree

Showing 38 changed files with 161 additions and 162 deletions.
diff --git a/.github/workflows/project-build.yml b/.github/workflows/project-build.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Checkout Project
         uses: actions/checkout@v3
         with:
-          path: './packages/projects/projects/${{ github.event.repository.name }}'
+          path: './packages/projects/projects/etherealengine/${{ github.event.repository.name }}'
       - name: Use Node.js
         uses: actions/setup-node@v3
         with:

diff --git a/dockerfiles/Dockerfile_bot b/dockerfiles/Dockerfile_bot
@@ -37,7 +37,7 @@ RUN cp .env.local.default .env.local
 
 RUN npm install --loglevel notice --legacy-peer-deps
 
-WORKDIR /etherealengine/packages/projects/projects/ee-development-test-suite
+WORKDIR /etherealengine/packages/projects/projects/etherealengine/ee-development-test-suite
 
 ENV DOMAIN=test2.etherealengine.com
 ENV LOCATION=default

diff --git a/e2e/benchmark/audio-and-video.test.ts b/e2e/benchmark/audio-and-video.test.ts
@@ -1,7 +1,7 @@
 import assert from 'assert'
 import { Vector3 } from 'three'
-import { EtherealEngineBot } from 'ee-bot/src/bot/bot-class'
-import { BotHooks } from 'ee-bot/src/enums/BotHooks'
+import { EtherealEngineBot } from '@etherealengine/ee-bot/src/bot/bot-class'
+import { BotHooks } from '@etherealengine/ee-bot/src/enums/BotHooks'
 
 // const vector3 = new Vector3()
 

diff --git a/e2e/benchmark/audio-only.test.ts b/e2e/benchmark/audio-only.test.ts
@@ -1,7 +1,7 @@
 import assert from 'assert'
 import { Vector3 } from 'three'
-import { EtherealEngineBot } from 'ee-bot/src/bot/bot-class'
-import { BotHooks } from 'ee-bot/src/enums/BotHooks'
+import { EtherealEngineBot } from '@etherealengine/ee-bot/src/bot/bot-class'
+import { BotHooks } from '@etherealengine/ee-bot/src/enums/BotHooks'
 
 // const vector3 = new Vector3()
 

diff --git a/e2e/benchmark/basic.test.ts b/e2e/benchmark/basic.test.ts
@@ -1,7 +1,7 @@
 import assert from 'assert'
 import { Vector3 } from 'three'
-import { EtherealEngineBot } from 'ee-bot/src/bot/bot-class'
-import { BotHooks } from 'ee-bot/src/enums/BotHooks'
+import { EtherealEngineBot } from '@etherealengine/ee-bot/src/bot/bot-class'
+import { BotHooks } from '@etherealengine/ee-bot/src/enums/BotHooks'
 
 // const vector3 = new Vector3()
 

diff --git a/e2e/benchmark/movement-audio-video.test.ts b/e2e/benchmark/movement-audio-video.test.ts
@@ -1,7 +1,7 @@
 import assert from 'assert'
 import { Vector3 } from 'three'
-import { EtherealEngineBot } from 'ee-bot/src/bot/bot-class'
-import { BotHooks } from 'ee-bot/src/enums/BotHooks'
+import { EtherealEngineBot } from '@etherealengine/ee-bot/src/bot/bot-class'
+import { BotHooks } from '@etherealengine/ee-bot/src/enums/BotHooks'
 
 // const vector3 = new Vector3()
 

diff --git a/e2e/benchmark/movement-only.test.ts b/e2e/benchmark/movement-only.test.ts
@@ -1,7 +1,7 @@
 import assert from 'assert'
 import { Vector3 } from 'three'
-import { EtherealEngineBot } from 'ee-bot/src/bot/bot-class'
-import { BotHooks } from 'ee-bot/src/enums/BotHooks'
+import { EtherealEngineBot } from '@etherealengine/ee-bot/src/bot/bot-class'
+import { BotHooks } from '@etherealengine/ee-bot/src/enums/BotHooks'
 
 // const vector3 = new Vector3()
 

diff --git a/e2e/benchmark/run-bot.ts b/e2e/benchmark/run-bot.ts
@@ -3,8 +3,8 @@ import appRootPath from 'app-root-path'
 import cli from 'cli'
 import dotenv from 'dotenv-flow'
 
-import { EtherealEngineBot } from 'ee-bot/src/bot/bot-class'
-import { BotHooks } from 'ee-bot/src/enums/BotHooks'
+import { EtherealEngineBot } from '@etherealengine/ee-bot/src/bot/bot-class'
+import { BotHooks } from '@etherealengine/ee-bot/src/enums/BotHooks'
 
 dotenv.config({
     path: appRootPath.path,

diff --git a/e2e/benchmark/video-only.test.ts b/e2e/benchmark/video-only.test.ts
@@ -1,7 +1,7 @@
 import assert from 'assert'
 import { Vector3 } from 'three'
-import { EtherealEngineBot } from 'ee-bot/src/bot/bot-class'
-import { BotHooks } from 'ee-bot/src/enums/BotHooks'
+import { EtherealEngineBot } from '@etherealengine/ee-bot/src/bot/bot-class'
+import { BotHooks } from '@etherealengine/ee-bot/src/enums/BotHooks'
 
 // const vector3 = new Vector3()
 

diff --git a/e2e/core/core.test.ts b/e2e/core/core.test.ts
@@ -1,6 +1,6 @@
 import assert from 'assert'
-import { EtherealEngineBot } from 'ee-bot/src/bot/bot-class'
-import { BotHooks } from 'ee-bot/src/enums/BotHooks'
+import { EtherealEngineBot } from '@etherealengine/ee-bot/src/bot/bot-class'
+import { BotHooks } from '@etherealengine/ee-bot/src/enums/BotHooks'
 import { Vector3 } from 'three'
 
 import { UserID } from '@etherealengine/common/src/schemas/user/user.schema'

diff --git a/e2e/core/webxr.test.ts b/e2e/core/webxr.test.ts
@@ -1,5 +1,5 @@
-import { EtherealEngineBot } from 'ee-bot/src/bot/bot-class'
-import { BotHooks } from 'ee-bot/src/enums/BotHooks'
+import { EtherealEngineBot } from '@etherealengine/ee-bot/src/bot/bot-class'
+import { BotHooks } from '@etherealengine/ee-bot/src/enums/BotHooks'
 
 import { setupXR, testWebXR } from '../utils/testWebXR'
 

diff --git a/e2e/dev/all-editor-action.test.ts b/e2e/dev/all-editor-action.test.ts
@@ -1,7 +1,7 @@
 import assert from 'assert'
 import { Vector3 } from 'three'
-import { EtherealEngineBot } from 'ee-bot/src/bot/bot-class'
-import { BotHooks } from 'ee-bot/src/enums/BotHooks'
+import { EtherealEngineBot } from '@etherealengine/ee-bot/src/bot/bot-class'
+import { BotHooks } from '@etherealengine/ee-bot/src/enums/BotHooks'
 
 const vector3 = new Vector3()
 

diff --git a/e2e/dev/alldirection.test.ts b/e2e/dev/alldirection.test.ts
@@ -1,7 +1,7 @@
 import assert from 'assert'
 import { Vector3 } from 'three'
-import { EtherealEngineBot } from 'ee-bot/src/bot/bot-class'
-import { BotHooks } from 'ee-bot/src/enums/BotHooks'
+import { EtherealEngineBot } from '@etherealengine/ee-bot/src/bot/bot-class'
+import { BotHooks } from '@etherealengine/ee-bot/src/enums/BotHooks'
 
 //const vector3 = new Vector3()
 

diff --git a/e2e/dev/dev.test.ts b/e2e/dev/dev.test.ts
@@ -1,7 +1,7 @@
 import assert from 'assert'
 import { Vector3 } from 'three'
-import { EtherealEngineBot } from 'ee-bot/src/bot/bot-class'
-import { BotHooks } from 'ee-bot/src/enums/BotHooks'
+import { EtherealEngineBot } from '@etherealengine/ee-bot/src/bot/bot-class'
+import { BotHooks } from '@etherealengine/ee-bot/src/enums/BotHooks'
 
 const vector3 = new Vector3()
 

diff --git a/e2e/dev/moveforward.test.ts b/e2e/dev/moveforward.test.ts
@@ -1,7 +1,7 @@
 import assert from 'assert'
 import { Vector3 } from 'three'
-import { EtherealEngineBot } from 'ee-bot/src/bot/bot-class'
-import { BotHooks } from 'ee-bot/src/enums/BotHooks'
+import { EtherealEngineBot } from '@etherealengine/ee-bot/src/bot/bot-class'
+import { BotHooks } from '@etherealengine/ee-bot/src/enums/BotHooks'
 
 //const vector3 = new Vector3()
 

diff --git a/e2e/dev/portal.test.ts b/e2e/dev/portal.test.ts
@@ -1,7 +1,7 @@
 import assert from 'assert'
 import { Vector3 } from 'three'
-import { EtherealEngineBot } from 'ee-bot/src/bot/bot-class'
-import { BotHooks } from 'ee-bot/src/enums/BotHooks'
+import { EtherealEngineBot } from '@etherealengine/ee-bot/src/bot/bot-class'
+import { BotHooks } from '@etherealengine/ee-bot/src/enums/BotHooks'
 
 const vector3 = new Vector3()
 

diff --git a/e2e/editor/editorScene.test.ts b/e2e/editor/editorScene.test.ts
@@ -1,6 +1,6 @@
 import assert from 'assert'
-import { EtherealEngineBot } from 'ee-bot/src/bot/bot-class'
-import { BotHooks } from 'ee-bot/src/enums/BotHooks'
+import { EtherealEngineBot } from '@etherealengine/ee-bot/src/bot/bot-class'
+import { BotHooks } from '@etherealengine/ee-bot/src/enums/BotHooks'
 
 import { delay } from '@etherealengine/spatial/src/common/functions/delay'
 

diff --git a/e2e/editor/xrui.test.ts b/e2e/editor/xrui.test.ts
@@ -1,6 +1,6 @@
 import assert from 'assert'
-import { EtherealEngineBot } from 'ee-bot/src/bot/bot-class'
-import { BotHooks } from 'ee-bot/src/enums/BotHooks'
+import { EtherealEngineBot } from '@etherealengine/ee-bot/src/bot/bot-class'
+import { BotHooks } from '@etherealengine/ee-bot/src/enums/BotHooks'
 
 import { delay } from '@etherealengine/spatial/src/common/functions/delay'
 

diff --git a/e2e/utils/testWebXR.ts b/e2e/utils/testWebXR.ts
@@ -1,6 +1,6 @@
 import assert from 'assert'
-import type { EtherealEngineBot } from 'ee-bot/src/bot/bot-class'
-import { XRBotHooks } from 'ee-bot/src/enums/BotHooks'
+import type { EtherealEngineBot } from '@etherealengine/ee-bot/src/bot/bot-class'
+import { XRBotHooks } from '@etherealengine/ee-bot/src/enums/BotHooks'
 
 export const setupXR = async (bot: EtherealEngineBot) => {
   await bot.runHook(XRBotHooks.OverrideXR)

diff --git a/manifest.json b/manifest.json
@@ -1,5 +1,5 @@
 {
-  "name": "ee-development-test-suite",
+  "name": "etherealengine/ee-development-test-suite",
   "version": "0.0.0",
   "engineVersion": "1.6.0",
   "description": "Assets and tests for iR Engine core development",

diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "ee-development-test-suite",
+  "name": "@etherealengine/ee-development-test-suite",
   "version": "0.0.0",
   "description": "Assets and tests for Ethereal Engine core development",
   "main": "",

diff --git a/projectEventHooks.ts b/projectEventHooks.ts
@@ -8,16 +8,15 @@ import appRootPath from 'app-root-path'
 import fs from 'fs'
 import path from 'path'
 import manifestJson from './manifest.json'
-import packageJson from './package.json'
 
 const projectRelativeFolder = path.resolve(appRootPath.path, 'packages/projects')
-const avatarsFolder = path.join(appRootPath.path, 'packages/projects/projects', packageJson.name, 'public/avatars')
+const avatarsFolder = path.join(appRootPath.path, 'packages/projects/projects', manifestJson.name, 'public/avatars')
 
 const config = {
   onInstall: async (app: Application) => {
-    await app.service('route-activate').create({ project: packageJson.name, route: '/examples', activate: true })
-    await app.service('route-activate').create({ project: packageJson.name, route: '/benchmarks', activate: true })
-    await app.service('route-activate').create({ project: packageJson.name, route: '/benchmarksAll', activate: true })
+    await app.service('route-activate').create({ project: manifestJson.name, route: '/examples', activate: true })
+    await app.service('route-activate').create({ project: manifestJson.name, route: '/benchmarks', activate: true })
+    await app.service('route-activate').create({ project: manifestJson.name, route: '/benchmarksAll', activate: true })
 
     await Promise.all(
       fs

diff --git a/public/scenes/Benchmarks.gltf b/public/scenes/Benchmarks.gltf
@@ -42,7 +42,7 @@
           "bakeType": "Baked",
           "resolution": 2048,
           "refreshMode": "OnAwake",
-          "envMapOrigin": "__$project$__/default-project/default.envmap.ktx2",
+          "envMapOrigin": "__$project$__/etherealengine/default-project/default.envmap.ktx2",
           "boxProjection": true
         },
         "EE_fog": {
@@ -211,8 +211,8 @@
           "shadowMapType": 2
         },
         "EE_scene_settings": {
-          "thumbnailURL": "__$project$__/default-project/public/scenes/default.thumbnail.jpg",
-          "loadingScreenURL": "__$project$__/default-project/public/scenes/default.loadingscreen.ktx2",
+          "thumbnailURL": "__$project$__/etherealengine/default-project/public/scenes/default.thumbnail.jpg",
+          "loadingScreenURL": "__$project$__/etherealengine/default-project/public/scenes/default.loadingscreen.ktx2",
           "primaryColor": "#38620D",
           "backgroundColor": "rgb(214, 214, 211)",
           "alternativeColor": "#376312",
@@ -254,7 +254,7 @@
         "EE_skybox": {
           "backgroundColor": 0,
           "equirectangularPath": "",
-          "cubemapPath": "__$project$__/default-project/assets/skyboxsun25deg/",
+          "cubemapPath": "__$project$__/etherealengine/default-project/assets/skyboxsun25deg/",
           "backgroundType": 1,
           "skyboxProps": {
             "turbidity": 10,

diff --git a/public/scenes/Examples.gltf b/public/scenes/Examples.gltf
@@ -41,7 +41,7 @@
           "bakeType": "Baked",
           "resolution": 2048,
           "refreshMode": "OnAwake",
-          "envMapOrigin": "__$project$__/default-project/default.envmap.ktx2",
+          "envMapOrigin": "__$project$__/etherealengine/default-project/default.envmap.ktx2",
           "boxProjection": true
         },
         "EE_fog": {
@@ -210,8 +210,8 @@
           "shadowMapType": 2
         },
         "EE_scene_settings": {
-          "thumbnailURL": "__$project$__/default-project/public/scenes/default.thumbnail.jpg",
-          "loadingScreenURL": "__$project$__/default-project/public/scenesdefault.loadingscreen.ktx2",
+          "thumbnailURL": "__$project$__/etherealengine/default-project/public/scenes/default.thumbnail.jpg",
+          "loadingScreenURL": "__$project$__/etherealengine/default-project/public/scenesdefault.loadingscreen.ktx2",
           "primaryColor": "#38620D",
           "backgroundColor": "rgb(214, 214, 211)",
           "alternativeColor": "#376312",
@@ -253,7 +253,7 @@
         "EE_skybox": {
           "backgroundColor": 2894892,
           "equirectangularPath": "",
-          "cubemapPath": "__$project$__/default-project/assets/skyboxsun25deg/",
+          "cubemapPath": "__$project$__/etherealengine/default-project/assets/skyboxsun25deg/",
           "backgroundType": 0,
           "skyboxProps": {
             "turbidity": 10,

diff --git a/public/scenes/animations-test.scene.json b/public/scenes/animations-test.scene.json
@@ -356,9 +356,9 @@
         {
           "name": "EE_model",
           "props": {
-            "src": "__$project$__/ee-development-test-suite/assets/animations/rings.glb",
+            "src": "__$project$__/etherealengine/ee-development-test-suite/assets/animations/rings.glb",
             "resource": {
-              "src": "__$project$__/ee-development-test-suite/assets/animations/rings.glb"
+              "src": "__$project$__/etherealengine/ee-development-test-suite/assets/animations/rings.glb"
             },
             "generateBVH": false,
             "avoidCameraOcclusion": false
@@ -423,9 +423,9 @@
         {
           "name": "EE_model",
           "props": {
-            "src": "__$project$__/ee-development-test-suite/assets/animations/transforms.glb",
+            "src": "__$project$__/etherealengine/ee-development-test-suite/assets/animations/transforms.glb",
             "resource": {
-              "src": "__$project$__/ee-development-test-suite/assets/animations/transforms.glb"
+              "src": "__$project$__/etherealengine/ee-development-test-suite/assets/animations/transforms.glb"
             },
             "generateBVH": false,
             "avoidCameraOcclusion": false
@@ -490,7 +490,7 @@
         {
           "name": "EE_model",
           "props": {
-            "src": "__$project$__/ee-development-test-suite/assets/animations/Racer-transformed.gltf",
+            "src": "__$project$__/etherealengine/ee-development-test-suite/assets/animations/Racer-transformed.gltf",
             "generateBVH": false,
             "avoidCameraOcclusion": false
           }

diff --git a/public/scenes/bpcem-envmap-bake-test.scene.json b/public/scenes/bpcem-envmap-bake-test.scene.json
@@ -49,7 +49,7 @@
             "bakeType": "Baked",
             "resolution": 2048,
             "refreshMode": "OnAwake",
-            "envMapOrigin": "__$project$__/ee-development-test-suite/envmaps.envmap.ktx2",
+            "envMapOrigin": "__$project$__/etherealengine/ee-development-test-suite/envmaps.envmap.ktx2",
             "boxProjection": false
           }
         },
@@ -430,7 +430,7 @@
         {
           "name": "EE_model",
           "props": {
-            "src": "__$project$__/ee-development-test-suite/assets/envmaps/hall.glb",
+            "src": "__$project$__/etherealengine/ee-development-test-suite/assets/envmaps/hall.glb",
             "generateBVH": true,
             "avoidCameraOcclusion": false
           }
@@ -495,7 +495,7 @@
         {
           "name": "EE_model",
           "props": {
-            "src": "__$project$__/ee-development-test-suite/assets/envmaps/hall.glb",
+            "src": "__$project$__/etherealengine/ee-development-test-suite/assets/envmaps/hall.glb",
             "generateBVH": true,
             "avoidCameraOcclusion": false
           }
@@ -571,7 +571,7 @@
             "bakeType": "Baked",
             "resolution": 1024,
             "refreshMode": "OnAwake",
-            "envMapOrigin": "__$project$__/ee-development-test-suite/bpcem-envmap-bake-test-bpcem-hall-bake-1.ktx2",
+            "envMapOrigin": "__$project$__/etherealengine/ee-development-test-suite/bpcem-envmap-bake-test-bpcem-hall-bake-1.ktx2",
             "boxProjection": true
           }
         }
@@ -628,7 +628,7 @@
             "bakeType": "Baked",
             "resolution": 1024,
             "refreshMode": "OnAwake",
-            "envMapOrigin": "__$project$__/ee-development-test-suite/bpcem-envmap-bake-test-bpcem-hall-bake-2.ktx2",
+            "envMapOrigin": "__$project$__/etherealengine/ee-development-test-suite/bpcem-envmap-bake-test-bpcem-hall-bake-2.ktx2",
             "boxProjection": true
           }
         }